From 164ced5777015aee49553e0c0a974fc1a94b87fa Mon Sep 17 00:00:00 2001 From: Vadik Sirekanyan Date: Sun, 11 Feb 2024 21:53:36 +0400 Subject: [PATCH] Updated dependencies --- app/build.gradle.kts | 10 +++++----- app/lint.xml | 3 +++ .../main/java/org/sirekanyan/outline/MainContent.kt | 3 ++- .../java/org/sirekanyan/outline/ui/DrawerContent.kt | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d868608..cb62d71 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,7 +32,7 @@ android { isDebuggable = props.getProperty("DEBUGGABLE").toBoolean() applicationIdSuffix = ".debug" buildConfigField("boolean", "DEBUG", "true") - val debugServers = props.getProperty("DEBUG_SERVERS").split('|').map { "\"$it\"" } + val debugServers = props.getProperty("DEBUG_SERVERS", "").split('|').map { "\"$it\"" } buildConfigField("String[]", "DEBUG_SERVERS", debugServers.joinToString(",", "{", "}")) } release { @@ -76,7 +76,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.8" + kotlinCompilerExtensionVersion = "1.5.9" } packaging { resources { @@ -89,20 +89,20 @@ dependencies { // compose implementation("androidx.activity:activity-compose:1.8.2") - implementation("androidx.compose.material3:material3:1.1.2") + implementation("androidx.compose.material3:material3:1.2.0") // ktor implementation("io.ktor:ktor-client-okhttp:2.3.8") implementation("io.ktor:ktor-client-content-negotiation:2.3.8") implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.8") - implementation("org.slf4j:slf4j-simple:2.0.11") + implementation("org.slf4j:slf4j-simple:2.0.12") // sqldelight implementation("app.cash.sqldelight:android-driver:2.0.1") implementation("app.cash.sqldelight:coroutines-extensions:2.0.1") // crash reporting - add("playImplementation", "com.google.firebase:firebase-crashlytics:18.6.1") + add("playImplementation", "com.google.firebase:firebase-crashlytics:18.6.2") } diff --git a/app/lint.xml b/app/lint.xml index 9af5e51..c1e9f9d 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -3,4 +3,7 @@ + + + diff --git a/app/src/main/java/org/sirekanyan/outline/MainContent.kt b/app/src/main/java/org/sirekanyan/outline/MainContent.kt index 5cb8100..3f7117d 100644 --- a/app/src/main/java/org/sirekanyan/outline/MainContent.kt +++ b/app/src/main/java/org/sirekanyan/outline/MainContent.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.systemBars import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Delete @@ -100,7 +101,7 @@ fun MainContent(state: MainState) { MainTopAppBar( title = { SearchField(search.query) { search.query = it } }, onMenuClick = search::closeSearch, - menuIcon = { Icon(Icons.Default.ArrowBack, "back") }, + menuIcon = { Icon(Icons.AutoMirrored.Default.ArrowBack, "back") }, ) } else { val menuItems: List = diff --git a/app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt b/app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt index 0e972e6..9a6985e 100644 --- a/app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt +++ b/app/src/main/java/org/sirekanyan/outline/ui/DrawerContent.kt @@ -17,7 +17,7 @@ import androidx.compose.material.icons.filled.Done import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Warning -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalDrawerSheet @@ -134,7 +134,7 @@ private fun DrawerSheetContent(state: MainState, insets: PaddingValues) { }, ) } - Divider(Modifier.padding(vertical = 8.dp)) + HorizontalDivider(Modifier.padding(vertical = 8.dp)) val context = LocalContext.current if (isDebugBuild()) { val debugDao = remember { context.app().debugDao }