Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@ 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
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) {
Expand All @@ -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")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
}
}
}
Expand Down
31 changes: 18 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
[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" }
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activity-compose" }
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" }
Expand Down Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading