@focus8/settings-registry 0.7.0 → 0.8.0

package/dist/index.d.ts

@@ -152,6 +152,10 @@ export type SettingDef<T = unknown> = {
     options?: readonly SettingOption<T>[];
     /** Slider configuration for SLIDER-type settings */
     sliderConfig?: SliderConfig;
+    /** Only show this setting for enrolled/kiosk devices (undefined = always) */
+    appMode?: 'ENROLLED';
+    /** Only show this setting for a specific calendar type (undefined = always) */
+    calendarType?: CalendarType;
 };
 export type RegistryConfig = {
     /** Whether the device is in enrolled/kiosk mode */
@@ -180,10 +184,10 @@ declare function buildEntries(config: RegistryConfig): {
     readonly 'calendarView.showWeatherOnTimeline': SettingDef<boolean>;
     readonly 'calendarView.weatherLocation': SettingDef<WeatherLocation | null>;
     readonly 'eventForm.recurrence': SettingDef<boolean>;
-    readonly 'eventForm.reminders': SettingDef<boolean>;
-    readonly 'eventForm.emailReminders': SettingDef<boolean>;
     readonly 'eventForm.location': SettingDef<boolean>;
     readonly 'eventForm.travelTime': SettingDef<boolean>;
+    readonly 'eventForm.reminders': SettingDef<boolean>;
+    readonly 'eventForm.emailReminders': SettingDef<boolean>;
     readonly 'eventForm.description': SettingDef<boolean>;
     readonly 'eventForm.checklist': SettingDef<boolean>;
     readonly 'eventForm.images': SettingDef<boolean>;
@@ -205,16 +209,16 @@ declare function buildEntries(config: RegistryConfig): {
     readonly 'timer.showEndTime': SettingDef<boolean>;
     readonly 'timer.showRestartButton': SettingDef<boolean>;
     readonly 'timer.showPauseButton': SettingDef<boolean>;
-    readonly 'lockScreen.pin': SettingDef<string>;
     readonly 'lockScreen.inactivityLockEnabled': SettingDef<boolean>;
     readonly 'lockScreen.inactivityTimeoutMinutes': SettingDef<InactivityTimeoutMinutes>;
+    readonly 'lockScreen.pin': SettingDef<string>;
     readonly 'lockScreen.clockDisplay': SettingDef<LockScreenClockDisplay>;
-    readonly 'lockScreen.showDate': SettingDef<boolean>;
     readonly 'lockScreen.showHourNumbers': SettingDef<boolean>;
+    readonly 'lockScreen.showDate': SettingDef<boolean>;
     readonly 'lockScreen.imageMode': SettingDef<LockScreenImageMode>;
     readonly 'lockScreen.backgroundImage': SettingDef<string | null>;
-    readonly 'lockScreen.photoFrameImages': SettingDef<LockScreenImage[]>;
     readonly 'lockScreen.photoFrameIntervalSeconds': SettingDef<PhotoFrameIntervalSeconds>;
+    readonly 'lockScreen.photoFrameImages': SettingDef<LockScreenImage[]>;
     readonly 'touch.enableTapToCreate': SettingDef<boolean>;
     readonly 'touch.enableDragDrop': SettingDef<boolean>;
     readonly 'device.id': SettingDef<string>;
@@ -227,8 +231,8 @@ declare function buildEntries(config: RegistryConfig): {
     readonly 'notification.enabledCalendarIds': SettingDef<string[]>;
     readonly 'notification.hasBeenPrompted': SettingDef<boolean>;
     readonly 'chronological.header.showNavigationArrows': SettingDef<boolean>;
-    readonly 'chronological.header.showClock': SettingDef<boolean>;
     readonly 'chronological.header.showCurrentYearInDate': SettingDef<boolean>;
+    readonly 'chronological.header.showClock': SettingDef<boolean>;
     readonly 'chronological.header.showTimeOfDay': SettingDef<boolean>;
     readonly 'chronological.footer.showMenuButton': SettingDef<boolean>;
     readonly 'chronological.footer.showViewSwitcherDay': SettingDef<boolean>;
@@ -239,9 +243,9 @@ declare function buildEntries(config: RegistryConfig): {
     readonly 'chronological.footer.showSettingsButton': SettingDef<boolean>;
     readonly 'chronological.timer.showNewCountdown': SettingDef<boolean>;
     readonly 'chronological.timer.showFromTemplate': SettingDef<boolean>;
+    readonly 'chronological.timer.showAddTemplate': SettingDef<boolean>;
     readonly 'chronological.timer.showEditTemplate': SettingDef<boolean>;
     readonly 'chronological.timer.showDeleteTemplate': SettingDef<boolean>;
-    readonly 'chronological.timer.showAddTemplate': SettingDef<boolean>;
     readonly 'chronological.menu.showSettingsButton': SettingDef<boolean>;
     readonly 'chronological.quickSettings.showTimerVolume': SettingDef<boolean>;
     readonly 'chronological.quickSettings.showReminderVolume': SettingDef<boolean>;
@@ -253,16 +257,16 @@ declare function buildEntries(config: RegistryConfig): {
     readonly 'chronological.timeOfDay.afternoonStart': SettingDef<number>;
     readonly 'chronological.timeOfDay.eveningStart': SettingDef<number>;
     readonly 'chronological.timeOfDay.nightStart': SettingDef<number>;
+    readonly 'chronologicalEventForm.fixedField.allDay': SettingDef<boolean>;
+    readonly 'chronologicalEventForm.fixedField.endTime': SettingDef<boolean>;
+    readonly 'chronologicalEventForm.fixedField.visibility': SettingDef<boolean>;
+    readonly 'chronologicalEventForm.field.acknowledge': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.description': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.recurrence': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.field.acknowledge': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.checklist': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.extraImages': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.reminders': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.audioClips': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.fixedField.allDay': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.fixedField.endTime': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.fixedField.visibility': SettingDef<boolean>;
     readonly 'chronologicalEventForm.suggestEndTime.enabled': SettingDef<boolean>;
     readonly 'chronologicalEventForm.suggestEndTime.value': SettingDef<number>;
     readonly 'chronologicalEventForm.suggestEndTime.unit': SettingDef<SuggestEndTimeUnit>;
@@ -330,6 +334,10 @@ export type ParsedSettingEntry = {
     options?: readonly SettingOption[];
     /** Slider configuration for SLIDER-type settings */
     sliderConfig?: SliderConfig;
+    /** Only show this setting for enrolled/kiosk devices (undefined = always) */
+    appMode?: 'ENROLLED';
+    /** Only show this setting for a specific calendar type (undefined = always) */
+    calendarType?: CalendarType;
 };
 export type ParsedSettingsGroup = {
     /** The category key */
@@ -354,6 +362,23 @@ export declare function parseSettingsSnapshot(json: string | Record<string, unkn
  * Handles booleans, numbers, strings, arrays, objects, and null/undefined.
  */
 export declare function formatSettingValue(value: unknown): string;
+/**
+ * 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 declare function serializeSettingsSnapshot(settings: Record<string, unknown>, registry: SettingsRegistry): Record<string, string>;
+/**
+ * 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 declare function deserializeSettingsSnapshot(snapshot: Record<string, unknown>, registry?: SettingsRegistry): Record<string, unknown>;
 export declare const defaultRegistry: SettingsRegistry;
 export declare function createSettingsRegistry(config?: Partial<RegistryConfig>): {
     readonly 'appearance.theme': SettingDef<ThemeSetting>;
@@ -372,10 +397,10 @@ export declare function createSettingsRegistry(config?: Partial<RegistryConfig>)
     readonly 'calendarView.showWeatherOnTimeline': SettingDef<boolean>;
     readonly 'calendarView.weatherLocation': SettingDef<WeatherLocation | null>;
     readonly 'eventForm.recurrence': SettingDef<boolean>;
-    readonly 'eventForm.reminders': SettingDef<boolean>;
-    readonly 'eventForm.emailReminders': SettingDef<boolean>;
     readonly 'eventForm.location': SettingDef<boolean>;
     readonly 'eventForm.travelTime': SettingDef<boolean>;
+    readonly 'eventForm.reminders': SettingDef<boolean>;
+    readonly 'eventForm.emailReminders': SettingDef<boolean>;
     readonly 'eventForm.description': SettingDef<boolean>;
     readonly 'eventForm.checklist': SettingDef<boolean>;
     readonly 'eventForm.images': SettingDef<boolean>;
@@ -397,16 +422,16 @@ export declare function createSettingsRegistry(config?: Partial<RegistryConfig>)
     readonly 'timer.showEndTime': SettingDef<boolean>;
     readonly 'timer.showRestartButton': SettingDef<boolean>;
     readonly 'timer.showPauseButton': SettingDef<boolean>;
-    readonly 'lockScreen.pin': SettingDef<string>;
     readonly 'lockScreen.inactivityLockEnabled': SettingDef<boolean>;
     readonly 'lockScreen.inactivityTimeoutMinutes': SettingDef<InactivityTimeoutMinutes>;
+    readonly 'lockScreen.pin': SettingDef<string>;
     readonly 'lockScreen.clockDisplay': SettingDef<LockScreenClockDisplay>;
-    readonly 'lockScreen.showDate': SettingDef<boolean>;
     readonly 'lockScreen.showHourNumbers': SettingDef<boolean>;
+    readonly 'lockScreen.showDate': SettingDef<boolean>;
     readonly 'lockScreen.imageMode': SettingDef<LockScreenImageMode>;
     readonly 'lockScreen.backgroundImage': SettingDef<string | null>;
-    readonly 'lockScreen.photoFrameImages': SettingDef<LockScreenImage[]>;
     readonly 'lockScreen.photoFrameIntervalSeconds': SettingDef<PhotoFrameIntervalSeconds>;
+    readonly 'lockScreen.photoFrameImages': SettingDef<LockScreenImage[]>;
     readonly 'touch.enableTapToCreate': SettingDef<boolean>;
     readonly 'touch.enableDragDrop': SettingDef<boolean>;
     readonly 'device.id': SettingDef<string>;
@@ -419,8 +444,8 @@ export declare function createSettingsRegistry(config?: Partial<RegistryConfig>)
     readonly 'notification.enabledCalendarIds': SettingDef<string[]>;
     readonly 'notification.hasBeenPrompted': SettingDef<boolean>;
     readonly 'chronological.header.showNavigationArrows': SettingDef<boolean>;
-    readonly 'chronological.header.showClock': SettingDef<boolean>;
     readonly 'chronological.header.showCurrentYearInDate': SettingDef<boolean>;
+    readonly 'chronological.header.showClock': SettingDef<boolean>;
     readonly 'chronological.header.showTimeOfDay': SettingDef<boolean>;
     readonly 'chronological.footer.showMenuButton': SettingDef<boolean>;
     readonly 'chronological.footer.showViewSwitcherDay': SettingDef<boolean>;
@@ -431,9 +456,9 @@ export declare function createSettingsRegistry(config?: Partial<RegistryConfig>)
     readonly 'chronological.footer.showSettingsButton': SettingDef<boolean>;
     readonly 'chronological.timer.showNewCountdown': SettingDef<boolean>;
     readonly 'chronological.timer.showFromTemplate': SettingDef<boolean>;
+    readonly 'chronological.timer.showAddTemplate': SettingDef<boolean>;
     readonly 'chronological.timer.showEditTemplate': SettingDef<boolean>;
     readonly 'chronological.timer.showDeleteTemplate': SettingDef<boolean>;
-    readonly 'chronological.timer.showAddTemplate': SettingDef<boolean>;
     readonly 'chronological.menu.showSettingsButton': SettingDef<boolean>;
     readonly 'chronological.quickSettings.showTimerVolume': SettingDef<boolean>;
     readonly 'chronological.quickSettings.showReminderVolume': SettingDef<boolean>;
@@ -445,16 +470,16 @@ export declare function createSettingsRegistry(config?: Partial<RegistryConfig>)
     readonly 'chronological.timeOfDay.afternoonStart': SettingDef<number>;
     readonly 'chronological.timeOfDay.eveningStart': SettingDef<number>;
     readonly 'chronological.timeOfDay.nightStart': SettingDef<number>;
+    readonly 'chronologicalEventForm.fixedField.allDay': SettingDef<boolean>;
+    readonly 'chronologicalEventForm.fixedField.endTime': SettingDef<boolean>;
+    readonly 'chronologicalEventForm.fixedField.visibility': SettingDef<boolean>;
+    readonly 'chronologicalEventForm.field.acknowledge': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.description': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.recurrence': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.field.acknowledge': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.checklist': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.extraImages': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.reminders': SettingDef<boolean>;
     readonly 'chronologicalEventForm.field.audioClips': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.fixedField.allDay': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.fixedField.endTime': SettingDef<boolean>;
-    readonly 'chronologicalEventForm.fixedField.visibility': SettingDef<boolean>;
     readonly 'chronologicalEventForm.suggestEndTime.enabled': SettingDef<boolean>;
     readonly 'chronologicalEventForm.suggestEndTime.value': SettingDef<number>;
     readonly 'chronologicalEventForm.suggestEndTime.unit': SettingDef<SuggestEndTimeUnit>;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

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,10 +189,11 @@ export const SETTINGS_GROUPS = [
         labelKey: 'Settings.TimerTitle',
         icon: 'Timer',
         keys: [
-            'sound.timerVolume',
+            'chronological.timer.',
+            'timer.',
             'sound.timerAlarmSound',
             'sound.timerAlarmTimeout',
-            'timer.',
+            'sound.timerVolume',
         ],
         appMode: 'ENROLLED',
     },
@@ -241,6 +242,9 @@ export const EXCLUDED_DEVICE_SETTINGS = new Set([
     'device.id',
     'device.devMenuEnabled',
     'device.authWarningDismissTtlDays',
+    'notification.enabled',
+    'notification.notifyAllCalendars',
+    'notification.enabledCalendarIds',
     'notification.hasBeenPrompted',
 ]);
 /**
@@ -466,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.
@@ -486,6 +515,14 @@ export function groupSettingsForDevice(allSettings, calendarType, appMode) {
         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();
@@ -503,6 +540,17 @@ export function groupSettingsForDevice(allSettings, calendarType, appMode) {
         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);
         }
@@ -546,7 +594,7 @@ const ALARM_TIMEOUT_OPTIONS = [
 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.60min' },
+    { value: 60, labelKey: 'Settings.Option.DayViewZoom.1hour' },
 ];
 const TIME_OF_DAY_SLIDER = { min: 0, max: 23, step: 1 };
 // ---------------------------------------------------------------------------
@@ -566,6 +614,12 @@ function def(category, type, defaultValue, uiType, extra) {
     if (extra?.sliderConfig) {
         result.sliderConfig = extra.sliderConfig;
     }
+    if (extra?.appMode) {
+        result.appMode = extra.appMode;
+    }
+    if (extra?.calendarType) {
+        result.calendarType = extra.calendarType;
+    }
     return result;
 }
 // ---------------------------------------------------------------------------
@@ -588,8 +642,9 @@ function buildEntries(config) {
                 { value: 'digital', labelKey: 'Settings.Option.ClockType.Digital' },
                 { value: 'analog', labelKey: 'Settings.Option.ClockType.Analog' },
             ],
+            appMode: 'ENROLLED',
         }),
-        'appearance.enableDayColors': def('appearance', 'boolean', false, 'TOGGLE'),
+        'appearance.enableDayColors': def('appearance', 'boolean', false, 'TOGGLE', { calendarType: 'chronological' }),
         // ═══════════════════════════════════════════════════════════════════════
         // Calendar view
         // ═══════════════════════════════════════════════════════════════════════
@@ -631,8 +686,8 @@ function buildEntries(config) {
                 },
             ],
         }),
-        'calendarView.dayViewZoom': def('calendarView', 'number', 60, 'SELECT', { options: DAY_VIEW_ZOOM_OPTIONS }),
-        'calendarView.weekViewZoom': def('calendarView', 'number', 60, 'SELECT', { options: DAY_VIEW_ZOOM_OPTIONS }),
+        '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'),
@@ -645,10 +700,10 @@ function buildEntries(config) {
         // Event form field visibility (time-based)
         // ═══════════════════════════════════════════════════════════════════════
         'eventForm.recurrence': def('eventForm', 'boolean', true, 'TOGGLE'),
-        'eventForm.reminders': def('eventForm', 'boolean', true, 'TOGGLE'),
-        'eventForm.emailReminders': def('eventForm', 'boolean', false, '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'),
@@ -659,16 +714,16 @@ function buildEntries(config) {
         // Sound & alerts
         // ═══════════════════════════════════════════════════════════════════════
         'sound.timerVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER'),
-        'sound.reminderVolume': def('sound', 'number', 0.5, 'VOLUME_SLIDER'),
-        'sound.mediaVolume': 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'),
-        'sound.ttsRate': def('sound', 'number', 1.0, 'SLIDER', { sliderConfig: { min: 0.5, max: 2, step: 0.1 } }),
+        '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
         // ═══════════════════════════════════════════════════════════════════════
@@ -679,7 +734,6 @@ function buildEntries(config) {
         // ═══════════════════════════════════════════════════════════════════════
         // Lock screen
         // ═══════════════════════════════════════════════════════════════════════
-        'lockScreen.pin': def('lockScreen', 'string', '', 'PIN_INPUT'),
         'lockScreen.inactivityLockEnabled': def('lockScreen', 'boolean', false, 'TOGGLE'),
         'lockScreen.inactivityTimeoutMinutes': def('lockScreen', 'number', 5, 'SELECT', {
             options: [
@@ -691,6 +745,7 @@ function buildEntries(config) {
                 { 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' },
@@ -704,8 +759,8 @@ function buildEntries(config) {
                 },
             ],
         }),
-        'lockScreen.showDate': def('lockScreen', 'boolean', true, 'TOGGLE'),
         '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' },
@@ -720,7 +775,6 @@ function buildEntries(config) {
             ],
         }),
         'lockScreen.backgroundImage': def('lockScreen', 'json', null, 'CUSTOM_IMAGE'),
-        'lockScreen.photoFrameImages': def('lockScreen', 'json', [], 'CUSTOM_IMAGE_ARRAY'),
         'lockScreen.photoFrameIntervalSeconds': def('lockScreen', 'number', 60, 'SELECT', {
             options: [
                 { value: 30, labelKey: 'Settings.Option.PhotoFrameInterval.30sec' },
@@ -729,6 +783,7 @@ function buildEntries(config) {
                 { value: 300, labelKey: 'Settings.Option.PhotoFrameInterval.5min' },
             ],
         }),
+        'lockScreen.photoFrameImages': def('lockScreen', 'json', [], 'CUSTOM_IMAGE_ARRAY'),
         // ═══════════════════════════════════════════════════════════════════════
         // Touch / gestures
         // ═══════════════════════════════════════════════════════════════════════
@@ -770,8 +825,8 @@ function buildEntries(config) {
         // ═══════════════════════════════════════════════════════════════════════
         // Header
         'chronological.header.showNavigationArrows': def('chronological', 'boolean', true, 'TOGGLE'),
-        'chronological.header.showClock': 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, 'TOGGLE'),
@@ -784,9 +839,9 @@ function buildEntries(config) {
         // Timer features
         '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'),
-        'chronological.timer.showAddTemplate': def('chronological', 'boolean', true, 'TOGGLE'),
         // Menu
         'chronological.menu.showSettingsButton': def('chronological', 'boolean', true, 'TOGGLE'),
         // Quick settings
@@ -804,18 +859,18 @@ function buildEntries(config) {
         // ═══════════════════════════════════════════════════════════════════════
         // Chronological event form
         // ═══════════════════════════════════════════════════════════════════════
+        // Fixed fields
+        '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.acknowledge': 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'),
-        // Fixed fields
-        'chronologicalEventForm.fixedField.allDay': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
-        'chronologicalEventForm.fixedField.endTime': def('chronologicalEventForm', 'boolean', true, 'TOGGLE'),
-        'chronologicalEventForm.fixedField.visibility': 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 } }),
@@ -890,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);
         }
     }
@@ -910,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);
@@ -1002,6 +1082,8 @@ export function parseSettingsSnapshot(json, calendarType, registry = defaultRegi
             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
@@ -1041,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)
 // ---------------------------------------------------------------------------