refactor(style): Migrate :style module to :style:theme

GerardPaligot · Oct 20, 2023 · 110471a · 110471a
1 parent 7d73593
commit 110471a
Show file tree

Hide file tree

Showing 62 changed files with 16 additions and 16 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -35,5 +35,5 @@ include(":theme-m3:infos:infos-feature")
 include(":theme-m3:event-list:event-list-ui")
 include(":theme-m3:event-list:event-list-feature")
 include(":theme-m3:navigation")
-include(":theme-m3:style")
+include(":theme-m3:style:theme")
 include(":ui-camera")
diff --git a/shared/core/build.gradle.kts b/shared/core/build.gradle.kts
@@ -64,7 +64,7 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                implementation(projects.themeM3.style)
+                implementation(projects.themeM3.style.theme)
                 implementation(libs.ktor.client.android)
                 implementation(libs.sqldelight.android)
                 implementation(libs.zxing)

diff --git a/theme-m3/event-list/event-list-feature/build.gradle.kts b/theme-m3/event-list/event-list-feature/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.shared.core)
     implementation(projects.themeM3.eventList.eventListUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/event-list/event-list-ui/build.gradle.kts b/theme-m3/event-list/event-list-ui/build.gradle.kts
@@ -10,7 +10,7 @@ android {
 
 dependencies {
     implementation(projects.shared.uiModels)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/infos/infos-feature/build.gradle.kts b/theme-m3/infos/infos-feature/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.shared.core)
     implementation(projects.themeM3.infos.infosUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/infos/infos-ui/build.gradle.kts b/theme-m3/infos/infos-ui/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.uiCamera)
     implementation(projects.shared.uiModels)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/main/build.gradle.kts b/theme-m3/main/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 dependencies {
     api(projects.themeM3.schedules.schedulesUi)
     api(projects.themeM3.speakers.speakersUi)
-    api(projects.themeM3.style)
+    api(projects.themeM3.style.theme)
     implementation(projects.themeM3.schedules.schedulesFeature)
     implementation(projects.themeM3.speakers.speakersFeature)
     implementation(projects.themeM3.networking.networkingFeature)

diff --git a/theme-m3/navigation/build.gradle.kts b/theme-m3/navigation/build.gradle.kts
@@ -8,7 +8,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.androidx.annotation)
     implementation(libs.androidx.compose.icons)

diff --git a/theme-m3/networking/networking-feature/build.gradle.kts b/theme-m3/networking/networking-feature/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.shared.core)
     implementation(projects.themeM3.networking.networkingUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/networking/networking-ui/build.gradle.kts b/theme-m3/networking/networking-ui/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.uiCamera)
     implementation(projects.shared.uiModels)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/partners/partners-feature/build.gradle.kts b/theme-m3/partners/partners-feature/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.shared.core)
     implementation(projects.themeM3.partners.partnersUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/partners/partners-ui/build.gradle.kts b/theme-m3/partners/partners-ui/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 dependencies {
     implementation(projects.shared.uiModels)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/schedules/schedules-feature/build.gradle.kts b/theme-m3/schedules/schedules-feature/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.shared.core)
     implementation(projects.themeM3.schedules.schedulesUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/schedules/schedules-ui/build.gradle.kts b/theme-m3/schedules/schedules-ui/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.shared.uiModels)
     implementation(projects.themeM3.speakers.speakersUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/speakers/speakers-feature/build.gradle.kts b/theme-m3/speakers/speakers-feature/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     implementation(projects.themeM3.schedules.schedulesUi)
     implementation(projects.themeM3.speakers.speakersUi)
     implementation(projects.themeM3.navigation)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(libs.kotlinx.collections)
 

diff --git a/theme-m3/speakers/speakers-ui/build.gradle.kts b/theme-m3/speakers/speakers-ui/build.gradle.kts
@@ -10,7 +10,7 @@ android {
 
 dependencies {
     implementation(projects.shared.uiModels)
-    implementation(projects.themeM3.style)
+    implementation(projects.themeM3.style.theme)
 
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material3)

diff --git a/theme-m3/style/.gitignore → theme-m3/style/theme/.gitignore b/theme-m3/style/.gitignore → theme-m3/style/theme/.gitignore
diff --git a/theme-m3/style/build.gradle.kts → theme-m3/style/theme/build.gradle.kts b/theme-m3/style/build.gradle.kts → theme-m3/style/theme/build.gradle.kts
diff --git a/.../devfest/android/theme/m3/style/Colors.kt → .../devfest/android/theme/m3/style/Colors.kt b/.../devfest/android/theme/m3/style/Colors.kt → .../devfest/android/theme/m3/style/Colors.kt
diff --git a/...d/theme/m3/style/Conferences4HallTheme.kt → ...d/theme/m3/style/Conferences4HallTheme.kt b/...d/theme/m3/style/Conferences4HallTheme.kt → ...d/theme/m3/style/Conferences4HallTheme.kt
diff --git a/...d/theme/m3/style/DecorativeColorScheme.kt → ...d/theme/m3/style/DecorativeColorScheme.kt b/...d/theme/m3/style/DecorativeColorScheme.kt → ...d/theme/m3/style/DecorativeColorScheme.kt
diff --git a/...e/m3/style/DecorativeColorSchemeTokens.kt → ...e/m3/style/DecorativeColorSchemeTokens.kt b/...e/m3/style/DecorativeColorSchemeTokens.kt → ...e/m3/style/DecorativeColorSchemeTokens.kt
diff --git a/...theme/m3/style/DecorativePaletteTokens.kt → ...theme/m3/style/DecorativePaletteTokens.kt b/...theme/m3/style/DecorativePaletteTokens.kt → ...theme/m3/style/DecorativePaletteTokens.kt
diff --git a/.../devfest/android/theme/m3/style/Locals.kt → .../devfest/android/theme/m3/style/Locals.kt b/.../devfest/android/theme/m3/style/Locals.kt → .../devfest/android/theme/m3/style/Locals.kt
diff --git a/...est/android/theme/m3/style/Placeholder.kt → ...est/android/theme/m3/style/Placeholder.kt b/...est/android/theme/m3/style/Placeholder.kt → ...est/android/theme/m3/style/Placeholder.kt
diff --git a/...evfest/android/theme/m3/style/Scaffold.kt → ...evfest/android/theme/m3/style/Scaffold.kt b/...evfest/android/theme/m3/style/Scaffold.kt → ...evfest/android/theme/m3/style/Scaffold.kt
diff --git a/...id/theme/m3/style/actions/BottomAction.kt → ...id/theme/m3/style/actions/BottomAction.kt b/...id/theme/m3/style/actions/BottomAction.kt → ...id/theme/m3/style/actions/BottomAction.kt
diff --git a/...theme/m3/style/actions/BottomActionsUi.kt → ...theme/m3/style/actions/BottomActionsUi.kt b/...theme/m3/style/actions/BottomActionsUi.kt → ...theme/m3/style/actions/BottomActionsUi.kt
diff --git a/...droid/theme/m3/style/actions/FabAction.kt → ...droid/theme/m3/style/actions/FabAction.kt b/...droid/theme/m3/style/actions/FabAction.kt → ...droid/theme/m3/style/actions/FabAction.kt
diff --git a/...ndroid/theme/m3/style/actions/ScreenUi.kt → ...ndroid/theme/m3/style/actions/ScreenUi.kt b/...ndroid/theme/m3/style/actions/ScreenUi.kt → ...ndroid/theme/m3/style/actions/ScreenUi.kt
diff --git a/...droid/theme/m3/style/actions/TabAction.kt → ...droid/theme/m3/style/actions/TabAction.kt b/...droid/theme/m3/style/actions/TabAction.kt → ...droid/theme/m3/style/actions/TabAction.kt
diff --git a/...id/theme/m3/style/actions/TabActionsUi.kt → ...id/theme/m3/style/actions/TabActionsUi.kt b/...id/theme/m3/style/actions/TabActionsUi.kt → ...id/theme/m3/style/actions/TabActionsUi.kt
diff --git a/...droid/theme/m3/style/actions/TopAction.kt → ...droid/theme/m3/style/actions/TopAction.kt b/...droid/theme/m3/style/actions/TopAction.kt → ...droid/theme/m3/style/actions/TopAction.kt
diff --git a/...id/theme/m3/style/actions/TopActionsUi.kt → ...id/theme/m3/style/actions/TopActionsUi.kt b/...id/theme/m3/style/actions/TopActionsUi.kt → ...id/theme/m3/style/actions/TopActionsUi.kt
diff --git a/...oid/theme/m3/style/appbars/AppBarIcons.kt → ...oid/theme/m3/style/appbars/AppBarIcons.kt b/...oid/theme/m3/style/appbars/AppBarIcons.kt → ...oid/theme/m3/style/appbars/AppBarIcons.kt
diff --git a/...id/theme/m3/style/appbars/BottomAppBar.kt → ...id/theme/m3/style/appbars/BottomAppBar.kt b/...id/theme/m3/style/appbars/BottomAppBar.kt → ...id/theme/m3/style/appbars/BottomAppBar.kt
diff --git a/...id/theme/m3/style/appbars/OverflowMenu.kt → ...id/theme/m3/style/appbars/OverflowMenu.kt b/...id/theme/m3/style/appbars/OverflowMenu.kt → ...id/theme/m3/style/appbars/OverflowMenu.kt
diff --git a/...est/android/theme/m3/style/appbars/Tab.kt → ...est/android/theme/m3/style/appbars/Tab.kt b/...est/android/theme/m3/style/appbars/Tab.kt → ...est/android/theme/m3/style/appbars/Tab.kt
diff --git a/...droid/theme/m3/style/appbars/TopAppBar.kt → ...droid/theme/m3/style/appbars/TopAppBar.kt b/...droid/theme/m3/style/appbars/TopAppBar.kt → ...droid/theme/m3/style/appbars/TopAppBar.kt
diff --git a/...roid/theme/m3/style/buttons/IconButton.kt → ...roid/theme/m3/style/buttons/IconButton.kt b/...roid/theme/m3/style/buttons/IconButton.kt → ...roid/theme/m3/style/buttons/IconButton.kt
diff --git a/...droid/theme/m3/style/cards/AddressCard.kt → ...droid/theme/m3/style/cards/AddressCard.kt b/...droid/theme/m3/style/cards/AddressCard.kt → ...droid/theme/m3/style/cards/AddressCard.kt
diff --git a/...ndroid/theme/m3/style/chips/FilterChip.kt → ...ndroid/theme/m3/style/chips/FilterChip.kt b/...ndroid/theme/m3/style/chips/FilterChip.kt → ...ndroid/theme/m3/style/chips/FilterChip.kt
diff --git a/.../android/theme/m3/style/menus/Dropdown.kt → .../android/theme/m3/style/menus/Dropdown.kt b/.../android/theme/m3/style/menus/Dropdown.kt → .../android/theme/m3/style/menus/Dropdown.kt
diff --git a/...ns/FeatureThatRequiresCameraPermission.kt → ...ns/FeatureThatRequiresCameraPermission.kt b/...ns/FeatureThatRequiresCameraPermission.kt → ...ns/FeatureThatRequiresCameraPermission.kt
diff --git a/...tureThatRequiresCameraPermissionDenied.kt → ...tureThatRequiresCameraPermissionDenied.kt b/...tureThatRequiresCameraPermissionDenied.kt → ...tureThatRequiresCameraPermissionDenied.kt
diff --git a/...eThatRequiresCameraPermissionRequested.kt → ...eThatRequiresCameraPermissionRequested.kt b/...eThatRequiresCameraPermissionRequested.kt → ...eThatRequiresCameraPermissionRequested.kt
diff --git a/...roid/theme/m3/style/shapes/DottedShape.kt → ...roid/theme/m3/style/shapes/DottedShape.kt b/...roid/theme/m3/style/shapes/DottedShape.kt → ...roid/theme/m3/style/shapes/DottedShape.kt
diff --git a/...oid/theme/m3/style/socials/SocialIcons.kt → ...oid/theme/m3/style/socials/SocialIcons.kt b/...oid/theme/m3/style/socials/SocialIcons.kt → ...oid/theme/m3/style/socials/SocialIcons.kt
diff --git a/.../theme/m3/style/socials/SocialsSection.kt → .../theme/m3/style/socials/SocialsSection.kt b/.../theme/m3/style/socials/SocialsSection.kt → .../theme/m3/style/socials/SocialsSection.kt
diff --git a/.../theme/m3/style/tags/AmethystTagTokens.kt → .../theme/m3/style/tags/AmethystTagTokens.kt b/.../theme/m3/style/tags/AmethystTagTokens.kt → .../theme/m3/style/tags/AmethystTagTokens.kt
diff --git a/...oid/theme/m3/style/tags/BrickTagTokens.kt → ...oid/theme/m3/style/tags/BrickTagTokens.kt b/...oid/theme/m3/style/tags/BrickTagTokens.kt → ...oid/theme/m3/style/tags/BrickTagTokens.kt
diff --git a/...id/theme/m3/style/tags/CobaltTagTokens.kt → ...id/theme/m3/style/tags/CobaltTagTokens.kt b/...id/theme/m3/style/tags/CobaltTagTokens.kt → ...id/theme/m3/style/tags/CobaltTagTokens.kt
diff --git a/...d/theme/m3/style/tags/EmeraldTagTokens.kt → ...d/theme/m3/style/tags/EmeraldTagTokens.kt b/...d/theme/m3/style/tags/EmeraldTagTokens.kt → ...d/theme/m3/style/tags/EmeraldTagTokens.kt
diff --git a/...roid/theme/m3/style/tags/GoldTagTokens.kt → ...roid/theme/m3/style/tags/GoldTagTokens.kt b/...roid/theme/m3/style/tags/GoldTagTokens.kt → ...roid/theme/m3/style/tags/GoldTagTokens.kt
diff --git a/...id/theme/m3/style/tags/GravelTagTokens.kt → ...id/theme/m3/style/tags/GravelTagTokens.kt b/...id/theme/m3/style/tags/GravelTagTokens.kt → ...id/theme/m3/style/tags/GravelTagTokens.kt
diff --git a/...roid/theme/m3/style/tags/JadeTagTokens.kt → ...roid/theme/m3/style/tags/JadeTagTokens.kt b/...roid/theme/m3/style/tags/JadeTagTokens.kt → ...roid/theme/m3/style/tags/JadeTagTokens.kt
diff --git a/...d/theme/m3/style/tags/SaffronTagTokens.kt → ...d/theme/m3/style/tags/SaffronTagTokens.kt b/...d/theme/m3/style/tags/SaffronTagTokens.kt → ...d/theme/m3/style/tags/SaffronTagTokens.kt
diff --git a/...evfest/android/theme/m3/style/tags/Tag.kt → ...evfest/android/theme/m3/style/tags/Tag.kt b/...evfest/android/theme/m3/style/tags/Tag.kt → ...evfest/android/theme/m3/style/tags/Tag.kt
diff --git a/.../android/theme/m3/style/tags/TagColors.kt → .../android/theme/m3/style/tags/TagColors.kt b/.../android/theme/m3/style/tags/TagColors.kt → .../android/theme/m3/style/tags/TagColors.kt
diff --git a/...ndroid/theme/m3/style/tags/TagDefaults.kt → ...ndroid/theme/m3/style/tags/TagDefaults.kt b/...ndroid/theme/m3/style/tags/TagDefaults.kt → ...ndroid/theme/m3/style/tags/TagDefaults.kt
diff --git a/.../style/src/main/res/values-fr/strings.xml → .../theme/src/main/res/values-fr/strings.xml b/.../style/src/main/res/values-fr/strings.xml → .../theme/src/main/res/values-fr/strings.xml
diff --git a/...-m3/style/src/main/res/values/strings.xml → ...yle/theme/src/main/res/values/strings.xml b/...-m3/style/src/main/res/values/strings.xml → ...yle/theme/src/main/res/values/strings.xml