Remove material you and dark/light theme

Author: Pururun

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt

@@ -7,7 +7,6 @@ import io.mockk.MockKAnnotations
 import net.mullvad.mullvadvpn.compose.createEdgeToEdgeComposeExtension
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
 import net.mullvad.mullvadvpn.compose.state.SettingsUiState
-import net.mullvad.mullvadvpn.lib.theme.DarkThemeState
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.RegisterExtension

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt

@@ -127,7 +127,6 @@ fun ScaffoldWithMediumTopBar(
     actions: @Composable RowScope.() -> Unit = {},
     lazyListState: LazyListState = rememberLazyListState(),
     scrollbarColor: Color = MaterialTheme.colorScheme.onSurface.copy(alpha = AlphaScrollbar),
-    toolbarColor: Color = MaterialTheme.colorScheme.surface,
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
     content: @Composable (modifier: Modifier, lazyListState: LazyListState) -> Unit
 ) {

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt

@@ -44,7 +44,6 @@ import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_TEST_TAG
 import net.mullvad.mullvadvpn.compose.transitions.SettingsTransition
 import net.mullvad.mullvadvpn.lib.common.util.openLink
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.lib.theme.DarkThemeState
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
 import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel
@@ -62,8 +61,6 @@ private fun PreviewSettings() {
                     isLoggedIn = true,
                     isSupportedVersion = true,
                     isPlayBuild = false,
-                    isMaterialYouTheme = false,
-                    darkThemeState = DarkThemeState.SYSTEM
                 ),
         )
     }
@@ -83,8 +80,6 @@ fun Settings(navigator: DestinationsNavigator) {
         onApiAccessClick = dropUnlessResumed { navigator.navigate(ApiAccessListDestination) },
         onReportProblemCellClick =
             dropUnlessResumed { navigator.navigate(ReportProblemDestination) },
-        onUseMaterialYouThemeClick = vm::setUseMaterialYouTheme,
-        onDarkThemeStateSelected = vm::onDarkThemeStateSelected,
         onBackClick = dropUnlessResumed { navigator.navigateUp() }
     )
 }
@@ -97,8 +92,6 @@ fun SettingsScreen(
     onSplitTunnelingCellClick: () -> Unit = {},
     onReportProblemCellClick: () -> Unit = {},
     onApiAccessClick: () -> Unit = {},
-    onUseMaterialYouThemeClick: (Boolean) -> Unit = {},
-    onDarkThemeStateSelected: (DarkThemeState) -> Unit = {},
     onBackClick: () -> Unit = {}
 ) {
     val context = LocalContext.current
@@ -112,11 +105,7 @@ fun SettingsScreen(
             state = lazyListState
         ) {
             item { Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding)) }
-            item {
-                MaterialYou(state = state, onUseMaterialYouThemeClick = onUseMaterialYouThemeClick)
-            }
             item { Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding)) }
-            item { DarkTheme(state = state, onDarkThemeStateSelected = onDarkThemeStateSelected) }
             if (state.isLoggedIn) {
                 item { Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding)) }
                 item {
@@ -261,39 +250,3 @@ private fun PrivacyPolicy(context: Context, state: SettingsUiState) {
         }
     )
 }
-
-@Composable
-private fun MaterialYou(state: SettingsUiState, onUseMaterialYouThemeClick: (Boolean) -> Unit) {
-    HeaderSwitchComposeCell(
-        title = stringResource(id = R.string.use_material_you),
-        isToggled = state.isMaterialYouTheme,
-        onCellClicked = onUseMaterialYouThemeClick
-    )
-}
-
-@Composable
-private fun DarkTheme(
-    state: SettingsUiState,
-    onDarkThemeStateSelected: (DarkThemeState) -> Unit = {}
-) {
-    Column {
-        HeaderCell(
-            text = stringResource(id = R.string.use_dark_theme),
-        )
-        SelectableCell(
-            title = stringResource(id = R.string.use_system_setting),
-            isSelected = state.darkThemeState == DarkThemeState.SYSTEM,
-            onCellClicked = { onDarkThemeStateSelected(DarkThemeState.SYSTEM) }
-        )
-        SelectableCell(
-            title = stringResource(id = R.string.on),
-            isSelected = state.darkThemeState == DarkThemeState.ON,
-            onCellClicked = { onDarkThemeStateSelected(DarkThemeState.ON) }
-        )
-        SelectableCell(
-            title = stringResource(id = R.string.off),
-            isSelected = state.darkThemeState == DarkThemeState.OFF,
-            onCellClicked = { onDarkThemeStateSelected(DarkThemeState.OFF) }
-        )
-    }
-}

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SettingsUiState.kt

@@ -1,12 +1,8 @@
 package net.mullvad.mullvadvpn.compose.state
 
-import net.mullvad.mullvadvpn.lib.theme.DarkThemeState
-
 data class SettingsUiState(
     val appVersion: String,
     val isLoggedIn: Boolean,
     val isSupportedVersion: Boolean,
     val isPlayBuild: Boolean,
-    val isMaterialYouTheme: Boolean,
-    val darkThemeState: DarkThemeState
 )

android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt

@@ -5,7 +5,6 @@ import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import androidx.datastore.dataStoreFile
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
-import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import net.mullvad.mullvadvpn.BuildConfig
@@ -14,7 +13,6 @@ import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
 import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
 import net.mullvad.mullvadvpn.lib.payment.PaymentProvider
 import net.mullvad.mullvadvpn.lib.shared.VoucherRepository
