feat: Switch to 12-hour time format in routines#60
Merged
Conversation
- Update `rememberTimePickerState` to use 12-hour mode in `CreateRoutineScreen`. - Update `formatTime` utility to use "hh:mm a" pattern in both `CreateRoutineScreen` and `RoutinesScreen`.
Member
|
thanks for your contribution! |
Contributor
|
@PranavPurwar |
Member
|
You can still set routine time for 24 hours, the picker will show am/pm for more accessibility to general public (who don't understand 24h clock) |
Contributor
@PranavPurwar
I'm french and use the 24h clock. I don't use the 12h clock. |
Member
|
sure, I'll add it |
alv-cor
added a commit
to alv-cor/Reef
that referenced
this pull request
Mar 25, 2026
This reverts commit b3be184.
alv-cor
added a commit
to alv-cor/Reef
that referenced
this pull request
May 4, 2026
commit 662080e Author: alv-cor <github.carport038@passmail.com> Date: Wed Apr 15 18:14:10 2026 +0200 Bump minSdk and JVM targets; update AGP & version Raise Android minSdk from 26 to 36 in Reef and appintro modules, and increment Reef versionCode to 413 and versionName to 4.1.3. Update Java/Kotlin compile targets to Java 21 (source/target and jvmTarget) across modules. Also bump Android Gradle Plugin version in gradle/libs.versions.toml from 9.1.0 to 9.1.1. commit 69e112a Author: alv-cor <github.carport038@passmail.com> Date: Wed Apr 15 18:13:14 2026 +0200 Disable whitelist bypass for usage limits Remove whitelist shortcuts that allowed whitelisted apps to skip blocking. Deleted the whitelist check in BlockerService and the early return in UsageTracker so whitelisted packages no longer bypass daily/other limits; routine limits remain enforced. Also simplified a comment in UsageTracker. This ensures limits are applied consistently to all apps. commit f959271 Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 25 12:31:01 2026 +0100 Bump app version to 4.1.2 (412) Update build.gradle.kts to increment versionCode from 411 to 412 and versionName from "4.1.1" to "4.1.2" in preparation for the next release. commit 48e93c0 Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 25 12:30:48 2026 +0100 Update libs.versions.toml commit b0652c6 Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 25 12:26:13 2026 +0100 Update libs.versions.toml commit e3d784f Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 25 12:08:41 2026 +0100 Revert "feat: Switch to 12-hour time format in routines (aload0#60)" This reverts commit b3be184. commit 272a2db Merge: c40d61f db5c330 Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 25 12:08:32 2026 +0100 Merge branch 'main' into releases4 commit db5c330 Merge: 7124ea3 9da8b79 Author: alv-cor <58772226+alv-cor@users.noreply.github.com> Date: Wed Mar 25 11:57:32 2026 +0100 Merge branch 'aload0:main' into main commit c40d61f Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 11 17:05:45 2026 +0100 Squashed commit of the following: commit 7124ea3 Author: alv-cor <58772226+alv-cor@users.noreply.github.com> Date: Wed Mar 11 17:04:52 2026 +0100 Fix grammatical error in README warning section commit 019e636 Author: alv-cor <58772226+alv-cor@users.noreply.github.com> Date: Wed Mar 11 17:03:53 2026 +0100 Update README to reflect project changes Removed screenshots and features sections from README, added warning about personal fork. commit 7124ea3 Author: alv-cor <58772226+alv-cor@users.noreply.github.com> Date: Wed Mar 11 17:04:52 2026 +0100 Fix grammatical error in README warning section commit 019e636 Author: alv-cor <58772226+alv-cor@users.noreply.github.com> Date: Wed Mar 11 17:03:53 2026 +0100 Update README to reflect project changes Removed screenshots and features sections from README, added warning about personal fork. commit a76d7f2 Merge: 40aed53 33de6ee Author: alv-cor <github.carport038@passmail.com> Date: Wed Mar 11 16:59:02 2026 +0100 Merge branch 'main' into releases4 commit 40aed53 Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 21:13:04 2026 +0100 Update build.gradle.kts commit ad37af7 Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 21:10:30 2026 +0100 Expand Spanish translations; add French app_name Add many new and updated Spanish strings (Reef/src/main/res/values-es/strings.xml): app_name, accessibility and permission descriptions, routines and scheduling labels, app/group limits, notifications, Pomodoro wording, plurals, UI labels and assorted fixes/rewrites (removed duplicate/outdated lines, adjusted phrasing). Also add app_name to the French strings file (Reef/src/main/res/values-fr/strings.xml). This improves localization coverage for core features like routines, focus mode, notifications and app groups. commit d2a728a Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:45:46 2026 +0100 Update FocusModeService.kt commit 672ad2b Merge: 8e2dfbf 2290100 Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:35:55 2026 +0100 Merge branch 'fix/transition-sound-not-playing' into releases4 commit 8e2dfbf Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:35:16 2026 +0100 Refine usage fallback logic with 1-day threshold Add a Map.totalTime() helper and ONE_DAY_MS constant; use a mutable `usage` variable to prefer event-based usage only when it's non-empty and the summed time is <= one day. If that check fails, fall back to stats-based calculation and return it only if it's <= one day; otherwise return an empty map. Also change exception handling to return an empty map instead of falling back to stats. This avoids returning large/invalid aggregates and makes the fallback behavior more explicit. commit 2290100 Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:34:01 2026 +0100 Set AudioAttributes on ringtone before play Assign AudioAttributes to the Ringtone with USAGE_ALARM and CONTENT_TYPE_SONIFICATION before calling play(). This ensures correct routing/behavior (volume, focus, and stream selection) on modern Android versions and avoids unexpected muted/incorrect stream playback. Kept nullable-safe access to ringtone. commit 72f0e1e Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:32:45 2026 +0100 Mark Application as having fragile user data Adds android:hasFragileUserData="true" to the <application> element in AndroidManifest.xml. This flags the app's user data as fragile so the system can treat backups/migrations accordingly (affecting automatic restoration or migration behavior). commit 53c7925 Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:32:26 2026 +0100 Ignore Kotlin sessions directory Add /.kotlin/sessions to .gitignore to avoid committing IDE-generated Kotlin session files from developer environments. commit 3db9f0f Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:18:31 2026 +0100 Ignore Java keystore (*.jks) files Add '*.jks' to .gitignore to prevent Java keystore files (e.g., signing keys) from being committed to the repository, reducing risk of exposing sensitive credentials. commit 456a37a Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:08:47 2026 +0100 Bump AGP to 9.1.0 and vico to 3.0.3 Update the Gradle version catalog (gradle/libs.versions.toml): change Android Gradle Plugin (agp) from 9.2.0-alpha02 to 9.1.0 and bump vico from 3.0.2 to 3.0.3. Aligns AGP to a stable release and pulls in the vico patch release. commit 79cabec Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 20:08:35 2026 +0100 Add dummy prepareKotlinBuildScriptModel task Register an empty 'prepareKotlinBuildScriptModel' Gradle task in Reef/build.gradle.kts. This ensures the expected task exists for IDE/Gradle tooling that looks for the Kotlin build script model, preventing related tooling errors without changing build outputs. commit 19fdaf2 Author: alv-cor <github.carport038@passmail.com> Date: Sun Mar 8 19:47:36 2026 +0100 Update .gitignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updated the routine creation and display logic to use a 12-hour time format (AM/PM) instead of the 24-hour format. This improves readability and provides a more familiar user experience when setting up daily schedules.