From 6361fa6e744a518a25f1cd2338c106a5a1f38766 Mon Sep 17 00:00:00 2001 From: Antoine Jaury Date: Tue, 7 Jul 2026 18:58:17 +0200 Subject: [PATCH] refactor: migrate package structure from `fr.ajaury.gwenedeg` to `bzh.ajaury.chombev` --- androidApp/build.gradle.kts | 2 +- .../ajaury/chombev}/ChomBevApp.kt | 2 +- .../ajaury/chombev}/MainActivity.kt | 4 +-- core/audioplayer/build.gradle.kts | 2 +- .../player/data/AndroidAudioPlayer.kt | 6 ++-- .../player/data/AndroidAudioSessionManager.kt | 4 +-- .../player/di/AudioPlayerModule.android.kt | 10 +++--- .../chombev}/player/di/AudioPlayerModule.kt | 2 +- .../chombev}/player/domain/AudioPlayer.kt | 4 +-- .../player/domain/AudioSessionManager.kt | 2 +- .../chombev}/player/model/PlaybackState.kt | 2 +- .../chombev}/player/data/IosAudioPlayer.kt | 6 ++-- .../player/data/IosAudioSessionManager.kt | 4 +-- .../player/di/AudioPlayerModule.ios.kt | 12 +++---- .../chombev}/player/data/JvmAudioPlayer.kt | 6 ++-- .../player/data/JvmAudioSessionManager.kt | 4 +-- .../player/di/AudioPlayerModule.jvm.kt | 10 +++--- .../chombev}/player/data/WebAudioPlayer.kt | 6 ++-- .../player/data/WebAudioSessionManager.kt | 4 +-- .../player/di/AudioPlayerModule.web.kt | 10 +++--- core/coroutines/build.gradle.kts | 2 +- .../coroutines/data/IoDispatcher.android.kt | 2 +- .../data/DefaultDispatcherProvider.kt | 4 +-- .../core/coroutines/data/IoDispatcher.kt | 2 +- .../core/coroutines/di/CoroutinesModule.kt | 6 ++-- .../coroutines/domain/DispatcherProvider.kt | 2 +- .../core/coroutines/data/IoDispatcher.ios.kt | 2 +- .../core/coroutines/data/IoDispatcher.js.kt | 2 +- .../core/coroutines/data/IoDispatcher.jvm.kt | 2 +- .../coroutines/data/IoDispatcher.wasmJs.kt | 2 +- core/logging/build.gradle.kts | 2 +- .../core/logging/data/KermitLogger.kt | 4 +-- .../chombev}/core/logging/di/LoggingModule.kt | 6 ++-- .../chombev}/core/logging/domain/Logger.kt | 2 +- core/model/build.gradle.kts | 2 +- .../ajaury/chombev}/core/model/Phrase.kt | 2 +- data/playback/build.gradle.kts | 2 +- .../player/data/PlaybackRepositoryImpl.kt | 30 +++++++++--------- .../chombev}/player/data/SubtitleProgress.kt | 4 +-- .../chombev}/player/di/PlaybackModule.kt | 6 ++-- .../player/domain/PlaybackRepository.kt | 6 ++-- .../chombev}/player/model/PlaybackTiming.kt | 2 +- .../chombev}/player/model/PlayerState.kt | 6 ++-- data/preferences/build.gradle.kts | 2 +- .../di/PreferencesModule.android.kt | 10 +++--- .../data/InMemoryPreferencesRepository.kt | 8 ++--- .../preferences/di/PreferencesModule.kt | 4 +-- .../domain/PreferencesRepository.kt | 6 ++-- .../preferences/model/PlaybackPreferences.kt | 2 +- .../preferences/model/SubtitlePreferences.kt | 5 ++- .../data/DataStorePreferencesRepository.kt | 8 ++--- .../preferences/data/PreferencesDataStore.kt | 2 +- .../preferences/di/PreferencesModule.ios.kt | 10 +++--- .../preferences/di/PreferencesModule.jvm.kt | 10 +++--- .../preferences/di/PreferencesModule.web.kt | 6 ++-- data/records/build.gradle.kts | 2 +- .../records/data/InMemoryRecordRepository.kt | 8 ++--- .../chombev}/records/di/RecordsModule.kt | 6 ++-- .../records/domain/RecordRepository.kt | 4 +-- .../ajaury/chombev}/records/model/Record.kt | 4 +-- data/resources/build.gradle.kts | 4 +-- .../resources/data/ComposeResourceReader.kt | 8 ++--- .../chombev}/resources/di/ResourcesModule.kt | 6 ++-- .../resources/domain/ResourceReader.kt | 2 +- data/subtitle/build.gradle.kts | 2 +- .../chombev}/subtitle/data/LrcParser.kt | 2 +- .../subtitle/data/LrcSubtitleRepository.kt | 16 +++++----- .../chombev}/subtitle/data/TimeCodedText.kt | 2 +- .../chombev}/subtitle/di/SubtitleModule.kt | 10 +++--- .../domain/GetCurrentSubtitleIndexUseCase.kt | 4 +-- .../subtitle/domain/SubtitleRepository.kt | 4 +-- .../model/CantGetSubtitleException.kt | 2 +- .../chombev}/subtitle/model/Subtitle.kt | 2 +- .../chombev}/subtitle/model/SubtitleLine.kt | 4 +-- .../GetCurrentSubtitleIndexUseCaseTest.kt | 10 +++--- .../ajaury/chombev}/subtitle/LrcParserTest.kt | 4 +-- desktopApp/build.gradle.kts | 4 +-- .../gwenedeg => bzh/ajaury/chombev}/main.kt | 2 +- iosApp/Configuration/Config.xcconfig | 2 +- shared/build.gradle.kts | 2 +- .../web/ui/PlatformWebView.android.kt | 2 +- .../web/ui/WebClientDelegatingExtLinks.kt | 2 +- .../gwenedeg => bzh/ajaury/chombev}/App.kt | 31 +++++++++---------- .../kotlin/bzh/ajaury/chombev/di/Modules.kt | 21 +++++++++++++ .../chombev}/navigation/MainBottomBar.kt | 12 +++---- .../ajaury/chombev}/navigation/MainTopBar.kt | 8 ++--- .../ajaury/chombev}/navigation/Route.kt | 2 +- .../ajaury/chombev}/navigation/WebPage.kt | 2 +- .../player/ui/PlaybackSpeedBottomSheet.kt | 16 +++++----- .../chombev}/player/ui/PlayerControl.kt | 18 +++++------ .../ajaury/chombev}/player/ui/PlayerScreen.kt | 26 ++++++++-------- .../ajaury/chombev}/player/ui/SubtitleList.kt | 12 +++---- .../player/ui/components/LabeledSlider.kt | 4 +-- .../player/ui/components/NextButton.kt | 8 ++--- .../player/ui/components/PlayButton.kt | 14 ++++----- .../player/ui/components/PlaybackProgress.kt | 8 ++--- .../player/ui/components/PreviousButton.kt | 8 ++--- .../ui/components/SpeedPreferenceButton.kt | 8 ++--- .../player/ui/components/TranscriptionText.kt | 4 +-- .../player/ui/viewmodel/PlayerUiState.kt | 10 +++--- .../player/ui/viewmodel/PlayerViewModel.kt | 22 ++++++------- .../preferences/ui/PreferenceToggle.kt | 5 ++- .../ui/SubtitlePreferencesBottomSheet.kt | 28 ++++++++--------- .../ajaury/chombev}/records/ui/RecordView.kt | 6 ++-- .../chombev}/records/ui/RecordsScreen.kt | 10 +++--- .../records/ui/viewmodel/RecordsViewModel.kt | 6 ++-- .../ajaury/chombev}/theme/Color.kt | 2 +- .../ajaury/chombev}/theme/Theme.kt | 2 +- .../ajaury/chombev}/web/ui/PlatformWebView.kt | 2 +- .../ajaury/chombev}/web/ui/WebViewScreen.kt | 4 +-- .../chombev}/web/ui/WebViewUnavailable.kt | 10 +++--- .../kotlin/fr/ajaury/gwenedeg/di/Modules.kt | 21 ------------- .../ajaury/chombev}/MainViewController.kt | 2 +- .../chombev}/web/ui/PlatformWebView.ios.kt | 5 ++- .../chombev}/web/ui/PlatformWebView.js.kt | 2 +- .../chombev}/web/ui/PlatformWebView.jvm.kt | 2 +- .../ajaury/chombev}/di/KoinModulesTest.kt | 6 ++-- .../chombev}/web/ui/PlatformWebView.wasmJs.kt | 2 +- .../gwenedeg => bzh/ajaury/chombev}/main.kt | 2 +- 119 files changed, 370 insertions(+), 376 deletions(-) rename androidApp/src/main/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/ChomBevApp.kt (70%) rename androidApp/src/main/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/MainActivity.kt (94%) rename core/audioplayer/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/AndroidAudioPlayer.kt (94%) rename core/audioplayer/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/AndroidAudioSessionManager.kt (59%) rename core/audioplayer/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/di/AudioPlayerModule.android.kt (54%) rename core/audioplayer/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/di/AudioPlayerModule.kt (66%) rename core/audioplayer/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/domain/AudioPlayer.kt (83%) rename core/audioplayer/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/domain/AudioSessionManager.kt (81%) rename core/audioplayer/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/model/PlaybackState.kt (69%) rename core/audioplayer/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/IosAudioPlayer.kt (96%) rename core/audioplayer/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/IosAudioSessionManager.kt (90%) rename core/audioplayer/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/di/AudioPlayerModule.ios.kt (52%) rename core/audioplayer/src/jvmMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/JvmAudioPlayer.kt (96%) rename core/audioplayer/src/jvmMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/JvmAudioSessionManager.kt (69%) rename core/audioplayer/src/jvmMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/di/AudioPlayerModule.jvm.kt (54%) rename core/audioplayer/src/webMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/WebAudioPlayer.kt (92%) rename core/audioplayer/src/webMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/WebAudioSessionManager.kt (58%) rename core/audioplayer/src/webMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/di/AudioPlayerModule.web.kt (54%) rename core/coroutines/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/IoDispatcher.android.kt (76%) rename core/coroutines/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/DefaultDispatcherProvider.kt (75%) rename core/coroutines/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/IoDispatcher.kt (68%) rename core/coroutines/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/di/CoroutinesModule.kt (60%) rename core/coroutines/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/domain/DispatcherProvider.kt (78%) rename core/coroutines/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/IoDispatcher.ios.kt (86%) rename core/coroutines/src/jsMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/IoDispatcher.js.kt (83%) rename core/coroutines/src/jvmMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/IoDispatcher.jvm.kt (76%) rename core/coroutines/src/wasmJsMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/coroutines/data/IoDispatcher.wasmJs.kt (83%) rename core/logging/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/logging/data/KermitLogger.kt (89%) rename core/logging/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/logging/di/LoggingModule.kt (59%) rename core/logging/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/logging/domain/Logger.kt (91%) rename core/model/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/core/model/Phrase.kt (85%) rename data/playback/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/PlaybackRepositoryImpl.kt (93%) rename data/playback/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/data/SubtitleProgress.kt (69%) rename data/playback/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/di/PlaybackModule.kt (61%) rename data/playback/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/domain/PlaybackRepository.kt (84%) rename data/playback/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/model/PlaybackTiming.kt (83%) rename data/playback/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/model/PlayerState.kt (68%) rename data/preferences/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/di/PreferencesModule.android.kt (58%) rename data/preferences/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/data/InMemoryPreferencesRepository.kt (87%) rename data/preferences/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/di/PreferencesModule.kt (67%) rename data/preferences/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/domain/PreferencesRepository.kt (75%) rename data/preferences/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/model/PlaybackPreferences.kt (95%) rename data/preferences/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/model/SubtitlePreferences.kt (93%) rename data/preferences/src/dataStoreMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/data/DataStorePreferencesRepository.kt (93%) rename data/preferences/src/dataStoreMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/data/PreferencesDataStore.kt (92%) rename data/preferences/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/di/PreferencesModule.ios.kt (76%) rename data/preferences/src/jvmMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/di/PreferencesModule.jvm.kt (61%) rename data/preferences/src/webMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/di/PreferencesModule.web.kt (62%) rename data/records/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/data/InMemoryRecordRepository.kt (95%) rename data/records/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/di/RecordsModule.kt (61%) rename data/records/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/domain/RecordRepository.kt (63%) rename data/records/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/model/Record.kt (73%) rename data/resources/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/resources/data/ComposeResourceReader.kt (64%) rename data/resources/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/resources/di/ResourcesModule.kt (60%) rename data/resources/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/resources/domain/ResourceReader.kt (91%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/data/LrcParser.kt (97%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/data/LrcSubtitleRepository.kt (78%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/data/TimeCodedText.kt (81%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/di/SubtitleModule.kt (54%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt (72%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/domain/SubtitleRepository.kt (77%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/model/CantGetSubtitleException.kt (67%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/model/Subtitle.kt (58%) rename data/subtitle/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/model/SubtitleLine.kt (68%) rename data/subtitle/src/commonTest/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt (86%) rename data/subtitle/src/commonTest/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/subtitle/LrcParserTest.kt (93%) rename desktopApp/src/main/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/main.kt (90%) rename shared/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/PlatformWebView.android.kt (97%) rename shared/src/androidMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/WebClientDelegatingExtLinks.kt (94%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/App.kt (85%) create mode 100644 shared/src/commonMain/kotlin/bzh/ajaury/chombev/di/Modules.kt rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/navigation/MainBottomBar.kt (86%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/navigation/MainTopBar.kt (84%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/navigation/Route.kt (90%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/navigation/WebPage.kt (89%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/PlaybackSpeedBottomSheet.kt (88%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/PlayerControl.kt (90%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/PlayerScreen.kt (94%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/SubtitleList.kt (96%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/LabeledSlider.kt (94%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/NextButton.kt (85%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/PlayButton.kt (91%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/PlaybackProgress.kt (92%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/PreviousButton.kt (85%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/SpeedPreferenceButton.kt (87%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/components/TranscriptionText.kt (99%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/viewmodel/PlayerUiState.kt (79%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/player/ui/viewmodel/PlayerViewModel.kt (89%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/ui/PreferenceToggle.kt (96%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/preferences/ui/SubtitlePreferencesBottomSheet.kt (87%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/ui/RecordView.kt (94%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/ui/RecordsScreen.kt (92%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/records/ui/viewmodel/RecordsViewModel.kt (77%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/theme/Color.kt (98%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/theme/Theme.kt (98%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/PlatformWebView.kt (93%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/WebViewScreen.kt (90%) rename shared/src/commonMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/WebViewUnavailable.kt (86%) delete mode 100644 shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt rename shared/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/MainViewController.kt (86%) rename shared/src/iosMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/PlatformWebView.ios.kt (89%) rename shared/src/jsMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/PlatformWebView.js.kt (90%) rename shared/src/jvmMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/PlatformWebView.jvm.kt (90%) rename shared/src/jvmTest/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/di/KoinModulesTest.kt (85%) rename shared/src/wasmJsMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/web/ui/PlatformWebView.wasmJs.kt (90%) rename webApp/src/webMain/kotlin/{fr/ajaury/gwenedeg => bzh/ajaury/chombev}/main.kt (90%) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 1a76416..ad81c65 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -32,7 +32,7 @@ dependencies { } android { - namespace = "fr.ajaury.gwenedeg" + namespace = "bzh.ajaury.chombev" compileSdk = libs.versions.androidCompileSdk .get() diff --git a/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/ChomBevApp.kt b/androidApp/src/main/kotlin/bzh/ajaury/chombev/ChomBevApp.kt similarity index 70% rename from androidApp/src/main/kotlin/fr/ajaury/gwenedeg/ChomBevApp.kt rename to androidApp/src/main/kotlin/bzh/ajaury/chombev/ChomBevApp.kt index 213c455..a60ff65 100644 --- a/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/ChomBevApp.kt +++ b/androidApp/src/main/kotlin/bzh/ajaury/chombev/ChomBevApp.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg +package bzh.ajaury.chombev import android.app.Application diff --git a/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/MainActivity.kt b/androidApp/src/main/kotlin/bzh/ajaury/chombev/MainActivity.kt similarity index 94% rename from androidApp/src/main/kotlin/fr/ajaury/gwenedeg/MainActivity.kt rename to androidApp/src/main/kotlin/bzh/ajaury/chombev/MainActivity.kt index 1ca701c..295dd65 100644 --- a/androidApp/src/main/kotlin/fr/ajaury/gwenedeg/MainActivity.kt +++ b/androidApp/src/main/kotlin/bzh/ajaury/chombev/MainActivity.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg +package bzh.ajaury.chombev import android.os.Bundle import androidx.activity.ComponentActivity @@ -22,4 +22,4 @@ class MainActivity : ComponentActivity() { @Composable fun AppAndroidPreview() { App() -} \ No newline at end of file +} diff --git a/core/audioplayer/build.gradle.kts b/core/audioplayer/build.gradle.kts index f9c4787..11e4918 100644 --- a/core/audioplayer/build.gradle.kts +++ b/core/audioplayer/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.core.audioplayer" + namespace = "bzh.ajaury.chombev.core.audioplayer" } sourceSets { diff --git a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/data/AndroidAudioPlayer.kt b/core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/data/AndroidAudioPlayer.kt similarity index 94% rename from core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/data/AndroidAudioPlayer.kt rename to core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/data/AndroidAudioPlayer.kt index e4bba84..46e571b 100644 --- a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/data/AndroidAudioPlayer.kt +++ b/core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/data/AndroidAudioPlayer.kt @@ -1,12 +1,12 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data import android.content.Context import androidx.media3.common.C import androidx.media3.common.MediaItem import androidx.media3.common.Player import androidx.media3.exoplayer.ExoPlayer -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.model.PlaybackState +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.model.PlaybackState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/data/AndroidAudioSessionManager.kt b/core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/data/AndroidAudioSessionManager.kt similarity index 59% rename from core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/data/AndroidAudioSessionManager.kt rename to core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/data/AndroidAudioSessionManager.kt index 09c5f34..1613734 100644 --- a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/data/AndroidAudioSessionManager.kt +++ b/core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/data/AndroidAudioSessionManager.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioSessionManager internal class AndroidAudioSessionManager : AudioSessionManager { override fun activate() { diff --git a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt b/core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.android.kt similarity index 54% rename from core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt rename to core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.android.kt index e6e689a..afee4b3 100644 --- a/core/audioplayer/src/androidMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.android.kt +++ b/core/audioplayer/src/androidMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.android.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.player.di +package bzh.ajaury.chombev.player.di -import fr.ajaury.gwenedeg.player.data.AndroidAudioPlayer -import fr.ajaury.gwenedeg.player.data.AndroidAudioSessionManager -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.data.AndroidAudioPlayer +import bzh.ajaury.chombev.player.data.AndroidAudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.domain.AudioSessionManager import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.kt b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.kt similarity index 66% rename from core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.kt rename to core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.kt index 5781f5c..4c84450 100644 --- a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.kt +++ b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.di +package bzh.ajaury.chombev.player.di import org.koin.core.module.Module diff --git a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/AudioPlayer.kt b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/AudioPlayer.kt similarity index 83% rename from core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/AudioPlayer.kt rename to core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/AudioPlayer.kt index 84f565c..e11c46d 100644 --- a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/AudioPlayer.kt +++ b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/AudioPlayer.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.player.domain +package bzh.ajaury.chombev.player.domain -import fr.ajaury.gwenedeg.player.model.PlaybackState +import bzh.ajaury.chombev.player.model.PlaybackState import kotlinx.coroutines.flow.StateFlow import kotlin.time.Duration diff --git a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/AudioSessionManager.kt b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/AudioSessionManager.kt similarity index 81% rename from core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/AudioSessionManager.kt rename to core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/AudioSessionManager.kt index fe118f4..6a194bd 100644 --- a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/AudioSessionManager.kt +++ b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/AudioSessionManager.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.domain +package bzh.ajaury.chombev.player.domain /** * An Audio Session will allow to request Audio focus and declare our audio source to the system diff --git a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlaybackState.kt b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlaybackState.kt similarity index 69% rename from core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlaybackState.kt rename to core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlaybackState.kt index 2a484d9..f54f218 100644 --- a/core/audioplayer/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlaybackState.kt +++ b/core/audioplayer/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlaybackState.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.model +package bzh.ajaury.chombev.player.model enum class PlaybackState { IDLE, diff --git a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/data/IosAudioPlayer.kt b/core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/data/IosAudioPlayer.kt similarity index 96% rename from core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/data/IosAudioPlayer.kt rename to core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/data/IosAudioPlayer.kt index 0270ed8..f0dc816 100644 --- a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/data/IosAudioPlayer.kt +++ b/core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/data/IosAudioPlayer.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.model.PlaybackState +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.model.PlaybackState import kotlinx.cinterop.ExperimentalForeignApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/data/IosAudioSessionManager.kt b/core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/data/IosAudioSessionManager.kt similarity index 90% rename from core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/data/IosAudioSessionManager.kt rename to core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/data/IosAudioSessionManager.kt index b47a039..9384743 100644 --- a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/data/IosAudioSessionManager.kt +++ b/core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/data/IosAudioSessionManager.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioSessionManager import kotlinx.cinterop.ExperimentalForeignApi import platform.AVFAudio.AVAudioSession import platform.AVFAudio.AVAudioSessionCategoryOptionDuckOthers diff --git a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt b/core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.ios.kt similarity index 52% rename from core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt rename to core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.ios.kt index a45df3a..d42a63b 100644 --- a/core/audioplayer/src/iosMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.ios.kt +++ b/core/audioplayer/src/iosMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.ios.kt @@ -1,10 +1,10 @@ -package fr.ajaury.gwenedeg.player.di +package bzh.ajaury.chombev.player.di -import fr.ajaury.gwenedeg.core.logging.di.loggingModule -import fr.ajaury.gwenedeg.player.data.IosAudioPlayer -import fr.ajaury.gwenedeg.player.data.IosAudioSessionManager -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.core.logging.di.loggingModule +import bzh.ajaury.chombev.player.data.IosAudioPlayer +import bzh.ajaury.chombev.player.data.IosAudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.domain.AudioSessionManager import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/data/JvmAudioPlayer.kt b/core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/data/JvmAudioPlayer.kt similarity index 96% rename from core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/data/JvmAudioPlayer.kt rename to core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/data/JvmAudioPlayer.kt index ef8bbd5..5100852 100644 --- a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/data/JvmAudioPlayer.kt +++ b/core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/data/JvmAudioPlayer.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.model.PlaybackState +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.model.PlaybackState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/data/JvmAudioSessionManager.kt b/core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/data/JvmAudioSessionManager.kt similarity index 69% rename from core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/data/JvmAudioSessionManager.kt rename to core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/data/JvmAudioSessionManager.kt index dd20897..2f095f7 100644 --- a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/data/JvmAudioSessionManager.kt +++ b/core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/data/JvmAudioSessionManager.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioSessionManager /** * Desktop has no system audio focus model to honour, so activation is a no-op. diff --git a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt b/core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.jvm.kt similarity index 54% rename from core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt rename to core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.jvm.kt index 83e8523..b2f2fa9 100644 --- a/core/audioplayer/src/jvmMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.jvm.kt +++ b/core/audioplayer/src/jvmMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.jvm.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.player.di +package bzh.ajaury.chombev.player.di -import fr.ajaury.gwenedeg.player.data.JvmAudioPlayer -import fr.ajaury.gwenedeg.player.data.JvmAudioSessionManager -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.data.JvmAudioPlayer +import bzh.ajaury.chombev.player.data.JvmAudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.domain.AudioSessionManager import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/data/WebAudioPlayer.kt b/core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/data/WebAudioPlayer.kt similarity index 92% rename from core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/data/WebAudioPlayer.kt rename to core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/data/WebAudioPlayer.kt index 23173cb..8b391e2 100644 --- a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/data/WebAudioPlayer.kt +++ b/core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/data/WebAudioPlayer.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.model.PlaybackState +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.model.PlaybackState import kotlinx.browser.document import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/data/WebAudioSessionManager.kt b/core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/data/WebAudioSessionManager.kt similarity index 58% rename from core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/data/WebAudioSessionManager.kt rename to core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/data/WebAudioSessionManager.kt index c4f18c3..eb3cf0c 100644 --- a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/data/WebAudioSessionManager.kt +++ b/core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/data/WebAudioSessionManager.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioSessionManager internal class WebAudioSessionManager : AudioSessionManager { override fun activate() { diff --git a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt b/core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.web.kt similarity index 54% rename from core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt rename to core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.web.kt index ddc2d5a..9c77c73 100644 --- a/core/audioplayer/src/webMain/kotlin/fr/ajaury/gwenedeg/player/di/AudioPlayerModule.web.kt +++ b/core/audioplayer/src/webMain/kotlin/bzh/ajaury/chombev/player/di/AudioPlayerModule.web.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.player.di +package bzh.ajaury.chombev.player.di -import fr.ajaury.gwenedeg.player.data.WebAudioPlayer -import fr.ajaury.gwenedeg.player.data.WebAudioSessionManager -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.data.WebAudioPlayer +import bzh.ajaury.chombev.player.data.WebAudioSessionManager +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.domain.AudioSessionManager import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/core/coroutines/build.gradle.kts b/core/coroutines/build.gradle.kts index 9c9af07..2f5e602 100644 --- a/core/coroutines/build.gradle.kts +++ b/core/coroutines/build.gradle.kts @@ -4,6 +4,6 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.core.coroutines" + namespace = "bzh.ajaury.chombev.core.coroutines" } } diff --git a/core/coroutines/src/androidMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.android.kt b/core/coroutines/src/androidMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.android.kt similarity index 76% rename from core/coroutines/src/androidMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.android.kt rename to core/coroutines/src/androidMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.android.kt index 5d176b5..bfac554 100644 --- a/core/coroutines/src/androidMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.android.kt +++ b/core/coroutines/src/androidMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.android.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/DefaultDispatcherProvider.kt b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/DefaultDispatcherProvider.kt similarity index 75% rename from core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/DefaultDispatcherProvider.kt rename to core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/DefaultDispatcherProvider.kt index 5b0373c..20a2ee5 100644 --- a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/DefaultDispatcherProvider.kt +++ b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/DefaultDispatcherProvider.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data -import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider +import bzh.ajaury.chombev.core.coroutines.domain.DispatcherProvider import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.kt b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.kt similarity index 68% rename from core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.kt rename to core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.kt index d37fd9d..aed368b 100644 --- a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.kt +++ b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data import kotlinx.coroutines.CoroutineDispatcher diff --git a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/di/CoroutinesModule.kt similarity index 60% rename from core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt rename to core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/di/CoroutinesModule.kt index 5f7a4a2..563ec57 100644 --- a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/di/CoroutinesModule.kt +++ b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/di/CoroutinesModule.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.core.coroutines.di +package bzh.ajaury.chombev.core.coroutines.di -import fr.ajaury.gwenedeg.core.coroutines.data.DefaultDispatcherProvider -import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider +import bzh.ajaury.chombev.core.coroutines.data.DefaultDispatcherProvider +import bzh.ajaury.chombev.core.coroutines.domain.DispatcherProvider import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/domain/DispatcherProvider.kt b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/domain/DispatcherProvider.kt similarity index 78% rename from core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/domain/DispatcherProvider.kt rename to core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/domain/DispatcherProvider.kt index 4d57c4b..b9a1a21 100644 --- a/core/coroutines/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/domain/DispatcherProvider.kt +++ b/core/coroutines/src/commonMain/kotlin/bzh/ajaury/chombev/core/coroutines/domain/DispatcherProvider.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.domain +package bzh.ajaury.chombev.core.coroutines.domain import kotlinx.coroutines.CoroutineDispatcher diff --git a/core/coroutines/src/iosMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.ios.kt b/core/coroutines/src/iosMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.ios.kt similarity index 86% rename from core/coroutines/src/iosMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.ios.kt rename to core/coroutines/src/iosMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.ios.kt index 78b8c61..2759ddc 100644 --- a/core/coroutines/src/iosMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.ios.kt +++ b/core/coroutines/src/iosMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.ios.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/coroutines/src/jsMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.js.kt b/core/coroutines/src/jsMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.js.kt similarity index 83% rename from core/coroutines/src/jsMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.js.kt rename to core/coroutines/src/jsMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.js.kt index 2583e70..170c036 100644 --- a/core/coroutines/src/jsMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.js.kt +++ b/core/coroutines/src/jsMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.js.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/coroutines/src/jvmMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.jvm.kt b/core/coroutines/src/jvmMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.jvm.kt similarity index 76% rename from core/coroutines/src/jvmMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.jvm.kt rename to core/coroutines/src/jvmMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.jvm.kt index 5d176b5..bfac554 100644 --- a/core/coroutines/src/jvmMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.jvm.kt +++ b/core/coroutines/src/jvmMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.jvm.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/coroutines/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.wasmJs.kt b/core/coroutines/src/wasmJsMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.wasmJs.kt similarity index 83% rename from core/coroutines/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.wasmJs.kt rename to core/coroutines/src/wasmJsMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.wasmJs.kt index 94ab444..871ffe8 100644 --- a/core/coroutines/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/core/coroutines/data/IoDispatcher.wasmJs.kt +++ b/core/coroutines/src/wasmJsMain/kotlin/bzh/ajaury/chombev/core/coroutines/data/IoDispatcher.wasmJs.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.coroutines.data +package bzh.ajaury.chombev.core.coroutines.data import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/core/logging/build.gradle.kts b/core/logging/build.gradle.kts index 03625fc..61244e8 100644 --- a/core/logging/build.gradle.kts +++ b/core/logging/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.core.logging" + namespace = "bzh.ajaury.chombev.core.logging" } sourceSets { diff --git a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt b/core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/data/KermitLogger.kt similarity index 89% rename from core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt rename to core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/data/KermitLogger.kt index 938650e..37da580 100644 --- a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/data/KermitLogger.kt +++ b/core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/data/KermitLogger.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.core.logging.data +package bzh.ajaury.chombev.core.logging.data -import fr.ajaury.gwenedeg.core.logging.domain.Logger +import bzh.ajaury.chombev.core.logging.domain.Logger internal class KermitLogger : Logger { private val tag: String = "Chom Bev" diff --git a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt b/core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/di/LoggingModule.kt similarity index 59% rename from core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt rename to core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/di/LoggingModule.kt index 005f757..366ec1a 100644 --- a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/di/LoggingModule.kt +++ b/core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/di/LoggingModule.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.core.logging.di +package bzh.ajaury.chombev.core.logging.di -import fr.ajaury.gwenedeg.core.logging.data.KermitLogger -import fr.ajaury.gwenedeg.core.logging.domain.Logger +import bzh.ajaury.chombev.core.logging.data.KermitLogger +import bzh.ajaury.chombev.core.logging.domain.Logger import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/domain/Logger.kt b/core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/domain/Logger.kt similarity index 91% rename from core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/domain/Logger.kt rename to core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/domain/Logger.kt index 6d7ddca..9def07e 100644 --- a/core/logging/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/logging/domain/Logger.kt +++ b/core/logging/src/commonMain/kotlin/bzh/ajaury/chombev/core/logging/domain/Logger.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.logging.domain +package bzh.ajaury.chombev.core.logging.domain /** * Logging abstraction so the rest of the app depends on this interface diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts index f248c16..d7664fc 100644 --- a/core/model/build.gradle.kts +++ b/core/model/build.gradle.kts @@ -4,6 +4,6 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.core.model" + namespace = "bzh.ajaury.chombev.core.model" } } diff --git a/core/model/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/model/Phrase.kt b/core/model/src/commonMain/kotlin/bzh/ajaury/chombev/core/model/Phrase.kt similarity index 85% rename from core/model/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/model/Phrase.kt rename to core/model/src/commonMain/kotlin/bzh/ajaury/chombev/core/model/Phrase.kt index 30db70f..e304940 100644 --- a/core/model/src/commonMain/kotlin/fr/ajaury/gwenedeg/core/model/Phrase.kt +++ b/core/model/src/commonMain/kotlin/bzh/ajaury/chombev/core/model/Phrase.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.core.model +package bzh.ajaury.chombev.core.model /** * [translation] is the optional translation of [transcription] in the user's language diff --git a/data/playback/build.gradle.kts b/data/playback/build.gradle.kts index be8b700..4021fe4 100644 --- a/data/playback/build.gradle.kts +++ b/data/playback/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.playback" + namespace = "bzh.ajaury.chombev.playback" } sourceSets { diff --git a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/data/PlaybackRepositoryImpl.kt similarity index 93% rename from data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt rename to data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/data/PlaybackRepositoryImpl.kt index 3915de2..965ce47 100644 --- a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/PlaybackRepositoryImpl.kt +++ b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/data/PlaybackRepositoryImpl.kt @@ -1,19 +1,19 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider -import fr.ajaury.gwenedeg.core.logging.domain.Logger -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.player.domain.AudioPlayer -import fr.ajaury.gwenedeg.player.domain.PlaybackRepository -import fr.ajaury.gwenedeg.player.model.PlaybackState -import fr.ajaury.gwenedeg.player.model.PlaybackTiming -import fr.ajaury.gwenedeg.player.model.PlayerState -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository -import fr.ajaury.gwenedeg.records.model.Record -import fr.ajaury.gwenedeg.resources.domain.ResourceReader -import fr.ajaury.gwenedeg.subtitle.domain.GetCurrentSubtitleIndexUseCase -import fr.ajaury.gwenedeg.subtitle.domain.SubtitleRepository -import fr.ajaury.gwenedeg.subtitle.model.Subtitle +import bzh.ajaury.chombev.core.coroutines.domain.DispatcherProvider +import bzh.ajaury.chombev.core.logging.domain.Logger +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.player.domain.AudioPlayer +import bzh.ajaury.chombev.player.domain.PlaybackRepository +import bzh.ajaury.chombev.player.model.PlaybackState +import bzh.ajaury.chombev.player.model.PlaybackTiming +import bzh.ajaury.chombev.player.model.PlayerState +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.records.model.Record +import bzh.ajaury.chombev.resources.domain.ResourceReader +import bzh.ajaury.chombev.subtitle.domain.GetCurrentSubtitleIndexUseCase +import bzh.ajaury.chombev.subtitle.domain.SubtitleRepository +import bzh.ajaury.chombev.subtitle.model.Subtitle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job diff --git a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/SubtitleProgress.kt b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/data/SubtitleProgress.kt similarity index 69% rename from data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/SubtitleProgress.kt rename to data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/data/SubtitleProgress.kt index dca6056..44a280a 100644 --- a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/data/SubtitleProgress.kt +++ b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/data/SubtitleProgress.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.player.data +package bzh.ajaury.chombev.player.data -import fr.ajaury.gwenedeg.subtitle.model.Subtitle +import bzh.ajaury.chombev.subtitle.model.Subtitle import kotlin.time.Duration data class SubtitleProgress( diff --git a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/di/PlaybackModule.kt b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/di/PlaybackModule.kt similarity index 61% rename from data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/di/PlaybackModule.kt rename to data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/di/PlaybackModule.kt index 31c80d4..7d1a69b 100644 --- a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/di/PlaybackModule.kt +++ b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/di/PlaybackModule.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.player.di +package bzh.ajaury.chombev.player.di -import fr.ajaury.gwenedeg.player.data.PlaybackRepositoryImpl -import fr.ajaury.gwenedeg.player.domain.PlaybackRepository +import bzh.ajaury.chombev.player.data.PlaybackRepositoryImpl +import bzh.ajaury.chombev.player.domain.PlaybackRepository import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/PlaybackRepository.kt similarity index 84% rename from data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt rename to data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/PlaybackRepository.kt index 9666273..87f560c 100644 --- a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/domain/PlaybackRepository.kt +++ b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/domain/PlaybackRepository.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.player.domain +package bzh.ajaury.chombev.player.domain -import fr.ajaury.gwenedeg.player.model.PlayerState -import fr.ajaury.gwenedeg.records.model.Record +import bzh.ajaury.chombev.player.model.PlayerState +import bzh.ajaury.chombev.records.model.Record import kotlinx.coroutines.flow.Flow import kotlin.time.Duration diff --git a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlaybackTiming.kt b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlaybackTiming.kt similarity index 83% rename from data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlaybackTiming.kt rename to data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlaybackTiming.kt index feef5db..be4daa1 100644 --- a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlaybackTiming.kt +++ b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlaybackTiming.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.model +package bzh.ajaury.chombev.player.model import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds diff --git a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlayerState.kt b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlayerState.kt similarity index 68% rename from data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlayerState.kt rename to data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlayerState.kt index 5f28a73..c9d35d1 100644 --- a/data/playback/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/model/PlayerState.kt +++ b/data/playback/src/commonMain/kotlin/bzh/ajaury/chombev/player/model/PlayerState.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.player.model +package bzh.ajaury.chombev.player.model -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.subtitle.model.SubtitleLine data class PlayerState( val recordTitle: Phrase = Phrase(transcription = ""), diff --git a/data/preferences/build.gradle.kts b/data/preferences/build.gradle.kts index ee8ff28..4604f5b 100644 --- a/data/preferences/build.gradle.kts +++ b/data/preferences/build.gradle.kts @@ -8,7 +8,7 @@ kotlin { applyDefaultHierarchyTemplate() androidLibrary { - namespace = "fr.ajaury.gwenedeg.preferences" + namespace = "bzh.ajaury.chombev.preferences" } sourceSets { diff --git a/data/preferences/src/androidMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.android.kt b/data/preferences/src/androidMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.android.kt similarity index 58% rename from data/preferences/src/androidMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.android.kt rename to data/preferences/src/androidMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.android.kt index fd524c2..5e0d906 100644 --- a/data/preferences/src/androidMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.android.kt +++ b/data/preferences/src/androidMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.android.kt @@ -1,10 +1,10 @@ -package fr.ajaury.gwenedeg.preferences.di +package bzh.ajaury.chombev.preferences.di import android.content.Context -import fr.ajaury.gwenedeg.preferences.data.DATA_STORE_FILE_NAME -import fr.ajaury.gwenedeg.preferences.data.DataStorePreferencesRepository -import fr.ajaury.gwenedeg.preferences.data.createPreferencesDataStore -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.data.DATA_STORE_FILE_NAME +import bzh.ajaury.chombev.preferences.data.DataStorePreferencesRepository +import bzh.ajaury.chombev.preferences.data.createPreferencesDataStore +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository import org.koin.core.module.Module import org.koin.dsl.module diff --git a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/data/InMemoryPreferencesRepository.kt b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/data/InMemoryPreferencesRepository.kt similarity index 87% rename from data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/data/InMemoryPreferencesRepository.kt rename to data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/data/InMemoryPreferencesRepository.kt index cd58d3b..60c3af3 100644 --- a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/data/InMemoryPreferencesRepository.kt +++ b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/data/InMemoryPreferencesRepository.kt @@ -1,8 +1,8 @@ -package fr.ajaury.gwenedeg.preferences.data +package bzh.ajaury.chombev.preferences.data -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository -import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.model.PlaybackPreferences +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.kt b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.kt similarity index 67% rename from data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.kt rename to data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.kt index c55f349..0397e37 100644 --- a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.kt +++ b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.preferences.di +package bzh.ajaury.chombev.preferences.di import org.koin.core.module.Module /** - * Binds [fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository]. Persisted with DataStore on + * Binds [bzh.ajaury.chombev.preferences.domain.PreferencesRepository]. Persisted with DataStore on * every target that ships it (Android, iOS, Desktop); web falls back to an in-memory implementation. */ expect val preferencesModule: Module diff --git a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/domain/PreferencesRepository.kt b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/domain/PreferencesRepository.kt similarity index 75% rename from data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/domain/PreferencesRepository.kt rename to data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/domain/PreferencesRepository.kt index 5c452b1..a996b06 100644 --- a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/domain/PreferencesRepository.kt +++ b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/domain/PreferencesRepository.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.preferences.domain +package bzh.ajaury.chombev.preferences.domain -import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.preferences.model.PlaybackPreferences +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences import kotlinx.coroutines.flow.Flow import kotlin.time.Duration diff --git a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/model/PlaybackPreferences.kt b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/model/PlaybackPreferences.kt similarity index 95% rename from data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/model/PlaybackPreferences.kt rename to data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/model/PlaybackPreferences.kt index de00823..2c2661d 100644 --- a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/model/PlaybackPreferences.kt +++ b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/model/PlaybackPreferences.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.preferences.model +package bzh.ajaury.chombev.preferences.model import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds diff --git a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/model/SubtitlePreferences.kt b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/model/SubtitlePreferences.kt similarity index 93% rename from data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/model/SubtitlePreferences.kt rename to data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/model/SubtitlePreferences.kt index 4fa34ba..2cd10ed 100644 --- a/data/preferences/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/model/SubtitlePreferences.kt +++ b/data/preferences/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/model/SubtitlePreferences.kt @@ -1,7 +1,6 @@ -package fr.ajaury.gwenedeg.preferences.model - -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences.Companion.TEXT_SCALE_STEPS +package bzh.ajaury.chombev.preferences.model +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences.Companion.TEXT_SCALE_STEPS /** * User preferences controlling the subtitle display on the player. diff --git a/data/preferences/src/dataStoreMain/kotlin/fr/ajaury/gwenedeg/preferences/data/DataStorePreferencesRepository.kt b/data/preferences/src/dataStoreMain/kotlin/bzh/ajaury/chombev/preferences/data/DataStorePreferencesRepository.kt similarity index 93% rename from data/preferences/src/dataStoreMain/kotlin/fr/ajaury/gwenedeg/preferences/data/DataStorePreferencesRepository.kt rename to data/preferences/src/dataStoreMain/kotlin/bzh/ajaury/chombev/preferences/data/DataStorePreferencesRepository.kt index c328fa8..b415f52 100644 --- a/data/preferences/src/dataStoreMain/kotlin/fr/ajaury/gwenedeg/preferences/data/DataStorePreferencesRepository.kt +++ b/data/preferences/src/dataStoreMain/kotlin/bzh/ajaury/chombev/preferences/data/DataStorePreferencesRepository.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.preferences.data +package bzh.ajaury.chombev.preferences.data import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.MutablePreferences @@ -7,9 +7,9 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.floatPreferencesKey import androidx.datastore.preferences.core.intPreferencesKey -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository -import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.model.PlaybackPreferences +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.map diff --git a/data/preferences/src/dataStoreMain/kotlin/fr/ajaury/gwenedeg/preferences/data/PreferencesDataStore.kt b/data/preferences/src/dataStoreMain/kotlin/bzh/ajaury/chombev/preferences/data/PreferencesDataStore.kt similarity index 92% rename from data/preferences/src/dataStoreMain/kotlin/fr/ajaury/gwenedeg/preferences/data/PreferencesDataStore.kt rename to data/preferences/src/dataStoreMain/kotlin/bzh/ajaury/chombev/preferences/data/PreferencesDataStore.kt index 8a19f55..46b0ba7 100644 --- a/data/preferences/src/dataStoreMain/kotlin/fr/ajaury/gwenedeg/preferences/data/PreferencesDataStore.kt +++ b/data/preferences/src/dataStoreMain/kotlin/bzh/ajaury/chombev/preferences/data/PreferencesDataStore.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.preferences.data +package bzh.ajaury.chombev.preferences.data import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.PreferenceDataStoreFactory diff --git a/data/preferences/src/iosMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.ios.kt b/data/preferences/src/iosMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.ios.kt similarity index 76% rename from data/preferences/src/iosMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.ios.kt rename to data/preferences/src/iosMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.ios.kt index 48c1743..2014770 100644 --- a/data/preferences/src/iosMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.ios.kt +++ b/data/preferences/src/iosMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.ios.kt @@ -1,11 +1,11 @@ @file:OptIn(ExperimentalForeignApi::class) -package fr.ajaury.gwenedeg.preferences.di +package bzh.ajaury.chombev.preferences.di -import fr.ajaury.gwenedeg.preferences.data.DATA_STORE_FILE_NAME -import fr.ajaury.gwenedeg.preferences.data.DataStorePreferencesRepository -import fr.ajaury.gwenedeg.preferences.data.createPreferencesDataStore -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.data.DATA_STORE_FILE_NAME +import bzh.ajaury.chombev.preferences.data.DataStorePreferencesRepository +import bzh.ajaury.chombev.preferences.data.createPreferencesDataStore +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository import kotlinx.cinterop.ExperimentalForeignApi import org.koin.core.module.Module import org.koin.dsl.module diff --git a/data/preferences/src/jvmMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.jvm.kt b/data/preferences/src/jvmMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.jvm.kt similarity index 61% rename from data/preferences/src/jvmMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.jvm.kt rename to data/preferences/src/jvmMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.jvm.kt index ac74012..3fdb212 100644 --- a/data/preferences/src/jvmMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.jvm.kt +++ b/data/preferences/src/jvmMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.jvm.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.preferences.di +package bzh.ajaury.chombev.preferences.di -import fr.ajaury.gwenedeg.preferences.data.DATA_STORE_FILE_NAME -import fr.ajaury.gwenedeg.preferences.data.DataStorePreferencesRepository -import fr.ajaury.gwenedeg.preferences.data.createPreferencesDataStore -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.data.DATA_STORE_FILE_NAME +import bzh.ajaury.chombev.preferences.data.DataStorePreferencesRepository +import bzh.ajaury.chombev.preferences.data.createPreferencesDataStore +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository import org.koin.core.module.Module import org.koin.dsl.module import java.io.File diff --git a/data/preferences/src/webMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.web.kt b/data/preferences/src/webMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.web.kt similarity index 62% rename from data/preferences/src/webMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.web.kt rename to data/preferences/src/webMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.web.kt index bf94d33..fbb660e 100644 --- a/data/preferences/src/webMain/kotlin/fr/ajaury/gwenedeg/preferences/di/PreferencesModule.web.kt +++ b/data/preferences/src/webMain/kotlin/bzh/ajaury/chombev/preferences/di/PreferencesModule.web.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.preferences.di +package bzh.ajaury.chombev.preferences.di -import fr.ajaury.gwenedeg.preferences.data.InMemoryPreferencesRepository -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.data.InMemoryPreferencesRepository +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.singleOf diff --git a/data/records/build.gradle.kts b/data/records/build.gradle.kts index 0c5bb29..573104b 100644 --- a/data/records/build.gradle.kts +++ b/data/records/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.records" + namespace = "bzh.ajaury.chombev.records" } sourceSets { diff --git a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/data/InMemoryRecordRepository.kt similarity index 95% rename from data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt rename to data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/data/InMemoryRecordRepository.kt index b39bf77..6bc3c68 100644 --- a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/data/InMemoryRecordRepository.kt +++ b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/data/InMemoryRecordRepository.kt @@ -1,8 +1,8 @@ -package fr.ajaury.gwenedeg.records.data +package bzh.ajaury.chombev.records.data -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.records.domain.RecordRepository -import fr.ajaury.gwenedeg.records.model.Record +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.records.domain.RecordRepository +import bzh.ajaury.chombev.records.model.Record import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/di/RecordsModule.kt b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/di/RecordsModule.kt similarity index 61% rename from data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/di/RecordsModule.kt rename to data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/di/RecordsModule.kt index 82c7c7f..bf34e08 100644 --- a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/di/RecordsModule.kt +++ b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/di/RecordsModule.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.records.di +package bzh.ajaury.chombev.records.di -import fr.ajaury.gwenedeg.records.data.InMemoryRecordRepository -import fr.ajaury.gwenedeg.records.domain.RecordRepository +import bzh.ajaury.chombev.records.data.InMemoryRecordRepository +import bzh.ajaury.chombev.records.domain.RecordRepository import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.factoryOf diff --git a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/domain/RecordRepository.kt similarity index 63% rename from data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt rename to data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/domain/RecordRepository.kt index c6149ae..fd3ab72 100644 --- a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/domain/RecordRepository.kt +++ b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/domain/RecordRepository.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.records.domain +package bzh.ajaury.chombev.records.domain -import fr.ajaury.gwenedeg.records.model.Record +import bzh.ajaury.chombev.records.model.Record import kotlinx.coroutines.flow.Flow interface RecordRepository { diff --git a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/model/Record.kt b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/model/Record.kt similarity index 73% rename from data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/model/Record.kt rename to data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/model/Record.kt index 2a6228f..08ab634 100644 --- a/data/records/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/model/Record.kt +++ b/data/records/src/commonMain/kotlin/bzh/ajaury/chombev/records/model/Record.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.records.model +package bzh.ajaury.chombev.records.model -import fr.ajaury.gwenedeg.core.model.Phrase +import bzh.ajaury.chombev.core.model.Phrase data class Record( val id: Int, diff --git a/data/resources/build.gradle.kts b/data/resources/build.gradle.kts index b226bba..e14cc11 100644 --- a/data/resources/build.gradle.kts +++ b/data/resources/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.resources" + namespace = "bzh.ajaury.chombev.resources" androidResources { enable = true } @@ -26,5 +26,5 @@ kotlin { compose.resources { // Public so that other modules (e.g. shared UI) can reference drawables such as the app icon. publicResClass = true - packageOfResClass = "fr.ajaury.gwenedeg.resources.generated.resources" + packageOfResClass = "bzh.ajaury.chombev.resources.generated.resources" } diff --git a/data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/data/ComposeResourceReader.kt b/data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/data/ComposeResourceReader.kt similarity index 64% rename from data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/data/ComposeResourceReader.kt rename to data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/data/ComposeResourceReader.kt index 1b30cb2..34c410f 100644 --- a/data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/data/ComposeResourceReader.kt +++ b/data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/data/ComposeResourceReader.kt @@ -1,8 +1,8 @@ -package fr.ajaury.gwenedeg.resources.data +package bzh.ajaury.chombev.resources.data -import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider -import fr.ajaury.gwenedeg.resources.domain.ResourceReader -import fr.ajaury.gwenedeg.resources.generated.resources.Res +import bzh.ajaury.chombev.core.coroutines.domain.DispatcherProvider +import bzh.ajaury.chombev.resources.domain.ResourceReader +import bzh.ajaury.chombev.resources.generated.resources.Res import kotlinx.coroutines.withContext internal class ComposeResourceReader( diff --git a/data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/di/ResourcesModule.kt b/data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/di/ResourcesModule.kt similarity index 60% rename from data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/di/ResourcesModule.kt rename to data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/di/ResourcesModule.kt index b326a85..d633b07 100644 --- a/data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/di/ResourcesModule.kt +++ b/data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/di/ResourcesModule.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.resources.di +package bzh.ajaury.chombev.resources.di -import fr.ajaury.gwenedeg.resources.data.ComposeResourceReader -import fr.ajaury.gwenedeg.resources.domain.ResourceReader +import bzh.ajaury.chombev.resources.data.ComposeResourceReader +import bzh.ajaury.chombev.resources.domain.ResourceReader import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.factoryOf diff --git a/data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/domain/ResourceReader.kt b/data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/domain/ResourceReader.kt similarity index 91% rename from data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/domain/ResourceReader.kt rename to data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/domain/ResourceReader.kt index bc038cd..329e7ee 100644 --- a/data/resources/src/commonMain/kotlin/fr/ajaury/gwenedeg/resources/domain/ResourceReader.kt +++ b/data/resources/src/commonMain/kotlin/bzh/ajaury/chombev/resources/domain/ResourceReader.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.resources.domain +package bzh.ajaury.chombev.resources.domain /** * Provides access to the app's bundled resources. Implemented by this module, which owns the diff --git a/data/subtitle/build.gradle.kts b/data/subtitle/build.gradle.kts index a0e3b56..cda7bdb 100644 --- a/data/subtitle/build.gradle.kts +++ b/data/subtitle/build.gradle.kts @@ -4,7 +4,7 @@ plugins { kotlin { androidLibrary { - namespace = "fr.ajaury.gwenedeg.subtitle" + namespace = "bzh.ajaury.chombev.subtitle" } sourceSets { diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/LrcParser.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/LrcParser.kt similarity index 97% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/LrcParser.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/LrcParser.kt index 2454290..17fa60c 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/LrcParser.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/LrcParser.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.subtitle.data +package bzh.ajaury.chombev.subtitle.data import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/LrcSubtitleRepository.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/LrcSubtitleRepository.kt similarity index 78% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/LrcSubtitleRepository.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/LrcSubtitleRepository.kt index 1967052..26c85a3 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/LrcSubtitleRepository.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/LrcSubtitleRepository.kt @@ -1,12 +1,12 @@ -package fr.ajaury.gwenedeg.subtitle.data +package bzh.ajaury.chombev.subtitle.data -import fr.ajaury.gwenedeg.core.coroutines.domain.DispatcherProvider -import fr.ajaury.gwenedeg.core.logging.domain.Logger -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.subtitle.domain.SubtitleRepository -import fr.ajaury.gwenedeg.subtitle.model.CantGetSubtitleException -import fr.ajaury.gwenedeg.subtitle.model.Subtitle -import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine +import bzh.ajaury.chombev.core.coroutines.domain.DispatcherProvider +import bzh.ajaury.chombev.core.logging.domain.Logger +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.subtitle.domain.SubtitleRepository +import bzh.ajaury.chombev.subtitle.model.CantGetSubtitleException +import bzh.ajaury.chombev.subtitle.model.Subtitle +import bzh.ajaury.chombev.subtitle.model.SubtitleLine import kotlinx.coroutines.withContext internal class LrcSubtitleRepository( diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/TimeCodedText.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/TimeCodedText.kt similarity index 81% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/TimeCodedText.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/TimeCodedText.kt index 1de3bc4..2216b77 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/data/TimeCodedText.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/data/TimeCodedText.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.subtitle.data +package bzh.ajaury.chombev.subtitle.data import kotlin.time.Duration diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/di/SubtitleModule.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/di/SubtitleModule.kt similarity index 54% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/di/SubtitleModule.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/di/SubtitleModule.kt index 853e477..a34e78d 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/di/SubtitleModule.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/di/SubtitleModule.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.subtitle.di +package bzh.ajaury.chombev.subtitle.di -import fr.ajaury.gwenedeg.subtitle.data.LrcParser -import fr.ajaury.gwenedeg.subtitle.data.LrcSubtitleRepository -import fr.ajaury.gwenedeg.subtitle.domain.GetCurrentSubtitleIndexUseCase -import fr.ajaury.gwenedeg.subtitle.domain.SubtitleRepository +import bzh.ajaury.chombev.subtitle.data.LrcParser +import bzh.ajaury.chombev.subtitle.data.LrcSubtitleRepository +import bzh.ajaury.chombev.subtitle.domain.GetCurrentSubtitleIndexUseCase +import bzh.ajaury.chombev.subtitle.domain.SubtitleRepository import org.koin.core.module.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.factoryOf diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt similarity index 72% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt index 31f1382..d228924 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/domain/GetCurrentSubtitleIndexUseCase.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.subtitle.domain +package bzh.ajaury.chombev.subtitle.domain -import fr.ajaury.gwenedeg.subtitle.model.Subtitle +import bzh.ajaury.chombev.subtitle.model.Subtitle import kotlin.time.Duration class GetCurrentSubtitleIndexUseCase { diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/domain/SubtitleRepository.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/domain/SubtitleRepository.kt similarity index 77% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/domain/SubtitleRepository.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/domain/SubtitleRepository.kt index 41754d7..e6cb6ff 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/domain/SubtitleRepository.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/domain/SubtitleRepository.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.subtitle.domain +package bzh.ajaury.chombev.subtitle.domain -import fr.ajaury.gwenedeg.subtitle.model.Subtitle +import bzh.ajaury.chombev.subtitle.model.Subtitle interface SubtitleRepository { /** diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/CantGetSubtitleException.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/CantGetSubtitleException.kt similarity index 67% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/CantGetSubtitleException.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/CantGetSubtitleException.kt index 18b3a43..3e3947e 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/CantGetSubtitleException.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/CantGetSubtitleException.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.subtitle.model +package bzh.ajaury.chombev.subtitle.model data class CantGetSubtitleException( override val message: String, diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/Subtitle.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/Subtitle.kt similarity index 58% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/Subtitle.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/Subtitle.kt index 72a7fce..4f90d10 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/Subtitle.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/Subtitle.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.subtitle.model +package bzh.ajaury.chombev.subtitle.model data class Subtitle( val lines: List, diff --git a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/SubtitleLine.kt b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/SubtitleLine.kt similarity index 68% rename from data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/SubtitleLine.kt rename to data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/SubtitleLine.kt index b72d03b..48cc378 100644 --- a/data/subtitle/src/commonMain/kotlin/fr/ajaury/gwenedeg/subtitle/model/SubtitleLine.kt +++ b/data/subtitle/src/commonMain/kotlin/bzh/ajaury/chombev/subtitle/model/SubtitleLine.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.subtitle.model +package bzh.ajaury.chombev.subtitle.model -import fr.ajaury.gwenedeg.core.model.Phrase +import bzh.ajaury.chombev.core.model.Phrase import kotlin.time.Duration /** diff --git a/data/subtitle/src/commonTest/kotlin/fr/ajaury/gwenedeg/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt b/data/subtitle/src/commonTest/kotlin/bzh/ajaury/chombev/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt similarity index 86% rename from data/subtitle/src/commonTest/kotlin/fr/ajaury/gwenedeg/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt rename to data/subtitle/src/commonTest/kotlin/bzh/ajaury/chombev/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt index 0e1c407..e6d57de 100644 --- a/data/subtitle/src/commonTest/kotlin/fr/ajaury/gwenedeg/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt +++ b/data/subtitle/src/commonTest/kotlin/bzh/ajaury/chombev/subtitle/GetCurrentSubtitleIndexUseCaseTest.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.subtitle +package bzh.ajaury.chombev.subtitle -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.subtitle.domain.GetCurrentSubtitleIndexUseCase -import fr.ajaury.gwenedeg.subtitle.model.Subtitle -import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.subtitle.domain.GetCurrentSubtitleIndexUseCase +import bzh.ajaury.chombev.subtitle.model.Subtitle +import bzh.ajaury.chombev.subtitle.model.SubtitleLine import kotlin.test.Test import kotlin.test.assertEquals import kotlin.time.Duration.Companion.milliseconds diff --git a/data/subtitle/src/commonTest/kotlin/fr/ajaury/gwenedeg/subtitle/LrcParserTest.kt b/data/subtitle/src/commonTest/kotlin/bzh/ajaury/chombev/subtitle/LrcParserTest.kt similarity index 93% rename from data/subtitle/src/commonTest/kotlin/fr/ajaury/gwenedeg/subtitle/LrcParserTest.kt rename to data/subtitle/src/commonTest/kotlin/bzh/ajaury/chombev/subtitle/LrcParserTest.kt index dc18921..305324f 100644 --- a/data/subtitle/src/commonTest/kotlin/fr/ajaury/gwenedeg/subtitle/LrcParserTest.kt +++ b/data/subtitle/src/commonTest/kotlin/bzh/ajaury/chombev/subtitle/LrcParserTest.kt @@ -1,6 +1,6 @@ -package fr.ajaury.gwenedeg.subtitle +package bzh.ajaury.chombev.subtitle -import fr.ajaury.gwenedeg.subtitle.data.LrcParser +import bzh.ajaury.chombev.subtitle.data.LrcParser import kotlin.test.Test import kotlin.test.assertEquals import kotlin.time.Duration.Companion.milliseconds diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts index 920b14c..823d2a1 100644 --- a/desktopApp/build.gradle.kts +++ b/desktopApp/build.gradle.kts @@ -17,11 +17,11 @@ dependencies { compose.desktop { application { - mainClass = "fr.ajaury.gwenedeg.MainKt" + mainClass = "bzh.ajaury.chombev.MainKt" nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) - packageName = "fr.ajaury.gwenedeg" + packageName = "bzh.ajaury.chombev" packageVersion = "1.0.0" } } diff --git a/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt b/desktopApp/src/main/kotlin/bzh/ajaury/chombev/main.kt similarity index 90% rename from desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt rename to desktopApp/src/main/kotlin/bzh/ajaury/chombev/main.kt index 3110a26..22c4e88 100644 --- a/desktopApp/src/main/kotlin/fr/ajaury/gwenedeg/main.kt +++ b/desktopApp/src/main/kotlin/bzh/ajaury/chombev/main.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg +package bzh.ajaury.chombev import androidx.compose.ui.window.Window import androidx.compose.ui.window.application diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig index feb27e7..dc0c15e 100644 --- a/iosApp/Configuration/Config.xcconfig +++ b/iosApp/Configuration/Config.xcconfig @@ -1,7 +1,7 @@ TEAM_ID= PRODUCT_NAME=Chom Bev -PRODUCT_BUNDLE_IDENTIFIER=fr.ajaury.gwenedeg.Gwenedeg$(TEAM_ID) +PRODUCT_BUNDLE_IDENTIFIER=bzh.ajaury.chombev.Gwenedeg$(TEAM_ID) CURRENT_PROJECT_VERSION=1 MARKETING_VERSION=1.0 \ No newline at end of file diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 0a8390e..19eab52 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -18,7 +18,7 @@ kotlin { } androidLibrary { - namespace = "fr.ajaury.gwenedeg.shared" + namespace = "bzh.ajaury.chombev.shared" androidResources { enable = true } diff --git a/shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.android.kt b/shared/src/androidMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.android.kt similarity index 97% rename from shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.android.kt rename to shared/src/androidMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.android.kt index cf90fcb..992566f 100644 --- a/shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.android.kt +++ b/shared/src/androidMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.android.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import android.annotation.SuppressLint import android.content.Intent diff --git a/shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebClientDelegatingExtLinks.kt b/shared/src/androidMain/kotlin/bzh/ajaury/chombev/web/ui/WebClientDelegatingExtLinks.kt similarity index 94% rename from shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebClientDelegatingExtLinks.kt rename to shared/src/androidMain/kotlin/bzh/ajaury/chombev/web/ui/WebClientDelegatingExtLinks.kt index 6256f40..222f3ff 100644 --- a/shared/src/androidMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebClientDelegatingExtLinks.kt +++ b/shared/src/androidMain/kotlin/bzh/ajaury/chombev/web/ui/WebClientDelegatingExtLinks.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import android.content.Intent import android.webkit.WebResourceRequest diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/App.kt similarity index 85% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/App.kt index c1834c6..7e81105 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/App.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/App.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg +package bzh.ajaury.chombev import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.WindowInsets @@ -10,31 +10,30 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.navigation3.runtime.NavEntry import androidx.navigation3.ui.NavDisplay import androidx.savedstate.compose.serialization.serializers.SnapshotStateListSerializer -import fr.ajaury.gwenedeg.core.coroutines.di.coroutinesModule -import fr.ajaury.gwenedeg.core.logging.di.loggingModule -import fr.ajaury.gwenedeg.di.sharedModule -import fr.ajaury.gwenedeg.navigation.MainBottomBar -import fr.ajaury.gwenedeg.navigation.MainTopBar -import fr.ajaury.gwenedeg.navigation.Route -import fr.ajaury.gwenedeg.navigation.WebPage -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.web.ui.WebViewScreen -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.core.coroutines.di.coroutinesModule +import bzh.ajaury.chombev.core.logging.di.loggingModule +import bzh.ajaury.chombev.di.sharedModule +import bzh.ajaury.chombev.navigation.MainBottomBar +import bzh.ajaury.chombev.navigation.MainTopBar +import bzh.ajaury.chombev.navigation.Route +import bzh.ajaury.chombev.navigation.WebPage +import bzh.ajaury.chombev.player.di.audioPlayerModule +import bzh.ajaury.chombev.player.ui.PlayerScreen +import bzh.ajaury.chombev.records.ui.RecordsScreen +import bzh.ajaury.chombev.subtitle.di.subtitleModule +import bzh.ajaury.chombev.theme.ChomBevTheme +import bzh.ajaury.chombev.web.ui.WebViewScreen import org.koin.compose.KoinApplication import org.koin.dsl.koinConfiguration import org.koin.dsl.module - val appModule = module { includes( loggingModule, sharedModule, audioPlayerModule, coroutinesModule, - subtitleModule + subtitleModule, ) } diff --git a/shared/src/commonMain/kotlin/bzh/ajaury/chombev/di/Modules.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/di/Modules.kt new file mode 100644 index 0000000..ad972c7 --- /dev/null +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/di/Modules.kt @@ -0,0 +1,21 @@ +package bzh.ajaury.chombev.di + +import bzh.ajaury.chombev.core.logging.di.loggingModule +import bzh.ajaury.chombev.player.di.playbackModule +import bzh.ajaury.chombev.player.ui.viewmodel.PlayerViewModel +import bzh.ajaury.chombev.preferences.di.preferencesModule +import bzh.ajaury.chombev.records.di.recordsModule +import bzh.ajaury.chombev.records.ui.viewmodel.RecordsViewModel +import bzh.ajaury.chombev.resources.di.resourcesModule +import org.koin.core.module.dsl.viewModelOf +import org.koin.dsl.module + +val sharedModule = module { + includes(loggingModule) + includes(playbackModule) + includes(preferencesModule) + includes(recordsModule) + includes(resourcesModule) + viewModelOf(::RecordsViewModel) + viewModelOf(::PlayerViewModel) +} diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/MainBottomBar.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/MainBottomBar.kt similarity index 86% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/MainBottomBar.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/MainBottomBar.kt index 76af23d..a3d4bd3 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/MainBottomBar.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/MainBottomBar.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.navigation +package bzh.ajaury.chombev.navigation import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Mic @@ -11,11 +11,11 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import fr.ajaury.gwenedeg.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.nav_about -import fr.ajaury.gwenedeg.resources.generated.resources.nav_deepen -import fr.ajaury.gwenedeg.resources.generated.resources.nav_records -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.nav_about +import bzh.ajaury.chombev.resources.generated.resources.nav_deepen +import bzh.ajaury.chombev.resources.generated.resources.nav_records +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource /** diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/MainTopBar.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/MainTopBar.kt similarity index 84% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/MainTopBar.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/MainTopBar.kt index 086d20c..9329775 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/MainTopBar.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/MainTopBar.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.navigation +package bzh.ajaury.chombev.navigation import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -11,9 +11,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.app_icon -import fr.ajaury.gwenedeg.resources.generated.resources.app_name +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.app_icon +import bzh.ajaury.chombev.resources.generated.resources.app_name import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/Route.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/Route.kt similarity index 90% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/Route.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/Route.kt index cd5b052..deb175f 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/Route.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/Route.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.navigation +package bzh.ajaury.chombev.navigation import androidx.navigation3.runtime.NavKey import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/WebPage.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/WebPage.kt similarity index 89% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/WebPage.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/WebPage.kt index f822782..c049758 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/navigation/WebPage.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/navigation/WebPage.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.navigation +package bzh.ajaury.chombev.navigation import kotlinx.serialization.Serializable diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlaybackSpeedBottomSheet.kt similarity index 88% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlaybackSpeedBottomSheet.kt index df2c278..6727243 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlaybackSpeedBottomSheet.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlaybackSpeedBottomSheet.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui +package bzh.ajaury.chombev.player.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -12,13 +12,13 @@ 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.player.ui.components.LabeledSlider -import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.break_between_phrases_title -import fr.ajaury.gwenedeg.resources.generated.resources.break_between_phrases_value -import fr.ajaury.gwenedeg.resources.generated.resources.playback_speed_title -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.player.ui.components.LabeledSlider +import bzh.ajaury.chombev.preferences.model.PlaybackPreferences +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.break_between_phrases_title +import bzh.ajaury.chombev.resources.generated.resources.break_between_phrases_value +import bzh.ajaury.chombev.resources.generated.resources.playback_speed_title +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource import kotlin.math.roundToInt diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlayerControl.kt similarity index 90% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlayerControl.kt index 6203310..f4036f1 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerControl.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlayerControl.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui +package bzh.ajaury.chombev.player.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -11,14 +11,14 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.player.model.PlaybackState -import fr.ajaury.gwenedeg.player.model.PlaybackTiming -import fr.ajaury.gwenedeg.player.ui.components.NextButton -import fr.ajaury.gwenedeg.player.ui.components.PlayButton -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.theme.ChomBevTheme +import bzh.ajaury.chombev.player.model.PlaybackState +import bzh.ajaury.chombev.player.model.PlaybackTiming +import bzh.ajaury.chombev.player.ui.components.NextButton +import bzh.ajaury.chombev.player.ui.components.PlayButton +import bzh.ajaury.chombev.player.ui.components.PlaybackProgress +import bzh.ajaury.chombev.player.ui.components.PreviousButton +import bzh.ajaury.chombev.player.ui.components.SpeedPreferenceButton +import bzh.ajaury.chombev.theme.ChomBevTheme import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlayerScreen.kt similarity index 94% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlayerScreen.kt index 41f1a0b..bcfc2f7 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/PlayerScreen.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/PlayerScreen.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui +package bzh.ajaury.chombev.player.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -28,18 +28,18 @@ import androidx.compose.ui.text.style.TextOverflow 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.player.model.PlaybackState -import fr.ajaury.gwenedeg.player.model.PlaybackTiming -import fr.ajaury.gwenedeg.player.model.PlayerState -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.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.player_back -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_preferences_action -import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.player.model.PlaybackState +import bzh.ajaury.chombev.player.model.PlaybackTiming +import bzh.ajaury.chombev.player.model.PlayerState +import bzh.ajaury.chombev.player.ui.viewmodel.PlayerUiState +import bzh.ajaury.chombev.player.ui.viewmodel.PlayerViewModel +import bzh.ajaury.chombev.preferences.ui.SubtitlePreferencesBottomSheet +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.player_back +import bzh.ajaury.chombev.resources.generated.resources.subtitle_preferences_action +import bzh.ajaury.chombev.subtitle.model.SubtitleLine +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource import org.koin.compose.viewmodel.koinViewModel import org.koin.core.parameter.parametersOf diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/SubtitleList.kt similarity index 96% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/SubtitleList.kt index 0c1ccef..30c4397 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/SubtitleList.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/SubtitleList.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui +package bzh.ajaury.chombev.player.ui import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.animateScrollBy @@ -35,11 +35,11 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.player.ui.components.TranscriptionText -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences -import fr.ajaury.gwenedeg.subtitle.model.SubtitleLine -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.player.ui.components.TranscriptionText +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.subtitle.model.SubtitleLine +import bzh.ajaury.chombev.theme.ChomBevTheme import kotlin.math.abs import kotlin.time.Duration.Companion.milliseconds diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/LabeledSlider.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/LabeledSlider.kt similarity index 94% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/LabeledSlider.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/LabeledSlider.kt index 5c9e1c5..dfb45a7 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/LabeledSlider.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/LabeledSlider.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -12,7 +12,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.theme.ChomBevTheme @Composable fun LabeledSlider( diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/NextButton.kt similarity index 85% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/NextButton.kt index 26f2f7a..c6d9b16 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/NextButton.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/NextButton.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons @@ -9,9 +9,9 @@ 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.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.player_next_sentence -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.player_next_sentence +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource @Composable diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PlayButton.kt similarity index 91% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PlayButton.kt index 41b27f4..3af6870 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlayButton.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PlayButton.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.LinearEasing @@ -21,12 +21,12 @@ import androidx.compose.ui.Modifier 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.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.player_pause -import fr.ajaury.gwenedeg.resources.generated.resources.player_play -import fr.ajaury.gwenedeg.resources.generated.resources.player_replay -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.player.model.PlaybackState +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.player_pause +import bzh.ajaury.chombev.resources.generated.resources.player_play +import bzh.ajaury.chombev.resources.generated.resources.player_replay +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PlaybackProgress.kt similarity index 92% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PlaybackProgress.kt index d82e576..e3eb217 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PlaybackProgress.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PlaybackProgress.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.Slider @@ -9,13 +9,12 @@ import androidx.compose.runtime.remember 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.ChomBevTheme +import bzh.ajaury.chombev.player.model.PlaybackTiming +import bzh.ajaury.chombev.theme.ChomBevTheme import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds - @Composable fun PlaybackProgress( playbackTiming: PlaybackTiming, @@ -67,4 +66,3 @@ private fun PlaybackProgressEndedPreview() { ) } } - diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PreviousButton.kt similarity index 85% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PreviousButton.kt index dce6aa8..5761473 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/PreviousButton.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/PreviousButton.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons @@ -9,9 +9,9 @@ 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.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.player_previous_sentence -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.player_previous_sentence +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource @Composable diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/SpeedPreferenceButton.kt similarity index 87% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/SpeedPreferenceButton.kt index 366d708..c499126 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/SpeedPreferenceButton.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/SpeedPreferenceButton.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons @@ -11,9 +11,9 @@ 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.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.playback_settings_action -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.playback_settings_action +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource /** diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/TranscriptionText.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/TranscriptionText.kt similarity index 99% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/TranscriptionText.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/TranscriptionText.kt index af5f0b0..6f20064 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/components/TranscriptionText.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/components/TranscriptionText.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.player.ui.components +package bzh.ajaury.chombev.player.ui.components import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.Box @@ -28,7 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em import androidx.compose.ui.unit.sp -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.theme.ChomBevTheme /** * Matches a single letter marked in a transcription, either: diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerUiState.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/viewmodel/PlayerUiState.kt similarity index 79% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerUiState.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/viewmodel/PlayerUiState.kt index 47f83cc..6b122f1 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerUiState.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/viewmodel/PlayerUiState.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.player.ui.viewmodel +package bzh.ajaury.chombev.player.ui.viewmodel -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.player.model.PlayerState -import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.player.model.PlayerState +import bzh.ajaury.chombev.preferences.model.PlaybackPreferences +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/viewmodel/PlayerViewModel.kt similarity index 89% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/viewmodel/PlayerViewModel.kt index db4ed2e..0b066c7 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/player/ui/viewmodel/PlayerViewModel.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/player/ui/viewmodel/PlayerViewModel.kt @@ -1,17 +1,17 @@ -package fr.ajaury.gwenedeg.player.ui.viewmodel +package bzh.ajaury.chombev.player.ui.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import fr.ajaury.gwenedeg.core.logging.domain.Logger -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.player.domain.AudioSessionManager -import fr.ajaury.gwenedeg.player.domain.PlaybackRepository -import fr.ajaury.gwenedeg.player.model.PlaybackState -import fr.ajaury.gwenedeg.preferences.domain.PreferencesRepository -import fr.ajaury.gwenedeg.preferences.model.PlaybackPreferences -import fr.ajaury.gwenedeg.preferences.model.SubtitlePreferences -import fr.ajaury.gwenedeg.records.domain.RecordRepository -import fr.ajaury.gwenedeg.records.model.Record +import bzh.ajaury.chombev.core.logging.domain.Logger +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.player.domain.AudioSessionManager +import bzh.ajaury.chombev.player.domain.PlaybackRepository +import bzh.ajaury.chombev.player.model.PlaybackState +import bzh.ajaury.chombev.preferences.domain.PreferencesRepository +import bzh.ajaury.chombev.preferences.model.PlaybackPreferences +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.records.domain.RecordRepository +import bzh.ajaury.chombev.records.model.Record import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/ui/PreferenceToggle.kt similarity index 96% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/ui/PreferenceToggle.kt index 4bd6de9..b0cbfd5 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/PreferenceToggle.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/ui/PreferenceToggle.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.preferences.ui +package bzh.ajaury.chombev.preferences.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -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.theme.ChomBevTheme - +import bzh.ajaury.chombev.theme.ChomBevTheme @Composable fun PreferenceToggle( diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/ui/SubtitlePreferencesBottomSheet.kt similarity index 87% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/ui/SubtitlePreferencesBottomSheet.kt index af162c2..88542d8 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/preferences/ui/SubtitlePreferencesBottomSheet.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/preferences/ui/SubtitlePreferencesBottomSheet.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.preferences.ui +package bzh.ajaury.chombev.preferences.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -21,19 +21,19 @@ import androidx.compose.ui.Alignment 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.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_marked_letters_description -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_marked_letters_label -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_preferences_title -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_text_size_decrease -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_text_size_increase -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_text_size_label -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_transcription_description -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_transcription_label -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_translation_description -import fr.ajaury.gwenedeg.resources.generated.resources.subtitle_translation_label -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.preferences.model.SubtitlePreferences +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.subtitle_marked_letters_description +import bzh.ajaury.chombev.resources.generated.resources.subtitle_marked_letters_label +import bzh.ajaury.chombev.resources.generated.resources.subtitle_preferences_title +import bzh.ajaury.chombev.resources.generated.resources.subtitle_text_size_decrease +import bzh.ajaury.chombev.resources.generated.resources.subtitle_text_size_increase +import bzh.ajaury.chombev.resources.generated.resources.subtitle_text_size_label +import bzh.ajaury.chombev.resources.generated.resources.subtitle_transcription_description +import bzh.ajaury.chombev.resources.generated.resources.subtitle_transcription_label +import bzh.ajaury.chombev.resources.generated.resources.subtitle_translation_description +import bzh.ajaury.chombev.resources.generated.resources.subtitle_translation_label +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource import kotlin.math.roundToInt diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/RecordView.kt similarity index 94% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/RecordView.kt index 29caa99..b6c5d15 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordView.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/RecordView.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.records.ui +package bzh.ajaury.chombev.records.ui import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.core.model.Phrase -import fr.ajaury.gwenedeg.records.model.Record +import bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.records.model.Record @Composable fun RecordView( diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/RecordsScreen.kt similarity index 92% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/RecordsScreen.kt index b147769..7ebb58b 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/RecordsScreen.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/RecordsScreen.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.records.ui +package bzh.ajaury.chombev.records.ui import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize @@ -13,10 +13,10 @@ 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 bzh.ajaury.chombev.core.model.Phrase +import bzh.ajaury.chombev.records.model.Record +import bzh.ajaury.chombev.records.ui.viewmodel.RecordsViewModel +import bzh.ajaury.chombev.theme.ChomBevTheme import org.koin.compose.viewmodel.koinViewModel @Composable diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/viewmodel/RecordsViewModel.kt similarity index 77% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/viewmodel/RecordsViewModel.kt index c44e755..5690d8d 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/records/ui/viewmodel/RecordsViewModel.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/records/ui/viewmodel/RecordsViewModel.kt @@ -1,9 +1,9 @@ -package fr.ajaury.gwenedeg.records.ui.viewmodel +package bzh.ajaury.chombev.records.ui.viewmodel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import fr.ajaury.gwenedeg.records.domain.RecordRepository -import fr.ajaury.gwenedeg.records.model.Record +import bzh.ajaury.chombev.records.domain.RecordRepository +import bzh.ajaury.chombev.records.model.Record import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.stateIn diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Color.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/theme/Color.kt similarity index 98% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Color.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/theme/Color.kt index f756e9b..8c3a9d1 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Color.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/theme/Color.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.theme +package bzh.ajaury.chombev.theme import androidx.compose.ui.graphics.Color diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/theme/Theme.kt similarity index 98% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/theme/Theme.kt index 8983f47..136819f 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/theme/Theme.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/theme/Theme.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.theme +package bzh.ajaury.chombev.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.ColorScheme diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.kt similarity index 93% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.kt index 0c333af..c35b473 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebViewScreen.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/WebViewScreen.kt similarity index 90% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebViewScreen.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/WebViewScreen.kt index cd29deb..74a443b 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebViewScreen.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/WebViewScreen.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.PaddingValues @@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import fr.ajaury.gwenedeg.navigation.WebPage +import bzh.ajaury.chombev.navigation.WebPage /** * Displays a [WebPage] inside the app: the embedded page, matching the app's [darkTheme]. The diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebViewUnavailable.kt b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/WebViewUnavailable.kt similarity index 86% rename from shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebViewUnavailable.kt rename to shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/WebViewUnavailable.kt index 49757f0..eb0745a 100644 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/web/ui/WebViewUnavailable.kt +++ b/shared/src/commonMain/kotlin/bzh/ajaury/chombev/web/ui/WebViewUnavailable.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -14,10 +14,10 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import fr.ajaury.gwenedeg.resources.generated.resources.Res -import fr.ajaury.gwenedeg.resources.generated.resources.web_open_in_browser -import fr.ajaury.gwenedeg.resources.generated.resources.web_unavailable_message -import fr.ajaury.gwenedeg.theme.ChomBevTheme +import bzh.ajaury.chombev.resources.generated.resources.Res +import bzh.ajaury.chombev.resources.generated.resources.web_open_in_browser +import bzh.ajaury.chombev.resources.generated.resources.web_unavailable_message +import bzh.ajaury.chombev.theme.ChomBevTheme import org.jetbrains.compose.resources.stringResource /** diff --git a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt b/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt deleted file mode 100644 index 1003805..0000000 --- a/shared/src/commonMain/kotlin/fr/ajaury/gwenedeg/di/Modules.kt +++ /dev/null @@ -1,21 +0,0 @@ -package fr.ajaury.gwenedeg.di - -import fr.ajaury.gwenedeg.core.logging.di.loggingModule -import fr.ajaury.gwenedeg.player.di.playbackModule -import fr.ajaury.gwenedeg.player.ui.viewmodel.PlayerViewModel -import fr.ajaury.gwenedeg.preferences.di.preferencesModule -import fr.ajaury.gwenedeg.records.di.recordsModule -import fr.ajaury.gwenedeg.records.ui.viewmodel.RecordsViewModel -import fr.ajaury.gwenedeg.resources.di.resourcesModule -import org.koin.core.module.dsl.viewModelOf -import org.koin.dsl.module - -val sharedModule = module { - includes(loggingModule) - includes(playbackModule) - includes(preferencesModule) - includes(recordsModule) - includes(resourcesModule) - viewModelOf(::RecordsViewModel) - viewModelOf(::PlayerViewModel) -} diff --git a/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt b/shared/src/iosMain/kotlin/bzh/ajaury/chombev/MainViewController.kt similarity index 86% rename from shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt rename to shared/src/iosMain/kotlin/bzh/ajaury/chombev/MainViewController.kt index a4d92bf..f98dad4 100644 --- a/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/MainViewController.kt +++ b/shared/src/iosMain/kotlin/bzh/ajaury/chombev/MainViewController.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg +package bzh.ajaury.chombev import androidx.compose.ui.window.ComposeUIViewController diff --git a/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.ios.kt b/shared/src/iosMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.ios.kt similarity index 89% rename from shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.ios.kt rename to shared/src/iosMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.ios.kt index c241877..a7eb575 100644 --- a/shared/src/iosMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.ios.kt +++ b/shared/src/iosMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.ios.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -40,5 +40,4 @@ actual fun PlatformWebView( ) } -private fun Boolean.toInterfaceStyle(): UIUserInterfaceStyle = - if (this) UIUserInterfaceStyleDark else UIUserInterfaceStyleLight +private fun Boolean.toInterfaceStyle(): UIUserInterfaceStyle = if (this) UIUserInterfaceStyleDark else UIUserInterfaceStyleLight diff --git a/shared/src/jsMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.js.kt b/shared/src/jsMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.js.kt similarity index 90% rename from shared/src/jsMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.js.kt rename to shared/src/jsMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.js.kt index e7f9d6c..83cd4ca 100644 --- a/shared/src/jsMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.js.kt +++ b/shared/src/jsMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.js.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/shared/src/jvmMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.jvm.kt b/shared/src/jvmMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.jvm.kt similarity index 90% rename from shared/src/jvmMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.jvm.kt rename to shared/src/jvmMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.jvm.kt index 5ce74e5..897a98d 100644 --- a/shared/src/jvmMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.jvm.kt +++ b/shared/src/jvmMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.jvm.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/shared/src/jvmTest/kotlin/fr/ajaury/gwenedeg/di/KoinModulesTest.kt b/shared/src/jvmTest/kotlin/bzh/ajaury/chombev/di/KoinModulesTest.kt similarity index 85% rename from shared/src/jvmTest/kotlin/fr/ajaury/gwenedeg/di/KoinModulesTest.kt rename to shared/src/jvmTest/kotlin/bzh/ajaury/chombev/di/KoinModulesTest.kt index aa4c69c..a317d1d 100644 --- a/shared/src/jvmTest/kotlin/fr/ajaury/gwenedeg/di/KoinModulesTest.kt +++ b/shared/src/jvmTest/kotlin/bzh/ajaury/chombev/di/KoinModulesTest.kt @@ -1,7 +1,7 @@ -package fr.ajaury.gwenedeg.di +package bzh.ajaury.chombev.di -import fr.ajaury.gwenedeg.appModule -import fr.ajaury.gwenedeg.player.di.audioPlayerModule +import bzh.ajaury.chombev.appModule +import bzh.ajaury.chombev.player.di.audioPlayerModule import org.koin.core.annotation.KoinExperimentalAPI import org.koin.test.verify.verify import kotlin.test.Test diff --git a/shared/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.wasmJs.kt b/shared/src/wasmJsMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.wasmJs.kt similarity index 90% rename from shared/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.wasmJs.kt rename to shared/src/wasmJsMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.wasmJs.kt index e7f9d6c..83cd4ca 100644 --- a/shared/src/wasmJsMain/kotlin/fr/ajaury/gwenedeg/web/ui/PlatformWebView.wasmJs.kt +++ b/shared/src/wasmJsMain/kotlin/bzh/ajaury/chombev/web/ui/PlatformWebView.wasmJs.kt @@ -1,4 +1,4 @@ -package fr.ajaury.gwenedeg.web.ui +package bzh.ajaury.chombev.web.ui import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt b/webApp/src/webMain/kotlin/bzh/ajaury/chombev/main.kt similarity index 90% rename from webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt rename to webApp/src/webMain/kotlin/bzh/ajaury/chombev/main.kt index c4d81e4..c6c8a37 100644 --- a/webApp/src/webMain/kotlin/fr/ajaury/gwenedeg/main.kt +++ b/webApp/src/webMain/kotlin/bzh/ajaury/chombev/main.kt @@ -1,6 +1,6 @@ @file:Suppress("ktlint:standard:filename") -package fr.ajaury.gwenedeg +package bzh.ajaury.chombev import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.window.ComposeViewport