Skip to content

fix timezone offset issue in custom rpc timestamp picker #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dead8309 merged 1 commit into from
May 13, 2026
Merged

fix timezone offset issue in custom rpc timestamp picker #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ...ure_custom_rpc/src/main/java/com/my/kizzy/feature_custom_rpc/components/DateTimePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.my.kizzy.resources.R
import java.util.Calendar
import java.util.TimeZone

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -192,12 +193,21 @@ internal fun getDateTimeInMillis(
hours: Int,
minutes: Int,
): Long {
val calender = Calendar.getInstance().apply {
val utcCalendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply {
timeInMillis = dateMillis
set(Calendar.HOUR_OF_DAY, hours % 12 + if (hours >= 12) 12 else 0)
}

val localCalendar = Calendar.getInstance().apply {
set(Calendar.YEAR, utcCalendar.get(Calendar.YEAR))
set(Calendar.MONTH, utcCalendar.get(Calendar.MONTH))
set(Calendar.DAY_OF_MONTH, utcCalendar.get(Calendar.DAY_OF_MONTH))
set(Calendar.HOUR_OF_DAY, hours)
set(Calendar.MINUTE, minutes)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}
return calender.timeInMillis

return localCalendar.timeInMillis
}

@Preview
Expand Down