makiolaj/clockula
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Merge branch 'feat/26-quick-settings-tiles' into release/v1.0.0

Browse Source 
# 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:
makiolaj committed 2026-10-26 21:00:57 +01:00
2 parents a0a1daa920 3b488ef6fc
commit df8be5e158
31 files changed
+998 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/values/strings.xml
+10
View File
@@ -552,4 +552,14 @@
<item quantity="other">Bedtime in %1$d minutes</item>
</plurals>
<string name="bedtime_reminder_text">Bedtime mode starts at %1$s.</string>
<!-- #26: Quick Settings tiles -->
<string name="tile_next_alarm_label">Next alarm</string>
<string name="tile_next_alarm_empty">No alarms</string>
<!-- The next alarm's day and time, e.g. "Tue 07:00". %1$s: the abbreviated weekday, %2$s: the time. -->
<string name="tile_next_alarm_subtitle">%1$s %2$s</string>
<string name="tile_quick_timer_label">Quick timer</string>
<!-- A running quick timer's end time, e.g. "Until 14:32". -->
<string name="tile_quick_timer_until">Until %1$s</string>
<string name="tile_quick_timer_config_title">Quick timer tile</string>
</resources>