Migrate UI to multiplatform

alorma · Dec 15, 2023 · 62f4de7 · 62f4de7
1 parent b9202c2
commit 62f4de7
Show file tree

Hide file tree

Showing 31 changed files with 846 additions and 831 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -44,10 +44,11 @@ android {
 }
 
 dependencies {
-  implementation(projects.composeSettingsUiM3)
+  implementation(projects.composeSettingsUi)
 
   implementation(projects.composeSettingsStorageBase)
-  implementation(projects.composeSettingsStoragePreferences)
+  implementation(projects.composeSettingsStorageDisk)
+  implementation(projects.composeSettingsStorageMemory)
 
   implementation(platform(libs.compose.bom))
   implementation(libs.androidx.activity.compose)

diff --git a/app/src/main/java/com/alorma/compose/settings/example/demo/AppScaffold.kt b/app/src/main/java/com/alorma/compose/settings/example/demo/AppScaffold.kt
@@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.navigation.NavController
 import com.alorma.compose.settings.example.ui.Navigation
-import SettingValueState
+import com.alorma.compose.settings.storage.base.SettingValueState
 import base.rememberBooleanSettingState
 
 @OptIn(

diff --git a/app/src/main/java/com/alorma/compose/settings/example/ui/screens/CheckboxesScreen.kt b/app/src/main/java/com/alorma/compose/settings/example/ui/screens/CheckboxesScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavHostController
 import com.alorma.compose.settings.example.demo.AppScaffold
-import SettingValueState
+import com.alorma.compose.settings.storage.base.SettingValueState
 import base.rememberBooleanSettingState
 import com.alorma.compose.settings.storage.preferences.rememberPreferenceBooleanSettingState
 import com.alorma.compose.settings.ui.SettingsCheckbox

diff --git a/app/src/main/java/com/alorma/compose/settings/example/ui/screens/SwitchesScreen.kt b/app/src/main/java/com/alorma/compose/settings/example/ui/screens/SwitchesScreen.kt
@@ -11,7 +11,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.navigation.NavHostController
 import com.alorma.compose.settings.example.demo.AppScaffold
-import SettingValueState
+import com.alorma.compose.settings.storage.base.SettingValueState
 import base.rememberBooleanSettingState
 import com.alorma.compose.settings.storage.preferences.rememberPreferenceBooleanSettingState
 import com.alorma.compose.settings.ui.SettingsSwitch

diff --git a/compose-settings-bom/build.gradle.kts b/compose-settings-bom/build.gradle.kts
@@ -9,6 +9,6 @@ dependencies {
     api(projects.composeSettingsStorageDisk)
     api(projects.composeSettingsStorageMemory)
 
-    api(projects.composeSettingsUiM3)
+    api(projects.composeSettingsUi)
   }
 }
diff --git a/compose-settings-storage-base/build.gradle.kts b/compose-settings-storage-base/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {

diff --git a/compose-settings-storage-disk/build.gradle.kts b/compose-settings-storage-disk/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {

diff --git a/compose-settings-storage-memory/build.gradle.kts b/compose-settings-storage-memory/build.gradle.kts
@@ -1,4 +1,3 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {

diff --git a/compose-settings-ui-m3/build.gradle.kts b/compose-settings-ui-m3/build.gradle.kts
diff --git a/compose-settings-ui-m3/src/main/AndroidManifest.xml b/compose-settings-ui-m3/src/main/AndroidManifest.xml
diff --git a/compose-settings-ui-m3/src/main/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt b/compose-settings-ui-m3/src/main/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt
diff --git a/compose-settings-ui-m3/src/main/kotlin/com/alorma/compose/settings/ui/SettingsList.kt b/compose-settings-ui-m3/src/main/kotlin/com/alorma/compose/settings/ui/SettingsList.kt