From c360753904a77d534d19ba2d5649fa955c180422 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 4 Jan 2022 18:53:41 +0100 Subject: [PATCH] Rename settings screens --- .../launcher2/ui/activity/ComposeActivity.kt | 8 ++------ .../launcher2/ui/settings/SettingsActivity.kt | 16 ++++++++-------- .../{AboutScreen.kt => AboutSettingsScreen.kt} | 4 ++-- ...AboutScreenVM.kt => AboutSettingsScreenVM.kt} | 2 +- ...anceScreen.kt => AppearanceSettingsScreen.kt} | 7 ++----- ...ScreenVM.kt => AppearanceSettingsScreenVM.kt} | 2 +- .../{MainScreen.kt => MainSettingsScreen.kt} | 2 +- .../WeatherWidgetSettingsScreen.kt} | 6 +++--- .../WeatherWidgetSettingsScreenVM.kt} | 7 +++---- 9 files changed, 23 insertions(+), 31 deletions(-) rename ui/src/main/java/de/mm20/launcher2/ui/settings/about/{AboutScreen.kt => AboutSettingsScreen.kt} (98%) rename ui/src/main/java/de/mm20/launcher2/ui/settings/about/{AboutScreenVM.kt => AboutSettingsScreenVM.kt} (66%) rename ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/{AppearanceScreen.kt => AppearanceSettingsScreen.kt} (90%) rename ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/{AppearanceScreenVM.kt => AppearanceSettingsScreenVM.kt} (95%) rename ui/src/main/java/de/mm20/launcher2/ui/settings/main/{MainScreen.kt => MainSettingsScreen.kt} (99%) rename ui/src/main/java/de/mm20/launcher2/ui/settings/{weather/WeatherScreen.kt => weatherwidget/WeatherWidgetSettingsScreen.kt} (96%) rename ui/src/main/java/de/mm20/launcher2/ui/settings/{weather/WeatherScreenVM.kt => weatherwidget/WeatherWidgetSettingsScreenVM.kt} (92%) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/activity/ComposeActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/activity/ComposeActivity.kt index 4bc5d9ac..4af00b4a 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/activity/ComposeActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/activity/ComposeActivity.kt @@ -1,7 +1,6 @@ package de.mm20.launcher2.ui.activity import android.appwidget.AppWidgetHost -import android.os.Build import android.os.Bundle import android.view.View import androidx.activity.compose.setContent @@ -18,7 +17,6 @@ import com.google.accompanist.insets.ProvideWindowInsets import com.google.accompanist.navigation.animation.AnimatedNavHost import com.google.accompanist.navigation.animation.composable import com.google.accompanist.navigation.animation.rememberAnimatedNavController -import de.mm20.launcher2.ktx.isAtLeastApiLevel import de.mm20.launcher2.preferences.Settings import de.mm20.launcher2.ui.LauncherTheme import de.mm20.launcher2.ui.locals.LocalAppWidgetHost @@ -27,10 +25,8 @@ import de.mm20.launcher2.ui.locals.LocalNavController import de.mm20.launcher2.ui.locals.LocalWindowSize import de.mm20.launcher2.ui.screens.LauncherMainScreen import de.mm20.launcher2.ui.screens.settings.* -import de.mm20.launcher2.ui.settings.appearance.AppearanceScreen +import de.mm20.launcher2.ui.settings.appearance.AppearanceSettingsScreen import de.mm20.launcher2.ui.theme.colors.* -import de.mm20.launcher2.ui.theme.wallpaperColorsAsState -import kotlinx.coroutines.flow.map class ComposeActivity : AppCompatActivity() { @@ -96,7 +92,7 @@ class ComposeActivity : AppCompatActivity() { SettingsAccountScreen() } composable("settings/appearance") { - AppearanceScreen() + AppearanceSettingsScreen() } composable( "settings/license?library={libraryName}", diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt index 56b1d223..d3a8c9a5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt @@ -21,11 +21,11 @@ import de.mm20.launcher2.ui.LegacyLauncherTheme import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.base.BaseActivity import de.mm20.launcher2.ui.locals.LocalNavController -import de.mm20.launcher2.ui.settings.about.AboutScreen -import de.mm20.launcher2.ui.settings.appearance.AppearanceScreen +import de.mm20.launcher2.ui.settings.about.AboutSettingsScreen +import de.mm20.launcher2.ui.settings.appearance.AppearanceSettingsScreen import de.mm20.launcher2.ui.settings.license.LicenseScreen -import de.mm20.launcher2.ui.settings.main.MainScreen -import de.mm20.launcher2.ui.settings.weather.WeatherScreen +import de.mm20.launcher2.ui.settings.main.MainSettingsScreen +import de.mm20.launcher2.ui.settings.weatherwidget.WeatherWidgetSettingsScreen class SettingsActivity : BaseActivity() { @@ -76,16 +76,16 @@ class SettingsActivity : BaseActivity() { popExitTransition = { fadeOut(tween(200)) }, ) { composable("settings") { - MainScreen() + MainSettingsScreen() } composable("settings/appearance") { - AppearanceScreen() + AppearanceSettingsScreen() } composable("settings/weather") { - WeatherScreen() + WeatherWidgetSettingsScreen() } composable("settings/about") { - AboutScreen() + AboutSettingsScreen() } composable( "settings/license?library={libraryName}", diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt similarity index 98% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutScreen.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt index 9bc3279b..c83cd253 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt @@ -21,8 +21,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @Composable -fun AboutScreen() { - val viewModel: AboutScreenVM = viewModel() +fun AboutSettingsScreen() { + val viewModel: AboutSettingsScreenVM = viewModel() val navController = LocalNavController.current val context = LocalContext.current PreferenceScreen(title = stringResource(R.string.preference_screen_about)) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutScreenVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt similarity index 66% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutScreenVM.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt index 8894c413..68afda79 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutScreenVM.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt @@ -2,4 +2,4 @@ package de.mm20.launcher2.ui.settings.about import androidx.lifecycle.ViewModel -class AboutScreenVM : ViewModel() \ No newline at end of file +class AboutSettingsScreenVM : ViewModel() \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt similarity index 90% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceScreen.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt index 826f7434..5592d5f0 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt @@ -4,19 +4,16 @@ import androidx.compose.runtime.* import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.res.stringResource import androidx.lifecycle.viewmodel.compose.viewModel -import de.mm20.launcher2.preferences.Settings import de.mm20.launcher2.preferences.Settings.AppearanceSettings.ColorScheme import de.mm20.launcher2.preferences.Settings.AppearanceSettings.Theme import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.preferences.ListPreference -import de.mm20.launcher2.ui.component.preferences.Preference import de.mm20.launcher2.ui.component.preferences.PreferenceCategory import de.mm20.launcher2.ui.component.preferences.PreferenceScreen -import de.mm20.launcher2.ui.locals.LocalNavController @Composable -fun AppearanceScreen() { - val viewModel: AppearanceScreenVM = viewModel() +fun AppearanceSettingsScreen() { + val viewModel: AppearanceSettingsScreenVM = viewModel() PreferenceScreen(title = stringResource(id = R.string.preference_screen_appearance)) { item { PreferenceCategory { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceScreenVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt similarity index 95% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceScreenVM.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt index 104f7269..c380d4cf 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceScreenVM.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent import org.koin.core.component.inject -class AppearanceScreenVM : ViewModel(), KoinComponent { +class AppearanceSettingsScreenVM : ViewModel(), KoinComponent { private val dataStore: LauncherDataStore by inject() val theme = dataStore.data.map { it.appearance.theme }.asLiveData() diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt similarity index 99% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainScreen.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt index 8ca00212..7c54b001 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt @@ -14,7 +14,7 @@ import de.mm20.launcher2.ui.icons.NotificationBadge import de.mm20.launcher2.ui.locals.LocalNavController @Composable -fun MainScreen() { +fun MainSettingsScreen() { val navController = LocalNavController.current PreferenceScreen( title = stringResource(R.string.settings), diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/weather/WeatherScreen.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt similarity index 96% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/weather/WeatherScreen.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt index dcfc54b3..8f3c8f41 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/weather/WeatherScreen.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui.settings.weather +package de.mm20.launcher2.ui.settings.weatherwidget import androidx.appcompat.app.AppCompatActivity import androidx.compose.animation.AnimatedVisibility @@ -19,8 +19,8 @@ import de.mm20.launcher2.ui.component.preferences.* import de.mm20.launcher2.weather.WeatherLocation @Composable -fun WeatherScreen() { - val viewModel: WeatherScreenVM = viewModel() +fun WeatherWidgetSettingsScreen() { + val viewModel: WeatherWidgetSettingsScreenVM = viewModel() val context = LocalContext.current PreferenceScreen(title = stringResource(R.string.preference_screen_weather)) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/weather/WeatherScreenVM.kt b/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt similarity index 92% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/weather/WeatherScreenVM.kt rename to ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt index f7695c4a..5a5a04bd 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/weather/WeatherScreenVM.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.ui.settings.weather +package de.mm20.launcher2.ui.settings.weatherwidget import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.MutableLiveData @@ -17,9 +17,8 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map import org.koin.core.component.KoinComponent import org.koin.core.component.inject -import kotlin.coroutines.coroutineContext -class WeatherScreenVM : ViewModel(), KoinComponent { +class WeatherWidgetSettingsScreenVM : ViewModel(), KoinComponent { private val repository: WeatherRepository by inject() private val dataStore: LauncherDataStore by inject() private val permissionsManager: PermissionsManager by inject() @@ -63,7 +62,7 @@ class WeatherScreenVM : ViewModel(), KoinComponent { if (autoLoc) lastLoc else loc }.collectLatest { - this@WeatherScreenVM.location.postValue(it) + this@WeatherWidgetSettingsScreenVM.location.postValue(it) } } }