Merge pull request #6 from LDRAlighieri/update/dependencies

Update dependencies

.github/workflows/build.yml

@@ -21,6 +21,9 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.4.2
 
+      - name: Check build-logic
+        run: ./gradlew check -p build-logic
+
       - name: Check spotless
         run: ./gradlew spotlessCheck --no-configuration-cache
 

.github/workflows/publish.yml

@@ -23,6 +23,9 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.4.2
 
+      - name: Check build-logic
+        run: ./gradlew check -p build-logic
+
       - name: Check spotless
         run: ./gradlew spotlessCheck --no-configuration-cache
 

CHANGELOG.md

@@ -1,6 +1,13 @@
 # ChangeLog
 
 
+## Version 0.3.1
+
+* Update: Kotlin to v1.9.21.
+* Update: Compose BOM to v2023.10.01.
+* Update: Minor update of other libraries.
+
+
 ## Version 0.3.0
 
 * Update: Fiberglass(`composites-fiberglass`) module:

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2023 Vladimir Raupov
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,6 +1,6 @@
 [![Maven Central](https://img.shields.io/maven-central/v/ru.ldralighieri.composites/composites-fiberglass.svg)](https://search.maven.org/search?q=g:ru.ldralighieri.composites)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.0-blue.svg?logo=kotlin)](https://kotlinlang.org)
-[![Compose BOM Version](https://img.shields.io/badge/Compose-v2023.08.00-blue.svg?logo=jetpackcompose)](https://developer.android.com/jetpack/compose)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.21-blue.svg?logo=kotlin)](https://kotlinlang.org)
+[![Compose BOM Version](https://img.shields.io/badge/Compose-v2023.10.01-blue.svg?logo=jetpackcompose)](https://developer.android.com/jetpack/compose)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg)](https://android-arsenal.com/api?level=21)
@@ -31,7 +31,7 @@ Add one or more dependencies:
 
 ```kotlin
 dependencies {
-    implementation("ru.ldralighieri.composites:composites-fiberglass:0.3.0")
+    implementation("ru.ldralighieri.composites:composites-fiberglass:0.3.1")
 }
 ```
 

build-logic/convention/build.gradle.kts

@@ -1,18 +1,20 @@
+@file:Suppress("UnstableApiUsage")
+
 /*
- * Copyright 2023 Vladimir Raupov
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+* Copyright 2023 Vladimir Raupov
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
 plugins {
     `kotlin-dsl`
@@ -26,10 +28,17 @@ java {
 }
 
 dependencies {
-    implementation(libs.android.gradlePlugin)
-    implementation(libs.kotlin.gradlePlugin)
+    compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.kotlin.gradlePlugin)
+    compileOnly(libs.spotless.gradlePlugin)
     implementation(libs.dokka.gradlePlugin)
-    implementation(libs.spotless.gradlePlugin)
+}
+
+tasks {
+    validatePlugins {
+        enableStricterValidation = true
+        failOnWarning = true
+    }
 }
 
 gradlePlugin {

composites-fiberglass/README.md

@@ -30,7 +30,7 @@ Add dependency:
 
 ```kotlin
 dependencies {
-    implementation("ru.ldralighieri.composites:composites-fiberglass:0.3.0")
+    implementation("ru.ldralighieri.composites:composites-fiberglass:0.3.1")
 }
 ```
 

gradle.properties

@@ -8,7 +8,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 # Maven
 GROUP=ru.ldralighieri.composites
-VERSION_NAME=0.4.0-SNAPSHOT
+VERSION_NAME=0.3.1
 
 POM_DESCRIPTION=Composites are a group of tools and handy libraries that make it easier to use Jetpack Compose.
 

gradle/libs.versions.toml

@@ -1,28 +1,26 @@
 [versions]
 # Plugins
-agp = "8.1.0"
-dokka = "1.8.20"
-spotless = "6.20.0"
+agp = "8.2.0"
+dokka = "1.9.10"
+spotless = "6.23.3"
 mavenPublish = "0.25.3"
 bcv = "0.13.2"
-gver = "0.47.0"
+gver = "0.50.0"
 
 # Kotlin
-kotlin = "1.9.0"
+kotlin = "1.9.21"
 
 # Androidx
 androidxCoreSplashscreen = "1.0.1"
-androidxActivity = "1.7.2"
-androidxNavigation = "2.7.0"
-androidxPagingCompose = "3.2.0"
+androidxActivity = "1.8.2"
+androidxNavigation = "2.7.6"
+androidxPagingCompose = "3.2.1"
 # Compose
-androidxComposeCompiler = "1.5.1"
-androidxComposeBom = "2023.08.00"
-# Accompanist
-accompanist = "0.30.1"
+androidxComposeCompiler = "1.5.7"
+androidxComposeBom = "2023.10.01"
 
 # Google
-googleMaterial="1.9.0"
+googleMaterial="1.11.0"
 
 # Lint
 ktlint = "0.49.1"
@@ -48,8 +46,6 @@ androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-test = { module = "androidx.compose.ui:ui-test-junit4" }
 androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 
-# Accompanist
-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 
 # Google
 google-material = { module = "com.google.android.material:material", version.ref = "googleMaterial" }

gradle/wrapper/gradle-wrapper.properties

@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip

sample/build.gradle.kts

@@ -70,9 +70,6 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.ui.tooling)
 
-    // Accompanist
-    implementation(libs.accompanist.systemuicontroller)
-
     // Google
     implementation(libs.google.material)
 }

sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/SampleActivity.kt

@@ -16,9 +16,12 @@
 
 package ru.ldralighieri.composites.sample.ui
 
+import android.graphics.Color
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import ru.ldralighieri.composites.sample.ui.app.CompositesApp
@@ -28,10 +31,12 @@ class SampleActivity : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+        )
         super.onCreate(savedInstanceState)
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         setContent {
             CompositesApp(
                 rememberCompositesAppState()

sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/app/CompositesApp.kt

@@ -16,27 +16,37 @@
 
 package ru.ldralighieri.composites.sample.ui.app
 
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.LocalOverscrollConfiguration
+import androidx.compose.foundation.background
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import androidx.compose.ui.graphics.toArgb
 import ru.ldralighieri.composites.sample.navigation.AppNavHost
 import ru.ldralighieri.composites.sample.theme.AppTheme
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun CompositesApp(appState: CompositesAppState) {
+fun ComponentActivity.CompositesApp(appState: CompositesAppState) {
+    val currentThemeIsDark = isSystemInDarkTheme()
+    val isDarkMode by rememberSaveable { mutableStateOf(currentThemeIsDark) }
+
+    ChangeSystemBarsTheme(isDarkMode)
+
     ProvideDefaults {
         Column {
             Scaffold(
@@ -49,6 +59,7 @@ fun CompositesApp(appState: CompositesAppState) {
                     onBackClick = appState::onBackClick,
                     navigate = appState::navigate,
                     modifier = Modifier
+                        .background(color = AppTheme.colors.background)
                         .padding(innerPadding)
                         .consumeWindowInsets(innerPadding)
                 )
@@ -58,16 +69,26 @@ fun CompositesApp(appState: CompositesAppState) {
 }
 
 @Composable
-private fun ProvideDefaults(content: @Composable () -> Unit) {
-    AppTheme(dynamicColor = true) {
-        val systemUiController = rememberSystemUiController()
-        val useDarkIcons = !isSystemInDarkTheme()
+private fun ComponentActivity.ChangeSystemBarsTheme(isDarkMode: Boolean) {
+    val barColor = AppTheme.colors.background.toArgb()
+    LaunchedEffect(isDarkMode) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.auto(
+                lightScrim = android.graphics.Color.TRANSPARENT,
+                darkScrim = android.graphics.Color.TRANSPARENT,
+            ) { isDarkMode },
 
-        DisposableEffect(systemUiController, useDarkIcons) {
-            systemUiController.setSystemBarsColor(color = Color.Transparent, darkIcons = useDarkIcons)
-            onDispose {}
-        }
+            navigationBarStyle = SystemBarStyle.auto(
+                lightScrim = barColor,
+                darkScrim = barColor,
+            ) { isDarkMode },
+        )
+    }
+}
 
+@Composable
+private fun ProvideDefaults(content: @Composable () -> Unit) {
+    AppTheme(dynamicColor = true) {
         @OptIn(ExperimentalFoundationApi::class)
         CompositionLocalProvider(
             LocalOverscrollConfiguration provides null,

sample/src/main/kotlin/ru/ldralighieri/composites/sample/ui/fiberglass/FiberglassColumnScreen.kt

@@ -16,6 +16,7 @@
 
 package ru.ldralighieri.composites.sample.ui.fiberglass
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets