@focus8/settings-registry 0.6.0 → 0.8.0

package/dist/index.js

@@ -138,7 +138,7 @@ export const SETTINGS_GROUPS = [
         id: 'calendarType',
         labelKey: 'Settings.CalendarType',
         icon: 'ArrowLeftRight',
-        keys: ['calendarView.type', 'calendarView.view'],
+        keys: ['calendarView.type'],
     },
     {
         id: 'calendarView',
@@ -147,9 +147,9 @@ export const SETTINGS_GROUPS = [
         keys: [
             'calendarView.showCalendarNames',
             'calendarView.splitView',
-            'calendarView.calendarColumns',
             'calendarView.dayViewZoom',
             'calendarView.weekViewZoom',
+            'calendarView.calendarColumns',
         ],
     },
     {
@@ -163,9 +163,9 @@ export const SETTINGS_GROUPS = [
         labelKey: 'Settings.DateWeather',
         icon: 'CloudSun',
         keys: [
-            'calendarView.showWeatherOnEvents',
             'calendarView.showWeatherOnTimeline',
             'calendarView.weatherLocation',
+            'calendarView.showWeatherOnEvents',
         ],
     },
     {
@@ -175,13 +175,13 @@ export const SETTINGS_GROUPS = [
         keys: [
             'sound.reminderVolume',
             'sound.mediaVolume',
-            'sound.alarmSound',
             'sound.reminderAlarmSound',
             'sound.reminderAlarmTimeout',
             'sound.allowCustomReminderSounds',
+            'notification.',
             'sound.ttsEnabled',
             'sound.ttsRate',
-            'notification.',
+            'sound.alarmSound',
         ],
     },
     {
@@ -189,17 +189,20 @@ export const SETTINGS_GROUPS = [
         labelKey: 'Settings.TimerTitle',
         icon: 'Timer',
         keys: [
-            'sound.timerVolume',
+            'chronological.timer.',
+            'timer.',
             'sound.timerAlarmSound',
             'sound.timerAlarmTimeout',
-            'timer.',
+            'sound.timerVolume',
         ],
+        appMode: 'ENROLLED',
     },
     {
         id: 'lockScreen',
         labelKey: 'Settings.LockScreen',
         icon: 'Lock',
         keys: ['lockScreen.'],
+        appMode: 'ENROLLED',
     },
     {
         id: 'touch',
@@ -239,6 +242,9 @@ export const EXCLUDED_DEVICE_SETTINGS = new Set([
     'device.id',
     'device.devMenuEnabled',
     'device.authWarningDismissTtlDays',
+    'notification.enabled',
+    'notification.notifyAllCalendars',
+    'notification.enabledCalendarIds',
     'notification.hasBeenPrompted',
 ]);
 /**
@@ -464,6 +470,31 @@ export const SETTINGS_LABELS = {
 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++) {
+        const matcher = keys[i];
+        if (key === matcher || (matcher.endsWith('.') && key.startsWith(matcher))) {
+            return i;
+        }
+    }
+    return keys.length;
+}
+/**
+ * Lazy-initialized map from setting key → declaration index in buildEntries.
+ * Used as a tiebreaker when multiple keys share the same prefix group index.
+ */
+let _registryKeyOrder;
+function registryKeyOrder() {
+    if (!_registryKeyOrder) {
+        _registryKeyOrder = new Map();
+        const keys = Object.keys(buildEntries(DEFAULT_REGISTRY_CONFIG));
+        for (let i = 0; i < keys.length; i++) {
+            _registryKeyOrder.set(keys[i], i);
+        }
+    }
+    return _registryKeyOrder;
+}
 /**
  * Group parsed setting entries into user-facing groups matching the mobile
  * app's settings menu structure.
@@ -472,9 +503,9 @@ function matchesGroup(key, group) {
  * buckets them into the standard groups, filtering by calendar type and
  * excluded keys.
  */
-export function groupSettingsForDevice(allSettings, calendarType) {
-    // Filter excluded
-    const settings = allSettings.filter((s) => !EXCLUDED_DEVICE_SETTINGS.has(s.key));
+export function groupSettingsForDevice(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) => {
@@ -484,6 +515,14 @@ export function groupSettingsForDevice(allSettings, calendarType) {
         if (!isChronological && s.key.startsWith('chronologicalEventForm.')) {
             return false;
         }
+        // Per-setting calendar type restriction
+        if (s.calendarType && s.calendarType !== calendarType) {
+            return false;
+        }
+        // Per-setting app mode restriction
+        if (s.appMode && s.appMode !== appMode) {
+            return false;
+        }
         return true;
     });
     const claimed = new Set();
@@ -493,10 +532,25 @@ export function groupSettingsForDevice(allSettings, calendarType) {
         if (group.calendarType && group.calendarType !== calendarType) {
             continue;
         }
+        // Skip groups not relevant for current app mode
+        if (group.appMode && group.appMode !== appMode) {
+            continue;
+        }
         const matched = filteredSettings.filter((s) => !claimed.has(s.key) && matchesGroup(s.key, group));
         if (matched.length === 0) {
             continue;
         }
+        // Sort matched settings by the order defined in group.keys,
+        // with registry declaration order as tiebreaker for prefix matches
+        const order = registryKeyOrder();
+        matched.sort((a, b) => {
+            const aIdx = groupKeyIndex(a.key, group.keys);
+            const bIdx = groupKeyIndex(b.key, group.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);
         }
@@ -516,10 +570,57 @@ export const DEFAULT_REGISTRY_CONFIG = {
     defaultLocale: 'nb',
 };
 // ---------------------------------------------------------------------------
+// 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' },
+];
+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' },
+];
+const DAY_VIEW_ZOOM_OPTIONS = [
+    { value: 15, labelKey: 'Settings.Option.DayViewZoom.15min' },
+    { value: 30, labelKey: 'Settings.Option.DayViewZoom.30min' },
+    { value: 60, labelKey: 'Settings.Option.DayViewZoom.1hour' },
+];
+const TIME_OF_DAY_SLIDER = { min: 0, max: 23, step: 1 };
+// ---------------------------------------------------------------------------
 // Helper
 // ---------------------------------------------------------------------------
-function def(category, type, defaultValue, sync = true) {
-    return { category, type, default: defaultValue, sync };
+function def(category, type, defaultValue, uiType, extra) {
+    const result = {
+        category,
+        type,
+        default: defaultValue,
+        sync: extra?.sync ?? true,
+        uiType,
+    };
+    if (extra?.options) {
+        result.options = extra.options;
+    }
+    if (extra?.sliderConfig) {
+        result.sliderConfig = extra.sliderConfig;
+    }
+    if (extra?.appMode) {
+        result.appMode = extra.appMode;
+    }
+    if (extra?.calendarType) {
+        result.calendarType = extra.calendarType;
+    }
+    return result;
 }
 // ---------------------------------------------------------------------------
 // Entry builder (internal — used by SettingsRegistry class and factory)
@@ -529,159 +630,277 @@ function buildEntries(config) {
         // ═══════════════════════════════════════════════════════════════════════
         // Appearance
         // ═══════════════════════════════════════════════════════════════════════
-        'appearance.theme': def('appearance', 'string', config.defaultTheme),
-        'appearance.clockType': def('appearance', 'string', 'digital'),
-        'appearance.enableDayColors': def('appearance', 'boolean', false),
+        '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' },
+            ],
+        }),
+        'appearance.clockType': def('appearance', 'string', 'digital', 'CUSTOM_CLOCK_TYPE', {
+            options: [
+                { value: 'digital', labelKey: 'Settings.Option.ClockType.Digital' },
+                { value: 'analog', labelKey: 'Settings.Option.ClockType.Analog' },
+            ],
+            appMode: 'ENROLLED',
+        }),
+        'appearance.enableDayColors': def('appearance', 'boolean', false, 'TOGGLE', { calendarType: 'chronological' }),
         // ═══════════════════════════════════════════════════════════════════════
         // Calendar view
         // ═══════════════════════════════════════════════════════════════════════
-        'calendarView.type': def('calendarView', 'string', 'time-based'),
-        'calendarView.view': def('calendarView', 'string', 'day'),
-        'calendarView.dayViewZoom': def('calendarView', 'number', 60),
-        'calendarView.weekViewZoom': def('calendarView', 'number', 60),
-        'calendarView.splitView': def('calendarView', 'boolean', false),
-        'calendarView.showCalendarNames': def('calendarView', 'boolean', true),
-        'calendarView.calendarColumns': def('calendarView', 'json', []),
-        'calendarView.autoReturnToTodayEnabled': def('calendarView', 'boolean', config.isEnrolled),
-        'calendarView.autoReturnToTodayTimeoutSeconds': def('calendarView', 'number', 300),
-        'calendarView.showWeatherOnEvents': def('calendarView', 'boolean', false),
-        'calendarView.showWeatherOnTimeline': def('calendarView', 'boolean', false),
-        'calendarView.weatherLocation': def('calendarView', 'json', null),
+        'calendarView.type': def('calendarView', 'string', 'time-based', 'CUSTOM_CALENDAR_TYPE', {
+            options: [
+                {
+                    value: 'chronological',
+                    labelKey: 'Settings.Option.CalendarType.Chronological',
+                },
+                {
+                    value: 'time-based',
+                    labelKey: 'Settings.Option.CalendarType.TimeBased',
+                },
+            ],
+        }),
+        'calendarView.view': def('calendarView', 'string', 'day', 'SELECT', {
+            options: [
+                { value: 'day', labelKey: 'Settings.Option.CalendarView.Day' },
+                {
+                    value: '3-days',
+                    labelKey: 'Settings.Option.CalendarView.3Days',
+                },
+                {
+                    value: '5-days',
+                    labelKey: 'Settings.Option.CalendarView.5Days',
+                },
+                {
+                    value: '7-days',
+                    labelKey: 'Settings.Option.CalendarView.7Days',
+                },
+                { value: 'week', labelKey: 'Settings.Option.CalendarView.Week' },
+                {
+                    value: 'month',
+                    labelKey: 'Settings.Option.CalendarView.Month',
+                },
+                {
+                    value: 'overview',
+                    labelKey: 'Settings.Option.CalendarView.Overview',
+                },
+            ],
+        }),
+        'calendarView.dayViewZoom': def('calendarView', 'number', 60, 'SELECT', { options: DAY_VIEW_ZOOM_OPTIONS, calendarType: 'time-based' }),
+        'calendarView.weekViewZoom': def('calendarView', 'number', 60, 'SELECT', { options: DAY_VIEW_ZOOM_OPTIONS, calendarType: 'time-based' }),
+        'calendarView.splitView': def('calendarView', 'boolean', false, 'TOGGLE'),
+        '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.showWeatherOnEvents': def('calendarView', 'boolean', false, 'TOGGLE'),
+        'calendarView.showWeatherOnTimeline': def('calendarView', 'boolean', false, 'TOGGLE'),
+        'calendarView.weatherLocation': def('calendarView', 'json', null, 'CUSTOM_WEATHER_LOCATION'),
         // ═══════════════════════════════════════════════════════════════════════
         // Event form field visibility (time-based)
         // ═══════════════════════════════════════════════════════════════════════
-        'eventForm.recurrence': def('eventForm', 'boolean', true),
-        'eventForm.reminders': def('eventForm', 'boolean', true),
-        'eventForm.emailReminders': def('eventForm', 'boolean', false),
-        'eventForm.location': def('eventForm', 'boolean', true),
-        'eventForm.travelTime': def('eventForm', 'boolean', false),
-        'eventForm.description': def('eventForm', 'boolean', true),
-        'eventForm.checklist': def('eventForm', 'boolean', true),
-        'eventForm.images': def('eventForm', 'boolean', false),
-        'eventForm.audioClips': def('eventForm', 'boolean', false),
-        'eventForm.notificationReceivers': def('eventForm', 'boolean', true),
-        'eventForm.visibility': def('eventForm', 'boolean', false),
+        'eventForm.recurrence': def('eventForm', 'boolean', true, 'TOGGLE'),
+        'eventForm.location': def('eventForm', 'boolean', true, 'TOGGLE'),
+        'eventForm.travelTime': def('eventForm', 'boolean', false, 'TOGGLE'),
+        'eventForm.reminders': def('eventForm', 'boolean', true, 'TOGGLE'),
+        'eventForm.emailReminders': def('eventForm', 'boolean', false, 'TOGGLE'),
+        'eventForm.description': def('eventForm', 'boolean', true, 'TOGGLE'),
+        'eventForm.checklist': def('eventForm', 'boolean', true, 'TOGGLE'),
+        'eventForm.images': def('eventForm', 'boolean', false, 'TOGGLE'),
+        'eventForm.audioClips': def('eventForm', 'boolean', false, 'TOGGLE'),
+        'eventForm.notificationReceivers': def('eventForm', 'boolean', true, 'TOGGLE'),
+        'eventForm.visibility': def('eventForm', 'boolean', false, 'TOGGLE'),
         // ═══════════════════════════════════════════════════════════════════════
         // Sound & alerts
         // ═══════════════════════════════════════════════════════════════════════
-        'sound.timerVolume': def('sound', 'number', 0.5),
-        'sound.reminderVolume': def('sound', 'number', 0.5),
-        'sound.mediaVolume': def('sound', 'number', 0.5),
-        'sound.alarmSound': def('sound', 'string', 'alarm1'),
-        'sound.reminderAlarmSound': def('sound', 'string', 'alarm1'),
-        'sound.timerAlarmSound': def('sound', 'string', 'alarm1'),
-        'sound.timerAlarmTimeout': def('sound', 'number', 3),
-        'sound.reminderAlarmTimeout': def('sound', 'number', 3),
-        'sound.allowCustomReminderSounds': def('sound', 'boolean', false),
-        'sound.ttsEnabled': def('sound', 'boolean', config.isEnrolled),
-        'sound.ttsRate': def('sound', 'number', 1.0),
+        '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.reminderAlarmSound': def('sound', 'string', 'alarm1', 'SELECT', { options: ALARM_SOUND_OPTIONS }),
+        '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.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' }),
         // ═══════════════════════════════════════════════════════════════════════
         // Timer
         // ═══════════════════════════════════════════════════════════════════════
-        'timer.showTimeRemaining': def('timer', 'boolean', true),
-        'timer.showEndTime': def('timer', 'boolean', true),
-        'timer.showRestartButton': def('timer', 'boolean', true),
-        'timer.showPauseButton': def('timer', 'boolean', true),
+        'timer.showTimeRemaining': def('timer', 'boolean', true, 'TOGGLE'),
+        'timer.showEndTime': def('timer', 'boolean', true, 'TOGGLE'),
+        'timer.showRestartButton': def('timer', 'boolean', true, 'TOGGLE'),
+        'timer.showPauseButton': def('timer', 'boolean', true, 'TOGGLE'),
         // ═══════════════════════════════════════════════════════════════════════
         // Lock screen
         // ═══════════════════════════════════════════════════════════════════════
-        'lockScreen.pin': def('lockScreen', 'string', ''),
-        'lockScreen.inactivityLockEnabled': def('lockScreen', 'boolean', false),
-        'lockScreen.inactivityTimeoutMinutes': def('lockScreen', 'number', 5),
-        'lockScreen.clockDisplay': def('lockScreen', 'string', 'digital'),
-        'lockScreen.showDate': def('lockScreen', 'boolean', true),
-        'lockScreen.showHourNumbers': def('lockScreen', 'boolean', true),
-        'lockScreen.imageMode': def('lockScreen', 'string', 'none'),
-        'lockScreen.backgroundImage': def('lockScreen', 'json', null),
-        'lockScreen.photoFrameImages': def('lockScreen', 'json', []),
-        'lockScreen.photoFrameIntervalSeconds': def('lockScreen', 'number', 60),
+        'lockScreen.inactivityLockEnabled': def('lockScreen', 'boolean', false, 'TOGGLE'),
+        'lockScreen.inactivityTimeoutMinutes': def('lockScreen', 'number', 5, 'SELECT', {
+            options: [
+                { value: 1, labelKey: 'Settings.Option.InactivityTimeout.1min' },
+                { value: 5, labelKey: 'Settings.Option.InactivityTimeout.5min' },
+                { value: 10, labelKey: 'Settings.Option.InactivityTimeout.10min' },
+                { value: 15, labelKey: 'Settings.Option.InactivityTimeout.15min' },
+                { value: 30, labelKey: 'Settings.Option.InactivityTimeout.30min' },
+                { value: 45, labelKey: 'Settings.Option.InactivityTimeout.45min' },
+            ],
+        }),
+        'lockScreen.pin': def('lockScreen', 'string', '', 'PIN_INPUT'),
+        'lockScreen.clockDisplay': def('lockScreen', 'string', 'digital', 'SELECT', {
+            options: [
+                { value: 'none', labelKey: 'Settings.Option.ClockDisplay.None' },
+                {
+                    value: 'digital',
+                    labelKey: 'Settings.Option.ClockDisplay.Digital',
+                },
+                {
+                    value: 'analog',
+                    labelKey: 'Settings.Option.ClockDisplay.Analog',
+                },
+            ],
+        }),
+        'lockScreen.showHourNumbers': def('lockScreen', 'boolean', true, 'TOGGLE'),
+        'lockScreen.showDate': def('lockScreen', 'boolean', true, 'TOGGLE'),
+        'lockScreen.imageMode': def('lockScreen', 'string', 'none', 'SELECT', {
+            options: [
+                { value: 'none', labelKey: 'Settings.Option.ImageMode.None' },
+                {
+                    value: 'background',
+                    labelKey: 'Settings.Option.ImageMode.Background',
+                },
+                {
+                    value: 'photoFrame',
+                    labelKey: 'Settings.Option.ImageMode.PhotoFrame',
+                },
+            ],
+        }),
+        'lockScreen.backgroundImage': def('lockScreen', 'json', null, 'CUSTOM_IMAGE'),
+        'lockScreen.photoFrameIntervalSeconds': def('lockScreen', 'number', 60, 'SELECT', {
+            options: [
+                { value: 30, labelKey: 'Settings.Option.PhotoFrameInterval.30sec' },
+                { value: 60, labelKey: 'Settings.Option.PhotoFrameInterval.1min' },
+                { value: 120, labelKey: 'Settings.Option.PhotoFrameInterval.2min' },
+                { value: 300, labelKey: 'Settings.Option.PhotoFrameInterval.5min' },
+            ],
+        }),
+        'lockScreen.photoFrameImages': def('lockScreen', 'json', [], 'CUSTOM_IMAGE_ARRAY'),
         // ═══════════════════════════════════════════════════════════════════════
         // Touch / gestures
         // ═══════════════════════════════════════════════════════════════════════
-        'touch.enableTapToCreate': def('touch', 'boolean', false),
-        'touch.enableDragDrop': def('touch', 'boolean', false),
+        'touch.enableTapToCreate': def('touch', 'boolean', false, 'TOGGLE'),
+        'touch.enableDragDrop': def('touch', 'boolean', false, 'TOGGLE'),
         // ═══════════════════════════════════════════════════════════════════════
         // Device (not synced unless noted)
         // ═══════════════════════════════════════════════════════════════════════
-        'device.id': def('device', 'string', '', false),
-        'device.timePickerMode': def('device', 'string', 'dials'),
-        'device.devMenuEnabled': def('device', 'boolean', false, false),
-        'device.authWarningDismissTtlDays': def('device', 'number', 3, false),
+        'device.id': def('device', 'string', '', 'HIDDEN', { sync: false }),
+        'device.timePickerMode': def('device', 'string', 'dials', 'SELECT', {
+            options: [
+                { value: 'dials', labelKey: 'Settings.Option.TimePickerMode.Dials' },
+                {
+                    value: 'keypad',
+                    labelKey: 'Settings.Option.TimePickerMode.Keypad',
+                },
+            ],
+        }),
+        'device.devMenuEnabled': def('device', 'boolean', false, 'HIDDEN', { sync: false }),
+        'device.authWarningDismissTtlDays': def('device', 'number', 3, 'HIDDEN', { sync: false }),
         // ═══════════════════════════════════════════════════════════════════════
         // Language
         // ═══════════════════════════════════════════════════════════════════════
-        'language.locale': def('language', 'string', config.defaultLocale),
+        'language.locale': def('language', 'string', config.defaultLocale, 'CUSTOM_LANGUAGE_PICKER', {
+            options: [
+                { value: 'nb', labelKey: 'Settings.Option.Language.Norwegian' },
+                { value: 'en', labelKey: 'Settings.Option.Language.English' },
+            ],
+        }),
         // ═══════════════════════════════════════════════════════════════════════
         // Notifications
         // ═══════════════════════════════════════════════════════════════════════
-        'notification.enabled': def('notification', 'boolean', false),
-        'notification.notifyAllCalendars': def('notification', 'boolean', true),
-        'notification.enabledCalendarIds': def('notification', 'json', []),
-        'notification.hasBeenPrompted': def('notification', 'boolean', false, false),
+        'notification.enabled': def('notification', 'boolean', false, 'TOGGLE'),
+        'notification.notifyAllCalendars': def('notification', 'boolean', true, 'TOGGLE'),
+        'notification.enabledCalendarIds': def('notification', 'json', [], 'CUSTOM_CALENDAR_IDS'),
+        'notification.hasBeenPrompted': def('notification', 'boolean', false, 'HIDDEN', { sync: false }),
         // ═══════════════════════════════════════════════════════════════════════
         // Chronological features (header, footer, menu, quick settings, timer)
         // ═══════════════════════════════════════════════════════════════════════
         // Header
-        'chronological.header.showNavigationArrows': def('chronological', 'boolean', true),
-        'chronological.header.showClock': def('chronological', 'boolean', true),
-        'chronological.header.showCurrentYearInDate': def('chronological', 'boolean', false),
-        'chronological.header.showTimeOfDay': def('chronological', 'boolean', false),
+        'chronological.header.showNavigationArrows': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.header.showCurrentYearInDate': def('chronological', 'boolean', false, 'TOGGLE'),
+        'chronological.header.showClock': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.header.showTimeOfDay': def('chronological', 'boolean', false, 'TOGGLE'),
         // Footer
-        'chronological.footer.showMenuButton': def('chronological', 'boolean', true),
-        'chronological.footer.showViewSwitcherDay': def('chronological', 'boolean', true),
-        'chronological.footer.showViewSwitcherWeek': def('chronological', 'boolean', true),
-        'chronological.footer.showViewSwitcherMonth': def('chronological', 'boolean', true),
-        'chronological.footer.showTimerButton': def('chronological', 'boolean', true),
-        'chronological.footer.showNewEventButton': def('chronological', 'boolean', true),
-        'chronological.footer.showSettingsButton': def('chronological', 'boolean', true),
+        'chronological.footer.showMenuButton': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.footer.showViewSwitcherDay': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.footer.showViewSwitcherWeek': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.footer.showViewSwitcherMonth': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.footer.showTimerButton': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.footer.showNewEventButton': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.footer.showSettingsButton': def('chronological', 'boolean', true, 'TOGGLE'),
         // Timer features
-        'chronological.timer.showNewCountdown': def('chronological', 'boolean', true),
-        'chronological.timer.showFromTemplate': def('chronological', 'boolean', true),
-        'chronological.timer.showEditTemplate': def('chronological', 'boolean', true),
-        'chronological.timer.showDeleteTemplate': def('chronological', 'boolean', true),
-        'chronological.timer.showAddTemplate': def('chronological', 'boolean', true),
+        'chronological.timer.showNewCountdown': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.timer.showFromTemplate': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.timer.showAddTemplate': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.timer.showEditTemplate': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.timer.showDeleteTemplate': def('chronological', 'boolean', true, 'TOGGLE'),
         // Menu
-        'chronological.menu.showSettingsButton': def('chronological', 'boolean', true),
+        'chronological.menu.showSettingsButton': def('chronological', 'boolean', true, 'TOGGLE'),
         // Quick settings
-        'chronological.quickSettings.showTimerVolume': def('chronological', 'boolean', true),
-        'chronological.quickSettings.showReminderVolume': def('chronological', 'boolean', true),
-        'chronological.quickSettings.showMediaVolume': def('chronological', 'boolean', true),
-        'chronological.quickSettings.showBrightness': def('chronological', 'boolean', true),
-        'chronological.quickSettings.showLockScreen': def('chronological', 'boolean', true),
+        'chronological.quickSettings.showTimerVolume': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.quickSettings.showReminderVolume': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.quickSettings.showMediaVolume': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.quickSettings.showBrightness': def('chronological', 'boolean', true, 'TOGGLE'),
+        'chronological.quickSettings.showLockScreen': def('chronological', 'boolean', true, 'TOGGLE'),
         // Time-of-day periods
-        'chronological.timeOfDay.morningStart': def('chronological', 'number', 6),
-        'chronological.timeOfDay.forenoonStart': def('chronological', 'number', 9),
-        'chronological.timeOfDay.afternoonStart': def('chronological', 'number', 12),
-        'chronological.timeOfDay.eveningStart': def('chronological', 'number', 18),
-        'chronological.timeOfDay.nightStart': def('chronological', 'number', 0),
+        '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 }),
+        'chronological.timeOfDay.afternoonStart': def('chronological', 'number', 12, 'SLIDER', { sliderConfig: TIME_OF_DAY_SLIDER }),
+        'chronological.timeOfDay.eveningStart': def('chronological', 'number', 18, 'SLIDER', { sliderConfig: TIME_OF_DAY_SLIDER }),
+        'chronological.timeOfDay.nightStart': def('chronological', 'number', 0, 'SLIDER', { sliderConfig: TIME_OF_DAY_SLIDER }),
         // ═══════════════════════════════════════════════════════════════════════
         // Chronological event form
         // ═══════════════════════════════════════════════════════════════════════
-        // Toggleable fields
-        'chronologicalEventForm.field.description': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.field.recurrence': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.field.acknowledge': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.field.checklist': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.field.extraImages': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.field.reminders': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.field.audioClips': def('chronologicalEventForm', 'boolean', true),
         // Fixed fields
-        'chronologicalEventForm.fixedField.allDay': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.fixedField.endTime': def('chronologicalEventForm', 'boolean', true),
-        'chronologicalEventForm.fixedField.visibility': def('chronologicalEventForm', 'boolean', true),
+        'chronologicalEventForm.fixedField.allDay': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.fixedField.endTime': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.fixedField.visibility': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        // Toggleable fields
+        'chronologicalEventForm.field.acknowledge': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.description': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.recurrence': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.checklist': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.extraImages': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.reminders': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
+        'chronologicalEventForm.field.audioClips': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
         // Suggest end time
-        'chronologicalEventForm.suggestEndTime.enabled': def('chronologicalEventForm', 'boolean', false),
-        'chronologicalEventForm.suggestEndTime.value': def('chronologicalEventForm', 'number', 30),
-        'chronologicalEventForm.suggestEndTime.unit': def('chronologicalEventForm', 'string', 'minutes'),
+        'chronologicalEventForm.suggestEndTime.enabled': def('chronologicalEventForm', 'boolean', false, 'TOGGLE'),
+        'chronologicalEventForm.suggestEndTime.value': def('chronologicalEventForm', 'number', 30, 'SLIDER', { sliderConfig: { min: 5, max: 480, step: 5 } }),
+        'chronologicalEventForm.suggestEndTime.unit': def('chronologicalEventForm', 'string', 'minutes', 'SELECT', {
+            options: [
+                {
+                    value: 'minutes',
+                    labelKey: 'Settings.Option.SuggestEndTimeUnit.Minutes',
+                },
+                {
+                    value: 'hours',
+                    labelKey: 'Settings.Option.SuggestEndTimeUnit.Hours',
+                },
+            ],
+        }),
         // Default visibility
-        'chronologicalEventForm.defaultVisibility': def('chronologicalEventForm', 'string', 'Private'),
+        'chronologicalEventForm.defaultVisibility': def('chronologicalEventForm', 'string', 'Private', 'SELECT', {
+            options: [
+                { value: 'Public', labelKey: 'Settings.Option.Visibility.Public' },
+                { value: 'Private', labelKey: 'Settings.Option.Visibility.Private' },
+                { value: 'Custom', labelKey: 'Settings.Option.Visibility.Custom' },
+            ],
+        }),
         // Reminder presets
-        'chronologicalEventForm.reminderPresets.timed': def('chronologicalEventForm', 'json', [5, 15, 30, 60, 120, 1440]),
+        'chronologicalEventForm.reminderPresets.timed': def('chronologicalEventForm', 'json', [5, 15, 30, 60, 120, 1440], 'CUSTOM_REMINDER_PRESETS'),
         'chronologicalEventForm.reminderPresets.allDay': def('chronologicalEventForm', 'json', [
             { daysBefore: 0, time: '09:00' },
             { daysBefore: 1, time: '18:00' },
             { daysBefore: 2, time: '09:00' },
-        ]),
+        ], 'CUSTOM_REMINDER_PRESETS'),
     };
 }
 // ---------------------------------------------------------------------------
