Show the delete (minus) icon for all deletable line items (#118)

Author: cmaier

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 ### Changed
 * ui: Show bin icon instead of minus if the quantity of the line item is 1
+* ui: Show the trash (minus) icon for all deletable line items
 
 ### Removed
 ### Fixed

build.gradle.kts

@@ -117,20 +117,13 @@ versionCatalogUpdate {
 
 fun isNonStable(version: String): Boolean {
     val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.toUpperCase().contains(it) }
-    val isNotStable = listOf("ALPHA", "BETA", "RC", "DEV").any { version.toUpperCase().contains(it) }
     val regex = "^[0-9,.v-]+(-r)?$".toRegex()
     val isStable = stableKeyword || regex.matches(version)
-    return isStable.not() && isNotStable
+    return isStable.not()
 }
 
 tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
-    resolutionStrategy {
-        componentSelection {
-            all {
-                if (isNonStable(candidate.version) && !isNonStable(currentVersion)) {
-                    reject("Release candidate")
-                }
-            }
-        }
+    rejectVersionIf {
+        isNonStable(candidate.version)
     }
 }

core/src/main/java/io/snabble/sdk/Snabble.kt

@@ -468,7 +468,7 @@ object Snabble {
         val snabbleError = arrayOfNulls<Error>(1)
         setup(app, config)
         val observer = object : Observer<InitializationState> {
-            override fun onChanged(t: InitializationState?) {
+            override fun onChanged(t: InitializationState) {
                 if (t == InitializationState.INITIALIZED || t == InitializationState.ERROR) {
                     countDownLatch.countDown()
                     initializationState.removeObserver(this)

gradle/libs.versions.toml

@@ -6,18 +6,18 @@ gradlePlugin = "7.4.2"
 desugarVersion = "1.1.5"
 okhttpVersion = "4.10.0"
 # @pin always, manually updated to ensure overall dependency support
-kotlin = "1.8.0"
+kotlin = "1.8.10"
 # @pin always, manually updated to ensure overall dependency support
-compose-compiler = "1.4.1"
+compose-compiler = "1.4.3"
 navigation = "2.5.3"
-# @#pin
+# @pin
 compose_version = "1.2.1"
 snabbleSdk = "0.69.6"
 androidx-camera = "1.2.1"
 androidx-compose-ui = "1.3.3"
 com-squareup-okhttp3 = "4.10.0"
 io-kotest = "5.5.5"
-org-jetbrains-dokka = "1.7.20"
+org-jetbrains-dokka = "1.8.10"
 
 [libraries]
 airbnb-lottie = "com.airbnb.android:lottie:6.0.0"
@@ -34,22 +34,22 @@ androidx-core-ktx = "androidx.core:core-ktx:1.9.0"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 androidx-constraintlayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
 # Compose previews won't work w/o this: https://issuetracker.google.com/issues/227767363
-androidx-customview = "androidx.customview:customview:1.2.0-alpha02"
+androidx-customview = "androidx.customview:customview:1.1.0"
 androidx-customview-poolingcontainer = "androidx.customview:customview-poolingcontainer:1.0.0"
 androidx-gridlayout = "androidx.gridlayout:gridlayout:1.0.0"
-androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.0-alpha02"
+androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.6.0"
 androidx-lifecycleExtension = "androidx.lifecycle:lifecycle-extensions:2.2.0"
-androidx-lifecycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
-androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.5.1"
-androidx-lifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha02"
-androidx-lifecycleRuntimeCompose = "androidx.lifecycle:lifecycle-runtime-compose:2.6.0-rc01"
-androidx-lifecycleViewmodelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+androidx-lifecycleLiveData = "androidx.lifecycle:lifecycle-livedata-ktx:2.6.0"
+androidx-lifecycle-process = "androidx.lifecycle:lifecycle-process:2.6.0"
+androidx-lifecycleRuntimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0"
+androidx-lifecycleRuntimeCompose = "androidx.lifecycle:lifecycle-runtime-compose:2.6.0"
+androidx-lifecycleViewmodelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0"
 android-material = "com.google.android.material:material:1.8.0"
 androidx-navigation-fragmentKtx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" }
 androidx-navigation-runtimeKtx = { module = "androidx.navigation:navigation-runtime-ktx", version.ref = "navigation" }
 androidx-navigation-uiKtx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" }
 androidx-preferences = "androidx.preference:preference-ktx:1.2.0"
-androidx-recyclerview = "androidx.recyclerview:recyclerview:1.2.1"
+androidx-recyclerview = "androidx.recyclerview:recyclerview:1.3.0"
 androidx-startupRuntime = "androidx.startup:startup-runtime:1.1.1"
 androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.0.0"
@@ -58,11 +58,11 @@ apache-commonsLang3 = "org.apache.commons:commons-lang3:3.12.0"
 caverock-androidsvgAar = "com.caverock:androidsvg-aar:1.4"
 compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
 compose-material = "androidx.compose.material:material:1.3.1"
-compose-material3 = "androidx.compose.material3:material3:1.1.0-alpha07"
+compose-material3 = "androidx.compose.material3:material3:1.1.0-alpha08"
 compose-material3Themeadapter = "com.google.accompanist:accompanist-themeadapter-material3:0.28.0"
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
 compose-uiTestManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose-ui" }
-compose-uiTestJunit = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose-ui" }
+compose-uiTestJunit = "androidx.compose.ui:ui-test-junit4:1.3.3"
 compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose-ui" }
 compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" }
 compose-uiUtil = { module = "androidx.compose.ui:ui-util", version.ref = "androidx-compose-ui" }
@@ -93,8 +93,8 @@ koin-androidxCompose = "io.insert-koin:koin-androidx-compose:3.4.2"
 koin-core = "io.insert-koin:koin-core:3.3.3"
 kotest-runnerJunit = { module = "io.kotest:kotest-runner-junit5", version.ref = "io-kotest" }
 kotest-assertionsCore = { module = "io.kotest:kotest-assertions-core", version.ref = "io-kotest" }
-koltin-reflect = "org.jetbrains.kotlin:kotlin-reflect:1.8.10"
-kotlin-stdlib = "org.jetbrains.kotlin:kotlin-stdlib:1.8.10"
+koltin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlinx-serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
 mock = "io.mockk:mockk:1.13.4"
 mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
@@ -152,7 +152,7 @@ koin = [
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "gradlePlugin" }
 androidLibrary = { id = "com.android.library", version.ref = "gradlePlugin" }
-dokka = "org.jetbrains.dokka:1.7.20"
+dokka = "org.jetbrains.dokka:1.8.10"
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew

@@ -46,7 +46,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.1"
+        kotlinCompilerExtensionVersion = "1.4.3"
     }
 
     packagingOptions {

kotlin-compose-sample/build.gradle.kts

@@ -48,7 +48,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.1"
+        kotlinCompilerExtensionVersion = "1.4.3"
     }
 }
 

kotlin-sample/build.gradle.kts

@@ -4,9 +4,9 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        id("org.jetbrains.dokka") version "1.6.21"
+        id("org.jetbrains.dokka") version "1.8.10"
         id("com.android.application") version "7.4.1"
-        id("org.jetbrains.kotlin.android") version "1.6.21"
+        id("org.jetbrains.kotlin.android") version "1.8.10"
     }
 }