Don't show AM/PM for 24 hour systems

sadellie · Oct 14, 2023 · 0d9a322 · 0d9a322
1 parent 7c53768
commit 0d9a322
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/.../main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt b/.../main/java/com/sadellie/unitto/feature/datecalculator/components/DateTimeSelectorBlock.kt
@@ -99,20 +99,22 @@ internal fun DateTimeSelectorBlock(
                 )
             }
 
-            AnimatedContent(
-                targetState = dateTime,
-                transitionSpec = {
-                    slideInVertically { height -> height } + fadeIn() togetherWith
-                            slideOutVertically { height -> -height } + fadeOut() using
-                            SizeTransform()
-                },
-                label = "Animated am/pm",
-            ) { time ->
-                Text(
-                    text = time.formatTimeAmPm(locale),
-                    style = MaterialTheme.typography.bodyLarge,
-                    maxLines = 1
-                )
+            if (is24Hour) {
+                AnimatedContent(
+                    targetState = dateTime,
+                    transitionSpec = {
+                        slideInVertically { height -> height } + fadeIn() togetherWith
+                                slideOutVertically { height -> -height } + fadeOut() using
+                                SizeTransform()
+                    },
+                    label = "Animated am/pm",
+                ) { time ->
+                    Text(
+                        text = time.formatTimeAmPm(locale),
+                        style = MaterialTheme.typography.bodyLarge,
+                        maxLines = 1
+                    )
+                }
             }
         }