Merge branch 'develop' into main

jeluchu · Feb 16, 2023 · 75f636c · 75f636c
2 parents 0e799bb + 0f3196e
commit 75f636c
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 42 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         minSdk 22
         targetSdk 33
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,7 +36,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.3.2"
+        kotlinCompilerExtensionVersion = "1.4.2"
     }
 
     compileOptions {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,26 +1,41 @@
 [versions]
 androidx-activity = "1.6.1"
-androidx-compose-animation = "1.3.2"
+androidx-compose-animation = "1.3.3"
 androidx-compose-foundation = "1.3.1"
 androidx-compose-material = "1.3.1"
-androidx-compose-runtime = "1.3.2"
-androidx-compose-ui = "1.3.2"
+androidx-compose-runtime = "1.3.3"
+androidx-compose-ui = "1.3.3"
 androidx-glance = "1.0.0-alpha05"
 androidx-lifecycle = "2.5.1"
 androidx-hilt = "1.0.0"
 androidx-navigation = "2.5.3"
-androidx-room = "2.4.3"
-androidx-work = "2.7.1"
+androidx-room = "2.5.0"
+androidx-work = "2.8.0"
 com-github-jeluchu-jchucomponents = "1.0.0-beta14"
 com-google-accompanist = "0.28.0"
-com-google-android-exoplayer = "2.18.2"
-com-google-dagger = "2.44.2"
+com-google-dagger = "2.45"
 com-squareup-retrofit2 = "2.9.0"
 io-coil-kt = "2.2.2"
-org-jetbrains-kotlin = "1.7.20"
+org-jetbrains-kotlin = "1.8.10"
 org-jetbrains-kotlinx = "1.6.4"
 
 [libraries]
+org-jetbrains-kotlinx-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "org-jetbrains-kotlinx" }
+org-jetbrains-kotlinx-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" }
+androidx-core-core-ktx = "androidx.core:core-ktx:1.9.0"
+androidx-lifecycle-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-lifecycle-livedata-core-ktx = { module = "androidx.lifecycle:lifecycle-livedata-core-ktx", version.ref = "androidx-lifecycle" }
+com-google-firebase-firebase-analytics-ktx = "com.google.firebase:firebase-analytics-ktx:21.2.0"
+com-squareup-retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "com-squareup-retrofit2" }
+com-squareup-retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" }
+com-squareup-okhttp3-logging-interceptor = "com.squareup.okhttp3:logging-interceptor:4.9.3"
+com-google-code-gson = "com.google.code.gson:gson:2.10"
+com-google-android-gms-play-services-base = "com.google.android.gms:play-services-base:18.1.0"
+androidx-navigation-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
+androidx-browser = "androidx.browser:browser:1.4.0"
+androidx-preference = "androidx.preference:preference-ktx:1.2.0"
+io-coil-kt-coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "io-coil-kt" }
+com-google-accompanist-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "com-google-accompanist" }
 androidx-activity-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "androidx-compose-animation" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-foundation" }
@@ -33,29 +48,12 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androi
 androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose-ui" }
 androidx-compose-ui-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version = "1.3.3" }
 androidx-constraintlayout-constraintlayout-compose = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
-org-jetbrains-kotlinx-kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "org-jetbrains-kotlinx" }
-org-jetbrains-kotlinx-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "org-jetbrains-kotlinx" }
 org-jetbrains-kotlin-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "org-jetbrains-kotlin" }
-org-jetbrains-dokka-dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "org-jetbrains-kotlin" }
-io-coil-kt-coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "io-coil-kt" }
-com-squareup-okhttp3-logging-interceptor = "com.squareup.okhttp3:logging-interceptor:4.9.3"
-com-squareup-retrofit2-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "com-squareup-retrofit2" }
-com-squareup-retrofit2-retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "com-squareup-retrofit2" }
-com-google-firebase-firebase-analytics-ktx = "com.google.firebase:firebase-analytics-ktx:21.2.0"
-com-google-code-gson = "com.google.code.gson:gson:2.10"
-com-google-android-gms-play-services-base = "com.google.android.gms:play-services-base:18.1.0"
-com-google-accompanist-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "com-google-accompanist" }
-com-android-tools-build-gradle = "com.android.tools.build:gradle:7.4.0"
-androidx-navigation-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
-androidx-preference = "androidx.preference:preference-ktx:1.2.0"
-androidx-browser = "androidx.browser:browser:1.4.0"
+org-jetbrains-dokka-dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.7.20" }
+com-android-tools-build-gradle = "com.android.tools.build:gradle:7.4.1"
 androidx-core-core-splashscreen = "androidx.core:core-splashscreen:1.0.0"
-androidx-lifecycle-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
-androidx-lifecycle-lifecycle-livedata-core-ktx = { module = "androidx.lifecycle:lifecycle-livedata-core-ktx", version.ref = "androidx-lifecycle" }
-androidx-core-core-ktx = "androidx.core:core-ktx:1.9.0"
 
 [bundles]
