diff --git a/androidVariant/src/main/java/org/comixedproject/variant/android/ui/DismissBackground.kt b/androidVariant/src/main/java/org/comixedproject/variant/android/ui/DismissBackground.kt index cd758df8..4013eafc 100644 --- a/androidVariant/src/main/java/org/comixedproject/variant/android/ui/DismissBackground.kt +++ b/androidVariant/src/main/java/org/comixedproject/variant/android/ui/DismissBackground.kt @@ -24,9 +24,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Delete -import androidx.compose.material.icons.filled.Edit import androidx.compose.material3.Icon import androidx.compose.material3.SwipeToDismissBoxState import androidx.compose.material3.SwipeToDismissBoxValue @@ -34,7 +31,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp +import org.comixedproject.variant.android.R @Composable fun DismissBackground(dismissState: SwipeToDismissBoxState) { @@ -50,8 +49,8 @@ fun DismissBackground(dismissState: SwipeToDismissBoxState) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, ) { - Icon(Icons.Default.Delete, contentDescription = "delete") + Icon(painterResource(R.drawable.ic_settings), contentDescription = "delete") Spacer(modifier = Modifier) - Icon(imageVector = Icons.Default.Edit, contentDescription = "Archive") + Icon(painterResource(R.drawable.ic_settings), contentDescription = "Archive") } } diff --git a/androidVariant/src/main/java/org/comixedproject/variant/android/view/server/DirectoryItemView.kt b/androidVariant/src/main/java/org/comixedproject/variant/android/view/server/DirectoryItemView.kt index 616f1334..4fadadf0 100644 --- a/androidVariant/src/main/java/org/comixedproject/variant/android/view/server/DirectoryItemView.kt +++ b/androidVariant/src/main/java/org/comixedproject/variant/android/view/server/DirectoryItemView.kt @@ -24,8 +24,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material3.CardDefaults import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon @@ -35,12 +33,14 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.comixedproject.variant.android.DIRECTORY_LIST +import org.comixedproject.variant.android.R import org.comixedproject.variant.android.VariantTheme import org.comixedproject.variant.model.library.DirectoryEntry import org.comixedproject.variant.platform.Log @@ -79,7 +79,7 @@ fun DirectoryItemView( modifier = Modifier.weight(1f), ) - Icon(Icons.Default.MoreVert, contentDescription = directoryEntry.title) + Icon(painterResource(R.drawable.ic_settings), contentDescription = directoryEntry.title) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 987be877..754b3393 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,15 +1,20 @@ [versions] -android-gradle-plugin = "8.10.0" -kotlin = "2.2.0" -compose = "1.5.4" -androidx-activity-compose = "1.8.0" -koin-version = "3.5.6" -sqldelight-plugin = "2.0.2" -android-material3-version = "1.3.2" -ktor-version = "3.1.3" +android-gradle-plugin = "8.13.2" +kotlin = "2.2.21" +ksp-version = "2.2.21-2.0.5" +compose = "1.10.3" +androidx-activity-compose = "1.12.4" +koin-version = "4.1.1" +sqldelight-plugin = "2.2.1" +android-material3-version = "1.4.0" +ktor-version = "3.4.0" xml-util-version = "0.91.0" spotless-version = "8.2.1" ktfmt = "0.61" +desugar-jdk = "2.1.5" +kmp-observableviewmodel-core = "1.0.2" +kfs-watch = "1.4.0" +stately-concurrent-collections-version = "2.1.0" [libraries] kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" } @@ -17,14 +22,14 @@ androidx-activity-compose = { group = "androidx.activity", name = "activity-comp compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" } compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose" } compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose" } -desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version = "2.0.4" } -kmp-viewmodel-core = { group = "com.rickclephas.kmp", name = "kmp-observableviewmodel-core", version = "1.0.0-BETA-12" } +desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar-jdk" } +kmp-viewmodel-core = { group = "com.rickclephas.kmp", name = "kmp-observableviewmodel-core", version.ref = "kmp-observableviewmodel-core" } kermit-logging = { group = "co.touchlab", name = "kermit", version = "2.0.4" } kmp-io = { group = "io.github.skolson", name = "kmp-io", version = "0.2.2" } -kfs-watch = { group = "io.github.irgaly.kfswatch", name = "kfswatch", version = "1.3.0" } +kfs-watch = { group = "io.github.irgaly.kfswatch", name = "kfswatch", version.ref = "kfs-watch" } kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.6.2" } multiplatform-settings = { group = "com.russhwolf", name = "multiplatform-settings", version = "1.3.0" } -stately-concurrent-collections = { group = "co.touchlab", name = "stately-concurrent-collections", version = "2.0.0" } +stately-concurrent-collections = { group = "co.touchlab", name = "stately-concurrent-collections", version.ref = "stately-concurrent-collections-version" } # koin koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin-version" } @@ -67,7 +72,7 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } sonarqube = { id = "org.sonarqube", version = "6.2.0.5505" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight-plugin" } -ksp = { id = "com.google.devtools.ksp", version = "2.2.0-2.0.2" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp-version" } native-coroutines = { id = "com.rickclephas.kmp.nativecoroutines", version = "1.0.0-ALPHA-45" } plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "2.1.21" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless-version" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f33f24c2..42d8158f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 26 08:06:20 EDT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index b1cf71a6..27e1df85 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -55,12 +55,12 @@ kotlin { } } - task("testClasses") + tasks { register("testClasses") } } android { namespace = "org.comixedproject.variant" - compileSdk = 34 + compileSdk = 36 defaultConfig { minSdk = 26 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"