iOS app

michaelbel · Jul 21, 2024 · 4a77a80 · 4a77a80
1 parent ce47cdb
commit 4a77a80
Show file tree

Hide file tree

Showing 135 changed files with 264 additions and 321 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3220,3 +3220,4 @@
 /core/repository-kmp/build/generated/ksp/android/androidDebug/java/org/michaelbel/movies/repository/impl/SearchRepositoryImpl_Factory.java
 /core/repository-kmp/build/generated/ksp/android/androidDebug/java/org/michaelbel/movies/repository/impl/SettingsRepositoryImpl_Factory.java
 /core/repository-kmp/build/generated/ksp/android/androidDebug/java/org/michaelbel/movies/repository/impl/SuggestionRepositoryImpl_Factory.java
+/.kotlin
diff --git a/core/analytics/build.gradle.kts b/core/analytics/build.gradle.kts
@@ -9,18 +9,14 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
             implementation(project(":core:platform-services:interactor"))
-            implementation(libs.bundles.koin.common)
-        }
-        androidMain.dependencies {
-            implementation(libs.bundles.koin.android)
         }
     }
 

diff --git a/...s/di/MoviesAnalyticsKoinModule.desktop.kt → ...s/di/MoviesAnalyticsKoinModule.desktop.kt b/...s/di/MoviesAnalyticsKoinModule.desktop.kt → ...s/di/MoviesAnalyticsKoinModule.desktop.kt
diff --git a/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt b/...ies/analytics/impl/MoviesAnalyticsImpl.kt → ...ies/analytics/impl/MoviesAnalyticsImpl.kt
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -11,17 +11,17 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
+            api(libs.bundles.kotlinx.coroutines.common)
             api(libs.bundles.kotlinx.datetime.common)
             api(libs.bundles.koin.common)
             implementation(compose.material3)
