diff --git a/settings.gradle.kts b/settings.gradle.kts index e9251f8c6..6d639f17a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,11 +47,12 @@ 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:components:markdown") +include(":theme-m3:style:components:permissions") +include(":theme-m3:style:components:placeholder") include(":theme-m3:style:events") include(":theme-m3:style:networking") -include(":theme-m3:style:markdown") include(":theme-m3:style:partners") -include(":theme-m3:style:permissions") include(":theme-m3:style:schedules") include(":theme-m3:style:speakers") include(":theme-m3:style:theme") diff --git a/theme-m3/event-list/event-list-ui/build.gradle.kts b/theme-m3/event-list/event-list-ui/build.gradle.kts index 73980c778..a34c2f9fd 100644 --- a/theme-m3/event-list/event-list-ui/build.gradle.kts +++ b/theme-m3/event-list/event-list-ui/build.gradle.kts @@ -10,6 +10,7 @@ android { dependencies { implementation(projects.shared.uiModels) + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.theme) implementation(compose.material3) diff --git a/theme-m3/event-list/event-list-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/events/ui/EventItem.kt b/theme-m3/event-list/event-list-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/events/ui/EventItem.kt index 258a40a52..efbc79b23 100644 --- a/theme-m3/event-list/event-list-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/events/ui/EventItem.kt +++ b/theme-m3/event-list/event-list-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/events/ui/EventItem.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.models.ui.EventItemUi @Composable diff --git a/theme-m3/infos/infos-feature/build.gradle.kts b/theme-m3/infos/infos-feature/build.gradle.kts index e480a4241..438214391 100644 --- a/theme-m3/infos/infos-feature/build.gradle.kts +++ b/theme-m3/infos/infos-feature/build.gradle.kts @@ -12,8 +12,8 @@ dependencies { implementation(projects.shared.core) implementation(projects.themeM3.infos.infosUi) implementation(projects.themeM3.navigation) + implementation(projects.themeM3.style.components.permissions) implementation(projects.themeM3.style.events) - implementation(projects.themeM3.style.permissions) implementation(projects.themeM3.style.theme) implementation(libs.koin.androidx.compose) diff --git a/theme-m3/infos/infos-ui/build.gradle.kts b/theme-m3/infos/infos-ui/build.gradle.kts index bfd40f67b..eaceb71cc 100644 --- a/theme-m3/infos/infos-ui/build.gradle.kts +++ b/theme-m3/infos/infos-ui/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { implementation(projects.uiCamera) implementation(projects.shared.uiModels) implementation(projects.themeM3.navigation) + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.theme) implementation(libs.jetbrains.kotlinx.collections) diff --git a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/menus/MenuItem.kt b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/menus/MenuItem.kt index 60ba3a731..0e6e3cdfb 100644 --- a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/menus/MenuItem.kt +++ b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/menus/MenuItem.kt @@ -13,7 +13,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.models.ui.MenuItemUi @Composable diff --git a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/qanda/QAndAItem.kt b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/qanda/QAndAItem.kt index 6a8c52a18..9c22f5a37 100644 --- a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/qanda/QAndAItem.kt +++ b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/qanda/QAndAItem.kt @@ -30,7 +30,7 @@ import com.halilibo.richtext.markdown.Markdown 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.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.models.ui.QuestionAndResponseUi private const val ExpandedDegrees = 180f diff --git a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketDetailed.kt b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketDetailed.kt index f04e330d4..0c1c016a5 100644 --- a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketDetailed.kt +++ b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketDetailed.kt @@ -33,7 +33,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.gdglille.devfest.models.ui.Image import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.shapes.DottedShape import org.gdglille.devfest.android.theme.m3.style.R import org.gdglille.devfest.models.ui.TicketInfoUi diff --git a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketQrCode.kt b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketQrCode.kt index d007480dd..38e43e37c 100644 --- a/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketQrCode.kt +++ b/theme-m3/infos/infos-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/infos/ui/tickets/TicketQrCode.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import org.gdglille.devfest.models.ui.Image -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.R private const val TicketRatio = 3 / 4 diff --git a/theme-m3/networking/networking-feature/build.gradle.kts b/theme-m3/networking/networking-feature/build.gradle.kts index a0e707739..a285f706f 100644 --- a/theme-m3/networking/networking-feature/build.gradle.kts +++ b/theme-m3/networking/networking-feature/build.gradle.kts @@ -13,8 +13,8 @@ dependencies { implementation(projects.themeM3.networking.networkingScreens) implementation(projects.themeM3.networking.networkingUi) implementation(projects.themeM3.navigation) + implementation(projects.themeM3.style.components.permissions) implementation(projects.themeM3.style.networking) - implementation(projects.themeM3.style.permissions) implementation(projects.themeM3.style.theme) implementation(libs.koin.androidx.compose) diff --git a/theme-m3/partners/partners-screens/build.gradle.kts b/theme-m3/partners/partners-screens/build.gradle.kts index 857b6fe6c..99d00a4df 100644 --- 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.components.placeholder) implementation(projects.themeM3.style.events) implementation(projects.themeM3.style.partners) implementation(projects.themeM3.style.theme) diff --git a/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerDetailVerticalScreen.kt b/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerDetailVerticalScreen.kt index e1e5c7722..a57939067 100644 --- a/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerDetailVerticalScreen.kt +++ b/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerDetailVerticalScreen.kt @@ -25,7 +25,7 @@ import org.gdglille.devfest.android.theme.m3.partners.ui.partners.PartnerDetailS import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme import org.gdglille.devfest.android.theme.m3.style.R import org.gdglille.devfest.android.theme.m3.style.partners.jobs.JobItem -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.models.ui.PartnerItemUi @Composable diff --git a/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerImageScreen.kt b/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerImageScreen.kt index dc0b5f471..1f577e9a8 100644 --- a/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerImageScreen.kt +++ b/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnerImageScreen.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme 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.placeholder.placeholder @Composable fun PartnerImageScreen( diff --git a/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnersGridScreen.kt b/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnersGridScreen.kt index ea3187bdf..33084b32b 100644 --- a/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnersGridScreen.kt +++ b/theme-m3/partners/partners-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/screens/PartnersGridScreen.kt @@ -26,7 +26,7 @@ import org.gdglille.devfest.android.theme.m3.style.R import org.gdglille.devfest.android.theme.m3.style.Scaffold import org.gdglille.devfest.android.theme.m3.style.SpacingTokens 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.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.toDp import org.gdglille.devfest.models.ui.PartnerGroupsUi diff --git a/theme-m3/partners/partners-ui/build.gradle.kts b/theme-m3/partners/partners-ui/build.gradle.kts index 635b37f8a..adce16aec 100644 --- a/theme-m3/partners/partners-ui/build.gradle.kts +++ b/theme-m3/partners/partners-ui/build.gradle.kts @@ -11,8 +11,9 @@ android { dependencies { implementation(projects.shared.uiModels) implementation(projects.themeM3.navigation) + implementation(projects.themeM3.style.components.markdown) + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.events) - implementation(projects.themeM3.style.markdown) implementation(projects.themeM3.style.partners) implementation(projects.themeM3.style.theme) diff --git a/theme-m3/partners/partners-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/ui/partners/PartnerDetailSection.kt b/theme-m3/partners/partners-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/ui/partners/PartnerDetailSection.kt index 67dfd830b..117d9328a 100644 --- a/theme-m3/partners/partners-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/ui/partners/PartnerDetailSection.kt +++ b/theme-m3/partners/partners-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/partners/ui/partners/PartnerDetailSection.kt @@ -14,7 +14,7 @@ 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.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.previews.ThemedPreviews import org.gdglille.devfest.models.ui.PartnerItemUi diff --git a/theme-m3/schedules/schedules-screens/build.gradle.kts b/theme-m3/schedules/schedules-screens/build.gradle.kts index 4e99056b4..5b4c5628b 100644 --- a/theme-m3/schedules/schedules-screens/build.gradle.kts +++ b/theme-m3/schedules/schedules-screens/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { implementation(projects.shared.core) implementation(projects.themeM3.schedules.schedulesUi) implementation(projects.themeM3.navigation) + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.schedules) implementation(projects.themeM3.style.speakers) implementation(projects.themeM3.style.theme) diff --git a/theme-m3/schedules/schedules-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/screens/ScheduleGridScreen.kt b/theme-m3/schedules/schedules-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/screens/ScheduleGridScreen.kt index e98c37607..3d67fde93 100644 --- a/theme-m3/schedules/schedules-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/screens/ScheduleGridScreen.kt +++ b/theme-m3/schedules/schedules-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/screens/ScheduleGridScreen.kt @@ -20,7 +20,7 @@ import org.gdglille.devfest.android.theme.m3.schedules.ui.talks.SmallScheduleIte import org.gdglille.devfest.android.theme.m3.schedules.ui.talks.Time import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme import org.gdglille.devfest.android.theme.m3.style.SpacingTokens -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.previews.PHONE_LANDSCAPE import org.gdglille.devfest.android.theme.m3.style.schedules.findTimeImageVector import org.gdglille.devfest.android.theme.m3.style.schedules.pause.MediumPauseItem diff --git a/theme-m3/schedules/schedules-ui/build.gradle.kts b/theme-m3/schedules/schedules-ui/build.gradle.kts index de3076598..ee7bb4f6c 100644 --- a/theme-m3/schedules/schedules-ui/build.gradle.kts +++ b/theme-m3/schedules/schedules-ui/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { implementation(projects.shared.uiModels) implementation(projects.themeM3.speakers.speakersUi) implementation(projects.themeM3.navigation) + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.schedules) implementation(projects.themeM3.style.speakers) implementation(projects.themeM3.style.theme) diff --git a/theme-m3/schedules/schedules-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/ui/speakers/SpeakerRow.kt b/theme-m3/schedules/schedules-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/ui/speakers/SpeakerRow.kt index 2eeaa4fcd..bafc7b8f9 100644 --- a/theme-m3/schedules/schedules-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/ui/speakers/SpeakerRow.kt +++ b/theme-m3/schedules/schedules-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/schedules/ui/speakers/SpeakerRow.kt @@ -12,7 +12,7 @@ import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme import org.gdglille.devfest.android.theme.m3.style.SpacingTokens -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.speakers.items.LargeSpeakerItem import org.gdglille.devfest.android.theme.m3.style.toDp import org.gdglille.devfest.models.ui.SpeakerItemUi diff --git a/theme-m3/speakers/speakers-screens/build.gradle.kts b/theme-m3/speakers/speakers-screens/build.gradle.kts index eb24101e0..5b1dcd5ac 100644 --- a/theme-m3/speakers/speakers-screens/build.gradle.kts +++ b/theme-m3/speakers/speakers-screens/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { implementation(projects.shared.core) implementation(projects.themeM3.schedules.schedulesUi) implementation(projects.themeM3.speakers.speakersUi) + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.schedules) implementation(projects.themeM3.style.speakers) implementation(projects.themeM3.style.theme) diff --git a/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerAvatarScreen.kt b/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerAvatarScreen.kt index 1973f6e82..fe0db61e3 100644 --- a/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerAvatarScreen.kt +++ b/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerAvatarScreen.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.speakers.avatar.MediumSpeakerAvatar @Composable diff --git a/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerDetailScreen.kt b/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerDetailScreen.kt index 43c165838..83b403576 100644 --- a/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerDetailScreen.kt +++ b/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakerDetailScreen.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.dp import org.gdglille.devfest.android.theme.m3.schedules.ui.talks.MediumScheduleItem import org.gdglille.devfest.android.theme.m3.speakers.ui.SpeakerDetailSectionVertical import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.previews.ThemedPreviews import org.gdglille.devfest.models.ui.SpeakerUi import org.gdglille.devfest.models.ui.TalkItemUi diff --git a/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakersGridScreen.kt b/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakersGridScreen.kt index 15dcf1077..19b97139b 100644 --- a/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakersGridScreen.kt +++ b/theme-m3/speakers/speakers-screens/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/screens/SpeakersGridScreen.kt @@ -2,7 +2,6 @@ package org.gdglille.devfest.android.theme.m3.speakers.screens import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -16,14 +15,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import kotlin.math.floor import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme import org.gdglille.devfest.android.theme.m3.style.R import org.gdglille.devfest.android.theme.m3.style.Scaffold import org.gdglille.devfest.android.theme.m3.style.SpacingTokens -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.speakers.items.LargeSpeakerItem import org.gdglille.devfest.android.theme.m3.style.toDp import org.gdglille.devfest.models.ui.SpeakerItemUi diff --git a/theme-m3/speakers/speakers-ui/build.gradle.kts b/theme-m3/speakers/speakers-ui/build.gradle.kts index cfb45aa2a..0149d7145 100644 --- a/theme-m3/speakers/speakers-ui/build.gradle.kts +++ b/theme-m3/speakers/speakers-ui/build.gradle.kts @@ -11,7 +11,8 @@ android { dependencies { implementation(projects.shared.uiModels) implementation(projects.themeM3.style.events) - implementation(projects.themeM3.style.markdown) + implementation(projects.themeM3.style.components.placeholder) + implementation(projects.themeM3.style.components.markdown) implementation(projects.themeM3.style.speakers) implementation(projects.themeM3.style.theme) diff --git a/theme-m3/speakers/speakers-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/ui/SpeakerDetailSection.kt b/theme-m3/speakers/speakers-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/ui/SpeakerDetailSection.kt index 36b7d811d..0c6ceb7dd 100644 --- a/theme-m3/speakers/speakers-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/ui/SpeakerDetailSection.kt +++ b/theme-m3/speakers/speakers-ui/src/main/kotlin/org/gdglille/devfest/android/theme/m3/speakers/ui/SpeakerDetailSection.kt @@ -11,7 +11,7 @@ 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.markdown.MarkdownText -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.previews.ThemedPreviews import org.gdglille.devfest.android.theme.m3.style.events.socials.SocialsSection import org.gdglille.devfest.android.theme.m3.style.speakers.avatar.MediumSpeakerAvatar diff --git a/theme-m3/style/markdown/.gitignore b/theme-m3/style/components/markdown/.gitignore similarity index 100% rename from theme-m3/style/markdown/.gitignore rename to theme-m3/style/components/markdown/.gitignore diff --git a/theme-m3/style/markdown/build.gradle.kts b/theme-m3/style/components/markdown/build.gradle.kts similarity index 100% rename from theme-m3/style/markdown/build.gradle.kts rename to theme-m3/style/components/markdown/build.gradle.kts diff --git a/theme-m3/style/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownText.kt b/theme-m3/style/components/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownText.kt similarity index 100% rename from theme-m3/style/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownText.kt rename to theme-m3/style/components/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownText.kt diff --git a/theme-m3/style/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextDefaults.kt b/theme-m3/style/components/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextDefaults.kt similarity index 100% rename from theme-m3/style/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextDefaults.kt rename to theme-m3/style/components/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextDefaults.kt diff --git a/theme-m3/style/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextTokens.kt b/theme-m3/style/components/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextTokens.kt similarity index 100% rename from theme-m3/style/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextTokens.kt rename to theme-m3/style/components/markdown/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/markdown/MarkdownTextTokens.kt diff --git a/theme-m3/style/permissions/.gitignore b/theme-m3/style/components/permissions/.gitignore similarity index 100% rename from theme-m3/style/permissions/.gitignore rename to theme-m3/style/components/permissions/.gitignore diff --git a/theme-m3/style/permissions/build.gradle.kts b/theme-m3/style/components/permissions/build.gradle.kts similarity index 100% rename from theme-m3/style/permissions/build.gradle.kts rename to theme-m3/style/components/permissions/build.gradle.kts diff --git a/theme-m3/style/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermission.kt b/theme-m3/style/components/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermission.kt similarity index 100% rename from theme-m3/style/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermission.kt rename to theme-m3/style/components/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermission.kt diff --git a/theme-m3/style/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionDenied.kt b/theme-m3/style/components/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionDenied.kt similarity index 100% rename from theme-m3/style/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionDenied.kt rename to theme-m3/style/components/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionDenied.kt diff --git a/theme-m3/style/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionRequested.kt b/theme-m3/style/components/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionRequested.kt similarity index 100% rename from theme-m3/style/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionRequested.kt rename to theme-m3/style/components/permissions/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/permissions/FeatureThatRequiresCameraPermissionRequested.kt diff --git a/theme-m3/style/components/placeholder/.gitignore b/theme-m3/style/components/placeholder/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/theme-m3/style/components/placeholder/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/theme-m3/style/components/placeholder/build.gradle.kts b/theme-m3/style/components/placeholder/build.gradle.kts new file mode 100644 index 000000000..bd825a50f --- /dev/null +++ b/theme-m3/style/components/placeholder/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("conferences4hall.android.library") + id("conferences4hall.android.library.compose") + id("conferences4hall.quality") +} + +android { + namespace = "org.gdglille.devfest.android.theme.m3.style.placeholder" +} + +dependencies { + implementation(projects.themeM3.style.theme) + + implementation(compose.material3) + implementation(compose.preview) + debugImplementation(compose.uiTooling) + + implementation(libs.google.accompanist.placeholder) +} diff --git a/theme-m3/style/theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/Placeholder.kt b/theme-m3/style/components/placeholder/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/placeholder/Placeholder.kt similarity index 89% rename from theme-m3/style/theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/Placeholder.kt rename to theme-m3/style/components/placeholder/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/placeholder/Placeholder.kt index f922095b0..9262fffda 100644 --- a/theme-m3/style/theme/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/Placeholder.kt +++ b/theme-m3/style/components/placeholder/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/placeholder/Placeholder.kt @@ -1,4 +1,4 @@ -package org.gdglille.devfest.android.theme.m3.style +package org.gdglille.devfest.android.theme.m3.style.placeholder import androidx.compose.material3.MaterialTheme import androidx.compose.ui.Modifier diff --git a/theme-m3/style/events/build.gradle.kts b/theme-m3/style/events/build.gradle.kts index 31e95e0f8..caa74fcd8 100644 --- a/theme-m3/style/events/build.gradle.kts +++ b/theme-m3/style/events/build.gradle.kts @@ -9,6 +9,7 @@ android { } dependencies { + implementation(projects.themeM3.style.components.placeholder) implementation(projects.themeM3.style.theme) implementation(compose.material3) diff --git a/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/cards/AddressCard.kt b/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/cards/AddressCard.kt index 3c2938154..fde1290d6 100644 --- a/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/cards/AddressCard.kt +++ b/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/cards/AddressCard.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.unit.dp import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.R @Composable diff --git a/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/socials/SocialsSection.kt b/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/socials/SocialsSection.kt index 7d92d4d4b..94ce4e177 100644 --- a/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/socials/SocialsSection.kt +++ b/theme-m3/style/events/src/main/kotlin/org/gdglille/devfest/android/theme/m3/style/events/socials/SocialsSection.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import org.gdglille.devfest.android.theme.m3.style.Conferences4HallTheme -import org.gdglille.devfest.android.theme.m3.style.placeholder +import org.gdglille.devfest.android.theme.m3.style.placeholder.placeholder import org.gdglille.devfest.android.theme.m3.style.toDp @OptIn(ExperimentalLayoutApi::class) diff --git a/theme-m3/style/theme/build.gradle.kts b/theme-m3/style/theme/build.gradle.kts index fbf8b5e0c..0c54b7766 100644 --- a/theme-m3/style/theme/build.gradle.kts +++ b/theme-m3/style/theme/build.gradle.kts @@ -14,7 +14,5 @@ dependencies { debugImplementation(compose.uiTooling) implementation(compose.materialIconsExtended) - implementation(libs.google.accompanist.placeholder) - implementation(libs.jetbrains.kotlinx.collections) }