feat: UI Changes
* fix(#220): implement edit soul and set model dialogs * fix(#211): make UI more compact and information dense * fix(#211): make navigation drawer sidebar more compact * feat(#252): move settings item to end of navigation drawer * feat(#250): add bottom navigation bar display mode settings * feat(#225): add search bar filtering to remaining screens * fix: make bottom navigation bar display modes more compact * fix: resolve compilation error in KanbanScreen by referencing assignedTo * feat: add search to achievements screen and top padding for icon-only navigation bar * fix: adjust icon-only bottom bar height and remove padding * fix(#249): remove unused PaddingValues imports in 6 screens --------- Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
1 parent
32def80694
commit
60bf6e8a33
20 files changed
+424
-61
No files matched your search
@@ -18,12 +18,12 @@ import androidx.compose.ui.unit.dp
|
||||
* Access in composables via `LocalSpacing.current` or the [Spacing] object.
|
||||
*/
|
||||
object Spacing {
|
||||
val xs = 4.dp
|
||||
val sm = 8.dp
|
||||
val md = 16.dp
|
||||
val lg = 24.dp
|
||||
val xl = 32.dp
|
||||
val xxl = 48.dp
|
||||
val xs = 2.dp
|
||||
val sm = 6.dp
|
||||
val md = 12.dp
|
||||
val lg = 18.dp
|
||||
val xl = 24.dp
|
||||
val xxl = 36.dp
|
||||
}
|
||||
|
||||
/** Alias for backwards-compatibility — existing `Spacing.xs` calls still work. */
|
||||
|
||||
@@ -17,6 +17,8 @@ enum class ThemePreference { SYSTEM, LIGHT, DARK }
|
||||
|
||||
enum class ThemePreset { DEFAULT, MONOCHROME, GRUVBOX, CATPPUCCIN, AMOLED }
|
||||
|
||||
enum class BottomNavDisplayMode { ICON_AND_TEXT, ICON_ONLY, TEXT_ONLY }
|
||||
|
||||
val LocalThemePreference = compositionLocalOf { ThemePreference.SYSTEM }
|
||||
val LocalThemePreset = compositionLocalOf { ThemePreset.DEFAULT }
|
||||
|
||||
@@ -242,8 +244,14 @@ fun HermesControlTheme(
|
||||
val dynamicAvailable = useDynamicColors && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
|
||||
val colorScheme =
|
||||
when {
|
||||
dynamicAvailable && darkTheme -> dynamicDarkColorScheme(context)
|
||||
dynamicAvailable && !darkTheme -> dynamicLightColorScheme(context)
|
||||
dynamicAvailable && darkTheme -> {
|
||||
dynamicDarkColorScheme(context)
|
||||
}
|
||||
|
||||
dynamicAvailable && !darkTheme -> {
|
||||
dynamicLightColorScheme(context)
|
||||
}
|
||||
|
||||
else -> {
|
||||
when (themePreset) {
|
||||
ThemePreset.DEFAULT -> if (darkTheme) HermesDarkColorScheme else HermesLightColorScheme
|
||||
@@ -269,6 +277,7 @@ fun HermesControlTheme(
|
||||
infoContainer = Color(0xFF3C3836),
|
||||
)
|
||||
}
|
||||
|
||||
themePreset == ThemePreset.GRUVBOX && !darkTheme -> {
|
||||
HermesStatusColors(
|
||||
success = Color(0xFF98971A),
|
||||
@@ -281,6 +290,7 @@ fun HermesControlTheme(
|
||||
infoContainer = Color(0xFFEBDBB2),
|
||||
)
|
||||
}
|
||||
|
||||
themePreset == ThemePreset.CATPPUCCIN && darkTheme -> {
|
||||
HermesStatusColors(
|
||||
success = Color(0xFFA6E3A1),
|
||||
@@ -293,6 +303,7 @@ fun HermesControlTheme(
|
||||
infoContainer = Color(0xFF313244),
|
||||
)
|
||||
}
|
||||
|
||||
themePreset == ThemePreset.CATPPUCCIN && !darkTheme -> {
|
||||
HermesStatusColors(
|
||||
success = Color(0xFF40A02B),
|
||||
@@ -305,6 +316,7 @@ fun HermesControlTheme(
|
||||
infoContainer = Color(0xFFE6E9EF),
|
||||
)
|
||||
}
|
||||
|
||||
darkTheme -> {
|
||||
HermesStatusColors(
|
||||
success = StatusGreen,
|
||||
@@ -317,6 +329,7 @@ fun HermesControlTheme(
|
||||
infoContainer = StatusBlueContainer,
|
||||
)
|
||||
}
|
||||
|
||||
else -> {
|
||||
HermesStatusColors(
|
||||
success = Color(0xFF1B873A),
|
||||
|
||||
Reference in new issue
Block a user