diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 705d98b..8516c67 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -54,16 +54,17 @@ android { "${projectDir.absolutePath}/compose_stability.conf" ) + val buildDir = layout.buildDirectory.asFile.get().absolutePath if (project.findProperty("composeCompilerReports") == "true") { freeCompilerArgs += listOf( "-P", - "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.absolutePath}/compose_compiler" + "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${buildDir}/compose_compiler" ) } if (project.findProperty("composeCompilerMetrics") == "true") { freeCompilerArgs += listOf( "-P", - "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.absolutePath}/compose_compiler" + "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${buildDir}/compose_compiler" ) } } @@ -74,7 +75,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.5.10" + kotlinCompilerExtensionVersion = "1.5.12" } packaging { @@ -102,13 +103,13 @@ ksp { } dependencies { - implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.core:core-ktx:1.13.0") implementation("androidx.core:core-splashscreen:1.0.1") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-runtime-compose:2.7.0") - implementation("androidx.activity:activity-compose:1.8.2") + implementation("androidx.activity:activity-compose:1.9.0") - val composeBom = platform("androidx.compose:compose-bom:2024.03.00") + val composeBom = platform("androidx.compose:compose-bom:2024.04.01") implementation(composeBom) implementation("androidx.compose.foundation:foundation") implementation("androidx.compose.material:material-icons-extended") @@ -120,7 +121,7 @@ dependencies { debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") - val cameraxVersion = "1.3.2" + val cameraxVersion = "1.3.3" implementation("androidx.camera:camera-core:$cameraxVersion") implementation("androidx.camera:camera-camera2:$cameraxVersion") implementation("androidx.camera:camera-view:$cameraxVersion") @@ -134,7 +135,7 @@ dependencies { implementation("androidx.biometric:biometric:1.1.0") implementation("androidx.security:security-crypto-ktx:1.1.0-alpha06") - implementation("androidx.datastore:datastore-preferences:1.0.0") + implementation("androidx.datastore:datastore-preferences:1.1.0") implementation("dev.olshevski.navigation:reimagined:1.5.0") diff --git a/app/src/main/java/com/xinto/mauth/ui/component/ResponsiveAppBarScaffold.kt b/app/src/main/java/com/xinto/mauth/ui/component/ResponsiveAppBarScaffold.kt index 53ef7cc..91043ee 100644 --- a/app/src/main/java/com/xinto/mauth/ui/component/ResponsiveAppBarScaffold.kt +++ b/app/src/main/java/com/xinto/mauth/ui/component/ResponsiveAppBarScaffold.kt @@ -3,7 +3,6 @@ package com.xinto.mauth.ui.component import android.app.Activity import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope import androidx.compose.material3.BottomAppBar import androidx.compose.material3.CenterAlignedTopAppBar @@ -15,15 +14,10 @@ import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSiz import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass import androidx.compose.runtime.Composable -import androidx.compose.runtime.derivedStateOf -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.LayoutDirection -import androidx.compose.ui.unit.dp /** * @param actions Aligned respective to the top appbar (3-dot menu last) @@ -61,15 +55,6 @@ fun ResponsiveAppBarScaffold( }, bottomBar = { if (sizeClass.widthSizeClass != WindowWidthSizeClass.Expanded) { - val currentDirection = LocalLayoutDirection.current - val newDirection by remember { - derivedStateOf { - when (currentDirection) { - LayoutDirection.Ltr -> LayoutDirection.Rtl - LayoutDirection.Rtl -> LayoutDirection.Ltr - } - } - } BottomAppBar( actions = { actions(Arrangement.Reverse) diff --git a/app/src/main/java/com/xinto/mauth/ui/component/TwoPaneCard.kt b/app/src/main/java/com/xinto/mauth/ui/component/TwoPaneCard.kt index 06d2e01..1baa829 100644 --- a/app/src/main/java/com/xinto/mauth/ui/component/TwoPaneCard.kt +++ b/app/src/main/java/com/xinto/mauth/ui/component/TwoPaneCard.kt @@ -4,8 +4,8 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Divider import androidx.compose.material3.ElevatedCard +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -42,7 +42,7 @@ fun TwoPaneCard( visible = expanded, ) { Column { - Divider(Modifier.padding(vertical = 12.dp)) + HorizontalDivider(Modifier.padding(vertical = 12.dp)) bottomContent() } } diff --git a/build.gradle.kts b/build.gradle.kts index 071c076..3ff3b4d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.android.application") version "8.3.0" apply false - kotlin("android") version "1.9.22" apply false - id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false + id("com.android.application") version "8.3.2" apply false + kotlin("android") version "1.9.23" apply false + id("com.google.devtools.ksp") version "1.9.23-1.0.20" apply false } \ No newline at end of file