Skip to content

Commit 400f3b8

Browse files
committed
Fix default value
Change-Id: I6b77e1c23ad91c1c97f31a705161d444be7913c0
1 parent bd508c4 commit 400f3b8

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import androidx.lifecycle.lifecycleScope
3535
import androidx.lifecycle.repeatOnLifecycle
3636
import androidx.metrics.performance.JankStats
3737
import androidx.tracing.trace
38+
import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
3839
import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper
3940
import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper
4041
import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
@@ -48,6 +49,8 @@ import com.google.samples.apps.nowinandroid.util.isSystemInDarkTheme
4849
import dagger.hilt.android.AndroidEntryPoint
4950
import kotlinx.coroutines.flow.combine
5051
import kotlinx.coroutines.flow.distinctUntilChanged
52+
import kotlinx.coroutines.flow.map
53+
import kotlinx.coroutines.flow.onEach
5154
import kotlinx.coroutines.launch
5255
import javax.inject.Inject
5356

@@ -83,8 +86,8 @@ class MainActivity : ComponentActivity() {
8386
var themeSettings by mutableStateOf(
8487
ThemeSettings(
8588
darkTheme = resources.configuration.isSystemInDarkTheme,
86-
androidTheme = false,
87-
disableDynamicTheming = true,
89+
androidTheme = Loading.shouldUseAndroidTheme,
90+
disableDynamicTheming = Loading.shouldDisableDynamicTheming,
8891
),
8992
)
9093

@@ -101,8 +104,10 @@ class MainActivity : ComponentActivity() {
101104
disableDynamicTheming = uiState.shouldDisableDynamicTheming,
102105
)
103106
}
107+
.onEach { themeSettings = it }
108+
.map { it.darkTheme }
104109
.distinctUntilChanged()
105-
.collect { newThemeSettings ->
110+
.collect { darkTheme ->
106111
trace("niaEdgeToEdge") {
107112
// Turn off the decor fitting system windows, which allows us to handle insets,
108113
// including IME animations, and go edge-to-edge.
@@ -113,15 +118,14 @@ class MainActivity : ComponentActivity() {
113118
statusBarStyle = SystemBarStyle.auto(
114119
lightScrim = android.graphics.Color.TRANSPARENT,
115120
darkScrim = android.graphics.Color.TRANSPARENT,
116-
) { newThemeSettings.darkTheme },
121+
) { darkTheme },
117122
navigationBarStyle = SystemBarStyle.auto(
118123
lightScrim = lightScrim,
119124
darkScrim = darkScrim,
120-
) { newThemeSettings.darkTheme },
125+
) { darkTheme },
121126
)
122127
}
123128

124-
themeSettings = newThemeSettings
125129
}
126130
}
127131
}

app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sealed interface MainActivityUiState {
7171
/**
7272
* Returns `true` if the dynamic color is disabled.
7373
*/
74-
val shouldDisableDynamicTheming: Boolean get() = false
74+
val shouldDisableDynamicTheming: Boolean get() = true
7575

7676
/**
7777
* Returns `true` if the Android theme should be used.

0 commit comments

Comments
 (0)