fix: change clock based on user locale (#50)

brahmkshatriya · Dec 30, 2024 · 3f45453 · 3f45453
1 parent 6c5b68b
commit 3f45453
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/dev/brahmkshatriya/echo/ui/item/ItemFragment.kt b/app/src/main/java/dev/brahmkshatriya/echo/ui/item/ItemFragment.kt
@@ -99,7 +99,6 @@ class ItemFragment : Fragment() {
 
         setupTransition(view)
         applyInsets {
-            binding.coverContainer.updateLayoutParams<MarginLayoutParams> { topMargin = it.top }
             binding.recyclerView.applyContentInsets(it)
             binding.fabContainer.applyFabInsets(it, systemInsets.value)
         }

diff --git a/app/src/main/java/dev/brahmkshatriya/echo/ui/player/SleepTimerBottomSheet.kt b/app/src/main/java/dev/brahmkshatriya/echo/ui/player/SleepTimerBottomSheet.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
 import android.os.Bundle
+import android.text.format.DateFormat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -77,8 +78,9 @@ class SleepTimerBottomSheet : BottomSheetDialogFragment() {
         binding.topAppBar.setOnMenuItemClickListener {
             when (it.itemId) {
                 R.id.schedule -> {
+                    val is24Hour = DateFormat.is24HourFormat(context)
                     val picker = MaterialTimePicker.Builder()
-                        .setTimeFormat(TimeFormat.CLOCK_12H)
+                        .setTimeFormat(if (is24Hour) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H)
                         .setTitleText(getString(R.string.sleep_on_specific_time))
                         .build()
                     picker.addOnCancelListener { picker.dismiss() }

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -129,7 +129,6 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">0dp</item>
         <item name="cardBackgroundColor">?attr/colorSurfaceContainerHigh</item>
-        <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintDimensionRatio">1,1</item>
         <item name="layout_constraintEnd_toEndOf">parent</item>
         <item name="layout_constraintHeight_max">@dimen/max_cover_size</item>