diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml index 4c4f5b7c..80a3280c 100644 --- a/composeApp/src/androidMain/AndroidManifest.xml +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -3,8 +3,6 @@ - - - \ No newline at end of file diff --git a/composeApp/src/androidMain/res/xml/data_extraction_rules.xml b/composeApp/src/androidMain/res/xml/data_extraction_rules.xml deleted file mode 100644 index 9ee9997b..00000000 --- a/composeApp/src/androidMain/res/xml/data_extraction_rules.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt b/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt index fa57d367..23d9c4cc 100644 --- a/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt +++ b/composeApp/src/commonMain/kotlin/com.codandotv.streamplayerapp/navigation/NavigationGraph.kt @@ -43,7 +43,6 @@ fun NavGraphBuilder.temporaryFun(route: String, navController: NavController) { } @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter") -@OptIn(ExperimentalMaterial3Api::class) @Composable fun example(navController: NavController, route: String) { Scaffold( diff --git a/core-navigation/src/androidMain/res/drawable/ic_downloads_selected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_downloads_selected.xml similarity index 91% rename from core-navigation/src/androidMain/res/drawable/ic_downloads_selected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_downloads_selected.xml index e64c7219..93b67523 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_downloads_selected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_downloads_selected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_downloads_unselected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_downloads_unselected.xml similarity index 91% rename from core-navigation/src/androidMain/res/drawable/ic_downloads_unselected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_downloads_unselected.xml index c23d8c3b..c85cae47 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_downloads_unselected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_downloads_unselected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_games_selected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_games_selected.xml similarity index 94% rename from core-navigation/src/androidMain/res/drawable/ic_games_selected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_games_selected.xml index 7108c3be..1b5f631c 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_games_selected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_games_selected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_games_unselected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_games_unselected.xml similarity index 96% rename from core-navigation/src/androidMain/res/drawable/ic_games_unselected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_games_unselected.xml index 1b02d38d..ebad3d46 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_games_unselected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_games_unselected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_home_selected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_home_selected.xml similarity index 85% rename from core-navigation/src/androidMain/res/drawable/ic_home_selected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_home_selected.xml index 1ce23235..16cfe658 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_home_selected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_home_selected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_home_unselected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_home_unselected.xml similarity index 84% rename from core-navigation/src/androidMain/res/drawable/ic_home_unselected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_home_unselected.xml index 5dc49b78..9517ebda 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_home_unselected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_home_unselected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_news_selected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_news_selected.xml similarity index 94% rename from core-navigation/src/androidMain/res/drawable/ic_news_selected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_news_selected.xml index 50b53635..48906958 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_news_selected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_news_selected.xml @@ -5,6 +5,6 @@ android:viewportHeight="960" android:tint="?attr/colorControlNormal"> diff --git a/core-navigation/src/androidMain/res/drawable/ic_news_unselected.xml b/core-navigation/src/commonMain/composeResources/drawable/ic_news_unselected.xml similarity index 90% rename from core-navigation/src/androidMain/res/drawable/ic_news_unselected.xml rename to core-navigation/src/commonMain/composeResources/drawable/ic_news_unselected.xml index b4d4c7a5..45cfe6ac 100644 --- a/core-navigation/src/androidMain/res/drawable/ic_news_unselected.xml +++ b/core-navigation/src/commonMain/composeResources/drawable/ic_news_unselected.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" - android:tint="@android:color/white"> + android:tint="#FFFFFF"> diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt index 50609dfe..96c2e576 100644 --- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt +++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/BottomNavItem.kt @@ -1,50 +1,56 @@ package com.codandotv.streamplayerapp.core_navigation.bottomnavigation -import androidx.annotation.DrawableRes -import androidx.annotation.StringRes -import com.codandotv.streamplayerapp.core.navigation.R import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes +import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.StringResource import streamplayerapp_kmp.core_navigation.generated.resources.Res import streamplayerapp_kmp.core_navigation.generated.resources.bottom_nav_downloads import streamplayerapp_kmp.core_navigation.generated.resources.bottom_nav_games import streamplayerapp_kmp.core_navigation.generated.resources.bottom_nav_home import streamplayerapp_kmp.core_navigation.generated.resources.bottom_nav_news +import streamplayerapp_kmp.core_navigation.generated.resources.ic_downloads_selected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_downloads_unselected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_games_selected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_games_unselected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_home_selected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_home_unselected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_news_selected +import streamplayerapp_kmp.core_navigation.generated.resources.ic_news_unselected sealed class BottomNavItem( - var title: StringResource, - @DrawableRes var iconUnselected: Int, - @DrawableRes var iconSelected: Int, - var screenRoute: String + val title: StringResource, + val iconUnselected: DrawableResource, + val iconSelected: DrawableResource, + val screenRoute: String ) { object Home : BottomNavItem( Res.string.bottom_nav_home, - R.drawable.ic_home_unselected, - R.drawable.ic_home_selected, + Res.drawable.ic_home_unselected, + Res.drawable.ic_home_selected, BottomNavRoutes.HOME ) object Games : BottomNavItem( Res.string.bottom_nav_games, - R.drawable.ic_games_unselected, - R.drawable.ic_games_selected, + Res.drawable.ic_games_unselected, + Res.drawable.ic_games_selected, BottomNavRoutes.GAMES ) object News : BottomNavItem( Res.string.bottom_nav_news, - R.drawable.ic_news_unselected, - R.drawable.ic_news_selected, + Res.drawable.ic_news_unselected, + Res.drawable.ic_news_selected, BottomNavRoutes.NEWS ) object Downloads : BottomNavItem( Res.string.bottom_nav_downloads, - R.drawable.ic_downloads_unselected, - R.drawable.ic_downloads_selected, + Res.drawable.ic_downloads_unselected, + Res.drawable.ic_downloads_selected, BottomNavRoutes.DOWNLOADS ) } \ No newline at end of file diff --git a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt index 8553c946..f4096a3a 100644 --- a/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt +++ b/core-navigation/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt @@ -11,10 +11,10 @@ import androidx.compose.material3.Text import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController import com.codandotv.streamplayerapp.core_navigation.helper.currentRoute +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource private val bottomMenuItems = listOf( @@ -62,7 +62,7 @@ private fun NavItemIcon( item: BottomNavItem ) { Icon( - painterResource(id = if (currentRoute == item.screenRoute) item.iconSelected else item.iconUnselected), + painterResource(if (currentRoute == item.screenRoute) item.iconSelected else item.iconUnselected), contentDescription = stringResource(item.title), ) } diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_copy_content.xml b/core-shared-ui/src/androidMain/res/drawable/ic_copy_content.xml deleted file mode 100644 index 9b16f48a..00000000 --- a/core-shared-ui/src/androidMain/res/drawable/ic_copy_content.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix.xml b/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix.xml deleted file mode 100644 index 4cc788ad..00000000 --- a/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix_round.xml b/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix_round.xml deleted file mode 100644 index 4cc788ad..00000000 --- a/core-shared-ui/src/androidMain/res/mipmap-anydpi-v26/ic_netflix_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core-shared-ui/src/androidMain/res/values-night/themes.xml b/core-shared-ui/src/androidMain/res/values-night/themes.xml deleted file mode 100644 index 75508352..00000000 --- a/core-shared-ui/src/androidMain/res/values-night/themes.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - diff --git a/core-shared-ui/src/androidMain/res/values-v31/themes.xml b/core-shared-ui/src/androidMain/res/values-v31/themes.xml index f234904b..d6657630 100644 --- a/core-shared-ui/src/androidMain/res/values-v31/themes.xml +++ b/core-shared-ui/src/androidMain/res/values-v31/themes.xml @@ -2,8 +2,9 @@ \ No newline at end of file diff --git a/core-shared-ui/src/androidMain/res/values/colors.xml b/core-shared-ui/src/androidMain/res/values/colors.xml deleted file mode 100644 index f8c6127d..00000000 --- a/core-shared-ui/src/androidMain/res/values/colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file diff --git a/core-shared-ui/src/androidMain/res/values/themes.xml b/core-shared-ui/src/androidMain/res/values/themes.xml index 56f74635..4dfb4c91 100644 --- a/core-shared-ui/src/androidMain/res/values/themes.xml +++ b/core-shared-ui/src/androidMain/res/values/themes.xml @@ -1,22 +1,11 @@ \ No newline at end of file diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_add.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_add.xml similarity index 88% rename from core-shared-ui/src/androidMain/res/drawable/ic_add.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_add.xml index eaf0cd27..7d46aa21 100644 --- a/core-shared-ui/src/androidMain/res/drawable/ic_add.xml +++ b/core-shared-ui/src/commonMain/composeResources/drawable/ic_add.xml @@ -5,6 +5,6 @@ android:viewportHeight="960" android:tint="?attr/colorControlNormal"> diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_close.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_close.xml similarity index 54% rename from core-shared-ui/src/androidMain/res/drawable/ic_close.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_close.xml index 844b6b62..6df42aa8 100644 --- a/core-shared-ui/src/androidMain/res/drawable/ic_close.xml +++ b/core-shared-ui/src/commonMain/composeResources/drawable/ic_close.xml @@ -1,5 +1,5 @@ - + diff --git a/core-shared-ui/src/commonMain/composeResources/drawable/ic_copy_content.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_copy_content.xml new file mode 100644 index 00000000..32b6ed83 --- /dev/null +++ b/core-shared-ui/src/commonMain/composeResources/drawable/ic_copy_content.xml @@ -0,0 +1,5 @@ + + + diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_info.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_info.xml similarity index 96% rename from core-shared-ui/src/androidMain/res/drawable/ic_info.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_info.xml index a85cba3b..75a1da27 100644 --- a/core-shared-ui/src/androidMain/res/drawable/ic_info.xml +++ b/core-shared-ui/src/commonMain/composeResources/drawable/ic_info.xml @@ -5,6 +5,6 @@ android:viewportHeight="960" android:tint="?attr/colorControlNormal"> diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_instagram.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_instagram.xml similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_instagram.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_instagram.xml diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_message.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_message.xml similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_message.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_message.xml diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_netflix.png b/core-shared-ui/src/commonMain/composeResources/drawable/ic_netflix.png similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_netflix.png rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_netflix.png diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_netflix_background.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_netflix_background.xml similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_netflix_background.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_netflix_background.xml diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_netflix_foreground.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_netflix_foreground.xml similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_netflix_foreground.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_netflix_foreground.xml diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_play.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_play.xml similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_play.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_play.xml diff --git a/core-shared-ui/src/androidMain/res/drawable/ic_whatsapp.xml b/core-shared-ui/src/commonMain/composeResources/drawable/ic_whatsapp.xml similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/ic_whatsapp.xml rename to core-shared-ui/src/commonMain/composeResources/drawable/ic_whatsapp.xml diff --git a/core-shared-ui/src/androidMain/res/drawable/perfil_fake.png b/core-shared-ui/src/commonMain/composeResources/drawable/perfil_fake.png similarity index 100% rename from core-shared-ui/src/androidMain/res/drawable/perfil_fake.png rename to core-shared-ui/src/commonMain/composeResources/drawable/perfil_fake.png diff --git a/core-shared-ui/src/commonMain/composeResources/drawable/transparent_image.xml b/core-shared-ui/src/commonMain/composeResources/drawable/transparent_image.xml new file mode 100644 index 00000000..fa4a79ea --- /dev/null +++ b/core-shared-ui/src/commonMain/composeResources/drawable/transparent_image.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt index 6a72b443..dd788dbc 100644 --- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt +++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/SharingStreamCustomView.kt @@ -42,13 +42,11 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.core.content.ContextCompat -import com.codandotv.streamplayerapp.core.shared.ui.R import com.codandotv.streamplayerapp.core_shared.extension.getUriFromUrlImage import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors import com.codandotv.streamplayerapp.core_shared_ui.utils.Sharing.ANIMATION_DURATION @@ -66,8 +64,14 @@ import com.codandotv.streamplayerapp.core_shared_ui.utils.isPackageInstalled import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import streamplayerapp_kmp.core_shared_ui.generated.resources.Res +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_close +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_copy_content +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_instagram +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_message +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_whatsapp import streamplayerapp_kmp.core_shared_ui.generated.resources.instagram_not_installed_message import streamplayerapp_kmp.core_shared_ui.generated.resources.sharing_link_copied_message import streamplayerapp_kmp.core_shared_ui.generated.resources.sharing_title_instagram @@ -142,7 +146,7 @@ fun SharingStreamCustomView( } ) { Image( - painter = painterResource(R.drawable.ic_whatsapp), + painter = painterResource(Res.drawable.ic_whatsapp), contentDescription = null, modifier = Modifier .width(24.dp) @@ -175,7 +179,7 @@ fun SharingStreamCustomView( } ) { Image( - painter = painterResource(R.drawable.ic_message), + painter = painterResource(Res.drawable.ic_message), contentDescription = null, modifier = Modifier .width(24.dp) @@ -204,7 +208,7 @@ fun SharingStreamCustomView( } ) { Image( - painter = painterResource(R.drawable.ic_instagram), + painter = painterResource(Res.drawable.ic_instagram), contentDescription = null, modifier = Modifier .width(24.dp) @@ -233,7 +237,7 @@ fun SharingStreamCustomView( } ) { Image( - painter = painterResource(R.drawable.ic_copy_content), + painter = painterResource(Res.drawable.ic_copy_content), contentDescription = null, modifier = Modifier .width(28.dp) @@ -293,7 +297,7 @@ fun SharingStreamCustomView( } ) { Image( - painter = painterResource(R.drawable.ic_close), + painter = painterResource(Res.drawable.ic_close), contentDescription = null, modifier = Modifier .width(32.dp) diff --git a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt index 588b6b08..b0954304 100644 --- a/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt +++ b/core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/StreamPlayerTopBar.kt @@ -24,19 +24,20 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import com.codandotv.streamplayerapp.core.shared.ui.R import com.codandotv.streamplayerapp.core_shared.extension.empty import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreview import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import streamplayerapp_kmp.core_shared_ui.generated.resources.Res +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_netflix import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_netflix import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_profile import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_search +import streamplayerapp_kmp.core_shared_ui.generated.resources.perfil_fake import streamplayerapp_kmp.core_shared_ui.generated.resources.topbar_categories import streamplayerapp_kmp.core_shared_ui.generated.resources.topbar_movies import streamplayerapp_kmp.core_shared_ui.generated.resources.topbar_shows @@ -76,7 +77,7 @@ private fun StreamPlayerTopBar( onClick = { /* todo */ } ) { Icon( - painter = painterResource(R.drawable.ic_netflix), + painter = painterResource(Res.drawable.ic_netflix), contentDescription = stringResource(Res.string.icon_netflix), tint = Color.Unspecified, ) @@ -105,8 +106,8 @@ private fun StreamPlayerTopBar( .height(24.dp) .clip(RoundedCornerShape(4.dp)), model = profilePicture, - error = painterResource(id = R.drawable.perfil_fake), - placeholder = painterResource(id = R.drawable.perfil_fake), + error = painterResource(Res.drawable.perfil_fake), + placeholder = painterResource(Res.drawable.perfil_fake), contentDescription = stringResource(Res.string.icon_profile) ) } diff --git a/feature-detail/src/androidMain/res/drawable/netflix_detail.webp b/feature-detail/src/commonMain/composeResources/drawable/netflix_detail.webp similarity index 100% rename from feature-detail/src/androidMain/res/drawable/netflix_detail.webp rename to feature-detail/src/commonMain/composeResources/drawable/netflix_detail.webp diff --git a/feature-detail/src/androidMain/res/drawable/play_circle.xml b/feature-detail/src/commonMain/composeResources/drawable/play_circle.xml similarity index 100% rename from feature-detail/src/androidMain/res/drawable/play_circle.xml rename to feature-detail/src/commonMain/composeResources/drawable/play_circle.xml diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt index 18657683..f21e7bf9 100644 --- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt +++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamImagePreview.kt @@ -14,12 +14,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import com.codandotv.streamplayerapp.core_shared_ui.widget.PlayerComponent -import com.codandotv.streamplayerapp.feature.detail.R import com.codandotv.streamplayerapp.feature_detail.presentation.screens.DetailStreamsUIState.DetailStreamsLoadedUIState +import org.jetbrains.compose.resources.painterResource +import streamplayerapp_kmp.feature_detail.generated.resources.Res +import streamplayerapp_kmp.feature_detail.generated.resources.play_circle @Suppress("MagicNumber") @Composable @@ -56,7 +57,7 @@ fun DetailStreamImagePreview( .align(Alignment.Center), ) Icon( - painter = painterResource(id = R.drawable.play_circle), + painter = painterResource(Res.drawable.play_circle), tint = Color.White, contentDescription = null, modifier = Modifier diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt index 17d7ef5d..cf5d5c0f 100644 --- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt +++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamRowHeader.kt @@ -11,15 +11,15 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em import androidx.compose.ui.unit.sp -import com.codandotv.streamplayerapp.feature.detail.R +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import streamplayerapp_kmp.feature_detail.generated.resources.Res import streamplayerapp_kmp.feature_detail.generated.resources.detail_movie +import streamplayerapp_kmp.feature_detail.generated.resources.netflix_detail @Composable fun DetailStreamRowHeader( @@ -30,7 +30,7 @@ fun DetailStreamRowHeader( modifier = modifier ) { Image( - painter = painterResource(id = R.drawable.netflix_detail), + painter = painterResource(Res.drawable.netflix_detail), contentDescription = null, modifier = Modifier .size(26.dp) diff --git a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamToolbar.kt b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamToolbar.kt index 41b244a9..cdf05dce 100644 --- a/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamToolbar.kt +++ b/feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/widget/DetailStreamToolbar.kt @@ -13,12 +13,13 @@ import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.codandotv.streamplayerapp.feature.detail.R +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource +import streamplayerapp_kmp.core_shared_ui.generated.resources.perfil_fake import streamplayerapp_kmp.feature_detail.generated.resources.Res +import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes import streamplayerapp_kmp.feature_detail.generated.resources.detail_back import streamplayerapp_kmp.feature_detail.generated.resources.detail_search @@ -50,7 +51,7 @@ fun DetailStreamToolbar( } IconButton(onClick = { }) { Image( - painter = painterResource(id = com.codandotv.streamplayerapp.core.shared.ui.R.drawable.perfil_fake), + painter = painterResource(SharedRes.drawable.perfil_fake), contentDescription = null ) } diff --git a/feature-list-streams/src/androidMain/res/drawable/ic_top_10.webp b/feature-list-streams/src/androidMain/res/drawable/ic_top_10.webp deleted file mode 100644 index e165119d..00000000 Binary files a/feature-list-streams/src/androidMain/res/drawable/ic_top_10.webp and /dev/null differ diff --git a/feature-list-streams/src/commonMain/composeResources/drawable/ic_top_10.png b/feature-list-streams/src/commonMain/composeResources/drawable/ic_top_10.png new file mode 100644 index 00000000..03b1f3b0 Binary files /dev/null and b/feature-list-streams/src/commonMain/composeResources/drawable/ic_top_10.png differ diff --git a/feature-list-streams/src/androidMain/res/drawable/image_placeholder.xml b/feature-list-streams/src/commonMain/composeResources/drawable/image_placeholder.xml similarity index 100% rename from feature-list-streams/src/androidMain/res/drawable/image_placeholder.xml rename to feature-list-streams/src/commonMain/composeResources/drawable/image_placeholder.xml diff --git a/feature-list-streams/src/androidMain/res/drawable/netflix_horizontal_logo.xml b/feature-list-streams/src/commonMain/composeResources/drawable/netflix_horizontal_logo.xml similarity index 100% rename from feature-list-streams/src/androidMain/res/drawable/netflix_horizontal_logo.xml rename to feature-list-streams/src/commonMain/composeResources/drawable/netflix_horizontal_logo.xml diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt index e2066d4c..75c93595 100644 --- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt +++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/domain/model/HighlightBanner.kt @@ -1,6 +1,6 @@ package com.codandotv.streamplayerapp.feature_list_streams.list.domain.model -import androidx.annotation.DrawableRes +import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.StringResource data class HighlightBanner( @@ -15,6 +15,6 @@ data class HighlightBanner( ) data class IconAndTextInfo( - @DrawableRes val icon: Int, + val icon: DrawableResource, val text: StringResource ) \ No newline at end of file diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt index 4d5b3e83..0c6ad07f 100644 --- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt +++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt @@ -5,7 +5,6 @@ import androidx.lifecycle.viewModelScope import androidx.paging.cachedIn import androidx.paging.map import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure -import com.codandotv.streamplayerapp.feature.list.streams.R import com.codandotv.streamplayerapp.feature_list_streams.core.ContentType import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetGenresUseCase import com.codandotv.streamplayerapp.feature_list_streams.list.domain.GetTopRatedStream @@ -25,12 +24,16 @@ import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_add +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_info +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_play import streamplayerapp_kmp.feature_list_streams.generated.resources.Res +import streamplayerapp_kmp.feature_list_streams.generated.resources.ic_top_10 +import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_add import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_info import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_stream_ranking import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_watch -import com.codandotv.streamplayerapp.core.shared.ui.R as SharedUiR class ListStreamViewModel( private val listStreams: ListStreamUseCase, @@ -86,19 +89,19 @@ class ListStreamViewModel( contentType = ContentType.getContentName(ContentType.FILM), contentTypeAsPlural = ContentType.getContentNameAsPlural(ContentType.FILM), extraInfo = IconAndTextInfo( - R.drawable.ic_top_10, + Res.drawable.ic_top_10, Res.string.list_highlight_banner_stream_ranking ), leftButton = IconAndTextInfo( - SharedUiR.drawable.ic_add, + SharedRes.drawable.ic_add, Res.string.list_highlight_banner_add ), centralButton = IconAndTextInfo( - SharedUiR.drawable.ic_play, + SharedRes.drawable.ic_play, Res.string.list_highlight_banner_watch ), rightButton = IconAndTextInfo( - SharedUiR.drawable.ic_info, + SharedRes.drawable.ic_info, Res.string.list_highlight_banner_info ), ) diff --git a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt index 4d251039..a5a35a4d 100644 --- a/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt +++ b/feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/widgets/HighlightBanner.kt @@ -26,7 +26,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -39,10 +38,16 @@ import com.codandotv.streamplayerapp.feature_list_streams.core.ContentType import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.HighlightBanner import com.codandotv.streamplayerapp.feature_list_streams.list.domain.model.IconAndTextInfo import org.jetbrains.compose.resources.StringResource +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import streamplayerapp_kmp.core_shared_ui.generated.resources.app_name +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_add +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_info +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_netflix +import streamplayerapp_kmp.core_shared_ui.generated.resources.ic_play import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_netflix import streamplayerapp_kmp.feature_list_streams.generated.resources.Res +import streamplayerapp_kmp.feature_list_streams.generated.resources.ic_top_10 import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highligh_banner_content import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_add import streamplayerapp_kmp.feature_list_streams.generated.resources.list_highlight_banner_info @@ -131,7 +136,7 @@ fun ContentRanking( ) { Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) { Icon( - painter = painterResource(id = extraInfo.icon), + painter = painterResource(extraInfo.icon), contentDescription = stringResource(Res.string.list_icon_highligh_banner_ranking), modifier = Modifier.size(24.dp), tint = Color.Unspecified @@ -150,7 +155,7 @@ fun ContentRanking( fun ContentType(modifier: Modifier = Modifier, contentType: StringResource) { Row(modifier = modifier, verticalAlignment = Alignment.CenterVertically) { Icon( - painter = painterResource(id = RSharedUI.drawable.ic_netflix), + painter = painterResource(SharedRes.drawable.ic_netflix), contentDescription = stringResource(SharedRes.string.icon_netflix), modifier = Modifier.size(16.dp), tint = Color.Unspecified @@ -198,7 +203,7 @@ fun AddToListButton( IconButton(onClick = { onClick.invoke() }, modifier = modifier) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Icon( - painter = painterResource(id = RSharedUI.drawable.ic_add), + painter = painterResource(SharedRes.drawable.ic_add), contentDescription = stringResource(Res.string.list_icon_add), tint = Color.White, ) @@ -220,7 +225,7 @@ fun InfoButton( IconButton(onClick = { onClick.invoke() }, modifier = modifier) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Icon( - painter = painterResource(id = RSharedUI.drawable.ic_info), + painter = painterResource(SharedRes.drawable.ic_info), contentDescription = stringResource(Res.string.list_icon_info), tint = Color.White ) @@ -251,7 +256,7 @@ fun PlayButton( ) ) { Icon( - painter = painterResource(RSharedUI.drawable.ic_play), + painter = painterResource(SharedRes.drawable.ic_play), contentDescription = stringResource(Res.string.list_icon_play), tint = Color.Black, modifier = Modifier.padding(vertical = 8.dp) @@ -278,12 +283,12 @@ fun HighlightBannerPreview() { contentType = ContentType.getContentName(ContentType.SHOW), contentTypeAsPlural = ContentType.getContentNameAsPlural(ContentType.SHOW), extraInfo = IconAndTextInfo( - R.drawable.ic_top_10, + Res.drawable.ic_top_10, ContentType.getContentName(ContentType.SHOW) ), - leftButton = IconAndTextInfo(RSharedUI.drawable.ic_add, Res.string.list_highlight_banner_add), - centralButton = IconAndTextInfo(RSharedUI.drawable.ic_play, Res.string.list_highlight_banner_watch), - rightButton = IconAndTextInfo(RSharedUI.drawable.ic_info, Res.string.list_highlight_banner_info), + leftButton = IconAndTextInfo(SharedRes.drawable.ic_add, Res.string.list_highlight_banner_add), + centralButton = IconAndTextInfo(SharedRes.drawable.ic_play, Res.string.list_highlight_banner_watch), + rightButton = IconAndTextInfo(SharedRes.drawable.ic_info, Res.string.list_highlight_banner_info), ) ) } diff --git a/feature-profile/src/androidMain/res/drawable/image_placeholder.xml b/feature-profile/src/commonMain/composeResources/drawable/image_placeholder.xml similarity index 100% rename from feature-profile/src/androidMain/res/drawable/image_placeholder.xml rename to feature-profile/src/commonMain/composeResources/drawable/image_placeholder.xml diff --git a/feature-profile/src/androidMain/res/drawable/netflix_horizontal_logo.xml b/feature-profile/src/commonMain/composeResources/drawable/netflix_horizontal_logo.xml similarity index 100% rename from feature-profile/src/androidMain/res/drawable/netflix_horizontal_logo.xml rename to feature-profile/src/commonMain/composeResources/drawable/netflix_horizontal_logo.xml diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt index 8eab20ed..0fe678f4 100644 --- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt +++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerProfilesGrid.kt @@ -18,15 +18,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.res.painterResource 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.profile.domain.ProfileStream import com.codandotv.streamplayerapp.profile.presentation.screens.ProfilePickerStreamsUIState +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import streamplayerapp_kmp.feature_profile.generated.resources.Res +import streamplayerapp_kmp.feature_profile.generated.resources.image_placeholder import streamplayerapp_kmp.feature_profile.generated.resources.profile_current_profile_name @Composable @@ -94,7 +95,7 @@ private fun ProfileItem( ) { AsyncImage( model = profile.imageUrl, - placeholder = painterResource(id = R.drawable.image_placeholder), + placeholder = painterResource(Res.drawable.image_placeholder), contentDescription = stringResource( Res.string.profile_current_profile_name, ).format(profile.name), diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt index 29946a5e..e42b7786 100644 --- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt +++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerSelectedProfileContainer.kt @@ -14,16 +14,16 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset 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.profile.presentation.screens.ProfilePickerStreamsUIState +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource import streamplayerapp_kmp.feature_profile.generated.resources.Res +import streamplayerapp_kmp.feature_profile.generated.resources.image_placeholder import streamplayerapp_kmp.feature_profile.generated.resources.profile_current_profile_name @SuppressLint("UnusedBoxWithConstraintsScope") @@ -51,7 +51,7 @@ fun ProfilePickerSelectedProfileContainer( .data(selectedItem?.imageUrl) .crossfade(true) .build(), - placeholder = painterResource(id = R.drawable.image_placeholder), + placeholder = painterResource(Res.drawable.image_placeholder), contentDescription = selectedItem?.let { stringResource( Res.string.profile_current_profile_name, diff --git a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt index fbde3c83..e8727675 100644 --- a/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt +++ b/feature-profile/src/commonMain/kotlin/com/codandotv/streamplayerapp/profile/presentation/widget/ProfilePickerStreamToolbar.kt @@ -14,10 +14,11 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews -import com.codandotv.streamplayerapp.feature.profile.R +import org.jetbrains.compose.resources.painterResource +import streamplayerapp_kmp.feature_profile.generated.resources.Res +import streamplayerapp_kmp.feature_profile.generated.resources.netflix_horizontal_logo @Composable fun ProfilePickerStreamToolbar(modifier: Modifier = Modifier) { @@ -34,7 +35,7 @@ fun ProfilePickerStreamToolbar(modifier: Modifier = Modifier) { horizontalArrangement = Arrangement.Center ) { Image( - painter = painterResource(id = R.drawable.netflix_horizontal_logo), + painter = painterResource(Res.drawable.netflix_horizontal_logo), contentDescription = null, modifier = Modifier .height(28.dp) diff --git a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt index 698351b0..0aaf1e8e 100644 --- a/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt +++ b/feature-search/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_search/presentation/widgets/SearchStreams.kt @@ -14,8 +14,6 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Check -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Search import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -26,23 +24,23 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.codandotv.streamplayerapp.core.shared.ui.R import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors import com.codandotv.streamplayerapp.core_shared_ui.widget.CloseButton import com.codandotv.streamplayerapp.core_shared_ui.widget.MicButton import com.codandotv.streamplayerapp.core_shared_ui.widget.SearchIcon +import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.stringResource -import streamplayerapp_kmp.core_shared_ui.generated.resources.* +import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_back +import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_cast +import streamplayerapp_kmp.core_shared_ui.generated.resources.icon_profile +import streamplayerapp_kmp.core_shared_ui.generated.resources.perfil_fake import streamplayerapp_kmp.feature_search.generated.resources.Res -import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes import streamplayerapp_kmp.feature_search.generated.resources.search_list_main_search +import streamplayerapp_kmp.core_shared_ui.generated.resources.Res as SharedRes @Suppress("LongParameterList") @Composable @@ -109,7 +107,7 @@ private fun StreamPlayerTopBar( modifier = Modifier .height(24.dp) .clip(RoundedCornerShape(4.dp)), - painter = painterResource(R.drawable.perfil_fake), + painter = painterResource(SharedRes.drawable.perfil_fake), contentDescription = stringResource(SharedRes.string.icon_profile), tint = Color.Unspecified, ) diff --git a/gradle.properties b/gradle.properties index f63f4eac..1d55b8a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,4 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false \ No newline at end of file