diff --git a/app/build.gradle.kts b/app/build.gradle.kts deleted file mode 100644 index 6b65c1b1..00000000 --- a/app/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -@file:Suppress("UnstableApiUsage") - -plugins { - id("com.streamplayer.application") - alias(libs.plugins.jetbrains.compose) - alias(libs.plugins.compose.compiler) -} - -dependencies { - implementation(projects.featureFavorites) - implementation(projects.featureListStreams) - implementation(projects.featureDetail) - implementation(projects.featureSearch) - implementation(projects.featureProfile) - implementation(projects.coreShared) - implementation(projects.coreSharedUi) - implementation(projects.coreNavigation) - implementation(projects.coreNetworking) - implementation(projects.coreLocalStorage) - - implementation(libs.navigation.compose) - implementation(compose.material3) - implementation(compose.ui) - implementation(compose.preview) - implementation(libs.bundles.koin) - implementation(libs.bundles.androidSupport) - implementation(libs.bundles.kotlin) - - implementation(libs.lottie) - implementation(libs.lottie) - testImplementation(libs.bundles.test) - - // Kover - Combined report - rootProject.subprojects.forEach { kover(it) } -} \ No newline at end of file diff --git a/app/src/test/java/com/codandotv/streamplayerapp/ExampleUnitTest.kt b/app/src/test/java/com/codandotv/streamplayerapp/ExampleUnitTest.kt deleted file mode 100644 index e83e0c8a..00000000 --- a/app/src/test/java/com/codandotv/streamplayerapp/ExampleUnitTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.codandotv.streamplayerapp - -import org.junit.Test - -import org.junit.Assert.assertEquals - -/** - * Example local unit test, which will execute on the development machine (host). - * - * See [testing documentation](http://d.android.com/tools/testing). - */ -class ExampleUnitTest { - @Test - fun addition_isCorrect() { - assertEquals(4, 2 + 2) - } -} \ No newline at end of file diff --git a/build-logic/src/main/java/com.streamplayer.android-library.gradle.kts b/build-logic/src/main/java/com.streamplayer.android-library.gradle.kts deleted file mode 100644 index 196d8a85..00000000 --- a/build-logic/src/main/java/com.streamplayer.android-library.gradle.kts +++ /dev/null @@ -1,47 +0,0 @@ -@file:Suppress("UnstableApiUsage") - -import extensions.dokkaPlugin -import extensions.getLibrary -import extensions.setupAndroidDefaultConfig -import extensions.setupCompileOptions -import extensions.setupNameSpace -import extensions.setupPackingOptions - -val libs: VersionCatalog = extensions.getByType().named("libs") - -plugins { - id("com.android.library") - id("kotlin-kapt") - id("kotlin-android") - id("kotlin-parcelize") - id("com.streamplayer.dokka") - id("org.jetbrains.kotlinx.kover") - id("com.streamplayer.detekt") -} - -android { - setupNameSpace(project) - - setupCompileOptions() - - setupPackingOptions() - - setupAndroidDefaultConfig() - defaultConfig.targetSdk = Config.targetSdkVersion - - buildTypes { - getByName("release") { - isMinifyEnabled = true - proguardFiles("proguard-android.txt", "proguard-rules.pro") - consumerProguardFiles("proguard-rules.pro") - } - - getByName("debug") { - isMinifyEnabled = false - } - } -} - -dependencies { - dokkaPlugin(libs.getLibrary("dokka")) -} \ No newline at end of file diff --git a/build-logic/src/main/java/com.streamplayer.application.gradle.kts b/build-logic/src/main/java/com.streamplayer.application.gradle.kts index 9304e428..b1bcd23f 100644 --- a/build-logic/src/main/java/com.streamplayer.application.gradle.kts +++ b/build-logic/src/main/java/com.streamplayer.application.gradle.kts @@ -5,12 +5,14 @@ import extensions.getLibrary import extensions.setupAndroidDefaultConfig import extensions.setupCompileOptions import extensions.setupPackingOptions +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi +import org.jetbrains.kotlin.gradle.dsl.JvmTarget val libs: VersionCatalog = extensions.getByType().named("libs") plugins { id("com.android.application") - id("kotlin-android") + id("org.jetbrains.kotlin.multiplatform") id("kotlin-kapt") id("kotlin-parcelize") id("com.streamplayer.dokka") @@ -19,6 +21,14 @@ plugins { } val catalog: VersionCatalog = extensions.getByType().named("libs") +kotlin { + androidTarget { + @OptIn(ExperimentalKotlinGradlePluginApi::class) + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } + } +} android { namespace = Config.applicationId diff --git a/app/.gitignore b/composeApp/.gitignore similarity index 100% rename from app/.gitignore rename to composeApp/.gitignore diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts new file mode 100644 index 00000000..658249ca --- /dev/null +++ b/composeApp/build.gradle.kts @@ -0,0 +1,38 @@ +@file:Suppress("UnstableApiUsage") + +plugins { + id("com.streamplayer.application") + alias(libs.plugins.jetbrains.compose) + alias(libs.plugins.compose.compiler) +} +kotlin { + sourceSets { + androidMain.dependencies { + implementation(projects.featureListStreams) + implementation(projects.featureDetail) + implementation(projects.featureSearch) + implementation(projects.featureProfile) + implementation(projects.coreShared) + implementation(projects.coreSharedUi) + implementation(projects.coreNavigation) + implementation(projects.coreNetworking) + implementation(projects.coreLocalStorage) + + implementation(libs.navigation.compose) + implementation(compose.material3) + implementation(compose.ui) + implementation(compose.preview) + implementation(libs.bundles.koin) + implementation(libs.bundles.androidSupport) + implementation(libs.bundles.kotlin) + + implementation(libs.lottie) + implementation(libs.lottie) + } + } +} + +dependencies { + // Kover - Combined report + rootProject.subprojects.forEach { kover(it) } +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/composeApp/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to composeApp/proguard-rules.pro diff --git a/app/src/main/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml similarity index 85% rename from app/src/main/AndroidManifest.xml rename to composeApp/src/androidMain/AndroidManifest.xml index 43b331ce..4c4f5b7c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -9,10 +9,10 @@ android:roundIcon="@mipmap/ic_netflix_round" android:label="@string/app_name" android:supportsRtl="true" - android:name="com.codandotv.streamplayerapp.CustomApplication"> + android:name=".CustomApplication"> diff --git a/app/src/main/java/com/codandotv/streamplayerapp/CustomApplication.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/CustomApplication.kt similarity index 100% rename from app/src/main/java/com/codandotv/streamplayerapp/CustomApplication.kt rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/CustomApplication.kt diff --git a/app/src/main/java/com/codandotv/streamplayerapp/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/MainActivity.kt similarity index 100% rename from app/src/main/java/com/codandotv/streamplayerapp/MainActivity.kt rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/MainActivity.kt diff --git a/app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/di/AppModule.kt similarity index 100% rename from app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/di/AppModule.kt diff --git a/app/src/main/java/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt similarity index 95% rename from app/src/main/java/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt index cbc81815..192ab17b 100644 --- a/app/src/main/java/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt +++ b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt @@ -15,7 +15,7 @@ import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlay import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes import com.codandotv.streamplayerapp.core_navigation.routes.Routes import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.navigation.listStreamsNavGraph -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.navigation.profilePickerStreamNavGraph +import com.codandotv.streamplayerapp.profile.presentation.navigation.profilePickerStreamNavGraph import com.codandotv.streamplayerapp.splah.presentation.navigation.splashNavGraph import com.codandotv.streamplayerapp.feature_detail.presentation.navigation.detailStreamNavGraph diff --git a/app/src/main/java/com/codandotv/streamplayerapp/splah/presentation/navigation/SplashNavigation.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/splah/presentation/navigation/SplashNavigation.kt similarity index 100% rename from app/src/main/java/com/codandotv/streamplayerapp/splah/presentation/navigation/SplashNavigation.kt rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/splah/presentation/navigation/SplashNavigation.kt diff --git a/app/src/main/java/com/codandotv/streamplayerapp/splah/presentation/screens/SplashScreen.kt b/composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/splah/presentation/screens/SplashScreen.kt similarity index 100% rename from app/src/main/java/com/codandotv/streamplayerapp/splah/presentation/screens/SplashScreen.kt rename to composeApp/src/androidMain/kotlin/com/codandotv/streamplayerapp/splah/presentation/screens/SplashScreen.kt diff --git a/app/src/main/res/xml/backup_rules.xml b/composeApp/src/androidMain/res/xml/backup_rules.xml similarity index 100% rename from app/src/main/res/xml/backup_rules.xml rename to composeApp/src/androidMain/res/xml/backup_rules.xml diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/composeApp/src/androidMain/res/xml/data_extraction_rules.xml similarity index 100% rename from app/src/main/res/xml/data_extraction_rules.xml rename to composeApp/src/androidMain/res/xml/data_extraction_rules.xml diff --git a/core-local-storage/build.gradle.kts b/core-local-storage/build.gradle.kts index c8e2ff05..4437ccef 100644 --- a/core-local-storage/build.gradle.kts +++ b/core-local-storage/build.gradle.kts @@ -1,13 +1,27 @@ plugins { - id("com.streamplayer.android-library") + id("com.streamplayer.kmp-library") id("com.google.devtools.ksp") } +kotlin { + sourceSets { + androidMain.dependencies { + implementation(libs.bundles.room) + implementation(libs.bundles.kotlin) + implementation(libs.bundles.koin) + } + } +} + dependencies { + add("kspCommonMainMetadata",libs.koin.compiler) + add("kspAndroid", libs.koin.compiler) +} +ksp { + arg("KOIN_CONFIG_CHECK","true") +} + +dependencies { ksp(libs.roomCompiler) - implementation(libs.bundles.room) - implementation(libs.bundles.kotlin) - implementation(libs.bundles.koin) - testImplementation(libs.bundles.test) } \ No newline at end of file diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt b/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt similarity index 100% rename from core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt rename to core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/dao/FavoriteDao.kt diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/database/StreamPlayerAppDatabase.kt b/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/StreamPlayerAppDatabase.kt similarity index 100% rename from core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/data/database/StreamPlayerAppDatabase.kt rename to core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/data/database/StreamPlayerAppDatabase.kt diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt b/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt similarity index 100% rename from core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt rename to core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/di/LocalStorageModule.kt diff --git a/core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt b/core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt similarity index 100% rename from core-local-storage/src/main/java/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt rename to core-local-storage/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_local_storage/domain/model/MovieEntity.kt diff --git a/core-navigation/build.gradle.kts b/core-navigation/build.gradle.kts index 93248caf..482d37d5 100644 --- a/core-navigation/build.gradle.kts +++ b/core-navigation/build.gradle.kts @@ -1,12 +1,16 @@ @file:Suppress("UnstableApiUsage") plugins { - id("com.streamplayer.android-library") + id("com.streamplayer.kmp-library") alias(libs.plugins.jetbrains.compose) alias(libs.plugins.compose.compiler) } -dependencies { - implementation(libs.bundles.kotlin) - implementation(libs.navigation.compose) - implementation(compose.material3) +kotlin { + sourceSets { + androidMain.dependencies { + implementation(libs.bundles.kotlin) + implementation(libs.navigation.compose) + implementation(compose.material3) + } + } } \ No newline at end of file diff --git a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt similarity index 100% rename from core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt rename to core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt diff --git a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt similarity index 100% rename from core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt rename to core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt diff --git a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt similarity index 100% rename from core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt rename to core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/extensions/NavControllerExtension.kt diff --git a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt similarity index 100% rename from core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt rename to core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/helper/NavigationHelper.kt diff --git a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt similarity index 100% rename from core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt rename to core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/BottomNavRoutes.kt diff --git a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt similarity index 87% rename from core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt rename to core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt index 572636d9..552cfc46 100644 --- a/core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt +++ b/core-navigation/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt @@ -4,7 +4,7 @@ import com.codandotv.streamplayerapp.core_navigation.routes.Routes.PARAM.ID object Routes { const val DETAIL = "DetailList/" - const val DETAIL_COMPLETE = "${DETAIL}{${ID}}" + const val DETAIL_COMPLETE = "$DETAIL{${ID}}" const val Splash = "splash" const val SEARCH = "Search" const val PROFILE_PICKER = "profilePicker" diff --git a/core-navigation/src/main/res/drawable/ic_downloads_selected.xml b/core-navigation/src/androidMain/res/drawable/ic_downloads_selected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_downloads_selected.xml rename to core-navigation/src/androidMain/res/drawable/ic_downloads_selected.xml diff --git a/core-navigation/src/main/res/drawable/ic_downloads_unselected.xml b/core-navigation/src/androidMain/res/drawable/ic_downloads_unselected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_downloads_unselected.xml rename to core-navigation/src/androidMain/res/drawable/ic_downloads_unselected.xml diff --git a/core-navigation/src/main/res/drawable/ic_games_selected.xml b/core-navigation/src/androidMain/res/drawable/ic_games_selected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_games_selected.xml rename to core-navigation/src/androidMain/res/drawable/ic_games_selected.xml diff --git a/core-navigation/src/main/res/drawable/ic_games_unselected.xml b/core-navigation/src/androidMain/res/drawable/ic_games_unselected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_games_unselected.xml rename to core-navigation/src/androidMain/res/drawable/ic_games_unselected.xml diff --git a/core-navigation/src/main/res/drawable/ic_home_selected.xml b/core-navigation/src/androidMain/res/drawable/ic_home_selected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_home_selected.xml rename to core-navigation/src/androidMain/res/drawable/ic_home_selected.xml diff --git a/core-navigation/src/main/res/drawable/ic_home_unselected.xml b/core-navigation/src/androidMain/res/drawable/ic_home_unselected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_home_unselected.xml rename to core-navigation/src/androidMain/res/drawable/ic_home_unselected.xml diff --git a/core-navigation/src/main/res/drawable/ic_news_selected.xml b/core-navigation/src/androidMain/res/drawable/ic_news_selected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_news_selected.xml rename to core-navigation/src/androidMain/res/drawable/ic_news_selected.xml diff --git a/core-navigation/src/main/res/drawable/ic_news_unselected.xml b/core-navigation/src/androidMain/res/drawable/ic_news_unselected.xml similarity index 100% rename from core-navigation/src/main/res/drawable/ic_news_unselected.xml rename to core-navigation/src/androidMain/res/drawable/ic_news_unselected.xml diff --git a/core-navigation/src/main/res/values/strings.xml b/core-navigation/src/androidMain/res/values/strings.xml similarity index 100% rename from core-navigation/src/main/res/values/strings.xml rename to core-navigation/src/androidMain/res/values/strings.xml diff --git a/core-networking/build.gradle.kts b/core-networking/build.gradle.kts index f5602562..c190c720 100644 --- a/core-networking/build.gradle.kts +++ b/core-networking/build.gradle.kts @@ -1,6 +1,7 @@ plugins { - id("com.streamplayer.android-library") + id("com.streamplayer.kmp-library") } + android { buildFeatures { buildConfig = true @@ -19,9 +20,13 @@ android { } } } -dependencies { - implementation(libs.bundles.kotlin) - implementation(libs.bundles.networking) - implementation(libs.bundles.koin) - testImplementation(libs.bundles.test) -} + +kotlin { + sourceSets { + androidMain.dependencies { + implementation(libs.bundles.kotlin) + implementation(libs.bundles.networking) + implementation(libs.bundles.koin) + } + } +} \ No newline at end of file diff --git a/core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt similarity index 100% rename from core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/NetworkModule.kt diff --git a/core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt similarity index 100% rename from core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/di/QualifierNetworking.kt diff --git a/core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt similarity index 100% rename from core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/Failure.kt diff --git a/core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt similarity index 100% rename from core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/HttpClientConfigExtensions.kt diff --git a/core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt similarity index 100% rename from core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/NetworkResponse.kt diff --git a/core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt b/core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt similarity index 100% rename from core-networking/src/main/java/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt rename to core-networking/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_networking/handleError/ResultExtensions.kt diff --git a/core-networking/src/main/res/values/strings.xml b/core-networking/src/androidMain/res/values/strings.xml similarity index 100% rename from core-networking/src/main/res/values/strings.xml rename to core-networking/src/androidMain/res/values/strings.xml diff --git a/core-networking/src/main/AndroidManifest.xml b/core-networking/src/main/AndroidManifest.xml deleted file mode 100644 index a8800291..00000000 --- a/core-networking/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/core-shared-ui/build.gradle.kts b/core-shared-ui/build.gradle.kts index 1a4e4c49..5e12fe36 100644 --- a/core-shared-ui/build.gradle.kts +++ b/core-shared-ui/build.gradle.kts @@ -1,21 +1,25 @@ @file:Suppress("UnstableApiUsage") plugins { - id("com.streamplayer.android-library") + id("com.streamplayer.kmp-library") alias(libs.plugins.jetbrains.compose) alias(libs.plugins.compose.compiler) } -dependencies { - implementation(projects.coreShared) - implementation(compose.material3) - implementation(compose.preview) - implementation(compose.ui) - implementation(libs.navigation.compose) - implementation(libs.bundles.koin) - implementation(libs.bundles.kotlin) - implementation(libs.bundles.androidSupport) - implementation(libs.android.youtube.player) - implementation(libs.paging.compose) - implementation(libs.coil) - testImplementation(libs.bundles.test) -} \ No newline at end of file +kotlin { + sourceSets { + androidMain.dependencies { + implementation(projects.coreShared) + implementation(compose.material3) + implementation(compose.preview) + implementation(compose.ui) + implementation(libs.navigation.compose) + implementation(libs.bundles.koin) + implementation(libs.bundles.kotlin) + implementation(libs.bundles.androidSupport) + implementation(libs.android.youtube.player) + implementation(libs.paging.compose) + implementation(libs.coil) + } + } +} + diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/StreamPlayerTheme.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/theme/ThemePreviews.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/utils/Sharing.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCard.kt diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt b/core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt similarity index 100% rename from core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt rename to core-shared-ui/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamsCarousel.kt diff --git a/core-shared-ui/src/main/res/drawable/ic_add.xml b/core-shared-ui/src/androidMain/res/drawable/ic_add.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_add.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_add.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_close.xml b/core-shared-ui/src/androidMain/res/drawable/ic_close.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_close.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_close.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_copy_content.xml b/core-shared-ui/src/androidMain/res/drawable/ic_copy_content.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_copy_content.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_copy_content.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_info.xml b/core-shared-ui/src/androidMain/res/drawable/ic_info.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_info.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_info.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_instagram.xml b/core-shared-ui/src/androidMain/res/drawable/ic_instagram.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_instagram.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_instagram.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_message.xml b/core-shared-ui/src/androidMain/res/drawable/ic_message.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_message.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_message.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_netflix.png b/core-shared-ui/src/androidMain/res/drawable/ic_netflix.png similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_netflix.png rename to core-shared-ui/src/androidMain/res/drawable/ic_netflix.png diff --git a/core-shared-ui/src/main/res/drawable/ic_netflix_background.xml b/core-shared-ui/src/androidMain/res/drawable/ic_netflix_background.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_netflix_background.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_netflix_background.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_netflix_foreground.xml b/core-shared-ui/src/androidMain/res/drawable/ic_netflix_foreground.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_netflix_foreground.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_netflix_foreground.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_play.xml b/core-shared-ui/src/androidMain/res/drawable/ic_play.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_play.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_play.xml diff --git a/core-shared-ui/src/main/res/drawable/ic_whatsapp.xml b/core-shared-ui/src/androidMain/res/drawable/ic_whatsapp.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/ic_whatsapp.xml rename to core-shared-ui/src/androidMain/res/drawable/ic_whatsapp.xml diff --git a/core-shared-ui/src/main/res/drawable/perfil_fake.png b/core-shared-ui/src/androidMain/res/drawable/perfil_fake.png similarity index 100% rename from core-shared-ui/src/main/res/drawable/perfil_fake.png rename to core-shared-ui/src/androidMain/res/drawable/perfil_fake.png diff --git a/core-shared-ui/src/main/res/drawable/transparent_image.xml b/core-shared-ui/src/androidMain/res/drawable/transparent_image.xml similarity index 100% rename from core-shared-ui/src/main/res/drawable/transparent_image.xml rename to core-shared-ui/src/androidMain/res/drawable/transparent_image.xml diff --git a/core-shared-ui/src/main/res/mipmap-anydpi-v26/ic_netflix.xml b/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix.xml similarity index 100% rename from core-shared-ui/src/main/res/mipmap-anydpi-v26/ic_netflix.xml rename to core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix.xml diff --git a/core-shared-ui/src/main/res/mipmap-anydpi-v26/ic_netflix_round.xml b/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix_round.xml similarity index 100% rename from core-shared-ui/src/main/res/mipmap-anydpi-v26/ic_netflix_round.xml rename to core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix_round.xml diff --git a/core-shared-ui/src/main/res/mipmap-hdpi/ic_netflix.png b/core-shared-ui/src/androidMain/res/mipmap-hdpi/ic_netflix.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-hdpi/ic_netflix.png rename to core-shared-ui/src/androidMain/res/mipmap-hdpi/ic_netflix.png diff --git a/core-shared-ui/src/main/res/mipmap-hdpi/ic_netflix_round.png b/core-shared-ui/src/androidMain/res/mipmap-hdpi/ic_netflix_round.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-hdpi/ic_netflix_round.png rename to core-shared-ui/src/androidMain/res/mipmap-hdpi/ic_netflix_round.png diff --git a/core-shared-ui/src/main/res/mipmap-mdpi/ic_netflix.png b/core-shared-ui/src/androidMain/res/mipmap-mdpi/ic_netflix.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-mdpi/ic_netflix.png rename to core-shared-ui/src/androidMain/res/mipmap-mdpi/ic_netflix.png diff --git a/core-shared-ui/src/main/res/mipmap-mdpi/ic_netflix_round.png b/core-shared-ui/src/androidMain/res/mipmap-mdpi/ic_netflix_round.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-mdpi/ic_netflix_round.png rename to core-shared-ui/src/androidMain/res/mipmap-mdpi/ic_netflix_round.png diff --git a/core-shared-ui/src/main/res/mipmap-xhdpi/ic_netflix.png b/core-shared-ui/src/androidMain/res/mipmap-xhdpi/ic_netflix.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-xhdpi/ic_netflix.png rename to core-shared-ui/src/androidMain/res/mipmap-xhdpi/ic_netflix.png diff --git a/core-shared-ui/src/main/res/mipmap-xhdpi/ic_netflix_round.png b/core-shared-ui/src/androidMain/res/mipmap-xhdpi/ic_netflix_round.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-xhdpi/ic_netflix_round.png rename to core-shared-ui/src/androidMain/res/mipmap-xhdpi/ic_netflix_round.png diff --git a/core-shared-ui/src/main/res/mipmap-xxhdpi/ic_netflix.png b/core-shared-ui/src/androidMain/res/mipmap-xxhdpi/ic_netflix.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-xxhdpi/ic_netflix.png rename to core-shared-ui/src/androidMain/res/mipmap-xxhdpi/ic_netflix.png diff --git a/core-shared-ui/src/main/res/mipmap-xxhdpi/ic_netflix_round.png b/core-shared-ui/src/androidMain/res/mipmap-xxhdpi/ic_netflix_round.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-xxhdpi/ic_netflix_round.png rename to core-shared-ui/src/androidMain/res/mipmap-xxhdpi/ic_netflix_round.png diff --git a/core-shared-ui/src/main/res/mipmap-xxxhdpi/ic_netflix.png b/core-shared-ui/src/androidMain/res/mipmap-xxxhdpi/ic_netflix.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-xxxhdpi/ic_netflix.png rename to core-shared-ui/src/androidMain/res/mipmap-xxxhdpi/ic_netflix.png diff --git a/core-shared-ui/src/main/res/mipmap-xxxhdpi/ic_netflix_round.png b/core-shared-ui/src/androidMain/res/mipmap-xxxhdpi/ic_netflix_round.png similarity index 100% rename from core-shared-ui/src/main/res/mipmap-xxxhdpi/ic_netflix_round.png rename to core-shared-ui/src/androidMain/res/mipmap-xxxhdpi/ic_netflix_round.png diff --git a/core-shared-ui/src/main/res/raw/logo.json b/core-shared-ui/src/androidMain/res/raw/logo.json similarity index 100% rename from core-shared-ui/src/main/res/raw/logo.json rename to core-shared-ui/src/androidMain/res/raw/logo.json diff --git a/core-shared-ui/src/main/res/values-night/themes.xml b/core-shared-ui/src/androidMain/res/values-night/themes.xml similarity index 100% rename from core-shared-ui/src/main/res/values-night/themes.xml rename to core-shared-ui/src/androidMain/res/values-night/themes.xml diff --git a/core-shared-ui/src/main/res/values-v31/themes.xml b/core-shared-ui/src/androidMain/res/values-v31/themes.xml similarity index 100% rename from core-shared-ui/src/main/res/values-v31/themes.xml rename to core-shared-ui/src/androidMain/res/values-v31/themes.xml diff --git a/core-shared-ui/src/main/res/values/colors.xml b/core-shared-ui/src/androidMain/res/values/colors.xml similarity index 100% rename from core-shared-ui/src/main/res/values/colors.xml rename to core-shared-ui/src/androidMain/res/values/colors.xml diff --git a/core-shared-ui/src/main/res/values/content-description.xml b/core-shared-ui/src/androidMain/res/values/content-description.xml similarity index 100% rename from core-shared-ui/src/main/res/values/content-description.xml rename to core-shared-ui/src/androidMain/res/values/content-description.xml diff --git a/core-shared-ui/src/main/res/values/strings.xml b/core-shared-ui/src/androidMain/res/values/strings.xml similarity index 100% rename from core-shared-ui/src/main/res/values/strings.xml rename to core-shared-ui/src/androidMain/res/values/strings.xml diff --git a/core-shared-ui/src/main/res/values/themes.xml b/core-shared-ui/src/androidMain/res/values/themes.xml similarity index 100% rename from core-shared-ui/src/main/res/values/themes.xml rename to core-shared-ui/src/androidMain/res/values/themes.xml diff --git a/core-shared-ui/src/main/AndroidManifest.xml b/core-shared-ui/src/main/AndroidManifest.xml deleted file mode 100644 index ee784d7a..00000000 --- a/core-shared-ui/src/main/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core-shared/build.gradle.kts b/core-shared/build.gradle.kts index f1b45dda..b10865f8 100644 --- a/core-shared/build.gradle.kts +++ b/core-shared/build.gradle.kts @@ -1,7 +1,12 @@ plugins { - id("com.streamplayer.android-library") + id("com.streamplayer.kmp-library") } -dependencies { - implementation(libs.bundles.koin) + +kotlin { + sourceSets { + androidMain.dependencies { + implementation(libs.bundles.koin) + } + } } \ No newline at end of file diff --git a/core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/Url.kt b/core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/Url.kt similarity index 100% rename from core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/Url.kt rename to core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/Url.kt diff --git a/core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/extension/ErrorExt.kt b/core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/extension/ErrorExt.kt similarity index 100% rename from core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/extension/ErrorExt.kt rename to core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/extension/ErrorExt.kt diff --git a/core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/extension/String.Ext.kt b/core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/extension/String.Ext.kt similarity index 100% rename from core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/extension/String.Ext.kt rename to core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/extension/String.Ext.kt diff --git a/core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/extension/UriExt.kt b/core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/extension/UriExt.kt similarity index 100% rename from core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/extension/UriExt.kt rename to core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/extension/UriExt.kt diff --git a/core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt b/core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt similarity index 100% rename from core-shared/src/main/java/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt rename to core-shared/src/androidMain/kotlin/com/codandotv/streamplayerapp/core_shared/qualifier/QualifierDispatcherIO.kt diff --git a/core-shared/src/main/AndroidManifest.xml b/core-shared/src/main/AndroidManifest.xml deleted file mode 100644 index a8800291..00000000 --- a/core-shared/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/DetailStreamRepositoryTest.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/DetailStreamRepositoryTest.kt similarity index 100% rename from feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/DetailStreamRepositoryTest.kt rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/DetailStreamRepositoryTest.kt diff --git a/feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/DetailStreamUseCaseTest.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/DetailStreamUseCaseTest.kt similarity index 100% rename from feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/DetailStreamUseCaseTest.kt rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/DetailStreamUseCaseTest.kt diff --git a/feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/DetailStreamViewModelTest.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/DetailStreamViewModelTest.kt similarity index 100% rename from feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/DetailStreamViewModelTest.kt rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/DetailStreamViewModelTest.kt diff --git a/feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/InstantTaskCoroutinesExecutorRule.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/InstantTaskCoroutinesExecutorRule.kt similarity index 100% rename from feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/InstantTaskCoroutinesExecutorRule.kt rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/InstantTaskCoroutinesExecutorRule.kt diff --git a/feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/Shared.kt b/feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/Shared.kt similarity index 100% rename from feature-detail/src/test/java/com/codandotv/streamplayerapp/feature_detail/Shared.kt rename to feature-detail/src/commonTest/kotlin/com/codandotv/streamplayerapp/feature_detail/Shared.kt diff --git a/feature-favorites/.gitignore b/feature-favorites/.gitignore deleted file mode 100644 index 42afabfd..00000000 --- a/feature-favorites/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/feature-favorites/build.gradle.kts b/feature-favorites/build.gradle.kts deleted file mode 100644 index ee61df78..00000000 --- a/feature-favorites/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -@file:Suppress("UnstableApiUsage") -plugins { - id("com.streamplayer.android-library") - alias(libs.plugins.jetbrains.compose) - alias(libs.plugins.compose.compiler) -} - -dependencies { - implementation(projects.coreNetworking) - implementation(projects.coreNavigation) - implementation(projects.coreShared) - implementation(projects.coreSharedUi) - - implementation(libs.bundles.koin) - implementation(libs.bundles.networking) - implementation(libs.bundles.androidSupport) - implementation(libs.coil) - - testImplementation(libs.bundles.test) -} \ No newline at end of file diff --git a/feature-favorites/consumer-rules.pro b/feature-favorites/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/feature-favorites/proguard-rules.pro b/feature-favorites/proguard-rules.pro deleted file mode 100644 index 481bb434..00000000 --- a/feature-favorites/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/feature-profile/build.gradle.kts b/feature-profile/build.gradle.kts index 7f44787a..fe8df508 100644 --- a/feature-profile/build.gradle.kts +++ b/feature-profile/build.gradle.kts @@ -1,30 +1,36 @@ @file:Suppress("UnstableApiUsage") plugins { - id("com.streamplayer.android-library") + id("com.streamplayer.kmp-library") alias(libs.plugins.jetbrains.compose) alias(libs.plugins.compose.compiler) alias(libs.plugins.ksp) } -dependencies { - implementation(projects.coreNetworking) - implementation(projects.coreNavigation) - implementation(projects.coreShared) - implementation(projects.coreSharedUi) - implementation(libs.navigation.compose) - implementation(compose.material3) - implementation(compose.ui) +kotlin { + sourceSets { + androidMain.dependencies { + implementation(projects.coreNetworking) + implementation(projects.coreNavigation) + implementation(projects.coreShared) + implementation(projects.coreSharedUi) + implementation(libs.navigation.compose) + implementation(compose.material3) + implementation(compose.ui) - implementation(libs.bundles.koin) - implementation(libs.koin.annotations) - ksp(libs.koin.compiler) + implementation(libs.bundles.koin) + implementation(libs.koin.annotations) + implementation(libs.bundles.networking) + implementation(libs.bundles.androidSupport) + implementation(libs.coil) - implementation(libs.bundles.networking) - implementation(libs.bundles.androidSupport) - implementation(libs.coil) + } + } +} - testImplementation(libs.bundles.test) +dependencies { + add("kspCommonMainMetadata",libs.koin.compiler) + add("kspAndroid", libs.koin.compiler) } ksp { diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/ProfilePickerStreamRepository.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamRepository.kt similarity index 90% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/ProfilePickerStreamRepository.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamRepository.kt index 7fdba887..6474a36c 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/ProfilePickerStreamRepository.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamRepository.kt @@ -1,10 +1,10 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.data +package com.codandotv.streamplayerapp.profile.data import android.util.Log import com.codandotv.streamplayerapp.core_networking.handleError.toFlow import com.codandotv.streamplayerapp.core_networking.handleError.toResult -import com.codandotv.streamplayerapp.feature_profile.profile.domain.ProfileStream -import com.codandotv.streamplayerapp.feature_profile.profile.domain.toProfiles +import com.codandotv.streamplayerapp.profile.domain.ProfileStream +import com.codandotv.streamplayerapp.profile.domain.toProfiles import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.map diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/ProfilePickerStreamService.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamService.kt similarity index 78% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/ProfilePickerStreamService.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamService.kt index 8f900f79..e071ddf2 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/ProfilePickerStreamService.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/ProfilePickerStreamService.kt @@ -1,8 +1,8 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.data +package com.codandotv.streamplayerapp.profile.data import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse import com.codandotv.streamplayerapp.core_networking.handleError.safeRequest -import com.codandotv.streamplayerapp.feature_profile.profile.data.model.ProfilesResponse +import com.codandotv.streamplayerapp.profile.data.model.ProfilesResponse import io.ktor.client.HttpClient import io.ktor.client.request.url diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/model/ProfileStreamResponse.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/model/ProfileStreamResponse.kt similarity index 80% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/model/ProfileStreamResponse.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/model/ProfileStreamResponse.kt index 2abc127a..afac8e93 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/data/model/ProfileStreamResponse.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/data/model/ProfileStreamResponse.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.data.model +package com.codandotv.streamplayerapp.profile.data.model import kotlinx.serialization.Serializable diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/di/ProfilePickerStreamModule.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/di/ProfilePickerStreamModule.kt similarity index 58% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/di/ProfilePickerStreamModule.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/di/ProfilePickerStreamModule.kt index 991e2c03..978c3a81 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/di/ProfilePickerStreamModule.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/di/ProfilePickerStreamModule.kt @@ -1,7 +1,7 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.di +package com.codandotv.streamplayerapp.profile.di -import com.codandotv.streamplayerapp.feature_profile.profile.data.ProfilePickerStreamService -import com.codandotv.streamplayerapp.feature_profile.profile.data.ProfilePickerStreamServiceImpl +import com.codandotv.streamplayerapp.profile.data.ProfilePickerStreamService +import com.codandotv.streamplayerapp.profile.data.ProfilePickerStreamServiceImpl import io.ktor.client.HttpClient import org.koin.core.annotation.ComponentScan import org.koin.core.annotation.Factory @@ -9,7 +9,7 @@ import org.koin.core.annotation.Module import org.koin.core.context.GlobalContext @Module -@ComponentScan("com.codandotv.streamplayerapp.feature_profile") +@ComponentScan("com.codandotv.streamplayerapp.profile") class ProfilePickerStreamModule { @Factory diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfilePickerStreamMapper.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamMapper.kt similarity index 60% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfilePickerStreamMapper.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamMapper.kt index 6d5ce0ac..ff732549 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfilePickerStreamMapper.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamMapper.kt @@ -1,6 +1,6 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.domain +package com.codandotv.streamplayerapp.profile.domain -import com.codandotv.streamplayerapp.feature_profile.profile.data.model.ProfilesResponse +import com.codandotv.streamplayerapp.profile.data.model.ProfilesResponse fun ProfilesResponse.toProfiles(): List = this.profiles.map { profileResponse -> ProfileStream( diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfilePickerStreamUseCase.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamUseCase.kt similarity index 93% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfilePickerStreamUseCase.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamUseCase.kt index 225a15be..490d855b 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfilePickerStreamUseCase.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfilePickerStreamUseCase.kt @@ -1,7 +1,7 @@ @file:Suppress("MagicNumber") -package com.codandotv.streamplayerapp.feature_profile.profile.domain +package com.codandotv.streamplayerapp.profile.domain -import com.codandotv.streamplayerapp.feature_profile.profile.data.ProfilePickerStreamRepository +import com.codandotv.streamplayerapp.profile.data.ProfilePickerStreamRepository import kotlinx.coroutines.flow.Flow import org.koin.core.annotation.Factory diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfileStream.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfileStream.kt similarity index 57% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfileStream.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfileStream.kt index 7c365999..5440084a 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/domain/ProfileStream.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/domain/ProfileStream.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.domain +package com.codandotv.streamplayerapp.profile.domain data class ProfileStream( val id: String, diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/navigation/ProfilePickerStreamNavigation.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/navigation/ProfilePickerStreamNavigation.kt similarity index 79% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/navigation/ProfilePickerStreamNavigation.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/navigation/ProfilePickerStreamNavigation.kt index 3624f939..61c12602 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/navigation/ProfilePickerStreamNavigation.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/navigation/ProfilePickerStreamNavigation.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.navigation +package com.codandotv.streamplayerapp.profile.presentation.navigation import androidx.lifecycle.Lifecycle import androidx.navigation.NavGraphBuilder @@ -7,8 +7,8 @@ import androidx.navigation.compose.composable import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.HOME import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes.PARAM.PROFILE_ID import com.codandotv.streamplayerapp.core_navigation.routes.Routes -import com.codandotv.streamplayerapp.feature_profile.profile.di.ProfilePickerStreamModule -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.screens.ProfilePickerStreamScreen +import com.codandotv.streamplayerapp.profile.di.ProfilePickerStreamModule +import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamScreen import org.koin.core.context.loadKoinModules import org.koin.core.context.unloadKoinModules import org.koin.ksp.generated.module diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamScreen.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamScreen.kt similarity index 90% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamScreen.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamScreen.kt index e54b0442..1fa56e33 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamScreen.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamScreen.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.screens +package com.codandotv.streamplayerapp.profile.presentation.screens import android.annotation.SuppressLint import androidx.compose.animation.animateColorAsState @@ -24,13 +24,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreview import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews import com.codandotv.streamplayerapp.feature.profile.R -import com.codandotv.streamplayerapp.feature_profile.profile.domain.ProfileStream -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget.LoadScreen -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget.ProfilePickerOpacityLayer -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget.ProfilePickerProfilesGrid -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget.ProfilePickerSelectedProfileContainer -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget.ProfilePickerStreamToolbar -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget.dpToPx +import com.codandotv.streamplayerapp.profile.domain.ProfileStream +import com.codandotv.streamplayerapp.profile.presentation.widget.LoadScreen +import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerOpacityLayer +import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerProfilesGrid +import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerSelectedProfileContainer +import com.codandotv.streamplayerapp.profile.presentation.widget.ProfilePickerStreamToolbar +import com.codandotv.streamplayerapp.profile.presentation.widget.dpToPx import org.koin.androidx.compose.koinViewModel @Composable diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamViewModel.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamViewModel.kt similarity index 94% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamViewModel.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamViewModel.kt index 36e3aa90..5e1c9b59 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamViewModel.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamViewModel.kt @@ -1,12 +1,12 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.screens +package com.codandotv.streamplayerapp.profile.presentation.screens import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure -import com.codandotv.streamplayerapp.feature_profile.profile.domain.ProfilePickerStreamUseCase -import com.codandotv.streamplayerapp.feature_profile.profile.domain.ProfileStream +import com.codandotv.streamplayerapp.profile.domain.ProfilePickerStreamUseCase +import com.codandotv.streamplayerapp.profile.domain.ProfileStream import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamsUIState.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamsUIState.kt similarity index 83% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamsUIState.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamsUIState.kt index 414b8d83..0ca2751b 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/screens/ProfilePickerStreamsUIState.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/screens/ProfilePickerStreamsUIState.kt @@ -1,6 +1,6 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.screens +package com.codandotv.streamplayerapp.profile.presentation.screens -import com.codandotv.streamplayerapp.feature_profile.profile.domain.ProfileStream +import com.codandotv.streamplayerapp.profile.domain.ProfileStream data class ProfilePickerStreamsUIState( diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ComposeExtensions.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ComposeExtensions.kt similarity index 72% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ComposeExtensions.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ComposeExtensions.kt index 2d30f8c5..109a6561 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ComposeExtensions.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ComposeExtensions.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget +package com.codandotv.streamplayerapp.profile.presentation.widget import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalDensity diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerOpacityLayer.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerOpacityLayer.kt similarity index 84% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerOpacityLayer.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerOpacityLayer.kt index f8fb3601..efbd403f 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerOpacityLayer.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerOpacityLayer.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget +package com.codandotv.streamplayerapp.profile.presentation.widget import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerProfilesGrid.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt similarity index 93% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerProfilesGrid.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt index f24737a2..45ae69e2 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerProfilesGrid.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget +package com.codandotv.streamplayerapp.profile.presentation.widget import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.BoxWithConstraints @@ -24,8 +24,8 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import com.codandotv.streamplayerapp.feature.profile.R -import com.codandotv.streamplayerapp.feature_profile.profile.domain.ProfileStream -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.screens.ProfilePickerStreamsUIState +import com.codandotv.streamplayerapp.profile.domain.ProfileStream +import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamsUIState @Composable fun ProfilePickerProfilesGrid( diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt similarity index 92% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt index beade0ac..be4e5e34 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget +package com.codandotv.streamplayerapp.profile.presentation.widget import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.Column @@ -21,7 +21,7 @@ import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest import com.codandotv.streamplayerapp.feature.profile.R -import com.codandotv.streamplayerapp.feature_profile.profile.presentation.screens.ProfilePickerStreamsUIState +import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamsUIState @Suppress("MagicNumber") @Composable diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerStreamLoad.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamLoad.kt similarity index 85% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerStreamLoad.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamLoad.kt index 7c2bc50d..a2746cbd 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerStreamLoad.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamLoad.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget +package com.codandotv.streamplayerapp.profile.presentation.widget import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize diff --git a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerStreamToolbar.kt b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt similarity index 95% rename from feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerStreamToolbar.kt rename to feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt index 50a2c455..fbde3c83 100644 --- a/feature-profile/src/main/java/com/codandotv/streamplayerapp/feature_profile/profile/presentation/widget/ProfilePickerStreamToolbar.kt +++ b/feature-profile/src/androidMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt @@ -1,4 +1,4 @@ -package com.codandotv.streamplayerapp.feature_profile.profile.presentation.widget +package com.codandotv.streamplayerapp.profile.presentation.widget import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement diff --git a/feature-profile/src/main/res/drawable/image_placeholder.xml b/feature-profile/src/androidMain/res/drawable/image_placeholder.xml similarity index 100% rename from feature-profile/src/main/res/drawable/image_placeholder.xml rename to feature-profile/src/androidMain/res/drawable/image_placeholder.xml diff --git a/feature-profile/src/main/res/drawable/netflix_horizontal_logo.xml b/feature-profile/src/androidMain/res/drawable/netflix_horizontal_logo.xml similarity index 100% rename from feature-profile/src/main/res/drawable/netflix_horizontal_logo.xml rename to feature-profile/src/androidMain/res/drawable/netflix_horizontal_logo.xml diff --git a/feature-profile/src/main/res/values/strings.xml b/feature-profile/src/androidMain/res/values/strings.xml similarity index 100% rename from feature-profile/src/main/res/values/strings.xml rename to feature-profile/src/androidMain/res/values/strings.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index bb5d9dd0..7bbc2720 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,7 +20,7 @@ dependencyResolutionManagement { } -include(":app") +include(":composeApp") include(":feature-list-streams") include(":core-shared") include(":core-networking") @@ -28,7 +28,6 @@ include(":core-shared-ui") include(":core-navigation") include(":feature-profile") include(":core-local-storage") -include(":feature-favorites") include(":feature-detail") include(":feature-search")