@@ -726,8 +945,22 @@ export class SettingsRegistry {
             case 'number':
                 return String(value ?? 0);
             case 'boolean':
+                if (typeof value === 'string') {
+                    return value === 'true' ? 'true' : 'false';
+                }
                 return value ? 'true' : 'false';
             case 'json':
+                // If already a serialized JSON string, return as-is to avoid
+                // double-wrapping (e.g. JSON.stringify("[]") → "\"[]\"")
+                if (typeof value === 'string') {
+                    try {
+                        JSON.parse(value);
+                        return value;
+                    }
+                    catch {
+                        return JSON.stringify(value);
+                    }
+                }
                 return JSON.stringify(value);
         }
     }
@@ -746,7 +979,18 @@ export class SettingsRegistry {
                 return (raw === 'true');
             case 'json':
                 try {
-                    return JSON.parse(raw);
+                    let result = JSON.parse(raw);
+                    // Unwrap multiply-escaped JSON strings caused by repeated
+                    // double-serialization (each push/pull cycle added a layer)
+                    while (typeof result === 'string') {
+                        try {
+                            result = JSON.parse(result);
+                        }
+                        catch {
+                            break;
+                        }
+                    }
+                    return result;
                 }
                 catch {
                     return this.getDefault(key);
@@ -825,6 +1069,9 @@ 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;
         groups.get(category).push({
             key,
             name,
@@ -832,6 +1079,11 @@ export function parseSettingsSnapshot(json, calendarType, registry = defaultRegi
             labelKey: labelDef?.labelKey,
             descriptionKey: labelDef?.descriptionKey,
             value,
+            uiType: entryDef?.uiType ?? 'TEXT_INPUT',
+            ...(entryDef?.options && { options: entryDef.options }),
+            ...(entryDef?.sliderConfig && { sliderConfig: entryDef.sliderConfig }),
+            ...(entryDef?.appMode && { appMode: entryDef.appMode }),
+            ...(entryDef?.calendarType && { calendarType: entryDef.calendarType }),
         });
     }
     // Determine which categories to show
@@ -871,6 +1123,45 @@ export function formatSettingValue(value) {
     }
     return String(value);
 }
+/**
+ * Serialize a settings object (with mixed native types) into a
+ * string-values-only snapshot suitable for pushing to a mobile device.
+ *
+ * Uses the registry's `serialize()` method for known keys so that
+ * booleans become "true"/"false", numbers become digit strings, etc.
+ * Unknown keys are converted with `String(value)`.
+ */
+export function serializeSettingsSnapshot(settings, registry) {
+    const result = {};
+    for (const [key, value] of Object.entries(settings)) {
+        if (key in registry.entries) {
+            result[key] = registry.serialize(key, value);
+        }
+        else {
+            result[key] = String(value ?? '');
+        }
+    }
+    return result;
+}
+/**
+ * Deserialize a settings snapshot (string values from the server/DB) into
+ * native-typed values using the registry.
+ *
+ * This ensures local state always contains native types (boolean, number, etc.)
+ * so that subsequent `serializeSettingsSnapshot` calls produce correct results.
+ */
+export function deserializeSettingsSnapshot(snapshot, registry = defaultRegistry) {
+    const result = {};
+    for (const [key, value] of Object.entries(snapshot)) {
+        if (typeof value === 'string' && key in registry.entries) {
+            result[key] = registry.deserialize(key, value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
 // ---------------------------------------------------------------------------
 // Default registry instance (non-enrolled, system theme, nb locale)
 // ---------------------------------------------------------------------------