@focus8/settings-registry 0.8.3 → 0.8.5

package/dist/index.js

@@ -12,8 +12,34 @@
  * App-specific defaults (theme, locale, enrolled mode) are parameterized
  * via `createRegistry(config)`.
  */
-export const ALARM_TIMEOUTS = [1, 2, 3, 5, 10];
+export const ALARM_TIMEOUTS = [5, 30, 60, 120, 180, 300, 600];
 export const LOCK_SCREEN_MAX_IMAGES = 10;
+/**
+ * Evaluate a visibility/disabled rule against current setting values.
+ * Returns `true` if the setting should be visible (or disabled, depending on usage).
+ * `undefined` rule = always true (no restriction).
+ */
+export function evaluateVisibility(rule, getValue) {
+    if (!rule)
+        return true;
+    const conditions = Array.isArray(rule) ? rule : [rule];
+    return conditions.every((c) => {
+        const value = getValue(c.dependsOn);
+        if ('equals' in c)
+            return value === c.equals;
+        if ('notEquals' in c)
+            return value !== c.notEquals;
+        if ('isTruthy' in c)
+            return !!value;
+        return true;
+    });
+}
+/** Convenience: returns true when the setting should be disabled. */
+export function evaluateDisabled(rule, getValue) {
+    if (!rule)
+        return false;
+    return evaluateVisibility(rule, getValue);
+}
 // ---------------------------------------------------------------------------
 // Setting categories — used for UI grouping and profile organization
 // ---------------------------------------------------------------------------
@@ -96,53 +122,121 @@ export function getCategoriesForCalendarType(calendarType) {
     });
 }
 // ---------------------------------------------------------------------------
-// Settings groups — user-facing groups that reorganize raw categories
+// Settings sections — top-level groupings (e.g. "Kalender", "Enhet")
 // ---------------------------------------------------------------------------
