FatttSnake/oxygen-android
1
0
Fork 0
Code Pull Requests Activity

Refactor(Enum): Change all caps to camel case

Browse Source
This commit is contained in:
Fat Snake
2024-08-14 15:18:00 +08:00
parent 627a32c7a3
commit f5cfbd7296
19 changed files with 101 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenApp.kt
View File

@@ -60,7 +60,7 @@ import top.fatweb.oxygen.toolbox.ui.theme.LocalGradientColors
@Composable
fun OxygenApp(appState: OxygenAppState) {
val shouldShowGradientBackground =
appState.currentTopLevelDestination == TopLevelDestination.TOOLS
appState.currentTopLevelDestination == TopLevelDestination.Tools
var showSettingsDialog by rememberSaveable {
mutableStateOf(false)
}
@@ -171,8 +171,8 @@ fun OxygenApp(appState: OxygenAppState) {
) == SnackbarResult.ActionPerformed
},
startDestination = when (appState.launchPageConfig) {
LaunchPageConfig.TOOLS -> TOOLS_ROUTE
LaunchPageConfig.STAR -> STAR_ROUTE
LaunchPageConfig.Tools -> TOOLS_ROUTE
LaunchPageConfig.Star -> STAR_ROUTE
}
)
}

12
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/OxygenAppState.kt
View File

@@ -75,9 +75,9 @@ class OxygenAppState(
val currentTopLevelDestination: TopLevelDestination?
@Composable get() = when (currentDestination?.route) {
TOOL_STORE_ROUTE -> TopLevelDestination.TOOL_STORE
TOOLS_ROUTE -> TopLevelDestination.TOOLS
STAR_ROUTE -> TopLevelDestination.STAR
TOOL_STORE_ROUTE -> TopLevelDestination.ToolStore
TOOLS_ROUTE -> TopLevelDestination.Tools
STAR_ROUTE -> TopLevelDestination.Star
else -> null
}
@@ -113,9 +113,9 @@ class OxygenAppState(
}
when (topLevelDestination) {
TopLevelDestination.TOOL_STORE -> navController.navigateToToolStore(topLevelNavOptions)
TopLevelDestination.TOOLS -> navController.navigateToTools(topLevelNavOptions)
TopLevelDestination.STAR -> navController.navigateToStar(topLevelNavOptions)
TopLevelDestination.ToolStore -> navController.navigateToToolStore(topLevelNavOptions)
TopLevelDestination.Tools -> navController.navigateToTools(topLevelNavOptions)
TopLevelDestination.Star -> navController.navigateToStar(topLevelNavOptions)
}
}

50
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/settings/SettingsDialog.kt
View File

