Revert "Implement content language change support" (#334)

Revert "Implement content language change support (#224)" This reverts commit df79de5.
AfigAliyev · Jul 3, 2023 · 32122fc · 32122fc
1 parent 9b2fc29
commit 32122fc
Show file tree

Hide file tree

Showing 55 changed files with 185 additions and 981 deletions.
diff --git a/app/src/main/kotlin/com/maximillianleonov/cinemax/di/DataStoreModule.kt b/app/src/main/kotlin/com/maximillianleonov/cinemax/di/DataStoreModule.kt
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -21,7 +21,5 @@
         <item name="android:navigationBarColor">@color/primaryDark</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
-        <item name="android:dialogTheme">@style/Theme.Cinemax.Dialog</item>
     </style>
-
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -21,17 +21,11 @@
         <item name="android:navigationBarColor">@color/primaryLight</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
-        <item name="android:dialogTheme">@style/Theme.Cinemax.Dialog</item>
     </style>
 
     <style name="Theme.Cinemax.Splash" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/primaryDark</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
         <item name="postSplashScreenTheme">@style/Theme.Cinemax</item>
     </style>
-
-    <style name="Theme.Cinemax.Dialog" parent="android:Theme.Material.Light.Dialog">
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
 </resources>
diff --git a/...ata/src/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/MovieRemoteMediator.kt b/...ata/src/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/MovieRemoteMediator.kt
@@ -33,16 +33,13 @@ import com.maximillianleonov.cinemax.core.database.model.common.MediaType
 import com.maximillianleonov.cinemax.core.database.model.movie.MovieEntity
 import com.maximillianleonov.cinemax.core.database.model.movie.MovieRemoteKeyEntity
 import com.maximillianleonov.cinemax.core.database.source.MovieDatabaseDataSource
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.network.source.MovieNetworkDataSource
-import kotlinx.coroutines.flow.first
 import java.io.IOException
 
 @OptIn(ExperimentalPagingApi::class)
 class MovieRemoteMediator(
     private val databaseDataSource: MovieDatabaseDataSource,
     private val networkDataSource: MovieNetworkDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource,
     private val mediaType: MediaType.Movie
 ) : RemoteMediator<Int, MovieEntity>() {
     @Suppress("ReturnCount")
@@ -74,7 +71,6 @@ class MovieRemoteMediator(
 
             val response = networkDataSource.getByMediaType(
                 mediaType = mediaType.asNetworkMediaType(),
-                language = preferencesDataStoreDataSource.getContentLanguage().first(),
                 page = currentPage
             )
 

diff --git a/...src/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/SearchMoviePagingSource.kt b/...src/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/SearchMoviePagingSource.kt
@@ -23,18 +23,15 @@ import com.maximillianleonov.cinemax.core.common.result.isFailure
 import com.maximillianleonov.cinemax.core.common.result.isSuccess
 import com.maximillianleonov.cinemax.core.data.mapper.asMovieModel
 import com.maximillianleonov.cinemax.core.data.util.Constants
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.domain.model.MovieModel
 import com.maximillianleonov.cinemax.core.network.model.movie.NetworkMovie
 import com.maximillianleonov.cinemax.core.network.source.MovieNetworkDataSource
 import com.maximillianleonov.cinemax.core.network.util.DEFAULT_PAGE
-import kotlinx.coroutines.flow.first
 import java.io.IOException
 
 class SearchMoviePagingSource(
     private val query: String,
-    private val networkDataSource: MovieNetworkDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource
+    private val networkDataSource: MovieNetworkDataSource
 ) : PagingSource<Int, MovieModel>() {
 
     override fun getRefreshKey(state: PagingState<Int, MovieModel>) = state.anchorPosition
@@ -43,11 +40,7 @@ class SearchMoviePagingSource(
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, MovieModel> {
         return try {
             val currentPage = params.key ?: DEFAULT_PAGE
-            val response = networkDataSource.search(
-                query = query,
-                language = preferencesDataStoreDataSource.getContentLanguage().first(),
-                page = currentPage
-            )
+            val response = networkDataSource.search(query = query, page = currentPage)
 
             when {
                 response.isSuccess() -> {

diff --git a/...rc/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/SearchTvShowPagingSource.kt b/...rc/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/SearchTvShowPagingSource.kt
@@ -23,18 +23,15 @@ import com.maximillianleonov.cinemax.core.common.result.isFailure
 import com.maximillianleonov.cinemax.core.common.result.isSuccess
 import com.maximillianleonov.cinemax.core.data.mapper.asTvShowModel
 import com.maximillianleonov.cinemax.core.data.util.Constants
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.domain.model.TvShowModel
 import com.maximillianleonov.cinemax.core.network.model.tvshow.NetworkTvShow
 import com.maximillianleonov.cinemax.core.network.source.TvShowNetworkDataSource
 import com.maximillianleonov.cinemax.core.network.util.DEFAULT_PAGE
-import kotlinx.coroutines.flow.first
 import java.io.IOException
 
 class SearchTvShowPagingSource(
     private val query: String,
-    private val networkDataSource: TvShowNetworkDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource
+    private val networkDataSource: TvShowNetworkDataSource
 ) : PagingSource<Int, TvShowModel>() {
 
     override fun getRefreshKey(state: PagingState<Int, TvShowModel>) = state.anchorPosition
@@ -43,11 +40,7 @@ class SearchTvShowPagingSource(
     override suspend fun load(params: LoadParams<Int>): LoadResult<Int, TvShowModel> {
         return try {
             val currentPage = params.key ?: DEFAULT_PAGE
-            val response = networkDataSource.search(
-                query = query,
-                language = preferencesDataStoreDataSource.getContentLanguage().first(),
-                page = currentPage
-            )
+            val response = networkDataSource.search(query = query, page = currentPage)
 
             when {
                 response.isSuccess() -> {

diff --git a/...ta/src/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/TvShowRemoteMediator.kt b/...ta/src/main/kotlin/com/maximillianleonov/cinemax/core/data/paging/TvShowRemoteMediator.kt
@@ -33,16 +33,13 @@ import com.maximillianleonov.cinemax.core.database.model.common.MediaType
 import com.maximillianleonov.cinemax.core.database.model.tvshow.TvShowEntity
 import com.maximillianleonov.cinemax.core.database.model.tvshow.TvShowRemoteKeyEntity
 import com.maximillianleonov.cinemax.core.database.source.TvShowDatabaseDataSource
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.network.source.TvShowNetworkDataSource
-import kotlinx.coroutines.flow.first
 import java.io.IOException
 
 @OptIn(ExperimentalPagingApi::class)
 class TvShowRemoteMediator(
     private val databaseDataSource: TvShowDatabaseDataSource,
     private val networkDataSource: TvShowNetworkDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource,
     private val mediaType: MediaType.TvShow
 ) : RemoteMediator<Int, TvShowEntity>() {
     @Suppress("ReturnCount")
@@ -74,7 +71,6 @@ class TvShowRemoteMediator(
 
             val response = networkDataSource.getByMediaType(
                 mediaType = mediaType.asNetworkMediaType(),
-                language = preferencesDataStoreDataSource.getContentLanguage().first(),
                 page = currentPage
             )
 

diff --git a/...n/kotlin/com/maximillianleonov/cinemax/core/data/repository/MovieDetailsRepositoryImpl.kt b/...n/kotlin/com/maximillianleonov/cinemax/core/data/repository/MovieDetailsRepositoryImpl.kt
@@ -22,22 +22,19 @@ import com.maximillianleonov.cinemax.core.data.mapper.asMovieDetailsModel
 import com.maximillianleonov.cinemax.core.data.mapper.listMap
 import com.maximillianleonov.cinemax.core.database.source.MovieDetailsDatabaseDataSource
 import com.maximillianleonov.cinemax.core.database.source.WishlistDatabaseDataSource
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.domain.model.MovieDetailsModel
 import com.maximillianleonov.cinemax.core.domain.repository.MovieDetailsRepository
 import com.maximillianleonov.cinemax.core.network.common.networkBoundResource
 import com.maximillianleonov.cinemax.core.network.model.movie.NetworkMovieDetails
 import com.maximillianleonov.cinemax.core.network.source.MovieDetailsNetworkDataSource
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class MovieDetailsRepositoryImpl @Inject constructor(
     private val databaseDataSource: MovieDetailsDatabaseDataSource,
     private val networkDataSource: MovieDetailsNetworkDataSource,
-    private val wishlistDatabaseDataSource: WishlistDatabaseDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource
+    private val wishlistDatabaseDataSource: WishlistDatabaseDataSource
 ) : MovieDetailsRepository {
     override fun getById(id: Int): Flow<CinemaxResult<MovieDetailsModel?>> = networkBoundResource(
         query = {
@@ -47,12 +44,7 @@ class MovieDetailsRepositoryImpl @Inject constructor(
                 )
             }
         },
-        fetch = {
-            networkDataSource.getById(
-                id = id,
-                language = preferencesDataStoreDataSource.getContentLanguage().first()
-            )
-        },
+        fetch = { networkDataSource.getById(id) },
         saveFetchResult = { response ->
             databaseDataSource.deleteAndInsert(response.asMovieDetailsEntity())
         }
@@ -67,12 +59,7 @@ class MovieDetailsRepositoryImpl @Inject constructor(
                     )
                 }
             },
-            fetch = {
-                networkDataSource.getByIds(
-                    ids = ids,
-                    language = preferencesDataStoreDataSource.getContentLanguage().first()
-                )
-            },
+            fetch = { networkDataSource.getByIds(ids) },
             saveFetchResult = { response ->
                 databaseDataSource.deleteAndInsertAll(
                     response.map(NetworkMovieDetails::asMovieDetailsEntity)

diff --git a/...src/main/kotlin/com/maximillianleonov/cinemax/core/data/repository/MovieRepositoryImpl.kt b/...src/main/kotlin/com/maximillianleonov/cinemax/core/data/repository/MovieRepositoryImpl.kt
@@ -31,21 +31,18 @@ import com.maximillianleonov.cinemax.core.data.paging.SearchMoviePagingSource
 import com.maximillianleonov.cinemax.core.data.util.defaultPagingConfig
 import com.maximillianleonov.cinemax.core.database.model.movie.MovieEntity
 import com.maximillianleonov.cinemax.core.database.source.MovieDatabaseDataSource
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.domain.model.MediaTypeModel
 import com.maximillianleonov.cinemax.core.domain.model.MovieModel
 import com.maximillianleonov.cinemax.core.domain.repository.MovieRepository
 import com.maximillianleonov.cinemax.core.network.common.networkBoundResource
 import com.maximillianleonov.cinemax.core.network.source.MovieNetworkDataSource
 import com.maximillianleonov.cinemax.core.network.util.PAGE_SIZE
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class MovieRepositoryImpl @Inject constructor(
     private val databaseDataSource: MovieDatabaseDataSource,
-    private val networkDataSource: MovieNetworkDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource
+    private val networkDataSource: MovieNetworkDataSource
 ) : MovieRepository {
     override fun getByMediaType(
         mediaTypeModel: MediaTypeModel.Movie
@@ -58,12 +55,7 @@ class MovieRepositoryImpl @Inject constructor(
                     pageSize = PAGE_SIZE
                 ).listMap(MovieEntity::asMovieModel)
             },
-            fetch = {
-                networkDataSource.getByMediaType(
-                    mediaType = mediaType.asNetworkMediaType(),
-                    language = preferencesDataStoreDataSource.getContentLanguage().first()
-                )
-            },
+            fetch = { networkDataSource.getByMediaType(mediaType.asNetworkMediaType()) },
             saveFetchResult = { response ->
                 databaseDataSource.deleteByMediaTypeAndInsertAll(
                     mediaType = mediaType,
@@ -80,24 +72,13 @@ class MovieRepositoryImpl @Inject constructor(
         val mediaType = mediaTypeModel.asMediaType()
         return Pager(
             config = defaultPagingConfig,
-            remoteMediator = MovieRemoteMediator(
-                databaseDataSource = databaseDataSource,
-                networkDataSource = networkDataSource,
-                preferencesDataStoreDataSource = preferencesDataStoreDataSource,
-                mediaType = mediaType
-            ),
+            remoteMediator = MovieRemoteMediator(databaseDataSource, networkDataSource, mediaType),
             pagingSourceFactory = { databaseDataSource.getPagingByMediaType(mediaType) }
         ).flow.pagingMap(MovieEntity::asMovieModel)
     }
 
     override fun search(query: String): Flow<PagingData<MovieModel>> = Pager(
         config = defaultPagingConfig,
-        pagingSourceFactory = {
-            SearchMoviePagingSource(
-                query = query,
-                networkDataSource = networkDataSource,
-                preferencesDataStoreDataSource = preferencesDataStoreDataSource
-            )
-        }
+        pagingSourceFactory = { SearchMoviePagingSource(query, networkDataSource) }
     ).flow
 }
diff --git a/.../main/kotlin/com/maximillianleonov/cinemax/core/data/repository/SettingsRepositoryImpl.kt b/.../main/kotlin/com/maximillianleonov/cinemax/core/data/repository/SettingsRepositoryImpl.kt
@@ -16,33 +16,14 @@
 
 package com.maximillianleonov.cinemax.core.data.repository
 
-import com.maximillianleonov.cinemax.core.data.util.titlecase
 import com.maximillianleonov.cinemax.core.database.source.SettingsDatabaseDataSource
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.domain.repository.SettingsRepository
-import java.util.Locale
 import javax.inject.Inject
 
 class SettingsRepositoryImpl @Inject constructor(
-    databaseDataSource: SettingsDatabaseDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource
+    databaseDataSource: SettingsDatabaseDataSource
 ) : SettingsRepository {
     override val repoUrl = databaseDataSource.repoUrl
     override val privacyPolicyUrl = databaseDataSource.privacyPolicyUrl
     override val version = databaseDataSource.version
-
-    override fun getAvailableLanguages(): Map<String, String> {
-        val languages = mutableMapOf<String, String>()
-        Locale.getAvailableLocales()
-            .sortedBy(Locale::getDisplayLanguage)
-            .forEach { locale ->
-                languages[locale.language] = locale.displayLanguage.titlecase()
-            }
-        return languages
-    }
-
-    override fun getContentLanguage() = preferencesDataStoreDataSource.getContentLanguage()
-    override suspend fun setContentLanguage(contentLanguage: String) {
-        preferencesDataStoreDataSource.setContentLanguage(contentLanguage)
-    }
 }
diff --git a/.../kotlin/com/maximillianleonov/cinemax/core/data/repository/TvShowDetailsRepositoryImpl.kt b/.../kotlin/com/maximillianleonov/cinemax/core/data/repository/TvShowDetailsRepositoryImpl.kt
@@ -22,22 +22,19 @@ import com.maximillianleonov.cinemax.core.data.mapper.asTvShowDetailsModel
 import com.maximillianleonov.cinemax.core.data.mapper.listMap
 import com.maximillianleonov.cinemax.core.database.source.TvShowDetailsDatabaseDataSource
 import com.maximillianleonov.cinemax.core.database.source.WishlistDatabaseDataSource
-import com.maximillianleonov.cinemax.core.datastore.PreferencesDataStoreDataSource
 import com.maximillianleonov.cinemax.core.domain.model.TvShowDetailsModel
 import com.maximillianleonov.cinemax.core.domain.repository.TvShowDetailsRepository
 import com.maximillianleonov.cinemax.core.network.common.networkBoundResource
 import com.maximillianleonov.cinemax.core.network.model.tvshow.NetworkTvShowDetails
 import com.maximillianleonov.cinemax.core.network.source.TvShowDetailsNetworkDataSource
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class TvShowDetailsRepositoryImpl @Inject constructor(
     private val databaseDataSource: TvShowDetailsDatabaseDataSource,
     private val networkDataSource: TvShowDetailsNetworkDataSource,
-    private val wishlistDatabaseDataSource: WishlistDatabaseDataSource,
-    private val preferencesDataStoreDataSource: PreferencesDataStoreDataSource
+    private val wishlistDatabaseDataSource: WishlistDatabaseDataSource
 ) : TvShowDetailsRepository {
     override fun getById(id: Int): Flow<CinemaxResult<TvShowDetailsModel?>> = networkBoundResource(
         query = {
@@ -47,12 +44,7 @@ class TvShowDetailsRepositoryImpl @Inject constructor(
                 )
             }
         },
-        fetch = {
-            networkDataSource.getById(
-                id = id,
-                language = preferencesDataStoreDataSource.getContentLanguage().first()
-            )
-        },
+        fetch = { networkDataSource.getById(id) },
         saveFetchResult = { response ->
             databaseDataSource.deleteAndInsert(response.asTvShowDetailsEntity())
         }
@@ -67,12 +59,7 @@ class TvShowDetailsRepositoryImpl @Inject constructor(
                     )
                 }
             },
-            fetch = {
-                networkDataSource.getByIds(
-                    ids = ids,
-                    language = preferencesDataStoreDataSource.getContentLanguage().first()
-                )
-            },
+            fetch = { networkDataSource.getByIds(ids) },
             saveFetchResult = { response ->
                 databaseDataSource.deleteAndInsertAll(
                     response.map(NetworkTvShowDetails::asTvShowDetailsEntity)