-            implementation(libs.bundles.kotlinx.coroutines.common)
         }
         androidMain.dependencies {
             api(libs.bundles.kotlinx.coroutines.android)
@@ -32,13 +32,12 @@ kotlin {
             api(libs.bundles.startup.android)
             api(libs.bundles.work.android)
             api(libs.bundles.timber.android)
-            api(libs.bundles.koin.compose.work.android)
+            api(libs.bundles.koin.android)
             implementation(libs.bundles.appcompat.android)
             implementation(libs.bundles.browser.android)
-            implementation(libs.bundles.paging.common) // fixme ломает navigation
+            implementation(libs.bundles.paging.common)
         }
-        val desktopMain by getting
-        desktopMain.dependencies {
+        jvmMain.dependencies {
             api(libs.bundles.kotlinx.coroutines.desktop)
             api(libs.bundles.jetbrains.androidx.lifecycle.viewmodel.compose.common)
         }

diff --git a/.../movies/common/browser/Browser.desktop.kt → .../movies/common/browser/Browser.desktop.kt b/.../movies/common/browser/Browser.desktop.kt → .../movies/common/browser/Browser.desktop.kt
diff --git a/...ommon/dispatchers/UiDispatcher.desktop.kt → ...ommon/dispatchers/UiDispatcher.desktop.kt b/...ommon/dispatchers/UiDispatcher.desktop.kt → ...ommon/dispatchers/UiDispatcher.desktop.kt
diff --git a/...common/ktx/SavedStateHandleKtx.desktop.kt → ...common/ktx/SavedStateHandleKtx.desktop.kt b/...common/ktx/SavedStateHandleKtx.desktop.kt → ...common/ktx/SavedStateHandleKtx.desktop.kt
diff --git a/...elbel/movies/common/log/Logger.desktop.kt → ...elbel/movies/common/log/Logger.desktop.kt b/...elbel/movies/common/log/Logger.desktop.kt → ...elbel/movies/common/log/Logger.desktop.kt
diff --git a/.../movies/common/viewmodel/BaseViewModel.kt → .../movies/common/viewmodel/BaseViewModel.kt b/.../movies/common/viewmodel/BaseViewModel.kt → .../movies/common/viewmodel/BaseViewModel.kt
diff --git a/core/interactor/build.gradle.kts b/core/interactor/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -20,9 +20,6 @@ kotlin {
         commonMain.dependencies {
             api(project(":core:analytics"))
             api(project(":core:repository"))
-            implementation(compose.runtime)
-            implementation(compose.runtimeSaveable)
-            implementation(libs.bundles.kotlinx.coroutines.common)
             implementation(libs.bundles.room.paging.common)
         }
     }

diff --git a/...ies/interactor/MovieBlockingInteractor.kt → ...ies/interactor/MovieBlockingInteractor.kt b/...ies/interactor/MovieBlockingInteractor.kt → ...ies/interactor/MovieBlockingInteractor.kt
diff --git a/...i/InteractorBlockingKoinModule.desktop.kt → ...i/InteractorBlockingKoinModule.desktop.kt b/...i/InteractorBlockingKoinModule.desktop.kt → ...i/InteractorBlockingKoinModule.desktop.kt
diff --git a/.../di/InteractorLocaleKoinModule.desktop.kt → .../di/InteractorLocaleKoinModule.desktop.kt b/.../di/InteractorLocaleKoinModule.desktop.kt → .../di/InteractorLocaleKoinModule.desktop.kt
diff --git a/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt b/...s/interactor/impl/LocaleInteractorImpl.kt → ...s/interactor/impl/LocaleInteractorImpl.kt
diff --git a/...actor/impl/MovieBlockingInteractorImpl.kt → ...actor/impl/MovieBlockingInteractorImpl.kt b/...actor/impl/MovieBlockingInteractorImpl.kt → ...actor/impl/MovieBlockingInteractorImpl.kt
diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -22,8 +22,7 @@ kotlin {
             api(libs.bundles.jetbrains.androidx.navigation.compose.common)
             api(libs.bundles.jetbrains.androidx.core.bundle.common)
         }
-        val desktopMain by getting
-        desktopMain.dependencies {
+        jvmMain.dependencies {
             api(libs.bundles.jetbrains.androidx.lifecycle.viewmodel.compose.common)
         }
     }

diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -19,22 +19,21 @@ private val tmdbApiKey: String by lazy {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
-            implementation(libs.bundles.kotlinx.serialization.common)
+            api(project(":core:common"))
+            api(libs.bundles.kotlinx.serialization.common)
             implementation(libs.bundles.ktor.common)
-            implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
             implementation(libs.bundles.ktor.android)
             implementation(libs.bundles.startup.android)
             implementation(libs.bundles.okhttp.logging.interceptor.android)
-            implementation(libs.bundles.koin.android)
         }
     }
 

diff --git a/...ies/network/config/Interceptor.desktop.kt → ...ies/network/config/Interceptor.desktop.kt b/...ies/network/config/Interceptor.desktop.kt → ...ies/network/config/Interceptor.desktop.kt
diff --git a/...vies/network/config/TmdbConfig.desktop.kt → ...vies/network/config/TmdbConfig.desktop.kt b/...vies/network/config/TmdbConfig.desktop.kt → ...vies/network/config/TmdbConfig.desktop.kt
diff --git a/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt b/...es/network/connectivity/NetworkManager.kt → ...es/network/connectivity/NetworkManager.kt
diff --git a/...network/ktor/di/KtorKoinModule.desktop.kt → ...network/ktor/di/KtorKoinModule.desktop.kt b/...network/ktor/di/KtorKoinModule.desktop.kt → ...network/ktor/di/KtorKoinModule.desktop.kt
diff --git a/core/notifications/build.gradle.kts b/core/notifications/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()

diff --git a/core/persistence/build.gradle.kts b/core/persistence/build.gradle.kts
@@ -11,14 +11,13 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":core:common"))
             api(project(":core:network"))
             implementation(libs.bundles.datastore.common)
             implementation(libs.bundles.room.common)
