fix: Fix inconsistent behavior of datetime-picker dialog (#152)

--------- Signed-off-by: starry-shivam <[email protected]>
Pool-Of-Tears · Jul 22, 2024 · d263a46 · d263a46
1 parent 2274142
commit d263a46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt
@@ -79,6 +79,7 @@ import com.airbnb.lottie.compose.animateLottieCompositionAsState
 import com.airbnb.lottie.compose.rememberLottieComposition
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
 import com.maxkeppeler.sheets.date_time.DateTimeDialog
+import com.maxkeppeler.sheets.date_time.models.DateTimeConfig
 import com.maxkeppeler.sheets.date_time.models.DateTimeSelection
 import com.starry.greenstash.R
 import com.starry.greenstash.database.transaction.TransactionType
@@ -96,6 +97,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.time.LocalDateTime
+import java.util.Locale
 
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -124,6 +126,7 @@ fun DWScreen(goalId: String, transactionTypeName: String, navController: NavCont
         ) { newDateTime ->
             selectedDateTime.value = newDateTime
         },
+        config = DateTimeConfig(locale = Locale.US)
     )
 
     Scaffold(

diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/EditTransactionSheet.kt b/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/EditTransactionSheet.kt
@@ -62,6 +62,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import com.maxkeppeker.sheets.core.models.base.rememberUseCaseState
 import com.maxkeppeler.sheets.date_time.DateTimeDialog
+import com.maxkeppeler.sheets.date_time.models.DateTimeConfig
 import com.maxkeppeler.sheets.date_time.models.DateTimeSelection
 import com.starry.greenstash.R
 import com.starry.greenstash.database.transaction.Transaction
@@ -76,6 +77,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.time.Instant
 import java.time.LocalDateTime
+import java.util.Locale
 import java.util.TimeZone
 
 
@@ -109,7 +111,8 @@ fun EditTransactionSheet(
         selection = DateTimeSelection.DateTime(
             selectedDate = selectedDateTime.value.toLocalDate(),
             selectedTime = selectedDateTime.value.toLocalTime(),
-        ) { newDateTime -> selectedDateTime.value = newDateTime }
+        ) { newDateTime -> selectedDateTime.value = newDateTime },
+        config = DateTimeConfig(locale = Locale.US)
     )
 
     if (showEditTransaction.value) {