Merge branch 'feat/26-quick-settings-tiles' into release/v1.0.0
# Conflicts: # CHANGELOG.md # app/src/main/java/de/jeanlucmakiola/clockula/backup/BackupEngine.kt # app/src/main/java/de/jeanlucmakiola/clockula/data/backup/BackupCodec.kt # app/src/main/java/de/jeanlucmakiola/clockula/data/backup/BackupDto.kt # app/src/main/java/de/jeanlucmakiola/clockula/data/prefs/SettingsPrefs.kt # app/src/main/java/de/jeanlucmakiola/clockula/domain/backup/BackupContent.kt # app/src/main/java/de/jeanlucmakiola/clockula/ui/common/AlarmTimeFormatter.kt # app/src/main/java/de/jeanlucmakiola/clockula/ui/widget/NextAlarmWidgetContent.kt # app/src/main/res/values/strings.xml # app/src/test/java/de/jeanlucmakiola/clockula/ManifestRulesTest.kt # app/src/test/java/de/jeanlucmakiola/clockula/data/backup/BackupCodecTest.kt # app/src/test/java/de/jeanlucmakiola/clockula/data/prefs/SettingsPrefsTest.kt # docs/ARCHITECTURE.md # docs/BACKUP.md # docs/ROADMAP.md
This commit is contained in:
commit
df8be5e158
31 files changed
+998
-27
No files matched your search
+6
-1
@@ -54,6 +54,10 @@ written here.
|
||||
`default_timer_volume_ramp_seconds` restores 0, the ring timers had then.
|
||||
- A missing `timer_presets` keeps the built-in presets. An empty list is a
|
||||
user who removed them all, and is imported as such.
|
||||
- A missing `quick_tile_duration_millis` (a file from before the Quick
|
||||
Settings tiles), or one outside the quick-timer range of 1 second to 59:59,
|
||||
keeps the quick-timer tile's default of five minutes — the same reading the
|
||||
quick-timer widget gives its own stored duration.
|
||||
- An enum field with a name this version does not recognise (a `dismiss_
|
||||
challenge` or `theme_mode` from a future version, say) degrades to that
|
||||
field's default, the same forgiving-read posture `AlarmMapper` already uses
|
||||
@@ -174,7 +178,8 @@ device or after a reboot (`docs/PLAN.md` §5). Every imported timer lands
|
||||
"hide_always_on_display": false
|
||||
},
|
||||
"screen_saver_style": "DIGITAL",
|
||||
"screen_saver_night_mode": false
|
||||
"screen_saver_night_mode": false,
|
||||
"quick_tile_duration_millis": 300000
|
||||
}
|
||||
```
|
||||
|
||||
|
||||
Reference in new issue
Block a user