@@ -28,8 +27,7 @@ kotlin {
         androidMain.dependencies {
             implementation(libs.bundles.datastore.android)
         }
-        val desktopMain by getting
-        desktopMain.dependencies {
+        jvmMain.dependencies {
             implementation(libs.bundles.datastore.desktop)
         }
     }
@@ -62,7 +60,10 @@ android {
 
 dependencies {
     add("kspAndroid", libs.bundles.room.compiler.common)
-    add("kspDesktop", libs.bundles.room.compiler.common)
+    add("kspJvm", libs.bundles.room.compiler.common)
+    add("kspIosX64", libs.bundles.room.compiler.common)
+    add("kspIosArm64", libs.bundles.room.compiler.common)
+    add("kspIosSimulatorArm64", libs.bundles.room.compiler.common)
 }
 
 room {

diff --git a/...stence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt b/...stence/src/commonMain/kotlin/org/michaelbel/movies/persistence/database/db/AppDatabase.kt
@@ -39,6 +39,6 @@ abstract class AppDatabase: RoomDatabase() {
 
     companion object {
         const val DATABASE_NAME = "movies.db"
-        const val DATABASE_VERSION = 27
+        const val DATABASE_VERSION = 28
     }
 }
diff --git a/...rc/iosMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.ios.kt b/...rc/iosMain/kotlin/org/michaelbel/movies/persistence/database/di/DatabaseKoinModule.ios.kt
@@ -2,4 +2,15 @@ package org.michaelbel.movies.persistence.database.di
 
 import org.koin.dsl.module
 
-actual val databaseKoinModule = module {}
+actual val databaseKoinModule = module {
+    //single<AppDatabase> { createRoomDatabase().build() }
+}
+
+/*
+private fun createRoomDatabase(): RoomDatabase.Builder<AppDatabase> {
+    val dbFile = NSHomeDirectory() + "/${AppDatabase.DATABASE_NAME}"
+    return Room.databaseBuilder<AppDatabase>(
+        name = dbFile,
+        factory = { AppDatabase::class.instantiateImpl() } // IDE may show error but there is none.
+    )
+}*/
diff --git a/...ence/database/MovieBlockingPersistence.kt → ...ence/database/MovieBlockingPersistence.kt b/...ence/database/MovieBlockingPersistence.kt → ...ence/database/MovieBlockingPersistence.kt
diff --git a/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt b/...es/persistence/database/MoviesDatabase.kt → ...es/persistence/database/MoviesDatabase.kt
diff --git a/...sistence/database/dao/MovieBlockingDao.kt → ...sistence/database/dao/MovieBlockingDao.kt b/...sistence/database/dao/MovieBlockingDao.kt → ...sistence/database/dao/MovieBlockingDao.kt
diff --git a/...database/di/DatabaseKoinModule.desktop.kt → ...database/di/DatabaseKoinModule.desktop.kt b/...database/di/DatabaseKoinModule.desktop.kt → ...database/di/DatabaseKoinModule.desktop.kt
diff --git a/...se/di/MoviesDatabaseKoinModule.desktop.kt → ...se/di/MoviesDatabaseKoinModule.desktop.kt b/...se/di/MoviesDatabaseKoinModule.desktop.kt → ...se/di/MoviesDatabaseKoinModule.desktop.kt
diff --git a/.../PersistenceBlockingKoinModule.desktop.kt → .../PersistenceBlockingKoinModule.desktop.kt b/.../PersistenceBlockingKoinModule.desktop.kt → .../PersistenceBlockingKoinModule.desktop.kt
diff --git a/...tastore/di/DataStoreKoinModule.desktop.kt → ...tastore/di/DataStoreKoinModule.desktop.kt b/...tastore/di/DataStoreKoinModule.desktop.kt → ...tastore/di/DataStoreKoinModule.desktop.kt
diff --git a/core/platform-services/foss/build.gradle.kts b/core/platform-services/foss/build.gradle.kts
@@ -9,16 +9,14 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor"))
-            implementation(libs.bundles.kotlinx.coroutines.common)
-            implementation(libs.bundles.koin.common)
+            api(project(":core:platform-services:interactor"))
         }
     }
 

diff --git a/...rm/impl/analytics/AnalyticsServiceImpl.kt → ...rm/impl/analytics/AnalyticsServiceImpl.kt b/...rm/impl/analytics/AnalyticsServiceImpl.kt → ...rm/impl/analytics/AnalyticsServiceImpl.kt
diff --git a/...platform/impl/review/ReviewServiceImpl.kt → ...platform/impl/review/ReviewServiceImpl.kt b/...platform/impl/review/ReviewServiceImpl.kt → ...platform/impl/review/ReviewServiceImpl.kt
diff --git a/...platform/impl/update/UpdateServiceImpl.kt → ...platform/impl/update/UpdateServiceImpl.kt b/...platform/impl/update/UpdateServiceImpl.kt → ...platform/impl/update/UpdateServiceImpl.kt
diff --git a/core/platform-services/gms/build.gradle.kts b/core/platform-services/gms/build.gradle.kts
@@ -9,19 +9,16 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor"))
+            api(project(":core:platform-services:interactor"))
             implementation(project(":core:notifications"))
-            implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
             api(libs.bundles.google.firebase.android)
             api(libs.bundles.google.services.android)
             api(libs.bundles.google.play.android)
-            implementation(libs.bundles.koin.android)
         }
     }
 

