Merge pull request #3 from gaiuszzang/release/1.2.0

[GroovinExpandableBox] Release 1.2.0 Version
gaiuszzang · Feb 12, 2024 · 3851c07 · 3851c07
2 parents 5ab1af8 + 78370c1
commit 3851c07
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        compose_bom_version = '2023.06.01'
+        androidx_core_version = '1.12.0'
+        compose_bom_version = '2024.01.00'
+        compose_compiler_version = '1.5.8'
+        kotlin_plugin_version = '1.9.22'
     }
 }
 
 plugins {
     id 'com.android.application' version '8.1.0' apply false
     id 'com.android.library' version '8.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
-}
+    id 'org.jetbrains.kotlin.android' version "$kotlin_plugin_version" apply false
+}
diff --git a/expandablebox/build.gradle b/expandablebox/build.gradle
@@ -33,13 +33,13 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.3'
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
 }
 
 dependencies {
     //AndroidX Core
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation "androidx.core:core-ktx:$androidx_core_version"
 
     //Compose
     def composeBom = platform("androidx.compose:compose-bom:$compose_bom_version")
@@ -59,10 +59,10 @@ afterEvaluate {
                 from components.release
                 groupId = 'io.groovin'
                 artifactId = 'groovinexpandablebox'
-                version = '1.1.0'
+                version = '1.2.0'
             }
         }
     }
 }
 
-group = 'com.github.gaiuszzang'
+group = 'com.github.gaiuszzang'
diff --git a/expandablebox/src/main/java/io/groovin/expandablebox/ExpandableBox.kt b/expandablebox/src/main/java/io/groovin/expandablebox/ExpandableBox.kt
@@ -94,9 +94,6 @@ fun ExpandableBox(
                     resistance = ExpandableBoxSwipeableDefaults.resistanceConfig(anchors.keys, 0f, 0f) //Prevent moving animation when over swiping
                 )
                 .nestedScroll(nestedScrollConnection)
-                /*.conditional(nestedScrollEnabled) {
-                    nestedScroll(nestedScrollConnection)
-                }*/
         ) {
             val innerHeightDp = with(density) { (expandableBoxState.offset.value).toDp() }
             Box(

diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle
@@ -37,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.3'
+        kotlinCompilerExtensionVersion "$compose_compiler_version"
     }
     packagingOptions {
         resources {
@@ -48,7 +48,7 @@ android {
 
 dependencies {
     //AndroidX Core
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation "androidx.core:core-ktx:$androidx_core_version"
     implementation 'androidx.datastore:datastore-core:1.0.0'
 
     //Compose
@@ -64,11 +64,11 @@ dependencies {
     implementation "androidx.compose.ui:ui-util"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.activity:activity-compose:1.8.2"
-    implementation "androidx.navigation:navigation-compose:2.7.6"
-    debugImplementation 'androidx.compose.ui:ui-tooling:1.5.4'
+    implementation "androidx.navigation:navigation-compose:2.7.7"
+    debugImplementation "androidx.compose.ui:ui-tooling"
 
     //Lifecycle
-    def lifecycle_version = '2.6.2'
+    def lifecycle_version = '2.7.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
@@ -78,4 +78,4 @@ dependencies {
 
     //GroovinExpandableBox
     implementation project(path: ':expandablebox')
-}
+}
diff --git a/sampleapp/src/main/java/io/groovin/expandablebox/sampleapp/map/MapSampleScreen.kt b/sampleapp/src/main/java/io/groovin/expandablebox/sampleapp/map/MapSampleScreen.kt
@@ -110,7 +110,11 @@ fun MapSampleScreen(
             exit = fadeOut()
         ) {
             FloatingActionButton(
-                onClick = {},
+                onClick = {
+                    coroutineScope.launch {
+                        expandableBoxState.animateTo(ExpandableBoxStateValue.Fold)
+                    }
+                },
                 backgroundColor = Purple40,
                 elevation = FloatingActionButtonDefaults.elevation(0.dp,0.dp)
             ) {