From 2aa6fe860be1a24636e1c9358bfa845381ee68a3 Mon Sep 17 00:00:00 2001
From: Gigi <dergigi@pm.me>
Date: Wed, 15 Oct 2025 19:33:22 +0200
Subject: [PATCH] refactor: merge Layout & Navigation and Startup & Behavior
 into Layout & Behavior section

---
 src/components/Settings.tsx                   |  6 +-
 ...ettings.tsx => LayoutBehaviorSettings.tsx} | 50 ++++++++++++++--
 .../Settings/LayoutNavigationSettings.tsx     | 60 -------------------
 3 files changed, 48 insertions(+), 68 deletions(-)
 rename src/components/Settings/{StartupPreferencesSettings.tsx => LayoutBehaviorSettings.tsx} (53%)
 delete mode 100644 src/components/Settings/LayoutNavigationSettings.tsx

diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index f70b056c..b179b5c2 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -6,8 +6,7 @@ import IconButton from './IconButton'
 import { loadFont } from '../utils/fontLoader'
 import ThemeSettings from './Settings/ThemeSettings'
 import ReadingDisplaySettings from './Settings/ReadingDisplaySettings'
-import LayoutNavigationSettings from './Settings/LayoutNavigationSettings'
-import StartupPreferencesSettings from './Settings/StartupPreferencesSettings'
+import LayoutBehaviorSettings from './Settings/LayoutBehaviorSettings'
 import ZapSettings from './Settings/ZapSettings'
 import RelaySettings from './Settings/RelaySettings'
 import PWASettings from './Settings/PWASettings'