diff --git a/core/platform-services/hms/build.gradle.kts b/core/platform-services/hms/build.gradle.kts
@@ -9,13 +9,10 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor"))
-            implementation(libs.bundles.kotlinx.coroutines.common)
-            implementation(libs.bundles.koin.common)
+            api(project(":core:platform-services:interactor"))
         }
     }
 

diff --git a/core/platform-services/inject-android/build.gradle.kts b/core/platform-services/inject-android/build.gradle.kts
@@ -9,15 +9,10 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor"))
-            implementation(libs.bundles.koin.common)
-        }
-        androidMain.dependencies {
-            implementation(libs.bundles.koin.android)
+            api(project(":core:platform-services:interactor"))
         }
     }
 

diff --git a/core/platform-services/inject-desktop/build.gradle.kts b/core/platform-services/inject-desktop/build.gradle.kts
@@ -3,13 +3,11 @@ plugins {
 }
 
 kotlin {
-    jvm("desktop")
+    jvm()
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor"))
             implementation(project(":core:platform-services:foss"))
-            implementation(libs.bundles.koin.common)
         }
     }
 }
diff --git a/core/platform-services/inject-ios/build.gradle.kts b/core/platform-services/inject-ios/build.gradle.kts
@@ -9,9 +9,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:platform-services:interactor"))
             implementation(project(":core:platform-services:foss"))
-            implementation(libs.bundles.koin.common)
         }
     }
 }
diff --git a/core/platform-services/interactor/build.gradle.kts b/core/platform-services/interactor/build.gradle.kts
@@ -9,14 +9,14 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
-            implementation(libs.bundles.kotlinx.coroutines.common)
+            api(project(":core:common"))
         }
     }
 

diff --git a/...es/platform/analytics/AnalyticsService.kt → ...es/platform/analytics/AnalyticsService.kt b/...es/platform/analytics/AnalyticsService.kt → ...es/platform/analytics/AnalyticsService.kt
diff --git a/...l/movies/platform/review/ReviewService.kt → ...l/movies/platform/review/ReviewService.kt b/...l/movies/platform/review/ReviewService.kt → ...l/movies/platform/review/ReviewService.kt
diff --git a/...l/movies/platform/update/UpdateService.kt → ...l/movies/platform/update/UpdateService.kt b/...l/movies/platform/update/UpdateService.kt → ...l/movies/platform/update/UpdateService.kt
diff --git a/core/repository/build.gradle.kts b/core/repository/build.gradle.kts
@@ -9,15 +9,14 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
             api(project(":core:persistence"))
-            implementation(libs.bundles.kotlinx.coroutines.common)
             implementation(libs.bundles.room.paging.common)
         }
     }

