A fully functional Android app built entirely with Kotlin and Jetpack Compose
Rename LocalTimeZone -> LocalZoneId + collects with lifecycle
Tomáš Mlynarič44ae059a2be0
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.ktindex 779b6edbe..0bf45f125 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt@@ -28,12 +28,12 @@ import androidx.compose.material3.windowsizeclass.calculateWindowSizeClassimport androidx.compose.runtime.Composableimport androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.DisposableEffect-import androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.setValueimport androidx.core.splashscreen.SplashScreen.Companion.installSplashScreenimport androidx.lifecycle.Lifecycle+import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.lifecycle.lifecycleScopeimport androidx.lifecycle.repeatOnLifecycleimport androidx.metrics.performance.JankStats@@ -47,7 +47,7 @@ import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfigimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand-import com.google.samples.apps.nowinandroid.core.ui.LocalTimeZone+import com.google.samples.apps.nowinandroid.core.ui.LocalZoneIdimport com.google.samples.apps.nowinandroid.ui.NiaAppimport com.google.samples.apps.nowinandroid.ui.rememberNiaAppStateimport dagger.hilt.android.AndroidEntryPoint@@ -140,11 +140,11 @@ class MainActivity : ComponentActivity() {timeZoneMonitor = timeZoneMonitor,)- val currentTimeZone by appState.currentTimeZone.collectAsState()+ val currentZoneId by appState.currentTimeZone.collectAsStateWithLifecycle()CompositionLocalProvider(LocalAnalyticsHelper provides analyticsHelper,- LocalTimeZone provides currentTimeZone,+ LocalZoneId provides currentZoneId,) {NiaTheme(darkTheme = darkTheme,diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/LocalTimeZone.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/LocalZoneId.ktsimilarity index 87%rename from core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/LocalTimeZone.ktrename to core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/LocalZoneId.ktindex cda5040bd..54aa7931d 100644--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/LocalTimeZone.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/LocalZoneId.kt@@ -20,7 +20,7 @@ import androidx.compose.runtime.compositionLocalOfimport java.time.ZoneId/**- * TimeZone that can be provided with the TimeZoneMonitor.+ * ZoneId that can be provided with the TimeZoneMonitor.* This way, it's not needed to pass every single composable the time zone to show in UI.*/-val LocalTimeZone = compositionLocalOf { ZoneId.systemDefault() }+val LocalZoneId = compositionLocalOf { ZoneId.systemDefault() }diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex c922d9687..9c4377b9d 100644--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@ -244,7 +244,7 @@ fun NotificationDot(fun dateFormatted(publishDate: Instant): String = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM).withLocale(Locale.getDefault())- .withZone(LocalTimeZone.current)+ .withZone(LocalZoneId.current).format(publishDate.toJavaInstant())@Composable