Fix time formatting in toolbar, merge duplicate rememberCurrentTime implementations

Author: nielsvanvelzen

Diff for: app/src/main/java/org/jellyfin/androidtv/integration/dream/composable/DreamHeader.kt

@@ -1,6 +1,5 @@
 package org.jellyfin.androidtv.integration.dream.composable
 
-import android.text.format.DateUtils
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -11,9 +10,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
@@ -59,9 +58,9 @@ fun DreamHeader(
 			enter = fadeIn(),
 			exit = fadeOut(),
 		) {
-			val time = rememberCurrentTime()
+			val currentTime by rememberCurrentTime()
 			Text(
-				text = DateUtils.formatDateTime(LocalContext.current, time, DateUtils.FORMAT_SHOW_TIME),
+				text = currentTime,
 				style = TextStyle(
 					color = Color.White,
 					fontSize = 20.sp

Diff for: app/src/main/java/org/jellyfin/androidtv/ui/composable/time.kt

@@ -1,28 +1,42 @@
 package org.jellyfin.androidtv.ui.composable
 
+import android.text.format.DateFormat
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.delay
-import java.time.Instant
-import kotlin.time.Duration.Companion.seconds
+import org.jellyfin.androidtv.util.locale
+import java.util.Date
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
 
-/**
- * A composable that returns the current time in milliseconds. Updates every second.
- */
 @Composable
-fun rememberCurrentTime(): Long {
-	var value by remember { mutableLongStateOf(Instant.now().toEpochMilli()) }
+fun rememberCurrentTime(
+	format12: String = "h:mm",
+	format24: String = "k:mm",
+	updateFrequency: Duration = 1.minutes,
+): State<String> {
+	val context = LocalContext.current
+	val locale = context.locale
+	val format = remember(context, locale) {
+		when (DateFormat.is24HourFormat(context)) {
+			true -> format24
+			false -> format12
+		}
+	}
+	val currentTime = remember { mutableStateOf(DateFormat.format(format, Date()).toString()) }
 
-	LaunchedEffect(Unit) {
+	LaunchedEffect(format) {
 		while (true) {
-			value = Instant.now().toEpochMilli()
-			delay(1.seconds)
+			val now = Date()
+			currentTime.value = DateFormat.format(format, now).toString()
+			// Delay until next expected change in time based on updateFrequency
+			delay(updateFrequency.inWholeMilliseconds - now.time % updateFrequency.inWholeMilliseconds)
 		}
 	}
 
-	return value
+	return currentTime
 }

Diff for: app/src/main/java/org/jellyfin/androidtv/ui/shared/toolbar/Toolbar.kt

@@ -12,28 +12,20 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import kotlinx.coroutines.delay
 import org.jellyfin.androidtv.R
 import org.jellyfin.androidtv.ui.base.JellyfinTheme
 import org.jellyfin.androidtv.ui.base.Text
 import org.jellyfin.androidtv.ui.base.modifier.childFocusRestorer
 import org.jellyfin.androidtv.ui.composable.modifier.overscan
-import org.jellyfin.androidtv.util.locale
-import java.text.DateFormat
-import java.util.Date
+import org.jellyfin.androidtv.ui.composable.rememberCurrentTime
 
 @Composable
 fun Logo(modifier: Modifier = Modifier) {
@@ -97,20 +89,3 @@ fun BoxScope.ToolbarButtons(
 		}
 	}
 }
-
-@Composable
-private fun rememberCurrentTime(): State<String> {
-	val locale = LocalContext.current.locale
-	val format = remember(locale) { DateFormat.getTimeInstance(DateFormat.SHORT, locale) }
-	val currentTime = remember { mutableStateOf(format.format(Date())) }
-
-	LaunchedEffect(format) {
-		while (true) {
-			val now = Date()
-			currentTime.value = format.format(now)
-			delay(60_000 - now.time % 60_000)
-		}
-	}
-
-	return currentTime
-}