Updated to 1.0.0-rc04 version

germainkevinbusiness · Jul 4, 2022 · 2b0a8ce · 2b0a8ce
1 parent 00c7212
commit 2b0a8ce
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ repositories {
 
 ```groovy
 dependencies {
-    implementation "com.github.germainkevinbusiness:CollapsingTopBarCompose:1.0.0-rc03"
+    implementation "com.github.germainkevinbusiness:CollapsingTopBarCompose:1.0.0-rc04"
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 32
         versionCode 1
-        versionName "1.0.0-rc03"
+        versionName "1.0.0-rc04"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -36,7 +36,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion '1.2.0'
     }
     packagingOptions {
         resources {
@@ -50,8 +50,8 @@ dependencies {
     implementation project(path: ':collapsingtopbar')
 
     implementation "androidx.core:core-ktx:$coreKtx"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
-    implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
+    implementation 'androidx.activity:activity-compose:1.5.0'
 
 
     // Compose dependencies

diff --git a/app/src/main/java/com/germainkevin/collapsingtopbarcompose/MainActivity.kt b/app/src/main/java/com/germainkevin/collapsingtopbarcompose/MainActivity.kt
@@ -1,6 +1,7 @@
 package com.germainkevin.collapsingtopbarcompose
 
 import android.os.Bundle
+import android.view.Window
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.background
@@ -17,11 +18,13 @@ import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringArrayResource
 import androidx.compose.ui.unit.dp
 import com.germainkevin.collapsingtopbar.CollapsingTopBar
+import com.germainkevin.collapsingtopbar.CollapsingTopBarDefaults
 import com.germainkevin.collapsingtopbar.rememberCollapsingTopBarScrollBehavior
 import com.germainkevin.collapsingtopbarcompose.ui.*
 import com.germainkevin.collapsingtopbarcompose.ui.theme.CollapsingTopBarComposeTheme
@@ -55,7 +58,8 @@ class MainActivity : ComponentActivity() {
                         contactNames = stringArrayResource(id = R.array.contactNames),
                         scaffoldState = scaffoldState,
                         openLeftDrawer = openLeftDrawer,
-                        closeLeftDrawer = closeLeftDrawer
+                        closeLeftDrawer = closeLeftDrawer,
+                        window = this@MainActivity.window
                     )
                 }
             }
@@ -68,7 +72,8 @@ private fun HomeScreen(
     contactNames: Array<String>,
     scaffoldState: ScaffoldState,
     openLeftDrawer: () -> Unit,
-    closeLeftDrawer: () -> Unit
+    closeLeftDrawer: () -> Unit,
+    window: Window
 ) {
     val scrollBehavior = rememberCollapsingTopBarScrollBehavior(
         isAlwaysCollapsed = false,
@@ -83,6 +88,14 @@ private fun HomeScreen(
         topBar = {
             CollapsingTopBar(
                 scrollBehavior = scrollBehavior,
+                colors = CollapsingTopBarDefaults
+                    .colors(
+                        backgroundColorWhenNotCollapsedOrExpanded =
+                        MaterialTheme.colorScheme.onPrimaryContainer,
+                        onBackgroundColorChange = {
+                            window.statusBarColor = it.toArgb()
+                        },
+                    ),
                 title = TitleText,
                 subtitle = { SubtitleText(contactNames) },
                 navigationIcon = { NavigationIcon(openLeftDrawer) },

diff --git a/app/src/main/java/com/germainkevin/collapsingtopbarcompose/ui/theme/Theme.kt b/app/src/main/java/com/germainkevin/collapsingtopbarcompose/ui/theme/Theme.kt
@@ -53,7 +53,7 @@ fun CollapsingTopBarComposeTheme(
         SideEffect {
             (view.context as Activity).apply {
                 window.statusBarColor = colorScheme.primary.toArgb()
-                WindowCompat.getInsetsController(window, view)?.isAppearanceLightStatusBars =
+                WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars =
                     darkTheme
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        compose_version = '1.2.0-rc02'
+        compose_version = '1.2.0-rc03'
         coreKtx = '1.8.0'
         material3Version ='1.0.0-alpha13'
         timberVersion ='5.0.1'
@@ -9,7 +9,7 @@ buildscript {
 plugins {
     id 'com.android.application' version '7.2.1' apply false
     id 'com.android.library' version '7.2.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
 }
 
 task clean(type: Delete) {

diff --git a/collapsingtopbar/build.gradle b/collapsingtopbar/build.gradle
@@ -24,7 +24,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.germainkevin.collapsingtopbarcompose'
                 artifactId = 'collapsingtopbarcompose'
-                version = '1.0.0-rc03'
+                version = '1.0.0-rc04'
             }
         }
     }
@@ -56,7 +56,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion '1.2.0'
     }
     packagingOptions {
         resources {

diff --git a/collapsingtopbar/src/main/java/com/germainkevin/collapsingtopbar/CollapsingTopBar.kt b/collapsingtopbar/src/main/java/com/germainkevin/collapsingtopbar/CollapsingTopBar.kt
@@ -7,6 +7,7 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
@@ -56,11 +57,12 @@ fun CollapsingTopBar(
         actions = actions,
         centeredTitleAndSubtitle = centeredTitleAndSubtitle,
         contentPadding = contentPadding,
-        colors = colors,
         expandedColumnAlphaValue = expandedColumnAlphaValue.invoke().value,
         collapsedTitleAlpha = collapsedTitleAlpha.invoke().value,
         currentTopBarHeight = currentTopBarHeight,
-        elevation = elevation
+        elevation = elevation,
+        currentBackgroundColor = currentBackgroundColor(colors).value,
+        currentContentColor = colors.contentColor
     )
 }
 
@@ -72,8 +74,6 @@ fun CollapsingTopBar(
  * This should typically be an [IconButton] or [IconToggleButton].
  * @param actions the actions displayed at the end of the [CollapsingTopBar]. This should typically
  * be [IconButton]s. The default layout here is a [Row], so icons inside will be placed horizontally.
- * @param colors [CollapsingTopBarColors] that will be used to resolve the colors used for this
- * [CollapsingTopBar] in different states. See [CollapsingTopBarDefaults.colors].
  * @param contentPadding The padding of the content inside the [CollapsingTopBar]
  * @param elevation The size of the shadow below the [Surface]
  * @param currentTopBarHeight The current height of the [CollapsingTopBar]
@@ -88,16 +88,17 @@ private fun CollapsingTopBarLayout(
     actions: @Composable RowScope.() -> Unit,
     centeredTitleAndSubtitle: Boolean,
     contentPadding: PaddingValues,
-    colors: CollapsingTopBarColors,
+    currentBackgroundColor: Color,
+    currentContentColor: Color,
     expandedColumnAlphaValue: Float,
     collapsedTitleAlpha: Float,
     currentTopBarHeight: Dp,
     elevation: Dp,
 ) = CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.high) {
     Surface(
         modifier = modifier,
-        color = colors.backgroundColor,
-        contentColor = colors.contentColor,
+        color = currentBackgroundColor,
+        contentColor = currentContentColor,
         elevation = elevation,
     ) {
         Box(

diff --git a/collapsingtopbar/src/main/java/com/germainkevin/collapsingtopbar/CollapsingTopBarDefaults.kt b/collapsingtopbar/src/main/java/com/germainkevin/collapsingtopbar/CollapsingTopBarDefaults.kt
@@ -50,24 +50,43 @@ object CollapsingTopBarDefaults {
 
     /**
      * Default colors used in the [CollapsingTopBar]
-     * @param backgroundColor The background color of the [CollapsingTopBar]
-     * @param contentColor The content color inside of the [CollapsingTopBar]
+     * @param backgroundColor The background color of the [CollapsingTopBar] when collapsed
+     * or expanded
+     * @param contentColor The content color inside of the [CollapsingTopBar] when collapsed
+     * or expanded
+     * @param backgroundColorWhenNotCollapsedOrExpanded The background color of
+     * the [CollapsingTopBar] when it's not collapsed or expanded
      * */
     @Composable
     fun colors(
         backgroundColor: Color = MaterialTheme.colorScheme.primary,
-        contentColor: Color = contentColorFor(backgroundColor = backgroundColor)
-    ): CollapsingTopBarColors = CollapsingTopBarColors(backgroundColor, contentColor)
+        contentColor: Color = contentColorFor(backgroundColor = backgroundColor),
+        backgroundColorWhenNotCollapsedOrExpanded: Color = backgroundColor,
+        onBackgroundColorChange: (Color) -> Unit = {},
+    ): CollapsingTopBarColors = CollapsingTopBarColors(
+        backgroundColor = backgroundColor,
+        contentColor = contentColor,
+        backgroundColorWhenNotCollapsedOrExpanded = backgroundColorWhenNotCollapsedOrExpanded,
+        onBackgroundColorChange = onBackgroundColorChange,
+    )
 }
 
 /**
  * Default colors used in the [CollapsingTopBar]
- * @param backgroundColor The background color of the [CollapsingTopBar]
- * @param contentColor The color for the content inside [CollapsingTopBar]
+ * @param backgroundColor The background color of the [CollapsingTopBar] when collapsed
+ * or expanded
+ * @param contentColor The content color inside of the [CollapsingTopBar] when collapsed
+ * or expanded
+ * @param backgroundColorWhenNotCollapsedOrExpanded The background color of
+ * the [CollapsingTopBar] when it's not collapsed or expanded
+ * @param onBackgroundColorChange This callback method has a Color parameter which emits the current
+ * background color of the [CollapsingTopBar] whenever it changes
  * */
 class CollapsingTopBarColors(
     var backgroundColor: Color,
-    var contentColor: Color
+    var contentColor: Color,
+    var backgroundColorWhenNotCollapsedOrExpanded: Color,
+    var onBackgroundColorChange: (Color) -> Unit,
 )
 
 /**

diff --git a/collapsingtopbar/src/main/java/com/germainkevin/collapsingtopbar/Constants.kt b/collapsingtopbar/src/main/java/com/germainkevin/collapsingtopbar/Constants.kt
@@ -3,8 +3,10 @@ package com.germainkevin.collapsingtopbar
 import androidx.compose.animation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 
 /**
@@ -73,4 +75,22 @@ internal val actionsRow: @Composable (@Composable RowScope.() -> Unit) -> Unit =
         verticalAlignment = Alignment.Bottom,
         content = it
     )
-}
+}
+
+/**
+ * Will provide us with the current background color of the [CollapsingTopBar]*/
+@Composable
+internal fun CollapsingTopBarScrollBehavior.currentBackgroundColor(
+    colors: CollapsingTopBarColors
+): State<Color> = animateColorAsState(
+    targetValue =
+    if (currentTopBarHeight == collapsedTopBarHeight ||
+        currentTopBarHeight == expandedTopBarMaxHeight
+    ) {
+        colors.onBackgroundColorChange(colors.backgroundColor)
+        colors.backgroundColor
+    } else {
+        colors.onBackgroundColorChange(colors.backgroundColorWhenNotCollapsedOrExpanded)
+        colors.backgroundColorWhenNotCollapsedOrExpanded
+    }
+)