-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: selectable app theme [WPB-4483] (#2379)
Co-authored-by: Oussama Hassine <[email protected]>
- Loading branch information
Showing
13 changed files
with
524 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
168 changes: 168 additions & 0 deletions
168
app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| * | ||
| */ | ||
|
|
||
| package com.wire.android.ui.home.settings.appearance | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.lazy.LazyListScope | ||
| import androidx.compose.foundation.lazy.LazyListState | ||
| import androidx.compose.foundation.lazy.rememberLazyListState | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.RadioButton | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.SpanStyle | ||
| import androidx.compose.ui.text.buildAnnotatedString | ||
| import androidx.compose.ui.text.withStyle | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.hilt.navigation.compose.hiltViewModel | ||
| import com.ramcosta.composedestinations.annotation.Destination | ||
| import com.ramcosta.composedestinations.annotation.RootNavGraph | ||
| import com.wire.android.R | ||
| import com.wire.android.navigation.Navigator | ||
| import com.wire.android.ui.common.dimensions | ||
| import com.wire.android.ui.common.scaffold.WireScaffold | ||
| import com.wire.android.ui.common.selectableBackground | ||
| import com.wire.android.ui.common.topappbar.WireCenterAlignedTopAppBar | ||
| import com.wire.android.ui.theme.ThemeData | ||
| import com.wire.android.ui.theme.ThemeOption | ||
| import com.wire.android.ui.theme.wireColorScheme | ||
| import com.wire.android.ui.theme.wireTypography | ||
| import com.wire.android.util.extension.folderWithElements | ||
| import com.wire.android.util.ui.PreviewMultipleThemes | ||
|
|
||
| @RootNavGraph | ||
| @Destination | ||
| @Composable | ||
| fun AppearanceScreen( | ||
| navigator: Navigator, | ||
| viewModel: AppearanceViewModel = hiltViewModel() | ||
| ) { | ||
| val lazyListState: LazyListState = rememberLazyListState() | ||
| AppearanceScreenContent( | ||
| lazyListState = lazyListState, | ||
| state = viewModel.state, | ||
| onThemeOptionChanged = viewModel::selectThemeOption, | ||
| onBackPressed = navigator::navigateBack | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun AppearanceScreenContent( | ||
| lazyListState: LazyListState = rememberLazyListState(), | ||
| state: AppearanceState, | ||
| onThemeOptionChanged: (ThemeOption) -> Unit, | ||
| onBackPressed: () -> Unit, | ||
| ) { | ||
| val context = LocalContext.current | ||
| WireScaffold(topBar = { | ||
| WireCenterAlignedTopAppBar( | ||
| onNavigationPressed = onBackPressed, | ||
| elevation = 0.dp, | ||
| title = stringResource(id = R.string.settings_appearance_label) | ||
| ) | ||
| }) { internalPadding -> | ||
| LazyColumn( | ||
| state = lazyListState, | ||
| modifier = Modifier | ||
| .padding(internalPadding) | ||
| .fillMaxSize() | ||
| ) { | ||
| folderWithElements( | ||
| header = context.getString(R.string.settings_appearance_theme_label), | ||
| items = buildList { | ||
| add(ThemeData(option = ThemeOption.SYSTEM, selectedOption = state.selectedThemeOption)) | ||
| add(ThemeData(option = ThemeOption.LIGHT, selectedOption = state.selectedThemeOption)) | ||
| add(ThemeData(option = ThemeOption.DARK, selectedOption = state.selectedThemeOption)) | ||
| }, | ||
| onItemClicked = onThemeOptionChanged | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun LazyListScope.folderWithElements( | ||
| header: String, | ||
| items: List<ThemeData>, | ||
| onItemClicked: (ThemeOption) -> Unit | ||
| ) { | ||
| folderWithElements( | ||
| header = header.uppercase(), | ||
| items = items.associateBy { it.option } | ||
| ) { themeItem -> | ||
| ThemeOptionItem( | ||
| themeOption = themeItem.option, | ||
| selectedOption = themeItem.selectedOption, | ||
| onItemClicked = onItemClicked | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun ThemeOptionItem( | ||
| themeOption: ThemeOption, | ||
| selectedOption: ThemeOption, | ||
| onItemClicked: (ThemeOption) -> Unit | ||
| ) { | ||
| val isSelected = themeOption == selectedOption | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(bottom = dimensions().spacing1x) | ||
| .selectableBackground(isSelected, onClick = { onItemClicked(themeOption) }) | ||
| .background(color = MaterialTheme.wireColorScheme.surface), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| RadioButton(selected = isSelected, onClick = { onItemClicked(themeOption) }) | ||
| Text( | ||
| text = when (themeOption) { | ||
| ThemeOption.LIGHT -> buildAnnotatedString { append(stringResource(R.string.settings_appearance_theme_option_light)) } | ||
| ThemeOption.DARK -> buildAnnotatedString { append(stringResource(R.string.settings_appearance_theme_option_dark)) } | ||
| ThemeOption.SYSTEM -> buildAnnotatedString { | ||
| append(stringResource(R.string.settings_appearance_theme_option_system)) | ||
| append(" ") | ||
| withStyle( | ||
| style = SpanStyle(color = MaterialTheme.wireColorScheme.secondaryText) | ||
| ) { | ||
| append(stringResource(R.string.settings_appearance_theme_option_default_hint)) | ||
| } | ||
| } | ||
| }, | ||
| style = MaterialTheme.wireTypography.body01, | ||
| color = MaterialTheme.wireColorScheme.onBackground, | ||
| modifier = Modifier.padding(vertical = dimensions().spacing16x) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @PreviewMultipleThemes | ||
| @Composable | ||
| fun PreviewSettingsScreen() { | ||
| AppearanceScreenContent(rememberLazyListState(), AppearanceState(), {}, {}) | ||
| } |
24 changes: 24 additions & 0 deletions
24
app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.home.settings.appearance | ||
|
|
||
| import com.wire.android.ui.theme.ThemeOption | ||
|
|
||
| data class AppearanceState( | ||
| val selectedThemeOption: ThemeOption = ThemeOption.SYSTEM, | ||
| ) |
52 changes: 52 additions & 0 deletions
52
app/src/main/kotlin/com/wire/android/ui/home/settings/appearance/AppearanceViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| * | ||
| */ | ||
|
|
||
| package com.wire.android.ui.home.settings.appearance | ||
|
|
||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import com.wire.android.datastore.GlobalDataStore | ||
| import com.wire.android.ui.theme.ThemeOption | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class AppearanceViewModel @Inject constructor( | ||
| private val globalDataStore: GlobalDataStore, | ||
| ) : ViewModel() { | ||
| var state by mutableStateOf(AppearanceState()) | ||
| private set | ||
|
|
||
| init { | ||
| viewModelScope.launch { | ||
| globalDataStore.selectedThemeOptionFlow().collect { option -> state = state.copy(selectedThemeOption = option) } | ||
| } | ||
| } | ||
|
|
||
| fun selectThemeOption(option: ThemeOption) { | ||
| viewModelScope.launch { | ||
| globalDataStore.setThemeOption(option) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.