-import net.mullvad.mullvadvpn.lib.theme.ThemeRepository
 import net.mullvad.mullvadvpn.repository.ApiAccessRepository
 import net.mullvad.mullvadvpn.repository.ChangelogRepository
 import net.mullvad.mullvadvpn.repository.CustomListsRepository
@@ -159,13 +157,6 @@ val uiModule = module {
     }
 
     single { ProblemReportRepository() }
-    single {
-        ThemeRepository(
-            PreferenceDataStoreFactory.create {
-                File(androidContext().filesDir, "settings.preferences_pb")
-            }
-        )
-    }
     single {
         PreferenceDataStoreFactory.create { androidContext().dataStoreFile(APP_PREFERENCES_NAME) }
     }
@@ -197,7 +188,7 @@ val uiModule = module {
     viewModel { LoginViewModel(get(), get(), get()) }
     viewModel { PrivacyDisclaimerViewModel(get(), IS_PLAY_BUILD) }
     viewModel { SelectLocationViewModel(get(), get(), get(), get(), get(), get()) }
-    viewModel { SettingsViewModel(get(), get(), get(), IS_PLAY_BUILD) }
+    viewModel { SettingsViewModel(get(), get(), IS_PLAY_BUILD) }
     viewModel { SplashViewModel(get(), get(), get(), get()) }
     viewModel { VoucherDialogViewModel(get()) }
     viewModel { VpnSettingsViewModel(get(), get(), get()) }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt

@@ -6,35 +6,27 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.state.SettingsUiState
 import net.mullvad.mullvadvpn.lib.model.DeviceState
 import net.mullvad.mullvadvpn.lib.shared.DeviceRepository
-import net.mullvad.mullvadvpn.lib.theme.DarkThemeState
-import net.mullvad.mullvadvpn.lib.theme.ThemeRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.AppVersionInfoRepository
 
 class SettingsViewModel(
     deviceRepository: DeviceRepository,
     appVersionInfoRepository: AppVersionInfoRepository,
-    private val themeRepository: ThemeRepository,
     isPlayBuild: Boolean
 ) : ViewModel() {
 
     val uiState: StateFlow<SettingsUiState> =
         combine(
                 deviceRepository.deviceState,
                 appVersionInfoRepository.versionInfo(),
-                themeRepository.useMaterialYouTheme(),
-                themeRepository.useDarkTheme()
-            ) { deviceState, versionInfo, useMaterialYouTheme, darkThemeState ->
+            ) { deviceState, versionInfo ->
                 SettingsUiState(
                     isLoggedIn = deviceState is DeviceState.LoggedIn,
                     appVersion = versionInfo.currentVersion,
                     isSupportedVersion = versionInfo.isSupported,
-                    isPlayBuild = isPlayBuild,
-                    isMaterialYouTheme = useMaterialYouTheme,
-                    darkThemeState = darkThemeState
+                    isPlayBuild = isPlayBuild
                 )
             }
             .stateIn(
@@ -45,16 +37,6 @@ class SettingsViewModel(
                     isLoggedIn = false,
                     isSupportedVersion = true,
                     isPlayBuild = isPlayBuild,
-                    isMaterialYouTheme = false,
-                    darkThemeState = DarkThemeState.ON
                 )
             )
-
-    fun setUseMaterialYouTheme(useMaterialYouTheme: Boolean) {
-        viewModelScope.launch { themeRepository.setUseMaterialYouTheme(useMaterialYouTheme) }
-    }
-
-    fun onDarkThemeStateSelected(darkThemeState: DarkThemeState) {
-        viewModelScope.launch { themeRepository.setUseDarkTheme(darkThemeState) }
-    }
 }

android/lib/resource/src/main/res/values/strings.xml

@@ -384,7 +384,4 @@
     <string name="failed_to_set_current_test_error">Failed to set to current - API not reachable</string>
     <string name="failed_to_set_current_unknown_error">Failed to set to current - Unknown reason</string>
     <string name="split_tunneling_disabled_description">Split tunneling is disabled.</string>
-    <string name="use_material_you">Use material you theme</string>
-    <string name="use_dark_theme">Use dark theme</string>
-    <string name="use_system_setting">Use system setting</string>
 </resources>

android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/AnimatableTheme.kt

@@ -168,31 +168,13 @@ private val LocalAppDimens = staticCompositionLocalOf { defaultDimensions }
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppTheme(content: @Composable () -> Unit) {
-    val themeRepository: ThemeRepository = get().get()
-    val dynamicColor = themeRepository.useMaterialYouTheme().collectAsState().value
-    val darkTheme =
-        when (themeRepository.useDarkTheme().collectAsState().value) {
-            DarkThemeState.SYSTEM -> isSystemInDarkTheme()
-            DarkThemeState.ON -> true
-            DarkThemeState.OFF -> false
-        }
-    val context = LocalContext.current
-    val colorScheme =
-        when {
-            dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-                if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-            }
-            darkTheme -> darkColorScheme
-            else -> lightColorScheme
-        }
-
     val typography = MullvadTypography
     // Set dimensions and type scale based on configurations here
     val dimensions = defaultDimensions
 
     ProvideDimens(dimensions = dimensions) {
         MaterialTheme(
-            colorScheme = colorScheme.switch(),
+            colorScheme = darkColorScheme,
             shapes = Shapes,
             typography = typography,
             content = {