makiolaj
a0a1daa920
Merge branch 'feat/25-screen-saver' into release/v1.0.0
# Conflicts:
# app/src/main/AndroidManifest.xml
# 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/di/TimeModule.kt
# app/src/main/java/de/jeanlucmakiola/clockula/data/prefs/SettingsPrefs.kt
# app/src/main/java/de/jeanlucmakiola/clockula/data/time/AndroidClockChanges.kt
# app/src/main/java/de/jeanlucmakiola/clockula/domain/backup/BackupContent.kt
# app/src/main/java/de/jeanlucmakiola/clockula/domain/widget/NextAlarmWidgetModel.kt
# app/src/main/java/de/jeanlucmakiola/clockula/ui/alarms/AlarmsScreen.kt
# app/src/main/java/de/jeanlucmakiola/clockula/ui/common/AlarmTimeFormatter.kt
# app/src/main/java/de/jeanlucmakiola/clockula/ui/settings/ClockSettingsScreen.kt
# app/src/main/java/de/jeanlucmakiola/clockula/ui/worldclock/WorldClockFace.kt
# app/src/main/res/values/strings.xml
# 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
2026-10-26 20:59:33 +01:00
..
2026-10-21 20:16:34 +02:00
2026-10-26 20:59:33 +01:00
2026-09-11 11:46:42 +02:00
2026-10-21 15:31:38 +02:00
2026-10-02 22:33:20 +02:00