@@ -163,8 +162,7 @@ const Settings: React.FC<SettingsProps> = ({ settings, onSave, onClose, relayPoo
         <ThemeSettings settings={localSettings} onUpdate={handleUpdate} />
         <ReadingDisplaySettings settings={localSettings} onUpdate={handleUpdate} />
         <ZapSettings settings={localSettings} onUpdate={handleUpdate} />
-        <LayoutNavigationSettings settings={localSettings} onUpdate={handleUpdate} />
-        <StartupPreferencesSettings settings={localSettings} onUpdate={handleUpdate} />
+        <LayoutBehaviorSettings settings={localSettings} onUpdate={handleUpdate} />
         <PWASettings settings={localSettings} onUpdate={handleUpdate} onClose={onClose} />
         <RelaySettings relayStatuses={relayStatuses} onClose={onClose} />
       </div>
diff --git a/src/components/Settings/StartupPreferencesSettings.tsx b/src/components/Settings/LayoutBehaviorSettings.tsx
similarity index 53%
rename from src/components/Settings/StartupPreferencesSettings.tsx
rename to src/components/Settings/LayoutBehaviorSettings.tsx
index 814861bd..ff51264b 100644
--- a/src/components/Settings/StartupPreferencesSettings.tsx
+++ b/src/components/Settings/LayoutBehaviorSettings.tsx
@@ -1,16 +1,58 @@
 import React from 'react'
+import { faList, faThLarge, faImage } from '@fortawesome/free-solid-svg-icons'
 import { UserSettings } from '../../services/settingsService'
+import IconButton from '../IconButton'
 
-interface StartupPreferencesSettingsProps {
+interface LayoutBehaviorSettingsProps {
   settings: UserSettings
   onUpdate: (updates: Partial<UserSettings>) => void
 }
 
-const StartupPreferencesSettings: React.FC<StartupPreferencesSettingsProps> = ({ settings, onUpdate }) => {
+const LayoutBehaviorSettings: React.FC<LayoutBehaviorSettingsProps> = ({ settings, onUpdate }) => {
   return (
     <div className="settings-section">
-      <h3 className="section-title">Startup & Behavior</h3>
+      <h3 className="section-title">Layout & Behavior</h3>
       
+      <div className="setting-group setting-inline">
+        <label>Default Bookmark View</label>
+        <div className="setting-buttons">
+          <IconButton 
+            icon={faList} 
+            onClick={() => onUpdate({ defaultViewMode: 'compact' })} 
+            title="Compact list view" 
+            ariaLabel="Compact list view" 
+            variant={(settings.defaultViewMode || 'compact') === 'compact' ? 'primary' : 'ghost'} 
+          />
+          <IconButton 
+            icon={faThLarge} 
+            onClick={() => onUpdate({ defaultViewMode: 'cards' })} 
+            title="Cards view" 
+            ariaLabel="Cards view" 
+            variant={settings.defaultViewMode === 'cards' ? 'primary' : 'ghost'} 
+          />
+          <IconButton 
+            icon={faImage} 
+            onClick={() => onUpdate({ defaultViewMode: 'large' })} 
+            title="Large preview view" 
+            ariaLabel="Large preview view" 
+            variant={settings.defaultViewMode === 'large' ? 'primary' : 'ghost'} 
+          />
+        </div>
+      </div>
+
+      <div className="setting-group">
+        <label htmlFor="collapseOnArticleOpen" className="checkbox-label">
+          <input
+            id="collapseOnArticleOpen"
+            type="checkbox"
+            checked={settings.collapseOnArticleOpen !== false}
+            onChange={(e) => onUpdate({ collapseOnArticleOpen: e.target.checked })}
+            className="setting-checkbox"
+          />
+          <span>Collapse bookmark bar when opening an article</span>
+        </label>
+      </div>
+
       <div className="setting-group">
         <label htmlFor="sidebarCollapsed" className="checkbox-label">
           <input
@@ -66,5 +108,5 @@ const StartupPreferencesSettings: React.FC<StartupPreferencesSettingsProps> = ({
   )
 }
 
-export default StartupPreferencesSettings
+export default LayoutBehaviorSettings
 
diff --git a/src/components/Settings/LayoutNavigationSettings.tsx b/src/components/Settings/LayoutNavigationSettings.tsx
deleted file mode 100644
index 4603a172..00000000
--- a/src/components/Settings/LayoutNavigationSettings.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react'
-import { faList, faThLarge, faImage } from '@fortawesome/free-solid-svg-icons'
-import { UserSettings } from '../../services/settingsService'
-import IconButton from '../IconButton'
-
-interface LayoutNavigationSettingsProps {
-  settings: UserSettings
-  onUpdate: (updates: Partial<UserSettings>) => void
-}
-
-const LayoutNavigationSettings: React.FC<LayoutNavigationSettingsProps> = ({ settings, onUpdate }) => {
-  return (
-    <div className="settings-section">
-      <h3 className="section-title">Layout & Navigation</h3>
-      
-      <div className="setting-group setting-inline">
-        <label>Default Bookmark View</label>
-        <div className="setting-buttons">
-          <IconButton 
-            icon={faList} 
-            onClick={() => onUpdate({ defaultViewMode: 'compact' })} 
-            title="Compact list view" 
-            ariaLabel="Compact list view" 
-            variant={(settings.defaultViewMode || 'compact') === 'compact' ? 'primary' : 'ghost'} 
-          />
-          <IconButton 
-            icon={faThLarge} 
-            onClick={() => onUpdate({ defaultViewMode: 'cards' })} 
-            title="Cards view" 
-            ariaLabel="Cards view" 
-            variant={settings.defaultViewMode === 'cards' ? 'primary' : 'ghost'} 
-          />
-          <IconButton 
-            icon={faImage} 
-            onClick={() => onUpdate({ defaultViewMode: 'large' })} 
-            title="Large preview view" 
-            ariaLabel="Large preview view" 
-            variant={settings.defaultViewMode === 'large' ? 'primary' : 'ghost'} 
-          />
-        </div>
-      </div>
-
-      <div className="setting-group">
-        <label htmlFor="collapseOnArticleOpen" className="checkbox-label">
-          <input
-            id="collapseOnArticleOpen"
-            type="checkbox"
-            checked={settings.collapseOnArticleOpen !== false}
-            onChange={(e) => onUpdate({ collapseOnArticleOpen: e.target.checked })}
-            className="setting-checkbox"
-          />
-          <span>Collapse bookmark bar when opening an article</span>
-        </label>
-      </div>
-    </div>
-  )
-}
-
-export default LayoutNavigationSettings
-