* updated compose bom: 2023.10.00 => 2023.10.01

* updated dialog dependency: 1.0.3 = 1.0.4 * code cleanup
MFlisar · Oct 26, 2023 · f2dcfea · f2dcfea
1 parent ce530d9
commit f2dcfea
Show file tree

Hide file tree

Showing 14 changed files with 83 additions and 84 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Made for **Compose M3**.
 
 | Dependency | Version | Infos |
 |:-|-:|:-:|
-| [Compose BOM](https://developer.android.com/jetpack/compose/bom/bom) | `2023.10.00` | [Mapping](https://developer.android.com/jetpack/compose/bom/bom-mapping) |
+| [Compose BOM](https://developer.android.com/jetpack/compose/bom/bom) | `2023.10.01` | [Mapping](https://developer.android.com/jetpack/compose/bom/bom-mapping) |
 | Material3 | `1.1.2` | |
 
 ### Other Dependencies
@@ -26,12 +26,12 @@ Made for **Compose M3**.
 | `core` | no dependency |  |
 | `screen-bool` | no dependency |  |
 | `screen-button` | no dependency |  |
-| `screen-input` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.3 |
-| `screen-color` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.3 |
-| `screen-date` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.3 |
-| `screen-time` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.3 |
-| `screen-list` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.3 |
-| `screen-number` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.3 |
+| `screen-input` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.4 |
+| `screen-color` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.4 |
+| `screen-date` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.4 |
+| `screen-time` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.4 |
+| `screen-list` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.4 |
+| `screen-number` | [ComposeDialogs](https://github.com/MFlisar/ComposeDialogs) | 1.0.4 |
 | `extension-kotpreferences` | [KotPreferences](https://github.com/MFlisar/KotPreferences) | 0.3 |
 
 ### Gradle (via [JitPack.io](https://jitpack.io/))

diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts
@@ -73,35 +73,16 @@ dependencies {
     // Libraries
     // ------------------------
 
-    val live = false
-    val composePreferences = "0.1"
-
-    // release test
-    if (live) {
-        implementation("com.github.MFlisar.ComposePreferences:core:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-bool:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-button:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-input:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-color:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-date:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-time:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-list:$composePreferences")
-        implementation("com.github.MFlisar.ComposePreferences:screen-number:$composePreferences")
-
-        implementation("com.github.MFlisar.ComposePreferences:extension-kotpreferences:$composePreferences")
-    } else {
-        implementation(project(":ComposePreferences:Core"))
-        implementation(project(":ComposePreferences:Modules:Screen:Bool"))
-        implementation(project(":ComposePreferences:Modules:Screen:Button"))
-        implementation(project(":ComposePreferences:Modules:Screen:Input"))
-        implementation(project(":ComposePreferences:Modules:Screen:Color"))
-        implementation(project(":ComposePreferences:Modules:Screen:Date"))
-        implementation(project(":ComposePreferences:Modules:Screen:Time"))
-        implementation(project(":ComposePreferences:Modules:Screen:List"))
-        implementation(project(":ComposePreferences:Modules:Screen:Number"))
-
-        implementation(project(":ComposePreferences:Modules:KotPreferences"))
-    }
+    implementation(project(":ComposePreferences:Core"))
+    implementation(project(":ComposePreferences:Modules:Screen:Bool"))
+    implementation(project(":ComposePreferences:Modules:Screen:Button"))
+    implementation(project(":ComposePreferences:Modules:Screen:Input"))
+    implementation(project(":ComposePreferences:Modules:Screen:Color"))
+    implementation(project(":ComposePreferences:Modules:Screen:Date"))
+    implementation(project(":ComposePreferences:Modules:Screen:Time"))
+    implementation(project(":ComposePreferences:Modules:Screen:List"))
+    implementation(project(":ComposePreferences:Modules:Screen:Number"))
+    implementation(project(":ComposePreferences:Modules:KotPreferences"))
 
     // KotPreferences
     // implementation(deps.kotpreferences.core) already included by the kotpreferences module!

diff --git a/demo/src/main/java/com/michaelflisar/composepreferences/demo/theme/Theme.kt b/demo/src/main/java/com/michaelflisar/composepreferences/demo/theme/Theme.kt
@@ -15,31 +15,11 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.ViewCompat
-
-private val Purple80 = Color(0xFFD0BCFF)
-private val PurpleGrey80 = Color(0xFFCCC2DC)
-private val Pink80 = Color(0xFFEFB8C8)
-
-private val Purple40 = Color(0xFF6650a4)
-private val PurpleGrey40 = Color(0xFF625b71)
-private val Pink40 = Color(0xFF7D5260)
-
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
-)
-
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-)
+import androidx.core.view.WindowCompat
 
 @Composable
 fun AppTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
@@ -48,14 +28,15 @@ fun AppTheme(
             val context = LocalContext.current
             if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
         }
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
+        darkTheme -> darkColorScheme()
+        else -> lightColorScheme()
     }
     val view = LocalView.current
     if (!view.isInEditMode) {
         SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
+            val window =  (view.context as Activity).window
+            window.statusBarColor = colorScheme.primary.toArgb()
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,3 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+useLiveDependencies=true
diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-composeBom =            "2023.10.00"
+composeBom =            "2023.10.01"
 compiler =              "1.5.3"
 
 lifecycle = 			"2.6.2"
-activity = 				"1.7.2"
+activity = 				"1.8.0"
 accompanist = 			"0.32.0"
 
 [libraries]

diff --git a/gradle/dependencies.versions.toml b/gradle/dependencies.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 
 # mflisar
-lumberjack = 				"5.3.0"
-composedialogs =   		    "1.0.3"
+lumberjack = 				"5.3.1"
+composedialogs =   		    "1.0.4"
 kotpreferences = 		    "0.3"
 desugar =                   "2.0.3"
 

diff --git a/library/modules/screen/color/build.gradle.kts b/library/modules/screen/color/build.gradle.kts
@@ -64,8 +64,14 @@ dependencies {
     // Dialog
     // ------------------------
 
-    implementation(deps.composedialogs.core)
-    implementation(deps.composedialogs.dialog.color)
+    val useLiveDependencies = providers.gradleProperty("useLiveDependencies").get().toBoolean()
+    if (useLiveDependencies) {
+        implementation(deps.composedialogs.core)
+        implementation(deps.composedialogs.dialog.color)
+    } else {
+        implementation(project(":ComposeDialogs:Core"))
+        implementation(project(":ComposeDialogs:Modules:Color"))
+    }
 
     // ------------------------
     // Libraries

diff --git a/library/modules/screen/date/build.gradle.kts b/library/modules/screen/date/build.gradle.kts
@@ -65,8 +65,14 @@ dependencies {
     // Dialog
     // ------------------------
 
-    implementation(deps.composedialogs.core)
-    implementation(deps.composedialogs.dialog.date)
+    val useLiveDependencies = providers.gradleProperty("useLiveDependencies").get().toBoolean()
+    if (useLiveDependencies) {
+        implementation(deps.composedialogs.core)
+        implementation(deps.composedialogs.dialog.date)
+    } else {
+        implementation(project(":ComposeDialogs:Core"))
+        implementation(project(":ComposeDialogs:Modules:Date"))
+    }
 
     // ------------------------
     // Libraries

diff --git a/...een/date/src/main/java/com/michaelflisar/composepreferences/screen/date/PreferenceDate.kt b/...een/date/src/main/java/com/michaelflisar/composepreferences/screen/date/PreferenceDate.kt
@@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.michaelflisar.composedialogs.core.rememberDialogState
-import com.michaelflisar.composedialogs.dialogs.datetime.DialogDate
-import com.michaelflisar.composedialogs.dialogs.datetime.DialogDateDefaults
-import com.michaelflisar.composedialogs.dialogs.datetime.rememberDialogDate
+import com.michaelflisar.composedialogs.dialogs.date.DialogDate
+import com.michaelflisar.composedialogs.dialogs.date.DialogDateDefaults
+import com.michaelflisar.composedialogs.dialogs.date.rememberDialogDate
 import com.michaelflisar.composepreferences.core.classes.PreferenceData
 import com.michaelflisar.composepreferences.core.classes.Dependency
 import com.michaelflisar.composepreferences.core.classes.LocalPreferenceSettings

diff --git a/library/modules/screen/input/build.gradle.kts b/library/modules/screen/input/build.gradle.kts
@@ -64,8 +64,14 @@ dependencies {
     // Dialog
     // ------------------------
 
-    implementation(deps.composedialogs.core)
-    implementation(deps.composedialogs.dialog.input)
+    val useLiveDependencies = providers.gradleProperty("useLiveDependencies").get().toBoolean()
+    if (useLiveDependencies) {
+        implementation(deps.composedialogs.core)
+        implementation(deps.composedialogs.dialog.input)
+    } else {
+        implementation(project(":ComposeDialogs:Core"))
+        implementation(project(":ComposeDialogs:Modules:Input"))
+    }
 
     // ------------------------
     // Libraries

diff --git a/library/modules/screen/list/build.gradle.kts b/library/modules/screen/list/build.gradle.kts
@@ -64,8 +64,14 @@ dependencies {
     // Dialog
     // ------------------------
 
-    implementation(deps.composedialogs.core)
-    implementation(deps.composedialogs.dialog.list)
+    val useLiveDependencies = providers.gradleProperty("useLiveDependencies").get().toBoolean()
+    if (useLiveDependencies) {
+        implementation(deps.composedialogs.core)
+        implementation(deps.composedialogs.dialog.list)
+    } else {
+        implementation(project(":ComposeDialogs:Core"))
+        implementation(project(":ComposeDialogs:Modules:List"))
+    }
 
     // ------------------------
     // Libraries

diff --git a/library/modules/screen/number/build.gradle.kts b/library/modules/screen/number/build.gradle.kts
@@ -64,8 +64,14 @@ dependencies {
     // Dialog
     // ------------------------
 
-    implementation(deps.composedialogs.core)
-    implementation(deps.composedialogs.dialog.number)
+    val useLiveDependencies = providers.gradleProperty("useLiveDependencies").get().toBoolean()
+    if (useLiveDependencies) {
+        implementation(deps.composedialogs.core)
+        implementation(deps.composedialogs.dialog.number)
+    } else {
+        implementation(project(":ComposeDialogs:Core"))
+        implementation(project(":ComposeDialogs:Modules:Number"))
+    }
 
     // ------------------------
     // Libraries

diff --git a/library/modules/screen/time/build.gradle.kts b/library/modules/screen/time/build.gradle.kts
@@ -65,8 +65,14 @@ dependencies {
     // Dialog
     // ------------------------
 
-    implementation(deps.composedialogs.core)
-    implementation(deps.composedialogs.dialog.time)
+    val useLiveDependencies = providers.gradleProperty("useLiveDependencies").get().toBoolean()
+    if (useLiveDependencies) {
+        implementation(deps.composedialogs.core)
+        implementation(deps.composedialogs.dialog.time)
+    } else {
+        implementation(project(":ComposeDialogs:Core"))
+        implementation(project(":ComposeDialogs:Modules:Time"))
+    }
 
     // ------------------------
     // Libraries

diff --git a/...een/time/src/main/java/com/michaelflisar/composepreferences/screen/time/PreferenceTime.kt b/...een/time/src/main/java/com/michaelflisar/composepreferences/screen/time/PreferenceTime.kt
@@ -10,11 +10,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import com.michaelflisar.composedialogs.core.rememberDialogState
-import com.michaelflisar.composedialogs.dialogs.datetime.DialogTime
-import com.michaelflisar.composedialogs.dialogs.datetime.DialogTimeDefaults
-import com.michaelflisar.composedialogs.dialogs.datetime.rememberDialogTime
+import com.michaelflisar.composedialogs.dialogs.time.DialogTime
+import com.michaelflisar.composedialogs.dialogs.time.DialogTimeDefaults
+import com.michaelflisar.composedialogs.dialogs.time.rememberDialogTime
 import com.michaelflisar.composepreferences.core.classes.PreferenceData
 import com.michaelflisar.composepreferences.core.classes.Dependency
 import com.michaelflisar.composepreferences.core.classes.LocalPreferenceSettings