Update dependencies, update to SDK 35 and delete unnecessary composables

jeluchu · Sep 19, 2024 · 9dac709 · 9dac709
1 parent 5632477
commit 9dac709
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 338 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -6,11 +6,11 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     defaultConfig {
         applicationId = "com.jeluchu.composer"
         minSdk = 22
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0.0"
     }

diff --git a/app/src/main/kotlin/com/jeluchu/composer/core/ui/navigation/NavGraphBuilderExtensions.kt b/app/src/main/kotlin/com/jeluchu/composer/core/ui/navigation/NavGraphBuilderExtensions.kt
@@ -149,6 +149,10 @@ fun NavGraphBuilder.toolbarsNav(nav: Destinations) {
         composable(Feature.CENTER_TOOBARS.nav) {
             CenterToolbarActionsPreview()
         }
+
+        composable(Feature.LARGE_TOOBARS.nav) {
+            // Soon
+        }
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-jchucomponents = "2.0.0-alpha15"
+jchucomponents = "2.0.0-alpha17"
 agp = "8.5.2"
 kotlin = "2.0.0"
 dokka = "1.9.20"
-androidx-activity = "1.9.1"
-androidx-compose = "1.6.8"
-androidx-lifecycle = "2.8.4"
-androidx-navigation = "2.7.7"
+androidx-activity = "1.9.2"
+androidx-compose = "1.7.2"
+androidx-lifecycle = "2.8.6"
+androidx-navigation = "2.8.1"
 com-squareup-okhttp3 = "4.12.0"
 com-squareup-retrofit2 = "2.11.0"
 coil-kt = "2.6.0"
@@ -23,7 +23,7 @@ androidx-compose-foundation = { module = "androidx.compose.foundation:foundation
 androidx-compose-foundation-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidx-compose" }
 androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "androidx-compose" }
 androidx-compose-material-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "androidx-compose" }
-androidx-compose-material3 = "androidx.compose.material3:material3:1.2.1"
+androidx-compose-material3 = "androidx.compose.material3:material3:1.3.0"
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose" }
 androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }

