Skip to content

Commit 559956e

Browse files
committed
fix: Missing missing AM/PM mode in MaterialTimePicker when local uses it
1 parent fbb652a commit 559956e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

app/src/main/java/com/infomaniak/mail/ui/alertDialogs/SelectDateAndTimeForScheduledDraftDialog.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package com.infomaniak.mail.ui.alertDialogs
1919

2020
import android.content.Context
21+
import android.text.format.DateFormat
2122
import androidx.annotation.StringRes
2223
import androidx.core.view.isVisible
2324
import com.google.android.material.datepicker.*
@@ -136,7 +137,7 @@ open class SelectDateAndTimeForScheduledDraftDialog @Inject constructor(
136137
private fun showTimePicker(dateToDisplay: Date, onDateSelected: (Int, Int) -> Unit) {
137138
val timePicker = MaterialTimePicker.Builder()
138139
.setInputMode(MaterialTimePicker.INPUT_MODE_CLOCK)
139-
.setTimeFormat(TimeFormat.CLOCK_24H)
140+
.setTimeFormat(if (DateFormat.is24HourFormat(activityContext)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H)
140141
.setHour(dateToDisplay.hours())
141142
.setMinute(dateToDisplay.minutes())
142143
.setTitleText(binding.context.getString(R.string.selectTimeDialogTitle))

0 commit comments

Comments
 (0)