refactor(style): create events module.

GerardPaligot · Mar 9, 2024 · 511f497 · 511f497
1 parent f4ab7c1
commit 511f497
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 20 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -47,6 +47,7 @@ include(":theme-m3:event-list:event-list-ui")
 include(":theme-m3:event-list:event-list-feature")
 include(":theme-m3:event-list:event-list-di")
 include(":theme-m3:navigation")
+include(":theme-m3:style:events")
 include(":theme-m3:style:networking")
 include(":theme-m3:style:markdown")
 include(":theme-m3:style:partners")

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

diff --git a/...nfos-feature/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/feature/Event.kt b/...nfos-feature/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/feature/Event.kt
@@ -19,8 +19,8 @@ import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.gdglille.devfest.android.theme.m3.style.cards.AddressCard
-import org.gdglille.devfest.android.theme.m3.style.socials.SocialsSection
+import org.gdglille.devfest.android.theme.m3.style.events.cards.AddressCard
+import org.gdglille.devfest.android.theme.m3.style.events.socials.SocialsSection
 import org.gdglille.devfest.android.theme.m3.infos.ui.tickets.TicketDetailed
 import org.gdglille.devfest.android.theme.m3.infos.ui.tickets.TicketQrCode
 import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme

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

diff --git a/...lin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerDetailVerticalScreen.kt b/...lin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerDetailVerticalScreen.kt
@@ -20,7 +20,7 @@ import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.gdglille.devfest.android.theme.m3.style.cards.AddressCard
+import org.gdglille.devfest.android.theme.m3.style.events.cards.AddressCard
 import org.gdglille.devfest.android.theme.m3.partners.ui.partners.PartnerDetailSectionVertical
 import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme
 import org.gdglille.devfest.android.theme.m3.style.R

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

diff --git a/...kotlin/org/gdglille/devfest/android/theme/m3/partners/ui/partners/PartnerDetailSection.kt b/...kotlin/org/gdglille/devfest/android/theme/m3/partners/ui/partners/PartnerDetailSection.kt
@@ -11,11 +11,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme
+import org.gdglille.devfest.android.theme.m3.style.events.socials.SocialsSection
 import org.gdglille.devfest.android.theme.m3.style.markdown.MarkdownText
 import org.gdglille.devfest.android.theme.m3.style.partners.items.PartnerItem
 import org.gdglille.devfest.android.theme.m3.style.placeholder
 import org.gdglille.devfest.android.theme.m3.style.previews.ThemedPreviews
-import org.gdglille.devfest.android.theme.m3.style.socials.SocialsSection
 import org.gdglille.devfest.models.ui.PartnerItemUi
 
 @Composable