-# FOR JCHUCOMPONENTS CORE
 core-jetbrains = [
     "org-jetbrains-kotlinx-kotlinx-coroutines-core",
     "org-jetbrains-kotlinx-kotlinx-coroutines-android"

diff --git a/jchucomponents-core/build.gradle b/jchucomponents-core/build.gradle
@@ -74,7 +74,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-core"
-                version = "1.0.0"
+                version = "1.0.2"
             }
         }
     }

diff --git a/jchucomponents-ktx/build.gradle b/jchucomponents-ktx/build.gradle
@@ -5,7 +5,6 @@ plugins {
     id 'org.jetbrains.dokka'
 }
 
-
 android {
 
     compileSdkVersion 33
@@ -18,7 +17,7 @@ android {
     }
 
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion = "1.3.2"
+    composeOptions.kotlinCompilerExtensionVersion = "1.4.2"
 
     buildTypes {
         release {
@@ -66,7 +65,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-ktx"
-                version = "1.0.0"
+                version = "1.0.2"
             }
         }
     }

diff --git a/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/preferences/Preferences.kt b/jchucomponents-ktx/src/main/java/com/jeluchu/jchucomponents/ktx/preferences/Preferences.kt
@@ -0,0 +1,5 @@
+package com.jeluchu.jchucomponents.ktx.preferences
+
+const val DEFAULT = 0
+const val NOT_SPECIFIED = 0
+const val SYSTEM_DEFAULT = 0
diff --git a/jchucomponents-ktx/src/main/res/values/strings.xml b/jchucomponents-ktx/src/main/res/values/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="la_nb" translatable="false">Bokmål</string>
+    <string name="la_cs" translatable="false">Čeština</string>
+    <string name="la_ca" translatable="false">Catalán</string>
+    <string name="la_de" translatable="false">Deutsch</string>
+    <string name="la_zh_CN" translatable="false">简体中文</string>
+    <string name="la_en_US" translatable="false">English</string>
+    <string name="la_fr" translatable="false">Français</string>
+    <string name="la_da" translatable="false">Dansk</string>
+    <string name="la_es" translatable="false">Español</string>
+    <string name="la_tr" translatable="false">Türkçe</string>
+    <string name="la_ru" translatable="false">Русский</string>
+    <string name="la_ar" translatable="false">عربي</string>
+    <string name="la_uk" translatable="false">Українська</string>
+    <string name="la_in" translatable="false">Indonesia</string>
+    <string name="la_fa" translatable="false">فارسی</string>
+    <string name="la_fil" translatable="false">Filipino</string>
+    <string name="la_it" translatable="false">Italiano</string>
+    <string name="la_nl" translatable="false">Nederlands</string>
+    <string name="la_pt_BR" translatable="false">Português Brasileiro</string>
+    <string name="la_ja" translatable="false">日本語</string>
+    <string name="la_pl" translatable="false">Polski</string>
+    <string name="la_hu" translatable="false">Magyar</string>
+    <string name="la_be" translatable="false">беларуская</string>
+    <string name="la_ms" translatable="false">Melayu</string>
+    <string name="la_zh_TW" translatable="false">繁體中文</string>
+    <string name="la_vi" translatable="false">Tiếng Việt</string>
+    <string name="la_hr" translatable="false">Hrvatski</string>
+    <string name="la_eu" translatable="false">Euskara</string>
+    <string name="la_hi" translatable="false">हिन्दी</string>
+    <string name="la_ml" translatable="false">മലയാളം</string>
+    <string name="la_si" translatable="false">සිංහල</string>
+    <string name="la_sr" translatable="false">Српски</string>
+    <string name="la_az" translatable="false">Azərbaycanca</string>
+    <string name="la_nn" translatable="false">Nynorsk</string>
+    <string name="la_pa" translatable="false">ਪੰਜਾਬੀ</string>
+</resources>
diff --git a/jchucomponents-ui/build.gradle b/jchucomponents-ui/build.gradle
@@ -17,7 +17,7 @@ android {
     }
 
     buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion = "1.3.2"
+    composeOptions.kotlinCompilerExtensionVersion = "1.4.2"
 
     buildTypes {
         release {
@@ -66,7 +66,7 @@ afterEvaluate {
                 from components.release
                 groupId = "com.github.jeluchu"
                 artifactId = "jchucomponents-ui"
-                version = "1.0.0"
+                version = "1.0.2"
             }
         }
     }

diff --git a/...onents-ui/src/main/java/com/jeluchu/jchucomponents/ui/composables/cards/ExpandableCard.kt b/...onents-ui/src/main/java/com/jeluchu/jchucomponents/ui/composables/cards/ExpandableCard.kt
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -140,13 +141,16 @@ fun CardArrow(
     tintIcon: Color,
     @StringRes contentDescription: Int? = null,
     onClick: () -> Unit
-) = Icon(
-    modifier = Modifier
-        .rotate(degrees)
-        .clickable(onClick = onClick),
-    painter = painterResource(id = R.drawable.ic_up_arrow),
-    contentDescription = contentDescription?.let { stringResource(id = it) },
-    tint = tintIcon
+) = IconButton(
+    onClick = onClick,
+    content = {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_up_arrow),
+            contentDescription = "Expandable Arrow",
+            modifier = Modifier.rotate(degrees),
+            tint = tintIcon
+        )
+    }
 )
 
 @ExperimentalAnimationApi