@@ -175,47 +175,47 @@ private fun ColumnScope.SettingsPanel(
DialogSectionGroup {
DialogChooserRow(
text = stringResource(R.string.feature_settings_language_system_default),
selected = settings.languageConfig == LanguageConfig.FOLLOW_SYSTEM,
onClick = { onChangeLanguageConfig(LanguageConfig.FOLLOW_SYSTEM) }
selected = settings.languageConfig == LanguageConfig.FollowSystem,
onClick = { onChangeLanguageConfig(LanguageConfig.FollowSystem) }
)
DialogChooserRow(
text = stringResource(R.string.feature_settings_language_chinese),
selected = settings.languageConfig == LanguageConfig.CHINESE,
onClick = { onChangeLanguageConfig(LanguageConfig.CHINESE) }
selected = settings.languageConfig == LanguageConfig.Chinese,
onClick = { onChangeLanguageConfig(LanguageConfig.Chinese) }
)
DialogChooserRow(
text = stringResource(R.string.feature_settings_language_english),
selected = settings.languageConfig == LanguageConfig.ENGLISH,
onClick = { onChangeLanguageConfig(LanguageConfig.ENGLISH) }
selected = settings.languageConfig == LanguageConfig.English,
onClick = { onChangeLanguageConfig(LanguageConfig.English) }
)
}
DialogSectionTitle(text = stringResource(R.string.feature_settings_launch_page))
DialogSectionGroup {
DialogChooserRow(
text = stringResource(R.string.feature_settings_launch_page_tools),
selected = settings.launchPageConfig == LaunchPageConfig.TOOLS,
onClick = { onChangeLaunchPageConfig(LaunchPageConfig.TOOLS) }
selected = settings.launchPageConfig == LaunchPageConfig.Tools,
onClick = { onChangeLaunchPageConfig(LaunchPageConfig.Tools) }
)
DialogChooserRow(
text = stringResource(R.string.feature_settings_launch_page_star),
selected = settings.launchPageConfig == LaunchPageConfig.STAR,
onClick = { onChangeLaunchPageConfig(LaunchPageConfig.STAR) }
selected = settings.launchPageConfig == LaunchPageConfig.Star,
onClick = { onChangeLaunchPageConfig(LaunchPageConfig.Star) }
)
}
DialogSectionTitle(text = stringResource(R.string.feature_settings_theme_brand))
DialogSectionGroup {
DialogChooserRow(
text = stringResource(R.string.feature_settings_theme_brand_default),
selected = settings.themeBrandConfig == ThemeBrandConfig.DEFAULT,
onClick = { onchangeThemeBrandConfig(ThemeBrandConfig.DEFAULT) }
selected = settings.themeBrandConfig == ThemeBrandConfig.Default,
onClick = { onchangeThemeBrandConfig(ThemeBrandConfig.Default) }
)
DialogChooserRow(
text = stringResource(R.string.feature_settings_theme_brand_android),
selected = settings.themeBrandConfig == ThemeBrandConfig.ANDROID,
onClick = { onchangeThemeBrandConfig(ThemeBrandConfig.ANDROID) }
selected = settings.themeBrandConfig == ThemeBrandConfig.Android,
onClick = { onchangeThemeBrandConfig(ThemeBrandConfig.Android) }
)
}
AnimatedVisibility(visible = settings.themeBrandConfig == ThemeBrandConfig.DEFAULT && supportDynamicColor) {
AnimatedVisibility(visible = settings.themeBrandConfig == ThemeBrandConfig.Default && supportDynamicColor) {
DialogSectionGroup {
DialogSectionTitle(text = stringResource(R.string.feature_settings_dynamic_color))
DialogChooserRow(
@@ -234,18 +234,18 @@ private fun ColumnScope.SettingsPanel(
DialogSectionGroup {
DialogChooserRow(
text = stringResource(R.string.feature_settings_dark_mode_system_default),
selected = settings.darkThemeConfig == DarkThemeConfig.FOLLOW_SYSTEM,
onClick = { onChangeDarkThemeConfig(DarkThemeConfig.FOLLOW_SYSTEM) }
selected = settings.darkThemeConfig == DarkThemeConfig.FollowSystem,
onClick = { onChangeDarkThemeConfig(DarkThemeConfig.FollowSystem) }
)
DialogChooserRow(
text = stringResource(R.string.feature_settings_dark_mode_light),
selected = settings.darkThemeConfig == DarkThemeConfig.LIGHT,
onClick = { onChangeDarkThemeConfig(DarkThemeConfig.LIGHT) }
selected = settings.darkThemeConfig == DarkThemeConfig.Light,
onClick = { onChangeDarkThemeConfig(DarkThemeConfig.Light) }
)
DialogChooserRow(
text = stringResource(R.string.feature_settings_dark_mode_dark),
selected = settings.darkThemeConfig == DarkThemeConfig.DARK,
onClick = { onChangeDarkThemeConfig(DarkThemeConfig.DARK) }
selected = settings.darkThemeConfig == DarkThemeConfig.Dark,
onClick = { onChangeDarkThemeConfig(DarkThemeConfig.Dark) }
)
}
DialogSectionTitle(text = stringResource(R.string.feature_settings_more))
@@ -296,10 +296,10 @@ private fun SettingDialogPreview() {
onDismiss = {},
settingsUiState = SettingsUiState.Success(
UserData(
languageConfig = LanguageConfig.FOLLOW_SYSTEM,
launchPageConfig = LaunchPageConfig.TOOLS,
themeBrandConfig = ThemeBrandConfig.DEFAULT,
darkThemeConfig = DarkThemeConfig.FOLLOW_SYSTEM,
languageConfig = LanguageConfig.FollowSystem,
launchPageConfig = LaunchPageConfig.Tools,
themeBrandConfig = ThemeBrandConfig.Default,
darkThemeConfig = DarkThemeConfig.FollowSystem,
useDynamicColor = true
)
),

12
app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/util/LocaleUtils.kt
View File

@@ -11,9 +11,9 @@ import java.util.Locale
object LocaleUtils {
fun switchLocale(activity: Activity, languageConfig: LanguageConfig) {
val newLanguage = when (languageConfig) {
LanguageConfig.FOLLOW_SYSTEM -> ResourcesUtils.getSystemLocale().get(0)!!.language
LanguageConfig.CHINESE -> "zh"
LanguageConfig.ENGLISH -> "en"
LanguageConfig.FollowSystem -> ResourcesUtils.getSystemLocale().get(0)!!.language
LanguageConfig.Chinese -> "zh"
LanguageConfig.English -> "en"
}
val currentLanguage = ResourcesUtils.getAppLocale(activity).language
if (newLanguage != currentLanguage) {
@@ -33,9 +33,9 @@ object LocaleUtils {
private fun getLocaleFromLanguageConfig(languageConfig: LanguageConfig): Locale =
when (languageConfig) {
LanguageConfig.FOLLOW_SYSTEM -> ResourcesUtils.getSystemLocale().get(0)!!
LanguageConfig.CHINESE -> Locale("zh")
LanguageConfig.ENGLISH -> Locale("en")
LanguageConfig.FollowSystem -> ResourcesUtils.getSystemLocale().get(0)!!
LanguageConfig.Chinese -> Locale("zh")
LanguageConfig.English -> Locale("en")
}
@RequiresApi(Build.VERSION_CODES.N)