diff --git a/theme-m3/speakers/speakers-ui/build.gradle.kts b/theme-m3/speakers/speakers-ui/build.gradle.kts
@@ -10,6 +10,7 @@ android {
 
 dependencies {
     implementation(projects.shared.uiModels)
+    implementation(projects.themeM3.style.events)
     implementation(projects.themeM3.style.markdown)
     implementation(projects.themeM3.style.speakers)
     implementation(projects.themeM3.style.theme)

diff --git a/...src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/ui/SpeakerDetailSection.kt b/...src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/ui/SpeakerDetailSection.kt
@@ -13,7 +13,7 @@ import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme
 import org.gdglille.devfest.android.theme.m3.style.markdown.MarkdownText
 import org.gdglille.devfest.android.theme.m3.style.placeholder
 import org.gdglille.devfest.android.theme.m3.style.previews.ThemedPreviews
-import org.gdglille.devfest.android.theme.m3.style.socials.SocialsSection
+import org.gdglille.devfest.android.theme.m3.style.events.socials.SocialsSection
 import org.gdglille.devfest.android.theme.m3.style.speakers.avatar.MediumSpeakerAvatar
 import org.gdglille.devfest.models.ui.SpeakerUi
 

diff --git a/theme-m3/style/events/.gitignore b/theme-m3/style/events/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/theme-m3/style/events/build.gradle.kts b/theme-m3/style/events/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    id("conferences4hall.android.library")
+    id("conferences4hall.android.library.compose")
+    id("conferences4hall.quality")
+}
+
+android {
+    namespace = "org.gdglille.devfest.android.theme.m3.style.events"
+}
+
+dependencies {
+    implementation(projects.themeM3.style.theme)
+
+    implementation(compose.material3)
+    implementation(compose.preview)
+    debugImplementation(compose.uiTooling)
+    implementation(compose.materialIconsExtended)
+
+    implementation(libs.jetbrains.kotlinx.collections)
+
+    implementation(libs.font.awesome)
+}
diff --git a/...droid/theme/m3/style/cards/AddressCard.kt → ...heme/m3/style/events/cards/AddressCard.kt b/...droid/theme/m3/style/cards/AddressCard.kt → ...heme/m3/style/events/cards/AddressCard.kt
@@ -1,4 +1,4 @@
-package org.gdglille.devfest.android.theme.m3.style.cards
+package org.gdglille.devfest.android.theme.m3.style.events.cards
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row

diff --git a/...oid/theme/m3/style/socials/SocialIcons.kt → ...me/m3/style/events/socials/SocialIcons.kt b/...oid/theme/m3/style/socials/SocialIcons.kt → ...me/m3/style/events/socials/SocialIcons.kt
@@ -1,4 +1,4 @@
-package org.gdglille.devfest.android.theme.m3.style.socials
+package org.gdglille.devfest.android.theme.m3.style.events.socials
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/.../theme/m3/style/socials/SocialsSection.kt → ...m3/style/events/socials/SocialsSection.kt b/.../theme/m3/style/socials/SocialsSection.kt → ...m3/style/events/socials/SocialsSection.kt
@@ -1,4 +1,4 @@
-package org.gdglille.devfest.android.theme.m3.style.socials
+package org.gdglille.devfest.android.theme.m3.style.events.socials
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

diff --git a/...3/style/socials/SocialsSectionDefaults.kt → .../events/socials/SocialsSectionDefaults.kt b/...3/style/socials/SocialsSectionDefaults.kt → .../events/socials/SocialsSectionDefaults.kt
@@ -1,4 +1,4 @@
-package org.gdglille.devfest.android.theme.m3.style.socials
+package org.gdglille.devfest.android.theme.m3.style.events.socials
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color

diff --git a/.../m3/style/socials/SocialsSectionTokens.kt → ...le/events/socials/SocialsSectionTokens.kt b/.../m3/style/socials/SocialsSectionTokens.kt → ...le/events/socials/SocialsSectionTokens.kt
@@ -1,4 +1,4 @@
-package org.gdglille.devfest.android.theme.m3.style.socials
+package org.gdglille.devfest.android.theme.m3.style.events.socials
 
 import org.gdglille.devfest.android.theme.m3.style.ColorSchemeTokens
 import org.gdglille.devfest.android.theme.m3.style.SpacingTokens

diff --git a/...down/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownText.kt b/...down/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownText.kt
@@ -9,7 +9,6 @@ import com.halilibo.richtext.ui.RichText
 import com.halilibo.richtext.ui.RichTextThemeIntegration
 import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme
 import org.gdglille.devfest.android.theme.m3.style.previews.ThemedPreviews
-import org.gdglille.devfest.android.theme.m3.style.socials.SocialsSectionDefaults
 
 @Composable
 fun MarkdownText(

diff --git a/.../main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextDefaults.kt b/.../main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextDefaults.kt
@@ -3,7 +3,6 @@ package org.gdglille.devfest.android.theme.m3.style.markdown
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
-import org.gdglille.devfest.android.theme.m3.style.socials.SocialsSectionTokens
 import org.gdglille.devfest.android.theme.m3.style.toColor
 import org.gdglille.devfest.android.theme.m3.style.toTextStyle
 

diff --git a/theme-m3/style/theme/build.gradle.kts b/theme-m3/style/theme/build.gradle.kts
@@ -17,6 +17,4 @@ dependencies {
     implementation(libs.google.accompanist.placeholder)
 
     implementation(libs.jetbrains.kotlinx.collections)
-
-    implementation(libs.font.awesome)
 }
diff --git a/.../theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/appbars/AppBarIcons.kt b/.../theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/appbars/AppBarIcons.kt
@@ -1,7 +1,7 @@
 package org.gdglille.devfest.android.theme.m3.style.appbars
 
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
@@ -23,7 +23,7 @@ object AppBarIcons {
         onClick: () -> Unit
     ) {
         AppBarIcon(
-            imageVector = Icons.Filled.ArrowBack,
+            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
             contentDescription = stringResource(id = R.string.action_back),
             modifier = modifier,
             color = color,

diff --git a/...e/theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/buttons/IconButton.kt b/...e/theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/buttons/IconButton.kt
@@ -1,6 +1,8 @@
 package org.gdglille.devfest.android.theme.m3.style.buttons
 
 import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.Icon
@@ -12,9 +14,6 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import compose.icons.FontAwesomeIcons
-import compose.icons.fontawesomeicons.Brands
-import compose.icons.fontawesomeicons.brands.Twitter
 import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme
 
 @Composable
@@ -51,7 +50,7 @@ fun IconButton(
 private fun IconButtonPreview() {
     Conferences4HallTheme {
         IconButton(
-            imageVector = FontAwesomeIcons.Brands.Twitter,
+            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
             contentDescription = null,
             onClick = {}
         )