Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI Library upgrades #396

Merged
merged 1 commit into from
Nov 1, 2024
Merged

UI Library upgrades #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions android/src/main/kotlin/com/darkrockstudios/apps/hammer/android/TopBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,19 @@ package com.darkrockstudios.apps.hammer.android

import androidx.compose.foundation.layout.RowScope
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.MenuOpen
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.MenuOpen
import androidx.compose.material3.*
import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import com.darkrockstudios.apps.hammer.common.compose.Ui
Expand All @@ -20,10 +29,10 @@ internal fun TopBar(
actions: @Composable (RowScope.() -> Unit) = {},
) {
val icon = when {
showBack -> Icons.Filled.ArrowBack
showBack -> Icons.AutoMirrored.Filled.ArrowBack
else -> when (drawerOpen.currentValue) {
DrawerValue.Closed -> Icons.Filled.Menu
DrawerValue.Open -> Icons.Filled.MenuOpen
DrawerValue.Open -> Icons.AutoMirrored.Filled.MenuOpen
}
}

Expand All @@ -41,7 +50,7 @@ internal fun TopBar(
)
}
},
colors = TopAppBarDefaults.smallTopAppBarColors(
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
Ui.Elevation.MEDIUM
)
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ kache = "2.1.0"
kotlin = "2.0.21"

# Android
android_gradle_plugin = "8.7.1"
android_sdk_compile = "34"
android_sdk_target = "34"
android_gradle_plugin = "8.7.2"
android_sdk_compile = "35"
android_sdk_target = "35"
android_sdk_min = "26"

# Other libraries
Expand All @@ -25,7 +25,7 @@ appcompat = "1.7.0"
appdirs = "1.2.2"
cache4k = "0.13.0"
core = "1.6.1"
coreKtx = "1.13.1"
coreKtx = "1.15.0"
cryptohash = "1.0.2"
darklafCore = "3.0.2"
glance = "1.1.1"
Expand All @@ -45,14 +45,14 @@ serialization = "1.7.3"
coroutines = "1.9.0"
datetime = "0.6.1"
napier = "2.7.1"
jetbrains_compose = "1.6.11"
jetbrains_compose = "1.7.0"
jetbrains_kover = "0.8.3"

moko_resources = "0.24.3"
moko_graphics = "0.10.0"

decompose = "3.1.0"
essenty = "2.1.0" # This should match what ever decompose is referncing internally
decompose = "3.2.1"
essenty = "2.2.1" # This should match what ever decompose is referncing internally

mpfilepicker = "3.1.0"
richtexteditor = "1.4.1"
Expand All @@ -69,7 +69,7 @@ ktor_i18n = "2.0.0"
okio = "3.9.1"
slf4jSimple = "2.0.16"
turbine = "1.2.0"
work-runtime-ktx = "2.9.1"
work-runtime-ktx = "2.10.0"

multiplatform_window_size = "0.5.0"
mockk = "1.13.13"
Expand Down