Fix non-transitive R classes x3

mars885 · Aug 9, 2024 · 5bc0655 · 5bc0655
1 parent 4d6aa65
commit 5bc0655
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/...fo/src/main/java/com/paulrybitskyi/gamedge/feature/info/presentation/GameInfoViewModel.kt b/...fo/src/main/java/com/paulrybitskyi/gamedge/feature/info/presentation/GameInfoViewModel.kt
@@ -25,9 +25,9 @@ import com.paulrybitskyi.gamedge.common.ui.base.events.common.GeneralCommand
 import com.paulrybitskyi.gamedge.common.ui.di.qualifiers.TransitionAnimationDuration
 import com.paulrybitskyi.gamedge.core.ErrorMapper
 import com.paulrybitskyi.gamedge.core.Logger
+import com.paulrybitskyi.gamedge.core.R as CoreR
 import com.paulrybitskyi.gamedge.core.providers.StringProvider
 import com.paulrybitskyi.gamedge.core.utils.onError
-import com.paulrybitskyi.gamedge.feature.info.R
 import com.paulrybitskyi.gamedge.feature.info.domain.entities.GameImageType
 import com.paulrybitskyi.gamedge.feature.info.domain.usecases.GetGameImageUrlsUseCase
 import com.paulrybitskyi.gamedge.feature.info.domain.usecases.GetGameInfoUseCase
@@ -114,7 +114,7 @@ internal class GameInfoViewModel @Inject constructor(
 
     fun onArtworkClicked(artworkIndex: Int) {
         navigateToImageViewer(
-            title = stringProvider.getString(R.string.artwork),
+            title = stringProvider.getString(CoreR.string.artwork),
             imageType = GameImageType.ARTWORK,
             initialPosition = artworkIndex,
         )
@@ -149,7 +149,7 @@ internal class GameInfoViewModel @Inject constructor(
 
     fun onCoverClicked() {
         navigateToImageViewer(
-            title = stringProvider.getString(R.string.cover),
+            title = stringProvider.getString(CoreR.string.cover),
             imageType = GameImageType.COVER,
         )
     }
@@ -167,7 +167,7 @@ internal class GameInfoViewModel @Inject constructor(
 
     fun onScreenshotClicked(screenshotIndex: Int) {
         navigateToImageViewer(
-            title = stringProvider.getString(R.string.screenshot),
+            title = stringProvider.getString(CoreR.string.screenshot),
             imageType = GameImageType.SCREENSHOT,
             initialPosition = screenshotIndex,
         )

diff --git a/...a/com/paulrybitskyi/gamedge/feature/info/presentation/widgets/header/artworks/Artworks.kt b/...a/com/paulrybitskyi/gamedge/feature/info/presentation/widgets/header/artworks/Artworks.kt
@@ -31,6 +31,7 @@ import com.paulrybitskyi.gamedge.common.ui.clickable
 import com.paulrybitskyi.gamedge.common.ui.images.defaultImageRequest
 import com.paulrybitskyi.gamedge.common.ui.images.secondaryImage
 import com.paulrybitskyi.gamedge.common.ui.theme.GamedgeTheme
+import com.paulrybitskyi.gamedge.common.ui.widgets.R as CommonUiWidgetsR
 import com.paulrybitskyi.gamedge.feature.info.R
 
 @Composable
@@ -68,13 +69,13 @@ private fun Artwork(
     onArtworkClicked: () -> Unit,
 ) {
     val data = when (artwork) {
-        is GameInfoArtworkUiModel.DefaultImage -> R.drawable.game_background_placeholder
+        is GameInfoArtworkUiModel.DefaultImage -> CommonUiWidgetsR.drawable.game_background_placeholder
         is GameInfoArtworkUiModel.UrlImage -> artwork.url
     }
 
     AsyncImage(
         model = defaultImageRequest(data) {
-            secondaryImage(R.drawable.game_background_placeholder)
+            secondaryImage(CommonUiWidgetsR.drawable.game_background_placeholder)
         },
         contentDescription = null,
         modifier = Modifier

diff --git a/...src/main/java/com/paulrybitskyi/gamedge/feature/likes/presentation/LikedGamesViewModel.kt b/...src/main/java/com/paulrybitskyi/gamedge/feature/likes/presentation/LikedGamesViewModel.kt
@@ -34,6 +34,7 @@ import com.paulrybitskyi.gamedge.core.utils.onError
 import com.paulrybitskyi.gamedge.common.domain.common.entities.hasDefaultLimit
 import com.paulrybitskyi.gamedge.common.domain.common.entities.nextLimit
 import com.paulrybitskyi.gamedge.common.domain.games.common.ObserveGamesUseCaseParams
+import com.paulrybitskyi.gamedge.core.R as CoreR
 import com.paulrybitskyi.gamedge.feature.likes.R
 import com.paulrybitskyi.gamedge.feature.likes.domain.ObserveLikedGamesUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -86,7 +87,7 @@ internal class LikedGamesViewModel @Inject constructor(
     private fun createDefaultUiState(): GamesUiState {
         return GamesUiState(
             isLoading = false,
-            infoIconId = R.drawable.account_heart_outline,
+            infoIconId = CoreR.drawable.account_heart_outline,
             infoTitle = stringProvider.getString(R.string.liked_games_info_title),
             games = emptyList(),
         )