Settings main screen: remove nested preference category
This commit is contained in:
parent
5da3dcd06c
commit
2054386179
@ -1,10 +1,15 @@
|
|||||||
package de.mm20.launcher2.ui.settings.main
|
package de.mm20.launcher2.ui.settings.main
|
||||||
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.rounded.*
|
import androidx.compose.material.icons.rounded.AccountBox
|
||||||
|
import androidx.compose.material.icons.rounded.BugReport
|
||||||
|
import androidx.compose.material.icons.rounded.Gesture
|
||||||
|
import androidx.compose.material.icons.rounded.Info
|
||||||
|
import androidx.compose.material.icons.rounded.Palette
|
||||||
|
import androidx.compose.material.icons.rounded.Search
|
||||||
|
import androidx.compose.material.icons.rounded.SettingsBackupRestore
|
||||||
|
import androidx.compose.material.icons.rounded.Widgets
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import de.mm20.launcher2.ui.R
|
import de.mm20.launcher2.ui.R
|
||||||
import de.mm20.launcher2.ui.component.preferences.Preference
|
import de.mm20.launcher2.ui.component.preferences.Preference
|
||||||
@ -21,80 +26,78 @@ fun MainSettingsScreen() {
|
|||||||
) {
|
) {
|
||||||
item {
|
item {
|
||||||
PreferenceCategory {
|
PreferenceCategory {
|
||||||
PreferenceCategory {
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.Palette,
|
||||||
icon = Icons.Rounded.Palette,
|
title = stringResource(id = R.string.preference_screen_appearance),
|
||||||
title = stringResource(id = R.string.preference_screen_appearance),
|
summary = stringResource(id = R.string.preference_screen_appearance_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_appearance_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/appearance")
|
||||||
navController?.navigate("settings/appearance")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.Search,
|
||||||
icon = Icons.Rounded.Search,
|
title = stringResource(id = R.string.preference_screen_search),
|
||||||
title = stringResource(id = R.string.preference_screen_search),
|
summary = stringResource(id = R.string.preference_screen_search_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_search_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/search")
|
||||||
navController?.navigate("settings/search")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.Widgets,
|
||||||
icon = Icons.Rounded.Widgets,
|
title = stringResource(id = R.string.preference_screen_widgets),
|
||||||
title = stringResource(id = R.string.preference_screen_widgets),
|
summary = stringResource(id = R.string.preference_screen_widgets_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_widgets_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/widgets")
|
||||||
navController?.navigate("settings/widgets")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.Gesture,
|
||||||
icon = Icons.Rounded.Gesture,
|
title = stringResource(id = R.string.preference_screen_gestures),
|
||||||
title = stringResource(id = R.string.preference_screen_gestures),
|
summary = stringResource(id = R.string.preference_screen_gestures_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_gestures_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/gestures")
|
||||||
navController?.navigate("settings/gestures")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.NotificationBadge,
|
||||||
icon = Icons.Rounded.NotificationBadge,
|
title = stringResource(id = R.string.preference_screen_badges),
|
||||||
title = stringResource(id = R.string.preference_screen_badges),
|
summary = stringResource(id = R.string.preference_screen_badges_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_badges_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/badges")
|
||||||
navController?.navigate("settings/badges")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.AccountBox,
|
||||||
icon = Icons.Rounded.AccountBox,
|
title = stringResource(id = R.string.preference_screen_services),
|
||||||
title = stringResource(id = R.string.preference_screen_services),
|
summary = stringResource(id = R.string.preference_screen_services_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_services_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/accounts")
|
||||||
navController?.navigate("settings/accounts")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.SettingsBackupRestore,
|
||||||
icon = Icons.Rounded.SettingsBackupRestore,
|
title = stringResource(id = R.string.preference_screen_backup),
|
||||||
title = stringResource(id = R.string.preference_screen_backup),
|
summary = stringResource(id = R.string.preference_screen_backup_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_backup_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/backup")
|
||||||
navController?.navigate("settings/backup")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.BugReport,
|
||||||
icon = Icons.Rounded.BugReport,
|
title = stringResource(id = R.string.preference_screen_debug),
|
||||||
title = stringResource(id = R.string.preference_screen_debug),
|
summary = stringResource(id = R.string.preference_screen_debug_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_debug_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/debug")
|
||||||
navController?.navigate("settings/debug")
|
}
|
||||||
}
|
)
|
||||||
)
|
Preference(
|
||||||
Preference(
|
icon = Icons.Rounded.Info,
|
||||||
icon = Icons.Rounded.Info,
|
title = stringResource(id = R.string.preference_screen_about),
|
||||||
title = stringResource(id = R.string.preference_screen_about),
|
summary = stringResource(id = R.string.preference_screen_about_summary),
|
||||||
summary = stringResource(id = R.string.preference_screen_about_summary),
|
onClick = {
|
||||||
onClick = {
|
navController?.navigate("settings/about")
|
||||||
navController?.navigate("settings/about")
|
}
|
||||||
}
|
)
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user