diff --git a/...ies/repository/MovieBlockingRepository.kt → ...ies/repository/MovieBlockingRepository.kt b/...ies/repository/MovieBlockingRepository.kt → ...ies/repository/MovieBlockingRepository.kt
diff --git a/...i/RepositoryBlockingKoinModule.desktop.kt → ...i/RepositoryBlockingKoinModule.desktop.kt b/...i/RepositoryBlockingKoinModule.desktop.kt → ...i/RepositoryBlockingKoinModule.desktop.kt
diff --git a/...itory/impl/MovieBlockingRepositoryImpl.kt → ...itory/impl/MovieBlockingRepositoryImpl.kt b/...itory/impl/MovieBlockingRepositoryImpl.kt → ...itory/impl/MovieBlockingRepositoryImpl.kt
diff --git a/...movies/repository/ktx/BuildKtx.desktop.kt → ...movies/repository/ktx/BuildKtx.desktop.kt b/...movies/repository/ktx/BuildKtx.desktop.kt → ...movies/repository/ktx/BuildKtx.desktop.kt
diff --git a/...es/repository/ktx/ExceptionKtx.desktop.kt → ...es/repository/ktx/ExceptionKtx.desktop.kt b/...es/repository/ktx/ExceptionKtx.desktop.kt → ...es/repository/ktx/ExceptionKtx.desktop.kt
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -11,33 +11,39 @@ plugins {
 
 kotlin {
     androidTarget()
-    jvm("desktop")
+    jvm()
     iosX64()
     iosArm64()
     iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {
-            implementation(project(":core:persistence"))
-            implementation(libs.bundles.lifecycle.common)
+            api(project(":core:persistence"))
             api(libs.bundles.coil.common)
-            implementation(libs.bundles.constraintlayout.common)
-            implementation(compose.components.resources)
-            implementation(compose.foundation)
-            implementation(compose.material)
-            implementation(compose.material3)
-            implementation(compose.runtime)
-            implementation(compose.runtimeSaveable)
+            api(libs.bundles.constraintlayout.common)
+            api(compose.animation)
+            api(compose.foundation)
+            api(compose.runtime)
+            api(compose.runtimeSaveable)
+            api(compose.ui)
+            api(compose.material)
+            api(compose.material3)
+            api(compose.components.resources)
+            api(compose.components.uiToolingPreview)
             implementation(compose.materialIconsExtended)
-            implementation(compose.ui)
+            implementation(libs.bundles.lifecycle.common)
         }
         androidMain.dependencies {
             api(libs.bundles.core.splashscreen.android)
             api(libs.bundles.palette.android)
             api(libs.bundles.coil.android)
             api(libs.bundles.compose.android)
             api(libs.bundles.google.material.android)
-            implementation(libs.bundles.paging.common) // fixme ломает navigation
+            implementation(libs.bundles.paging.common)
+        }
+        jvmMain.dependencies {
+            api(compose.desktop.common)
+            api(compose.desktop.currentOs)
         }
     }
 

diff --git a/...es/ui/compose/page/PageContent.desktop.kt → ...es/ui/compose/page/PageContent.desktop.kt b/...es/ui/compose/page/PageContent.desktop.kt → ...es/ui/compose/page/PageContent.desktop.kt
diff --git a/...es/ui/compose/page/PageFailure.desktop.kt → ...es/ui/compose/page/PageFailure.desktop.kt b/...es/ui/compose/page/PageFailure.desktop.kt → ...es/ui/compose/page/PageFailure.desktop.kt
diff --git a/...es/ui/compose/page/PageLoading.desktop.kt → ...es/ui/compose/page/PageLoading.desktop.kt b/...es/ui/compose/page/PageLoading.desktop.kt → ...es/ui/compose/page/PageLoading.desktop.kt
diff --git a/...movies/ui/ktx/ConfigurationKtx.desktop.kt → ...movies/ui/ktx/ConfigurationKtx.desktop.kt b/...movies/ui/ktx/ConfigurationKtx.desktop.kt → ...movies/ui/ktx/ConfigurationKtx.desktop.kt
diff --git a/...vies/ui/ktx/LazyPagingItemsKtx.desktop.kt → ...vies/ui/ktx/LazyPagingItemsKtx.desktop.kt b/...vies/ui/ktx/LazyPagingItemsKtx.desktop.kt → ...vies/ui/ktx/LazyPagingItemsKtx.desktop.kt
diff --git a/...bel/movies/ui/ktx/LifecycleKtx.desktop.kt → ...bel/movies/ui/ktx/LifecycleKtx.desktop.kt b/...bel/movies/ui/ktx/LifecycleKtx.desktop.kt → ...bel/movies/ui/ktx/LifecycleKtx.desktop.kt
diff --git a/.../movies/ui/ktx/WindowInsetsKtx.desktop.kt → .../movies/ui/ktx/WindowInsetsKtx.desktop.kt b/.../movies/ui/ktx/WindowInsetsKtx.desktop.kt → .../movies/ui/ktx/WindowInsetsKtx.desktop.kt
diff --git a/...chaelbel/movies/ui/theme/Theme.desktop.kt → ...chaelbel/movies/ui/theme/Theme.desktop.kt b/...chaelbel/movies/ui/theme/Theme.desktop.kt → ...chaelbel/movies/ui/theme/Theme.desktop.kt