Move utils depending on material3 to separate module

Author: w2sv

README.md

@@ -44,6 +44,8 @@ dependencies {
     implementation "com.github.w2sv.Composed:core:<version>"
     // Permission utils
     implementation "com.github.w2sv.Composed:permissions:<version>"
+    // Material3 utils
+    implementation "com.github.w2sv.Composed:material3:<version>"
 }
 ```
 

composed-core/build.gradle.kts

@@ -39,12 +39,15 @@ publishing {
 }
 
 dependencies {
+    implementation(libs.compose.foundation)
     implementation(libs.compose.ui)
     implementation(libs.compose.ui.tooling)
-    implementation(libs.compose.material3)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.annotation)
+    implementation(libs.androidx.compose.animation.core)
+
     testImplementation(libs.junit)
     testImplementation(libs.roboelectric)
     testImplementation(libs.androidx.ui.test.junit4.android)
+    testImplementation(libs.compose.material3)
 }

composed-core/src/test/kotlin/com/w2sv/composed/core/extensions/ModifierKtTest.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.w2sv.composed.core.extensions.thenIf
 import junit.framework.TestCase.assertEquals
 import org.junit.Test
 

composed-material3/build.gradle.kts

@@ -0,0 +1,49 @@
+plugins {
+    id("w2sv.android-library")
+    id("w2sv.compose-module")
+    alias(libs.plugins.kover)
+}
+
+publishing {
+    publications {
+        register<MavenPublication>("release") {
+            groupId = "com.w2sv.composed"
+            artifactId = "material3"
+            version = version.toString()
+            pom {
+                developers {
+                    developer {
+                        id.set("w2sv")
+                        name.set("Janek Zangenberg")
+                    }
+                }
+                description.set("Material3 utils for development with Jetpack Compose.")
+                url.set("https://github.com/w2sv/Composed")
+                licenses {
+                    license {
+                        name.set("The Apache Software License, Version 2.0")
+                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                    }
+                }
+            }
+
+            afterEvaluate {
+                from(components["release"])
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation(projects.composed.composedCore)
+
+    implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling)
+    implementation(libs.compose.material3)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.annotation)
+
+    testImplementation(libs.junit)
+    testImplementation(libs.roboelectric)
+    testImplementation(libs.androidx.ui.test.junit4.android)
+}

composed-core/src/main/kotlin/com/w2sv/composed/core/Layout.kt renamed to composed-material3/src/main/kotlin/com/w2sv/composed/material3/Layout.kt

@@ -1,4 +1,4 @@
-package com.w2sv.composed.core
+package com.w2sv.composed.material3
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Arrangement

composed-core/src/main/kotlin/com/w2sv/composed/core/extensions/DrawerState.kt renamed to composed-material3/src/main/kotlin/com/w2sv/composed/material3/extensions/DrawerState.kt

@@ -1,4 +1,4 @@
-package com.w2sv.composed.core.extensions
+package com.w2sv.composed.material3.extensions
 
 import androidx.annotation.FloatRange
 import androidx.compose.material3.DrawerDefaults
@@ -7,6 +7,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
+import com.w2sv.composed.core.extensions.toPx
 
 /**
  * @return Float [State] whose value ranges from 0.0 (drawer fully closed) to 1.0 (drawer fully open).

composed-core/src/main/kotlin/com/w2sv/composed/core/extensions/SnackbarHostState.kt renamed to composed-material3/src/main/kotlin/com/w2sv/composed/material3/extensions/SnackbarHostState.kt

@@ -1,4 +1,4 @@
-package com.w2sv.composed.core.extensions
+package com.w2sv.composed.material3.extensions
 
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHostState

composed-material3/src/test/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name="androidx.activity.ComponentActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

composed-core/src/test/kotlin/com/w2sv/composed/core/extensions/DrawerStateKtTest.kt renamed to composed-material3/src/test/kotlin/com/w2sv/composed/material3/extensions/DrawerStateKtTest.kt

@@ -1,11 +1,11 @@
-package com.w2sv.composed.core.extensions
+package com.w2sv.composed.material3.extensions
 
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.test.junit4.createComposeRule
-import com.w2sv.composed.core.extensions.visibilityPercentage
+import com.w2sv.composed.material3.extensions.visibilityPercentage
 import kotlin.properties.Delegates
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals

gradle/libs.versions.toml

@@ -13,18 +13,21 @@ ktlint = "14.0.1"
 robolectric = "4.16"
 uiTestJunit4Android = "1.10.0"
 versionCatalogUpdate = "1.0.1"
+androidxComposeAnimation = "1.10.0"
 
 [libraries]
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
 androidx-ui-test-junit4-android = { module = "androidx.compose.ui:ui-test-junit4-android", version.ref = "uiTestJunit4Android" }
 compose-lint-checks = { module = "com.slack.lint.compose:compose-lint-checks", version.ref = "compose-lint-checks" }
 compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
+compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose-ui" }
 compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui" }
 google-accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "google-accompanist-permissions" }
 junit = { module = "junit:junit", version.ref = "junit" }
 roboelectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
+androidx-compose-animation-core = { group = "androidx.compose.animation", name = "animation-core", version.ref = "androidxComposeAnimation" }
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "agp" }