diff --git a/jchucomponents-core/build.gradle.kts b/jchucomponents-core/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace = "com.jeluchu.jchucomponents.core"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         proguardFiles(
             getDefaultProguardFile("proguard-android-optimize.txt"),
             "proguard-rules.pro"

diff --git a/jchucomponents-ktx/build.gradle.kts b/jchucomponents-ktx/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace = "com.jeluchu.jchucomponents.ktx"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         proguardFiles(
             getDefaultProguardFile("proguard-android-optimize.txt"),
             "proguard-rules.pro"

diff --git a/...components-ktx/src/main/kotlin/com/jeluchu/jchucomponents/ktx/bitmaps/BitmapExtensions.kt b/...components-ktx/src/main/kotlin/com/jeluchu/jchucomponents/ktx/bitmaps/BitmapExtensions.kt
@@ -70,4 +70,7 @@ fun Bitmap.scaleBitmap(maxBytes: Long = SIZE_2MB_BYTES.toLong()): Bitmap? {
     val newWidthPx = floor(currentWidth * scaleFactor).toInt()
     val newHeightPx = floor(currentHeight * scaleFactor).toInt()
     return Bitmap.createScaledBitmap(this, newWidthPx, newHeightPx, true)
-}
+}
+
+internal val Bitmap.safeConfig: Bitmap.Config
+    get() = config ?: Bitmap.Config.ARGB_8888
diff --git a/jchucomponents-ktx/src/main/kotlin/com/jeluchu/jchucomponents/ktx/numbers/IntExtensions.kt b/jchucomponents-ktx/src/main/kotlin/com/jeluchu/jchucomponents/ktx/numbers/IntExtensions.kt
@@ -18,6 +18,9 @@ fun Int?.orEmpty(defaultValue: Int = Int.empty()) = this ?: defaultValue
 fun Int.isNotEmpty() = this != Int.empty()
 fun Long.bytesToMeg(): String = (this / (1024L * 1024L)).toString()
 
+fun Double.Companion.empty() = 0.0
+fun Double?.orEmpty(defaultValue: Double = Double.empty()): Double = this ?: defaultValue
+
 fun Float.Companion.empty() = 0f
 fun Float?.orEmpty(defaultValue: Float = Float.empty()): Float = this ?: defaultValue
 

diff --git a/jchucomponents-pay/build.gradle.kts b/jchucomponents-pay/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace = "com.jeluchu.jchucomponents.pay"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         proguardFiles(
             getDefaultProguardFile("proguard-android-optimize.txt"),
             "proguard-rules.pro"

diff --git a/jchucomponents-prefs/build.gradle.kts b/jchucomponents-prefs/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.jeluchu.jchucomponents.prefs"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         proguardFiles(
             getDefaultProguardFile("proguard-android-optimize.txt"),
             "proguard-rules.pro"

diff --git a/jchucomponents-qr/build.gradle.kts b/jchucomponents-qr/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 android {
     namespace = "com.jeluchu.jchucomponents.qr"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         proguardFiles(
             getDefaultProguardFile("proguard-android-optimize.txt"),
             "proguard-rules.pro"

diff --git a/jchucomponents-ui/build.gradle.kts b/jchucomponents-ui/build.gradle.kts
@@ -8,11 +8,11 @@ plugins {
 
 android {
     namespace = "com.jeluchu.jchucomponents.ui"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         proguardFiles(
             getDefaultProguardFile("proguard-android-optimize.txt"),
             "proguard-rules.pro"

diff --git a/...in/com/jeluchu/jchucomponents/ui/composables/images/transformations/BlurTransformation.kt b/...in/com/jeluchu/jchucomponents/ui/composables/images/transformations/BlurTransformation.kt
@@ -37,7 +37,7 @@ private suspend fun Bitmap.blur(
     val width = (sentBitmap.width * scale).roundToInt()
     val height = (sentBitmap.height * scale).roundToInt()
     sentBitmap = Bitmap.createScaledBitmap(sentBitmap, width, height, false)
-    val bitmap = sentBitmap.copy(sentBitmap.config, true)
+    val bitmap = sentBitmap.copy(sentBitmap.safeConfig, true)
     if (radius < 1) {
         return@withContext null
     }
@@ -242,4 +242,7 @@ private suspend fun Bitmap.blur(
     bitmap.setPixels(pix, 0, w, 0, 0, w, h)
     sentBitmap.recycle()
     return@withContext bitmap
-}
+}
+
+internal val Bitmap.safeConfig: Bitmap.Config
+    get() = config ?: Bitmap.Config.ARGB_8888
diff --git a/...i/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/progress/LinearProgressbar.kt b/...i/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/progress/LinearProgressbar.kt
@@ -44,7 +44,6 @@ import com.jeluchu.jchucomponents.ui.extensions.toPainter
 import com.jeluchu.jchucomponents.ktx.strings.empty
 import com.jeluchu.jchucomponents.ui.R
 import com.jeluchu.jchucomponents.ui.extensions.modifier.cornerRadius
-import com.jeluchu.jchucomponents.ui.foundation.text.AutoSizeText
 import com.jeluchu.jchucomponents.ui.runtime.remember.rememberMutableStateOf
 import com.jeluchu.jchucomponents.ui.themes.cosmicLatte
 import com.jeluchu.jchucomponents.ui.themes.darkGreen
@@ -148,14 +147,13 @@ fun LinearProgressbar(
             contentColor = if (enabled) linearProgressCounter.content
             else linearProgressCounter.disabledContent
         ) {
-            AutoSizeText(
+            Text(
                 modifier = Modifier.padding(
                     vertical = 2.dp,
                     horizontal = 8.dp
                 ),
                 text = if (enabled) "${numberTimes.toInt()}/${maxNumber.toInt()}" else "- / -",
                 style = style,
-                maxTextSize = 14.sp,
                 textAlign = TextAlign.Center,
             )
         }
@@ -260,22 +258,21 @@ fun LinearProgressbar(
             contentColor = if (enabled) linearProgressCounter.content
             else linearProgressCounter.disabledContent
         ) {
-            AutoSizeText(
+            Text(
                 modifier = Modifier.padding(
                     vertical = 2.dp,
                     horizontal = 8.dp
                 ),
                 text = if (enabled) "${numberTimes.toInt()}/${maxNumber.toInt()}" else "- / -",
                 style = style,
-                maxTextSize = 14.sp,
                 textAlign = TextAlign.Center,
             )
         }
     }
 }
 
 @Immutable
-class LinearProgressCustom constructor(
+class LinearProgressCustom(
     val disabledIndicator: Color = milky.copy(.2f),
     val backgroundIndicator: Color = Color.LightGray.copy(.3f),
     val foregroundIndicator: Color = milky,

diff --git a/...ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/textfields/CountTextField.kt b/...ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/textfields/CountTextField.kt
@@ -18,6 +18,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldColors
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
@@ -72,8 +73,8 @@ fun CountTextField(
     TextField(
         modifier = Modifier.fillMaxWidth(),
         value = textState,
-        colors = TextFieldDefaults.textFieldColors(
-            containerColor = countField.backgroundColor,
+        colors = TextFieldDefaults.colors(
+            focusedContainerColor = countField.backgroundColor,
             cursorColor = countField.cursorColor,
             disabledLabelColor = countField.disabledLabelColor,
             focusedIndicatorColor = Color.Transparent,

diff --git a/...mponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/toolbars/Toolbar.kt b/...mponents-ui/src/main/kotlin/com/jeluchu/jchucomponents/ui/composables/toolbars/Toolbar.kt
@@ -131,7 +131,7 @@ fun Toolbar(
             maxLines = 1
         )
     },
-    colors = TopAppBarDefaults.smallTopAppBarColors(
+    colors = TopAppBarDefaults.topAppBarColors(
         containerColor = topBarSettings.backgroundColor
     ),
     navigationIcon = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -149,6 +149,10 @@ fun NavGraphBuilder.toolbarsNav(nav: Destinations) { @@
             composable(Feature.CENTER_TOOBARS.nav) {
                 CenterToolbarActionsPreview()
             }
+            composable(Feature.LARGE_TOOBARS.nav) {
+                // Soon
+            }
         }
     }
@@ Expand Down @@