Update libraries and plugins version at project

app/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("wottrich.github.io.smartchecklist.android.app")
+    id("wottrich.github.io.smartchecklist.compose")
     alias(libs.plugins.ksp)
 }
 
@@ -19,13 +20,7 @@ android {
         }
     }
 
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
+    android.buildFeatures.buildConfig = true
 
     packaging {
         resources.excludes.apply {
@@ -45,10 +40,10 @@ dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(libs.android.core.ktx)
     implementation(libs.android.app.compat)
-    implementation(libs.compose.accompanist.system.ui.controller)
     implementation(libs.bundles.compose.default)
     implementation(libs.bundles.koin.default)
     implementation(libs.bundles.compose.navigation.default)
+    implementation(libs.android.activity.ktx)
     implementation(project(path = ":baseui"))
     implementation(project(path = ":datasource"))
     implementation(project(path = ":infrastructure:extensions:intent"))

app/src/main/java/wottrich/github/io/smartchecklist/presentation/activity/MainHostActivity.kt

@@ -3,9 +3,18 @@ package wottrich.github.io.smartchecklist.presentation.activity
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.layout.windowInsetsTopHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
@@ -16,10 +25,11 @@ import com.google.accompanist.navigation.material.ModalBottomSheetLayout
 import com.google.accompanist.navigation.material.rememberBottomSheetNavigator
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.koin.android.ext.android.inject
+import wottrich.github.io.smartchecklist.baseui.ui.ApplicationTheme
 import wottrich.github.io.smartchecklist.baseui.ui.Dimens
+import wottrich.github.io.smartchecklist.baseui.ui.pallet.SmartChecklistTheme
 import wottrich.github.io.smartchecklist.navigation.AppNavigator
 import wottrich.github.io.smartchecklist.navigation.NavigationHome
-import wottrich.github.io.smartchecklist.presentation.ui.StatusBarColor
 
 @InternalCoroutinesApi
 @OptIn(ExperimentalMaterialNavigationApi::class)
@@ -29,21 +39,29 @@ class MainHostActivity : AppCompatActivity() {
     private var sharedNavHostController: NavHostController? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContent {
             val navController = rememberNavController().also {
                 sharedNavHostController = it
             }
             val bottomSheetNavigator = rememberBottomSheetNavigator()
             navController.navigatorProvider += bottomSheetNavigator
-            BottomSheetNavigator(bottomSheetNavigator = bottomSheetNavigator) {
-                AppNavigator(navHostController = navController)
+            ApplicationTheme {
+                Surface(color = SmartChecklistTheme.colors.background) {
+                    Column {
+                        Spacer(modifier = Modifier.windowInsetsTopHeight(WindowInsets.systemBars))
+                        BottomSheetNavigator(bottomSheetNavigator = bottomSheetNavigator) {
+                            AppNavigator(navHostController = navController)
+                        }
+                        Spacer(modifier = Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
+                    }
+                }
             }
-            StatusBarColor()
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         sharedNavHostController?.handleDeepLink(intent)
     }

app/src/main/java/wottrich/github/io/smartchecklist/presentation/ui/content/HomeScaffold.kt

@@ -1,7 +1,9 @@
 package wottrich.github.io.smartchecklist.presentation.ui.content
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.material.DrawerState
 import androidx.compose.material.FabPosition
 import androidx.compose.material.Icon
@@ -10,12 +12,16 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.ScaffoldState
 import androidx.compose.material.SnackbarHostState
+import androidx.compose.material.Surface
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.primarySurface
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import wottrich.github.io.smartchecklist.baseui.ui.pallet.SmartChecklistTheme
@@ -42,7 +48,11 @@ fun HomeScaffold(
             drawerContent()
         },
         bottomBar = {
-            HomeTopBar(coroutineScope, drawerState, onTitleContent, actionContent)
+            Surface(color = MaterialTheme.colors.primarySurface) {
+                Box(modifier = Modifier.navigationBarsPadding()) {
+                    HomeTopBar(coroutineScope, drawerState, onTitleContent, actionContent)
+                }
+            }
         }
     ) { innerPadding ->
         content(innerPadding)
@@ -75,6 +85,7 @@ private fun HomeTopBar(
         title = {
             onTitleContent()
         },
-        actions = actionContent
+        actions = actionContent,
+        elevation = 0.dp
     )
 }

baseui/build.gradle.kts

@@ -1,10 +1,9 @@
 plugins {
     id("wottrich.github.io.smartchecklist.android.lib")
+    id("wottrich.github.io.smartchecklist.compose")
 }
 
 android {
-    buildFeatures.compose = true
-    composeOptions.kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     namespace = "wottrich.github.io.smartchecklist.baseui"
 }
 

baseui/src/main/java/wottrich/github/io/smartchecklist/baseui/components/completable/CompletableComponentRippleLayer.kt

@@ -1,14 +1,33 @@
 package wottrich.github.io.smartchecklist.baseui.components.completable
 
+import androidx.compose.material.LocalRippleConfiguration
+import androidx.compose.material.RippleConfiguration
+import androidx.compose.material.RippleDefaults
 import androidx.compose.material.ripple.LocalRippleTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import wottrich.github.io.smartchecklist.baseui.behaviour.ripple.RippleStatusColor
+import wottrich.github.io.smartchecklist.baseui.ui.pallet.SmartChecklistTheme
 
 @Composable
 internal fun CompletableComponentRippleLayer(isCompleted: Boolean, content: @Composable () -> Unit) {
+    val rippleConfiguration = getRippleConfiguration(isPositive = !isCompleted)
     CompositionLocalProvider(
-        LocalRippleTheme provides RippleStatusColor(!isCompleted),
+        LocalRippleConfiguration provides rippleConfiguration,
         content = content
     )
+}
+
+@Composable
+private fun getRippleConfiguration(isPositive: Boolean): RippleConfiguration {
+    return RippleConfiguration(
+        color = if (isPositive) {
+            SmartChecklistTheme.colors.status.positive
+        } else {
+            SmartChecklistTheme.colors.status.negative
+        },
+        rippleAlpha = RippleDefaults.rippleAlpha(
+            contentColor = SmartChecklistTheme.colors.secondary,
+            lightTheme = SmartChecklistTheme.colors.isLight
+        )
+    )
 }

baseui/src/main/java/wottrich/github/io/smartchecklist/baseui/icons/ArrowBackIcon.kt

@@ -3,7 +3,7 @@ package wottrich.github.io.smartchecklist.baseui.icons
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -29,7 +29,7 @@ fun ArrowBackIcon(
 ) {
     VectorIcon(
         modifier = modifier,
-        imageVector = Icons.Default.ArrowBack,
+        imageVector = Icons.AutoMirrored.Default.ArrowBack,
         contentDescription = contentDescription,
         tint = SmartChecklistTheme.colors.onSurface
     )

baseui/src/main/java/wottrich/github/io/smartchecklist/baseui/ui/Theme.kt

@@ -33,19 +33,19 @@ fun ApplicationTheme(
 
 fun SmartChecklistColors.toMaterialTheme(): Colors {
     return Colors(
-        primary,
-        primaryVariant,
-        secondary,
-        secondaryVariant,
-        background,
-        surface,
-        error,
-        onPrimary,
-        onSecondary,
-        onBackground,
-        onSurface,
-        onError,
-        isLight
+        primary = primary,
+        primaryVariant = primaryVariant,
+        secondary = secondary,
+        secondaryVariant = secondaryVariant,
+        background = background,
+        surface = surface,
+        error = error,
+        onPrimary = onPrimary,
+        onSecondary = onSecondary,
+        onBackground = onBackground,
+        onSurface = onSurface,
+        onError = onError,
+        isLight = isLight
     )
 }
 

build.gradle.kts

@@ -6,4 +6,5 @@ plugins {
     alias(libs.plugins.jetbrains.kotlin.jvm) apply false
     alias(libs.plugins.jetbrains.kotlin.parcelize) apply false
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }

features/checklist/impl/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("wottrich.github.io.smartchecklist.feature.impl")
+    id("wottrich.github.io.smartchecklist.compose")
 }
 
 android {

features/newchecklist/impl/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("wottrich.github.io.smartchecklist.feature.impl")
+    id("wottrich.github.io.smartchecklist.compose")
 }
 
 android {

features/quicklychecklist/impl/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("wottrich.github.io.smartchecklist.feature.impl")
+    id("wottrich.github.io.smartchecklist.compose")
 }
 
 android {

features/task/impl/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("wottrich.github.io.smartchecklist.feature.impl")
+    id("wottrich.github.io.smartchecklist.compose")
 }
 
 android {

gradle-conventions/conventions/build.gradle.kts

@@ -12,11 +12,8 @@ repositories {
 }
 
 dependencies {
-    // Make version catalogs accessible from precompiled script plugins
-    // https://github.com/gradle/gradle/issues/15383
-    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
-
     implementation(libs.kotlin.gradle.plugin)
+    implementation(libs.gradlePlugins.compose.compiler)
     implementation("com.android.tools.build:gradle:${libs.versions.gradle.get()}")
 }