diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml index 36dfc9b..f92faf8 100644 --- a/androidApp/src/main/AndroidManifest.xml +++ b/androidApp/src/main/AndroidManifest.xml @@ -2,7 +2,7 @@ - Gwenedeg + Chom Bev \ No newline at end of file diff --git a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt b/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt index 51e16ec..938650e 100644 --- a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt +++ b/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt @@ -3,7 +3,7 @@ package fr.ajaury.gwenedeg.core.logging.data import fr.ajaury.gwenedeg.core.logging.domain.Logger internal class KermitLogger : Logger { - private val tag: String = "Gwenedeg" + private val tag: String = "Chom Bev" override fun debug( message: String, diff --git a/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt b/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt index d62c403..3110a26 100644 --- a/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt +++ b/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt @@ -7,7 +7,7 @@ fun main() { application { Window( onCloseRequest = ::exitApplication, - title = "Gwenedeg", + title = "Chom Bev", ) { App() } diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig index c1b702b..feb27e7 100644 --- a/iosApp/Configuration/Config.xcconfig +++ b/iosApp/Configuration/Config.xcconfig @@ -1,6 +1,6 @@ TEAM_ID= -PRODUCT_NAME=Gwenedeg +PRODUCT_NAME=Chom Bev PRODUCT_BUNDLE_IDENTIFIER=fr.ajaury.gwenedeg.Gwenedeg$(TEAM_ID) CURRENT_PROJECT_VERSION=1 diff --git a/settings.gradle.kts b/settings.gradle.kts index f1c8272..c1599d7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "Gwenedeg" +rootProject.name = "ChomBev" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt index 40e4716..d6dfc66 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt @@ -15,7 +15,7 @@ import fr.ajaury.gwenedeg.player.di.audioPlayerModule import fr.ajaury.gwenedeg.player.ui.PlayerScreen import fr.ajaury.gwenedeg.records.ui.RecordsScreen import fr.ajaury.gwenedeg.subtitle.di.subtitleModule -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme import org.koin.compose.KoinApplication import org.koin.dsl.koinConfiguration import org.koin.dsl.module @@ -44,7 +44,7 @@ fun App() { mutableStateListOf(Route.Records) } - GwenedegTheme { + ChomBevTheme { NavDisplay( backStack = backStack, onBack = { backStack.removeLastOrNull() }, diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt index 0a7a047..fe8d46c 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme import kotlin.math.roundToInt /** @@ -94,7 +94,7 @@ internal fun formatPlaybackSpeed(speed: Float): String { @Preview @Composable private fun PlaybackSpeedContentPreview() { - GwenedegTheme { + ChomBevTheme { PlaybackSpeedContent(speed = 0.7f) } } diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt index 892a17e..75c9525 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt @@ -19,7 +19,7 @@ import fr.ajaury.gwenedeg.player.ui.components.PlaybackProgress import fr.ajaury.gwenedeg.player.ui.components.PreviousButton import fr.ajaury.gwenedeg.player.ui.components.SpeedPreferenceButton import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds @@ -94,7 +94,7 @@ fun PlayerControl( @Preview @Composable private fun PlayerControlPreview() { - GwenedegTheme { + ChomBevTheme { PlayerControl( playbackState = PlaybackState.PLAYING, playbackTiming = PlaybackTiming(position = 1.2.seconds, duration = 5.seconds), @@ -109,7 +109,7 @@ private fun PlayerControlPreview() { @Preview @Composable private fun PlayerControlFirstSentencePreview() { - GwenedegTheme { + ChomBevTheme { PlayerControl( playbackState = PlaybackState.PLAYING, playbackTiming = PlaybackTiming(position = 1.2.seconds, duration = 5.seconds), @@ -124,7 +124,7 @@ private fun PlayerControlFirstSentencePreview() { @Preview @Composable private fun PlayerControlActiveSpeedPreview() { - GwenedegTheme { + ChomBevTheme { PlayerControl( playbackState = PlaybackState.PLAYING, playbackTiming = PlaybackTiming(position = 1.2.seconds, duration = 5.seconds), @@ -139,7 +139,7 @@ private fun PlayerControlActiveSpeedPreview() { @Preview @Composable private fun PlayerControlLastSentencePreview() { - GwenedegTheme { + ChomBevTheme { PlayerControl( playbackState = PlaybackState.PLAYING, playbackTiming = PlaybackTiming(position = 1.2.seconds, duration = 5.seconds), diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt index e76c414..9708b66 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt @@ -36,7 +36,7 @@ import fr.ajaury.gwenedeg.player.ui.viewmodel.PlayerUiState import fr.ajaury.gwenedeg.player.ui.viewmodel.PlayerViewModel import fr.ajaury.gwenedeg.preferences.ui.SubtitlePreferencesBottomSheet import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme import org.koin.compose.viewmodel.koinViewModel import org.koin.core.parameter.parametersOf import kotlin.time.Duration @@ -222,7 +222,7 @@ private val previewSubtitleLines = @Preview @Composable private fun PlayerScreenPlayingPreview() { - GwenedegTheme { + ChomBevTheme { PlayerScreen( uiState = PlayerUiState( recordEmoji = "🙏", @@ -247,7 +247,7 @@ private fun PlayerScreenPlayingPreview() { @Preview @Composable private fun PlayerScreenPausedPreview() { - GwenedegTheme { + ChomBevTheme { PlayerScreen( uiState = PlayerUiState( recordEmoji = "🙏", @@ -272,7 +272,7 @@ private fun PlayerScreenPausedPreview() { @Preview @Composable private fun PlayerScreenEndedPreview() { - GwenedegTheme { + ChomBevTheme { PlayerScreen( uiState = PlayerUiState( recordEmoji = "🙏", diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt index 3401f24..650f593 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState @@ -36,7 +35,7 @@ import androidx.compose.ui.unit.sp import fr.ajaury.gwenedeg.core.model.Phrase import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme import kotlin.math.abs import kotlin.time.Duration.Companion.milliseconds @@ -230,7 +229,7 @@ private val previewSubtitleLines = @Preview @Composable private fun SubtitleListPreview() { - GwenedegTheme { + ChomBevTheme { SubtitleList( lines = previewSubtitleLines, currentIndex = 1, diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt index 3cc769e..c100cf6 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt @@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme @Composable fun NextButton( @@ -31,7 +31,7 @@ fun NextButton( @Preview @Composable private fun NextButtonCanGoToNextSentencePreview() { - GwenedegTheme { + ChomBevTheme { NextButton( canGoToNextSentence = true, ) @@ -41,7 +41,7 @@ private fun NextButtonCanGoToNextSentencePreview() { @Preview @Composable private fun NextButtonCanNotGoToNextSentencePreview() { - GwenedegTheme { + ChomBevTheme { NextButton( canGoToNextSentence = false, ) diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt index c8d17cd..c2965a9 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import fr.ajaury.gwenedeg.player.model.PlaybackState -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme @Composable fun PlayButton( @@ -50,7 +50,7 @@ private fun PlaybackState.toActionContentDescription(): String = @Preview @Composable private fun PlayButtonPlayingPreview() { - GwenedegTheme { + ChomBevTheme { PlayButton( playbackState = PlaybackState.PLAYING, ) @@ -60,7 +60,7 @@ private fun PlayButtonPlayingPreview() { @Preview @Composable private fun PlayButtonPausedPreview() { - GwenedegTheme { + ChomBevTheme { PlayButton( playbackState = PlaybackState.PAUSED, ) @@ -70,7 +70,7 @@ private fun PlayButtonPausedPreview() { @Preview @Composable private fun PlayButtonEndedPreview() { - GwenedegTheme { + ChomBevTheme { PlayButton( playbackState = PlaybackState.ENDED, ) @@ -80,7 +80,7 @@ private fun PlayButtonEndedPreview() { @Preview @Composable private fun PlayButtonIdlePreview() { - GwenedegTheme { + ChomBevTheme { PlayButton( playbackState = PlaybackState.IDLE, ) diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt index 10420a7..d82e576 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import fr.ajaury.gwenedeg.player.model.PlaybackTiming -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -41,7 +41,7 @@ fun PlaybackProgress( @Preview @Composable private fun PlaybackProgressPreview() { - GwenedegTheme { + ChomBevTheme { PlaybackProgress( playbackTiming = PlaybackTiming(0.seconds, 0.seconds), ) @@ -51,7 +51,7 @@ private fun PlaybackProgressPreview() { @Preview @Composable private fun PlaybackProgressInProgressPreview() { - GwenedegTheme { + ChomBevTheme { PlaybackProgress( playbackTiming = PlaybackTiming(7.seconds, 10.seconds), ) @@ -61,7 +61,7 @@ private fun PlaybackProgressInProgressPreview() { @Preview @Composable private fun PlaybackProgressEndedPreview() { - GwenedegTheme { + ChomBevTheme { PlaybackProgress( playbackTiming = PlaybackTiming(10.seconds, 10.seconds), ) diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt index 6c18811..0b524d4 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt @@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme @Composable fun PreviousButton( @@ -31,7 +31,7 @@ fun PreviousButton( @Preview @Composable private fun PreviousButtonCanGoToPreviousSentencePreview() { - GwenedegTheme { + ChomBevTheme { PreviousButton( canGoToPreviousSentence = true, ) @@ -41,7 +41,7 @@ private fun PreviousButtonCanGoToPreviousSentencePreview() { @Preview @Composable private fun PreviousButtonCanNotGoToPreviousSentencePreview() { - GwenedegTheme { + ChomBevTheme { PreviousButton( canGoToPreviousSentence = false, ) diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt index 29fbd90..f5c5f6f 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import fr.ajaury.gwenedeg.player.ui.formatPlaybackSpeed -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme @Composable fun SpeedPreferenceButton( @@ -42,7 +42,7 @@ fun SpeedPreferenceButton( @Preview @Composable private fun SpeedPreferenceButtonDefaultPreview() { - GwenedegTheme { + ChomBevTheme { SpeedPreferenceButton( isSpeedActive = false, playbackSpeed = 1f, @@ -53,7 +53,7 @@ private fun SpeedPreferenceButtonDefaultPreview() { @Preview @Composable private fun SpeedPreferenceButtonPreview() { - GwenedegTheme { + ChomBevTheme { SpeedPreferenceButton( isSpeedActive = true, playbackSpeed = 0.7f, diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt index e3fc1b9..4bd6de9 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt @@ -19,8 +19,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.semantics.Role import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme @Composable @@ -68,7 +67,7 @@ fun PreferenceToggle( @Preview @Composable private fun PreferenceTogglePreview() { - GwenedegTheme { + ChomBevTheme { PreferenceToggle( title = "Subtitle", subtitle = "Subtitle", @@ -81,7 +80,7 @@ private fun PreferenceTogglePreview() { @Preview @Composable private fun PreferenceToggleWithIconPreview() { - GwenedegTheme { + ChomBevTheme { PreferenceToggle( title = "Subtitle", subtitle = "Subtitle", diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt index 92b3104..6fae95a 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences -import fr.ajaury.gwenedeg.theme.GwenedegTheme +import fr.ajaury.gwenedeg.theme.ChomBevTheme /** * Bottom sheet letting the user toggle the display of the Breton transcription (BZH) and the @@ -77,7 +77,7 @@ private fun SubtitlePreferencesContent( @Preview @Composable private fun SubtitlePreferencesContentPreview() { - GwenedegTheme { + ChomBevTheme { SubtitlePreferencesContent( subtitlePreferences = SubtitlePreferences( showTranscription = true, diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt index 4429064..53fcff4 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt @@ -4,18 +4,27 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle +import fr.ajaury.gwenedeg.core.model.Phrase import fr.ajaury.gwenedeg.records.model.Record import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel +import fr.ajaury.gwenedeg.theme.ChomBevTheme import org.koin.compose.viewmodel.koinViewModel +/** Display name of the application, shown as the title of the records screen. */ +const val APP_NAME = "Chom bev" + @Composable fun RecordsScreen( viewModel: RecordsViewModel = koinViewModel(), @@ -29,12 +38,19 @@ fun RecordsScreen( ) } +@OptIn(ExperimentalMaterial3Api::class) @Composable fun RecordsScreen( records: List, onRecordClick: (Record) -> Unit, ) { - Scaffold { innerPadding -> + Scaffold( + topBar = { + TopAppBar( + title = { Text(text = APP_NAME) }, + ) + }, + ) { innerPadding -> LazyColumn( modifier = Modifier @@ -61,3 +77,31 @@ fun RecordsScreen( } } } + +@Preview +@Composable +private fun RecordsScreenPreview() { + ChomBevTheme { + RecordsScreen( + records = listOf( + Record( + id = 1, + index = 1, + emoji = "🙏", + title = Phrase(transcription = "An onestiz", translation = "La politesse"), + audioResourcePath = "files/Chom_bev_01.m4a", + subtitleResourcePath = "files/Chom_bev_01_st_bzh.lrc", + ), + Record( + id = 2, + index = 2, + emoji = "👋", + title = Phrase(transcription = "En em brezantiñ", translation = "Se présenter"), + audioResourcePath = "files/Chom_bev_02.m4a", + subtitleResourcePath = "files/Chom_bev_02_st_bzh.lrc", + ), + ), + onRecordClick = {}, + ) + } +} diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt index d9d3aef..8983f47 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt +++ b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt @@ -7,7 +7,7 @@ import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable -val GwenedegLightColorScheme: ColorScheme = lightColorScheme( +val ChomBevLightColorScheme: ColorScheme = lightColorScheme( primary = md_light_primary, onPrimary = md_light_onPrimary, primaryContainer = md_light_primaryContainer, @@ -39,7 +39,7 @@ val GwenedegLightColorScheme: ColorScheme = lightColorScheme( surfaceTint = md_light_primary, ) -val GwenedegDarkColorScheme: ColorScheme = darkColorScheme( +val ChomBevDarkColorScheme: ColorScheme = darkColorScheme( primary = md_dark_primary, onPrimary = md_dark_onPrimary, primaryContainer = md_dark_primaryContainer, @@ -72,10 +72,10 @@ val GwenedegDarkColorScheme: ColorScheme = darkColorScheme( ) @Composable -fun GwenedegTheme( +fun ChomBevTheme( darkTheme: Boolean = isSystemInDarkTheme(), - lightColorScheme: ColorScheme = GwenedegLightColorScheme, - darkColorScheme: ColorScheme = GwenedegDarkColorScheme, + lightColorScheme: ColorScheme = ChomBevLightColorScheme, + darkColorScheme: ColorScheme = ChomBevDarkColorScheme, content: @Composable () -> Unit, ) { val colorScheme = if (darkTheme) darkColorScheme else lightColorScheme diff --git a/webApp/src/webMain/resources/index.html b/webApp/src/webMain/resources/index.html index f0c94d3..0c30b40 100644 --- a/webApp/src/webMain/resources/index.html +++ b/webApp/src/webMain/resources/index.html @@ -3,7 +3,7 @@ - Gwenedeg + Chom Bev