-/**
- * Settings group IDs matching the mobile app's settings menu structure.
- * These provide user-friendly groupings that may pull settings from multiple
- * raw registry categories.
- */
-export const SETTINGS_GROUP_IDS = [
+export const SETTINGS_SECTION_IDS = ['calendar', 'unit'];
+export const SETTINGS_SECTIONS = [
+    { id: 'calendar', labelKey: 'Calendar.LabelCalendar' },
+    { id: 'unit', labelKey: 'Settings.Unit' },
+];
+// ---------------------------------------------------------------------------
+// Settings menu items — ordered list of all items in the settings menu
+// ---------------------------------------------------------------------------
+export const SETTINGS_MENU_ITEM_IDS = [
     // Calendar section
     'calendarView',
+    'calendars',
+    'eventCategories',
+    'notification',
     'timer',
-    'activities',
-    'dateWeather',
-    'touch',
+    'guests',
+    'eventForm',
+    'chronologicalEventForm',
+    'weather',
+    'gallery',
+    'audioClips',
+    'gestures',
     'calendarType',
-    'chronological',
+    'sharing',
     // Unit section
-    'appearance',
-    'soundAlerts',
+    'screen',
+    'volume',
     'lockScreen',
     'language',
-    'device',
+    'wifi',
+    'devices',
+    'profiles',
+    'tts',
+    'updates',
+    'about',
+    'help',
+    'dev',
+    // Account (rendered separately)
+    'account',
+    'activityLog',
 ];
 /**
- * Group definitions matching the mobile app's settings structure.
- *
- * ─ i18n keys use the format `Settings.GroupLabel.<Id>` and must exist
- *   in every consumer's i18n catalog.
+ * Ordered list of all settings menu items. The array order defines the
+ * display order within each section. Items without registry setting keys
+ * are navigation-only (e.g. gallery, guests).
  */
-export const SETTINGS_GROUPS = [
-    // ── Calendar section ──────────────────────────────────────────────────
+export const SETTINGS_MENU_ITEMS = [
+    // -- Calendar section --
     {
         id: 'calendarView',
-        labelKey: 'Settings.CalendarView',
+        labelKey: 'Settings.Calendar',
         icon: 'Eye',
+        section: 'calendar',
+        screens: [
+            'calendarDayView',
+            'calendarWeekView',
+            'chronologicalHeader',
+            'chronologicalFooter',
+            'chronologicalMenu',
+            'dayColors',
+            'dateTime',
+        ],
         keys: [
             'calendarView.showCalendarNames',
             'calendarView.splitView',
             'calendarView.dayViewZoom',
             'calendarView.weekViewZoom',
             'calendarView.calendarColumns',
+            'appearance.enableDayColors',
+            'chronological.dayView.displayMode',
+            'chronological.header.',
+            'chronological.footer.',
+            'chronological.menu.',
+            'chronological.quickSettings.',
+            'chronological.timeOfDay.',
+        ],
+    },
+    {
+        id: 'calendars',
+        labelKey: 'Common.Calendars',
+        icon: 'Calendar',
+        section: 'calendar',
+        screens: ['calendars'],
+    },
+    {
+        id: 'eventCategories',
+        labelKey: 'EventCategory.SettingsTitle',
+        icon: 'Tag',
+        section: 'calendar',
+        screens: ['eventCategories'],
+        calendarType: 'chronological',
+    },
+    {
+        id: 'notification',
+        labelKey: 'Settings.Notification',
+        icon: 'Bell',
+        section: 'calendar',
+        screens: ['notification'],
+        keys: [
+            'sound.reminderAlarmSound',
+            'sound.startAlarmSound',
+            'sound.endAlarmSound',
+            'sound.reminderAlarmTimeout',
+            'sound.reminderVolume',
         ],
     },
     {
         id: 'timer',
         labelKey: 'Settings.TimerTitle',
         icon: 'Timer',
+        section: 'calendar',
+        screens: ['timerFeatures', 'timer'],
+        appMode: 'ENROLLED',
         keys: [
             'chronological.timer.',
             'timer.',
@@ -150,18 +244,39 @@ export const SETTINGS_GROUPS = [
             'sound.timerAlarmTimeout',
             'sound.timerVolume',
         ],
-        appMode: 'ENROLLED',
     },
     {
-        id: 'activities',
-        labelKey: 'Settings.Activities',
-        icon: 'CalendarPlus',
-        keys: ['eventForm.', 'chronologicalEventForm.'],
+        id: 'guests',
+        labelKey: 'Settings.GuestUsers',
+        icon: 'Users',
+        section: 'calendar',
+        screens: ['guests'],
+    },
+    {
+        id: 'eventForm',
+        labelKey: 'SettingsEventForm.Title',
+        icon: 'ClipboardList',
+        section: 'calendar',
+        screens: ['eventForm'],
+        calendarType: 'time-based',
+        keys: ['eventForm.'],
+    },
+    {
+        id: 'chronologicalEventForm',
+        labelKey: 'SettingsChronologicalEventForm.Title',
+        icon: 'Plus',
+        section: 'calendar',
+        screens: ['chronologicalEventForm'],
+        calendarType: 'chronological',
+        keys: ['chronologicalEventForm.'],
     },
     {
-        id: 'dateWeather',
-        labelKey: 'Settings.DateWeather',
+        id: 'weather',
+        labelKey: 'Settings.WeatherTitle',
         icon: 'CloudSun',
+        section: 'calendar',
+        screens: ['weather'],
+        calendarType: 'time-based',
         keys: [
             'calendarView.showWeatherOnTimeline',
             'calendarView.weatherLocation',
@@ -169,76 +284,167 @@ export const SETTINGS_GROUPS = [
         ],
     },
     {
-        id: 'touch',
+        id: 'gallery',
+        labelKey: 'Gallery.Title',
+        icon: 'Images',
+        section: 'calendar',
+        screens: ['gallery'],
+        noScrollView: true,
+    },
+    {
+        id: 'audioClips',
+        labelKey: 'AudioClips.Title',
+        icon: 'AudioLines',
+        section: 'calendar',
+        screens: ['audioClips'],
+        noScrollView: true,
+    },
+    {
+        id: 'gestures',
         labelKey: 'Settings.FunctionsTitle',
         icon: 'Hand',
+        section: 'calendar',
+        screens: ['gestures'],
         keys: ['touch.'],
     },
     {
         id: 'calendarType',
-        labelKey: 'Settings.CalendarType',
-        icon: 'ArrowLeftRight',
+        labelKey: 'Settings.Mode',
+        icon: 'SlidersHorizontal',
+        section: 'calendar',
+        screens: ['calendarType'],
         keys: ['calendarView.type'],
     },
     {
-        id: 'chronological',
-        labelKey: 'Settings.Chronological',
-        icon: 'List',
-        keys: ['chronological.'],
-        calendarType: 'chronological',
+        id: 'sharing',
+        labelKey: 'Settings.Sharing',
+        icon: 'Share2',
+        section: 'calendar',
+        screens: ['icalSubscriptions'],
     },
-    // ── Unit section ──────────────────────────────────────────────────────
+    // -- Unit section --
     {
-        id: 'appearance',
-        labelKey: 'Settings.Appearance',
-        icon: 'Palette',
-        keys: [
-            'appearance.theme',
-            'appearance.clockType',
-            'appearance.enableDayColors',
-        ],
+        id: 'screen',
+        labelKey: 'Settings.Screen',
+        icon: 'LaptopMinimal',
+        section: 'unit',
+        screens: ['displayDensity', 'darkMode'],
+        keys: ['appearance.theme', 'appearance.clockType'],
     },
     {
-        id: 'soundAlerts',
-        labelKey: 'Settings.SoundAlerts',
+        id: 'volume',
+        labelKey: 'Common.Volume',
         icon: 'Volume2',
+        section: 'unit',
+        screens: ['volume'],
+        appMode: 'ENROLLED',
         keys: [
             'sound.reminderVolume',
+            'sound.timerVolume',
             'sound.mediaVolume',
-            'sound.reminderAlarmSound',
-            'sound.startAlarmSound',
-            'sound.endAlarmSound',
-            'sound.reminderAlarmTimeout',
-            'sound.allowCustomReminderSounds',
-            'notification.',
-            'sound.ttsEnabled',
-            'sound.ttsRate',
-            'sound.alarmSound',
         ],
     },
     {
         id: 'lockScreen',
         labelKey: 'Settings.LockScreen',
         icon: 'Lock',
-        keys: ['lockScreen.'],
+        section: 'unit',
+        screens: ['inactivity', 'lockScreen'],
         appMode: 'ENROLLED',
+        keys: ['lockScreen.'],
     },
     {
         id: 'language',
         labelKey: 'Settings.Language',
         icon: 'Globe',
+        section: 'unit',
+        screens: ['language'],
         keys: ['language.'],
     },
     {
-        id: 'device',
+        id: 'wifi',
+        labelKey: 'Settings.WifiTitle',
+        icon: 'Wifi',
+        section: 'unit',
+        screens: ['wifi'],
+        appMode: 'ENROLLED',
+    },
+    {
+        id: 'devices',
         labelKey: 'SettingsDevices.Title',
         icon: 'Smartphone',
+        section: 'unit',
+        screens: ['devices'],
         keys: [
             'device.',
             'calendarView.autoReturnToTodayEnabled',
             'calendarView.autoReturnToTodayTimeoutSeconds',
         ],
     },
+    {
+        id: 'tts',
+        labelKey: 'Settings.TtsTitle',
+        icon: 'Speech',
+        section: 'unit',
+        screens: ['tts'],
+        appMode: 'ENROLLED',
+        keys: [
+            'sound.ttsEnabled',
+            'sound.ttsRate',
+        ],
+    },
+    {
+        id: 'updates',
+        labelKey: 'Settings.UpdatesTitle',
+        icon: 'Download',
+        section: 'unit',
+        screens: ['updates'],
+    },
+    {
+        id: 'about',
+        labelKey: 'Settings.About',
+        icon: 'Info',
+        section: 'unit',
+        screens: ['restoreDefaults', 'recycleAppData', 'license', 'version'],
+    },
+    {
+        id: 'help',
+        labelKey: 'Settings.HelpTitle',
+        icon: 'CircleQuestionMark',
+        section: 'unit',
+        screens: ['help'],
+    },
+    {
+        id: 'dev',
+        labelKey: 'Settings.Dev',
+        icon: 'FolderCode',
+        section: 'unit',
+        screens: [
+            'devDeviceInfo',
+            'devComponents',
+            'devStores',
+            'devActions',
+            'devAuth',
+            'devNavigation',
+            'devNetwork',
+            'devAndroidSettings',
+        ],
+    },
+    // -- Account (rendered separately) --
+    {
+        id: 'account',
+        labelKey: 'Settings.Profile',
+        icon: 'User',
+        section: 'account',
+        screens: ['account', 'mfa'],
+    },
+    {
+        id: 'activityLog',
+        labelKey: 'SettingsActivityLog.Title',
+        icon: 'ScrollText',
+        section: 'account',
+        screens: ['activityLog'],
+    },
 ];
 /**
  * Settings excluded from remote editing (web portal / profile management).
@@ -271,6 +477,10 @@ export const SETTINGS_LABELS = {
         labelKey: 'Settings.EnableDayColors',
         descriptionKey: 'Settings.EnableDayColorsDescription',
     },
+    // ── Chronological day view display mode ──────────────────────────────────
+    'chronological.dayView.displayMode': {
+        labelKey: 'Settings.DayViewDisplayMode',
+    },
     // ── Calendar type ───────────────────────────────────────────────────────
     'calendarView.type': {
         labelKey: 'Settings.CalendarType',
@@ -341,6 +551,7 @@ export const SETTINGS_LABELS = {
     },
     'sound.ttsRate': { labelKey: 'Settings.TtsTitle' },
     // ── Timer ───────────────────────────────────────────────────────────────
+    'timer.face': { labelKey: 'Settings.TimerFace' },
     'timer.showTimeRemaining': { labelKey: 'Settings.TimerShowTimeRemaining' },
     'timer.showEndTime': { labelKey: 'Settings.TimerShowEndTime' },
     'timer.showRestartButton': { labelKey: 'Settings.TimerShowRestartButton' },
@@ -421,6 +632,9 @@ export const SETTINGS_LABELS = {
     'chronological.footer.showNewEventButton': {
         labelKey: 'ChronologicalFeatures.NewEventButton',
     },
+    'chronological.footer.showNowButton': {
+        labelKey: 'ChronologicalFeatures.NowButton',
+    },
     'chronological.footer.showSettingsButton': {
         labelKey: 'ChronologicalFeatures.SettingsButton',
     },
@@ -469,15 +683,15 @@ export const SETTINGS_LABELS = {
     'eventForm.checklist': { labelKey: 'EventChecklist.DefaultName' },
     'eventForm.images': { labelKey: 'EventImageGallery.SectionTitle' },
     'eventForm.audioClips': { labelKey: 'EventAudioGallery.SectionTitle' },
-    'eventForm.notificationReceivers': { labelKey: 'EventForm.NotificationReceivers' },
+    'eventForm.notificationReceivers': {
+        labelKey: 'EventForm.NotificationReceivers',
+    },
     'eventForm.visibility': { labelKey: 'EventVisibility.Title' },
+    // ── Chronological event form ────────────────────────────────────────────
+    'chronologicalEventForm.field.category': {
+        labelKey: 'ChronologicalEventForm.CategoryField',
+    },
 };
-/**
- * Check whether a setting key matches a group's key matchers.
- */
-function matchesGroup(key, group) {
-    return group.keys.some((matcher) => key === matcher || (matcher.endsWith('.') && key.startsWith(matcher)));
-}
 /** Return the index of the first matching key pattern in the group, for sorting. */
 function groupKeyIndex(key, keys) {
     for (let i = 0; i < keys.length; i++) {
@@ -504,68 +718,88 @@ function registryKeyOrder() {
     return _registryKeyOrder;
 }
 /**
- * Group parsed setting entries into user-facing groups matching the mobile
- * app's settings menu structure.
- *
- * Takes a flat list of parsed settings (from `parseSettingsSnapshot`) and
- * buckets them into the standard groups, filtering by calendar type and
- * excluded keys.
+ * Get the ordered list of setting keys for a given menu item.
+ * Returns keys matching the app's render order, filtered by EXCLUDED_DEVICE_SETTINGS and HIDDEN.
  */
-export function groupSettingsForDevice(allSettings, calendarType, appMode) {
+export function getKeysForMenuItem(menuItemId, reg = defaultRegistry) {
+    const menuItem = SETTINGS_MENU_ITEMS.find((m) => m.id === menuItemId);
+    if (!menuItem?.keys || menuItem.keys.length === 0)
+        return [];
+    const matched = reg.keys.filter((key) => {
+        if (EXCLUDED_DEVICE_SETTINGS.has(key))
+            return false;
+        const entry = reg.entries[key];
+        if (entry?.uiType === 'HIDDEN')
+            return false;
+        return menuItem.keys.some((k) => k.endsWith('.') ? key.startsWith(k) : key === k);
+    });
+    const order = registryKeyOrder();
+    matched.sort((a, b) => {
+        const aIdx = groupKeyIndex(a, menuItem.keys);
+        const bIdx = groupKeyIndex(b, menuItem.keys);
+        if (aIdx !== bIdx)
+            return aIdx - bIdx;
+        return (order.get(a) ?? Infinity) - (order.get(b) ?? Infinity);
+    });
+    return matched;
+}
+/**
+ * Group parsed setting entries using the app's menu structure (SETTINGS_MENU_ITEMS).
+ * Only includes menu items that have `keys` defined (editable settings).
+ * This ensures the web editor has the exact same menu items, order, sections,
+ * labels, and icons as the mobile app.
+ */
+export function groupSettingsForWeb(allSettings, calendarType, appMode) {
     // Filter excluded and hidden settings
     const settings = allSettings.filter((s) => !EXCLUDED_DEVICE_SETTINGS.has(s.key) && s.uiType !== 'HIDDEN');
-    // Calendar type filtering for event form keys
     const isChronological = calendarType === 'chronological';
     const filteredSettings = settings.filter((s) => {
-        if (isChronological && s.key.startsWith('eventForm.')) {
+        if (isChronological && s.key.startsWith('eventForm.'))
             return false;
-        }
-        if (!isChronological && s.key.startsWith('chronologicalEventForm.')) {
+        if (!isChronological && s.key.startsWith('chronologicalEventForm.'))
             return false;
-        }
-        // Per-setting calendar type restriction
-        if (s.calendarType && s.calendarType !== calendarType) {
+        if (s.calendarType && s.calendarType !== calendarType)
             return false;
-        }
-        // Per-setting app mode restriction
-        if (s.appMode && s.appMode !== appMode) {
+        if (s.appMode && s.appMode !== appMode)
             return false;
-        }
         return true;
     });
     const claimed = new Set();
     const result = [];
-    for (const group of SETTINGS_GROUPS) {
-        // Skip groups not relevant for current calendar type
-        if (group.calendarType && group.calendarType !== calendarType) {
+    for (const menuItem of SETTINGS_MENU_ITEMS) {
+        // Skip items without keys (navigation-only like gallery, guests, etc.)
+        if (!menuItem.keys || menuItem.keys.length === 0)
             continue;
-        }
-        // Skip groups not relevant for current app mode
-        if (group.appMode && group.appMode !== appMode) {
+        // Skip items not relevant for current calendar type
+        if (menuItem.calendarType && menuItem.calendarType !== calendarType)
             continue;
-        }
-        const matched = filteredSettings.filter((s) => !claimed.has(s.key) && matchesGroup(s.key, group));
-        if (matched.length === 0) {
+        // Skip items not relevant for current app mode
+        if (menuItem.appMode && menuItem.appMode !== appMode)
             continue;
-        }
-        // Sort matched settings by the order defined in group.keys,
-        // with registry declaration order as tiebreaker for prefix matches
+        const matched = filteredSettings.filter((s) => {
+            if (claimed.has(s.key))
+                return false;
+            return menuItem.keys.some((k) => k.endsWith('.') ? s.key.startsWith(k) : s.key === k);
+        });
+        if (matched.length === 0)
+            continue;
+        // Sort by key order within the menu item's keys array
         const order = registryKeyOrder();
         matched.sort((a, b) => {
-            const aIdx = groupKeyIndex(a.key, group.keys);
-            const bIdx = groupKeyIndex(b.key, group.keys);
-            if (aIdx !== bIdx) {
+            const aIdx = groupKeyIndex(a.key, menuItem.keys);
+            const bIdx = groupKeyIndex(b.key, menuItem.keys);
+            if (aIdx !== bIdx)
                 return aIdx - bIdx;
-            }
             return (order.get(a.key) ?? Infinity) - (order.get(b.key) ?? Infinity);
         });
         for (const s of matched) {
             claimed.add(s.key);
         }
         result.push({
-            id: group.id,
-            labelKey: group.labelKey,
-            icon: group.icon,
+            id: menuItem.id,
+            labelKey: menuItem.labelKey,
+            icon: menuItem.icon,
+            section: menuItem.section,
             settings: matched,
         });
     }
@@ -581,23 +815,25 @@ export const DEFAULT_REGISTRY_CONFIG = {
 // Shared option arrays (reused across multiple settings)
 // ---------------------------------------------------------------------------
 const ALARM_SOUND_OPTIONS = [
-    { value: 'none', labelKey: 'Settings.Option.AlarmSound.None' },
-    { value: 'alarm1', labelKey: 'Settings.Option.AlarmSound.Alarm1' },
-    { value: 'alarm2', labelKey: 'Settings.Option.AlarmSound.Alarm2' },
-    { value: 'alarm3', labelKey: 'Settings.Option.AlarmSound.Alarm3' },
-    { value: 'alarm4', labelKey: 'Settings.Option.AlarmSound.Alarm4' },
-    { value: 'alarm5', labelKey: 'Settings.Option.AlarmSound.Alarm5' },
-    { value: 'alarm6', labelKey: 'Settings.Option.AlarmSound.Alarm6' },
-    { value: 'alarm7', labelKey: 'Settings.Option.AlarmSound.Alarm7' },
-    { value: 'alarm8', labelKey: 'Settings.Option.AlarmSound.Alarm8' },
-    { value: 'alarm9', labelKey: 'Settings.Option.AlarmSound.Alarm9' },
+    { value: 'none', labelKey: 'AlarmAsset.none' },
+    { value: 'alarm1', labelKey: 'AlarmAsset.alarm1' },
+    { value: 'alarm2', labelKey: 'AlarmAsset.alarm2' },
+    { value: 'alarm3', labelKey: 'AlarmAsset.alarm3' },
+    { value: 'alarm4', labelKey: 'AlarmAsset.alarm4' },
+    { value: 'alarm5', labelKey: 'AlarmAsset.alarm5' },
+    { value: 'alarm6', labelKey: 'AlarmAsset.alarm6' },
+    { value: 'alarm7', labelKey: 'AlarmAsset.alarm7' },
+    { value: 'alarm8', labelKey: 'AlarmAsset.alarm8' },
+    { value: 'alarm9', labelKey: 'AlarmAsset.alarm9' },
 ];
 const ALARM_TIMEOUT_OPTIONS = [
-    { value: 1, labelKey: 'Settings.Option.AlarmTimeout.1min' },
-    { value: 2, labelKey: 'Settings.Option.AlarmTimeout.2min' },
-    { value: 3, labelKey: 'Settings.Option.AlarmTimeout.3min' },
-    { value: 5, labelKey: 'Settings.Option.AlarmTimeout.5min' },
-    { value: 10, labelKey: 'Settings.Option.AlarmTimeout.10min' },
+    { value: 5, labelKey: 'Duration.CountSeconds', labelValues: { count: 5 } },
+    { value: 30, labelKey: 'Duration.CountSeconds', labelValues: { count: 30 } },
+    { value: 60, labelKey: 'Duration.CountMinutes', labelValues: { count: 1 } },
+    { value: 120, labelKey: 'Duration.CountMinutes', labelValues: { count: 2 } },
+    { value: 180, labelKey: 'Duration.CountMinutes', labelValues: { count: 3 } },
+    { value: 300, labelKey: 'Duration.CountMinutes', labelValues: { count: 5 } },
+    { value: 600, labelKey: 'Duration.CountMinutes', labelValues: { count: 10 } },
 ];
 const DAY_VIEW_ZOOM_OPTIONS = [
     { value: 15, labelKey: 'Settings.Option.DayViewZoom.15min' },
@@ -628,6 +864,12 @@ function def(category, type, defaultValue, uiType, extra) {
     if (extra?.calendarType) {
         result.calendarType = extra.calendarType;
     }
+    if (extra?.visibleWhen) {
+        result.visibleWhen = extra.visibleWhen;
+    }
+    if (extra?.disabledWhen) {
+        result.disabledWhen = extra.disabledWhen;
+    }
     return result;
 }
 // ---------------------------------------------------------------------------
@@ -639,11 +881,16 @@ function buildEntries(config) {
         // Appearance
         // ═══════════════════════════════════════════════════════════════════════
         'appearance.theme': def('appearance', 'string', config.defaultTheme, 'CUSTOM_THEME_PICKER', {
-            options: [
-                { value: 'light', labelKey: 'Settings.Option.Theme.Light' },
-                { value: 'dark', labelKey: 'Settings.Option.Theme.Dark' },
-                { value: 'system', labelKey: 'Settings.Option.Theme.System' },
-            ],
+            options: config.isEnrolled
+                ? [
+                    { value: 'light', labelKey: 'Settings.Option.Theme.Light' },
+                    { value: 'dark', labelKey: 'Settings.Option.Theme.Dark' },
+                ]
+                : [
+                    { value: 'light', labelKey: 'Settings.Option.Theme.Light' },
+                    { value: 'dark', labelKey: 'Settings.Option.Theme.Dark' },
+                    { value: 'system', labelKey: 'Settings.Option.Theme.System' },
+                ],
         }),
         'appearance.clockType': def('appearance', 'string', 'digital', 'CUSTOM_CLOCK_TYPE', {
             options: [
@@ -700,10 +947,13 @@ function buildEntries(config) {
         'calendarView.showCalendarNames': def('calendarView', 'boolean', true, 'TOGGLE'),
         'calendarView.calendarColumns': def('calendarView', 'json', [], 'CUSTOM_SPLIT_VIEW_CONFIG'),
         'calendarView.autoReturnToTodayEnabled': def('calendarView', 'boolean', config.isEnrolled, 'TOGGLE'),
-        'calendarView.autoReturnToTodayTimeoutSeconds': def('calendarView', 'number', 300, 'SLIDER', { sliderConfig: { min: 30, max: 600, step: 30 } }),
+        'calendarView.autoReturnToTodayTimeoutSeconds': def('calendarView', 'number', 300, 'SLIDER', {
+            sliderConfig: { min: 30, max: 600, step: 30 },
+            visibleWhen: { dependsOn: 'calendarView.autoReturnToTodayEnabled', isTruthy: true },
+        }),
         'calendarView.showWeatherOnEvents': def('calendarView', 'boolean', false, 'TOGGLE'),
         'calendarView.showWeatherOnTimeline': def('calendarView', 'boolean', false, 'TOGGLE'),
-        'calendarView.weatherLocation': def('calendarView', 'json', null, 'CUSTOM_WEATHER_LOCATION'),
+        'calendarView.weatherLocation': def('calendarView', 'json', null, 'CUSTOM_WEATHER_LOCATION', { visibleWhen: { dependsOn: 'calendarView.showWeatherOnTimeline', isTruthy: true } }),
         // ═══════════════════════════════════════════════════════════════════════
         // Event form field visibility (time-based)
         // ═══════════════════════════════════════════════════════════════════════
@@ -721,26 +971,57 @@ function buildEntries(config) {
         // ═══════════════════════════════════════════════════════════════════════
         // Sound & alerts
         // ═══════════════════════════════════════════════════════════════════════
-        'sound.timerVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER'),
-        'sound.reminderVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER', { appMode: 'ENROLLED' }),
-        'sound.mediaVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER', { appMode: 'ENROLLED' }),
-        'sound.alarmSound': def('sound', 'string', 'alarm1', 'SELECT', { options: ALARM_SOUND_OPTIONS }),
+        'sound.timerVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER', {
+            visibleWhen: { dependsOn: 'sound.timerAlarmSound', notEquals: 'none' },
+        }),
+        'sound.reminderVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER', {
+            appMode: 'ENROLLED',
+            visibleWhen: { dependsOn: 'sound.reminderAlarmSound', notEquals: 'none' },
+        }),
+        'sound.mediaVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER', {
+            appMode: 'ENROLLED',
+        }),
+        'sound.alarmSound': def('sound', 'string', 'alarm1', 'SELECT', {
+            options: ALARM_SOUND_OPTIONS,
+        }),
         'sound.reminderAlarmSound': def('sound', 'string', 'alarm1', 'SELECT', { options: ALARM_SOUND_OPTIONS }),
-        'sound.startAlarmSound': def('sound', 'string', 'none', 'SELECT', { options: ALARM_SOUND_OPTIONS, appMode: 'ENROLLED' }),
-        'sound.endAlarmSound': def('sound', 'string', 'none', 'SELECT', { options: ALARM_SOUND_OPTIONS, appMode: 'ENROLLED' }),
+        'sound.startAlarmSound': def('sound', 'string', 'alarm1', 'SELECT', {
+            options: ALARM_SOUND_OPTIONS,
+            visibleWhen: { dependsOn: 'calendarView.type', equals: 'chronological' },
+        }),
+        'sound.endAlarmSound': def('sound', 'string', 'alarm1', 'SELECT', {
+            options: ALARM_SOUND_OPTIONS,
+            visibleWhen: { dependsOn: 'calendarView.type', equals: 'chronological' },
+        }),
         'sound.timerAlarmSound': def('sound', 'string', 'alarm1', 'SELECT', { options: ALARM_SOUND_OPTIONS }),
-        'sound.timerAlarmTimeout': def('sound', 'number', 3, 'SELECT', { options: ALARM_TIMEOUT_OPTIONS }),
-        'sound.reminderAlarmTimeout': def('sound', 'number', 3, 'SELECT', { options: ALARM_TIMEOUT_OPTIONS }),
-        'sound.allowCustomReminderSounds': def('sound', 'boolean', false, 'TOGGLE'),
+        'sound.timerAlarmTimeout': def('sound', 'number', 180, 'SELECT', {
+            options: ALARM_TIMEOUT_OPTIONS,
+            visibleWhen: { dependsOn: 'sound.timerAlarmSound', notEquals: 'none' },
+        }),
+        'sound.reminderAlarmTimeout': def('sound', 'number', 180, 'SELECT', {
+            options: ALARM_TIMEOUT_OPTIONS,
+            visibleWhen: { dependsOn: 'sound.reminderAlarmSound', notEquals: 'none' },
+        }),
+        'sound.allowCustomReminderSounds': def('sound', 'boolean', false, 'HIDDEN'),
         'sound.ttsEnabled': def('sound', 'boolean', config.isEnrolled, 'TOGGLE', { appMode: 'ENROLLED' }),
-        'sound.ttsRate': def('sound', 'number', 1.0, 'SLIDER', { sliderConfig: { min: 0.5, max: 2, step: 0.1 }, appMode: 'ENROLLED' }),
+        'sound.ttsRate': def('sound', 'number', 1.0, 'SLIDER', {
+            sliderConfig: { min: 0.5, max: 2, step: 0.1 },
+            appMode: 'ENROLLED',
+            visibleWhen: { dependsOn: 'sound.ttsEnabled', isTruthy: true },
+        }),
         // ═══════════════════════════════════════════════════════════════════════
         // Timer
         // ═══════════════════════════════════════════════════════════════════════
+        'timer.face': def('timer', 'string', 'ring', 'SELECT', {
+            options: [
+                { value: 'ring', labelKey: 'Timer.FaceRing' },
+                { value: 'bars', labelKey: 'Timer.FaceBars' },
+            ],
+        }),
         'timer.showTimeRemaining': def('timer', 'boolean', true, 'TOGGLE'),
-        'timer.showEndTime': def('timer', 'boolean', true, 'TOGGLE', { calendarType: 'time-based' }),
+        'timer.showEndTime': def('timer', 'boolean', true, 'TOGGLE'),
         'timer.showRestartButton': def('timer', 'boolean', true, 'TOGGLE'),
-        'timer.showPauseButton': def('timer', 'boolean', true, 'TOGGLE', { calendarType: 'time-based' }),
+        'timer.showPauseButton': def('timer', 'boolean', true, 'TOGGLE'),
         // ═══════════════════════════════════════════════════════════════════════
         // Lock screen
         // ═══════════════════════════════════════════════════════════════════════
@@ -754,6 +1035,7 @@ function buildEntries(config) {
                 { value: 30, labelKey: 'Settings.Option.InactivityTimeout.30min' },
                 { value: 45, labelKey: 'Settings.Option.InactivityTimeout.45min' },
             ],
+            visibleWhen: { dependsOn: 'lockScreen.inactivityLockEnabled', isTruthy: true },
         }),
         'lockScreen.pin': def('lockScreen', 'string', '', 'PIN_INPUT'),
         'lockScreen.clockDisplay': def('lockScreen', 'string', 'digital', 'SELECT', {
@@ -769,7 +1051,7 @@ function buildEntries(config) {
                 },
             ],
         }),
-        'lockScreen.showHourNumbers': def('lockScreen', 'boolean', true, 'TOGGLE'),
+        'lockScreen.showHourNumbers': def('lockScreen', 'boolean', true, 'TOGGLE', { visibleWhen: { dependsOn: 'lockScreen.clockDisplay', equals: 'analog' } }),
         'lockScreen.showDate': def('lockScreen', 'boolean', true, 'TOGGLE'),
         'lockScreen.imageMode': def('lockScreen', 'string', 'none', 'SELECT', {
             options: [
@@ -784,7 +1066,7 @@ function buildEntries(config) {
                 },
             ],
         }),
-        'lockScreen.backgroundImage': def('lockScreen', 'json', null, 'CUSTOM_IMAGE'),
+        'lockScreen.backgroundImage': def('lockScreen', 'json', null, 'CUSTOM_IMAGE', { visibleWhen: { dependsOn: 'lockScreen.imageMode', equals: 'background' } }),
         'lockScreen.photoFrameIntervalSeconds': def('lockScreen', 'number', 60, 'SELECT', {
             options: [
                 { value: 30, labelKey: 'Settings.Option.PhotoFrameInterval.30sec' },
@@ -792,13 +1074,16 @@ function buildEntries(config) {
                 { value: 120, labelKey: 'Settings.Option.PhotoFrameInterval.2min' },
                 { value: 300, labelKey: 'Settings.Option.PhotoFrameInterval.5min' },
             ],
+            visibleWhen: { dependsOn: 'lockScreen.imageMode', equals: 'photoFrame' },
         }),
-        'lockScreen.photoFrameImages': def('lockScreen', 'json', [], 'CUSTOM_IMAGE_ARRAY'),
+        'lockScreen.photoFrameImages': def('lockScreen', 'json', [], 'CUSTOM_IMAGE_ARRAY', { visibleWhen: { dependsOn: 'lockScreen.imageMode', equals: 'photoFrame' } }),
         // ═══════════════════════════════════════════════════════════════════════
         // Touch / gestures
         // ═══════════════════════════════════════════════════════════════════════
-        'touch.enableTapToCreate': def('touch', 'boolean', false, 'TOGGLE'),
-        'touch.enableDragDrop': def('touch', 'boolean', false, 'TOGGLE'),
+        'touch.enableTapToCreate': def('touch', 'boolean', false, 'TOGGLE', { disabledWhen: { dependsOn: 'sound.ttsEnabled', isTruthy: true } }),
+        'touch.enableDragDrop': def('touch', 'boolean', false, 'TOGGLE', {
+            disabledWhen: { dependsOn: 'sound.ttsEnabled', isTruthy: true },
+        }),
         // ═══════════════════════════════════════════════════════════════════════
         // Device (not synced unless noted)
         // ═══════════════════════════════════════════════════════════════════════
@@ -861,6 +1146,21 @@ function buildEntries(config) {
         'chronological.quickSettings.showMediaVolume': def('chronological', 'boolean', true, 'TOGGLE'),
         'chronological.quickSettings.showBrightness': def('chronological', 'boolean', true, 'TOGGLE'),
         'chronological.quickSettings.showLockScreen': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.quickSettings.showDayViewMode': def('chronological', 'boolean', true, 'TOGGLE'),
+        // Day view display mode
+        'chronological.dayView.displayMode': def('chronological', 'string', 'list', 'SELECT', {
+            options: [
+                {
+                    value: 'list',
+                    labelKey: 'Settings.Option.DayViewDisplayMode.List',
+                },
+                {
+                    value: 'timeline',
+                    labelKey: 'Settings.Option.DayViewDisplayMode.Timeline',
+                },
+            ],
+            calendarType: 'chronological',
+        }),
         // Time-of-day periods
         'chronological.timeOfDay.morningStart': def('chronological', 'number', 6, 'SLIDER', { sliderConfig: TIME_OF_DAY_SLIDER }),
         'chronological.timeOfDay.forenoonStart': def('chronological', 'number', 9, 'SLIDER', { sliderConfig: TIME_OF_DAY_SLIDER }),
@@ -871,6 +1171,7 @@ function buildEntries(config) {
         // Chronological event form
         // ═══════════════════════════════════════════════════════════════════════
         // Fixed fields
+        'chronologicalEventForm.fixedField.category': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         'chronologicalEventForm.fixedField.allDay': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         'chronologicalEventForm.fixedField.endTime': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         'chronologicalEventForm.fixedField.alarm': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
@@ -883,6 +1184,7 @@ function buildEntries(config) {
         'chronologicalEventForm.field.extraImages': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         'chronologicalEventForm.field.reminders': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         'chronologicalEventForm.field.audioClips': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.category': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         // Suggest end time
         'chronologicalEventForm.suggestEndTime.enabled': def('chronologicalEventForm', 'boolean', false, 'TOGGLE'),
         'chronologicalEventForm.suggestEndTime.value': def('chronologicalEventForm', 'number', 30, 'SLIDER', { sliderConfig: { min: 5, max: 480, step: 5 } }),
@@ -906,6 +1208,9 @@ function buildEntries(config) {
                 { value: 'Custom', labelKey: 'Settings.Option.Visibility.Custom' },
             ],
         }),
+        // Default alarm toggles
+        'chronologicalEventForm.defaultAlarm.atStart': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.defaultAlarm.atEnd': def('chronologicalEventForm', 'boolean', false, 'TOGGLE'),
         // Reminder presets
         'chronologicalEventForm.reminderPresets.timed': def('chronologicalEventForm', 'json', [5, 15, 30, 60, 120, 1440], 'CUSTOM_REMINDER_PRESETS'),
         'chronologicalEventForm.reminderPresets.allDay': def('chronologicalEventForm', 'json', [
@@ -1081,9 +1386,7 @@ export function parseSettingsSnapshot(json, calendarType, registry = defaultRegi
             groups.set(category, []);
         }
         const labelDef = SETTINGS_LABELS[key];
-        const entryDef = key in registry.entries
-            ? registry.entries[key]
-            : undefined;
+        const entryDef = key in registry.entries ? registry.entries[key] : undefined;
         groups.get(category).push({
             key,
             name,
@@ -1092,10 +1395,14 @@ export function parseSettingsSnapshot(json, calendarType, registry = defaultRegi
             descriptionKey: labelDef?.descriptionKey,
             value,
             uiType: entryDef?.uiType ?? 'TEXT_INPUT',
-            ...(entryDef?.options && { options: entryDef.options }),
+            ...(entryDef?.options && {
+                options: entryDef.options,
+            }),
             ...(entryDef?.sliderConfig && { sliderConfig: entryDef.sliderConfig }),
             ...(entryDef?.appMode && { appMode: entryDef.appMode }),
             ...(entryDef?.calendarType && { calendarType: entryDef.calendarType }),
+            ...(entryDef?.visibleWhen && { visibleWhen: entryDef.visibleWhen }),
+            ...(entryDef?.disabledWhen && { disabledWhen: entryDef.disabledWhen }),
         });
     }
     // Determine which categories to show