Add translation by country

app/src/main/java/com/michaldrabik/showly2/ui/main/MainActivity.kt

@@ -50,7 +50,7 @@ import com.michaldrabik.ui_base.utilities.extensions.openWebUrl
 import com.michaldrabik.ui_base.utilities.extensions.showErrorSnackbar
 import com.michaldrabik.ui_base.utilities.extensions.showInfoSnackbar
 import com.michaldrabik.ui_base.utilities.extensions.visibleIf
-import com.michaldrabik.ui_settings.helpers.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLanguage
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.debounce

app/src/main/java/com/michaldrabik/showly2/ui/main/MainUiState.kt

@@ -2,7 +2,7 @@ package com.michaldrabik.showly2.ui.main
 
 import com.michaldrabik.showly2.utilities.deeplink.DeepLinkBundle
 import com.michaldrabik.ui_base.utilities.events.Event
-import com.michaldrabik.ui_settings.helpers.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLanguage
 
 // TODO Split events into their Channel
 data class MainUiState(

app/src/main/java/com/michaldrabik/showly2/ui/main/MainViewModel.kt

@@ -23,7 +23,7 @@ import com.michaldrabik.ui_base.utilities.extensions.combine
 import com.michaldrabik.ui_base.utilities.extensions.launchDelayed
 import com.michaldrabik.ui_base.utilities.extensions.rethrowCancellation
 import com.michaldrabik.ui_model.Tip
-import com.michaldrabik.ui_settings.helpers.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLanguage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -92,7 +92,7 @@ class MainViewModel @Inject constructor(
   private fun checkApi13Locale(isInitialRun: Boolean) {
     if (!isInitialRun && !settingsRepository.isLocaleInitialised) {
       settingsRepository.isLocaleInitialised = true
-      val locale = LocaleListCompat.forLanguageTags(settingsRepository.language)
+      val locale = LocaleListCompat.forLanguageTags(settingsRepository.locale.language.code)
       AppCompatDelegate.setApplicationLocales(locale)
     }
   }

app/src/main/java/com/michaldrabik/showly2/ui/main/cases/MainInitialsCase.kt

@@ -13,9 +13,10 @@ import com.michaldrabik.repository.RatingsRepository
 import com.michaldrabik.repository.UserTraktManager
 import com.michaldrabik.repository.settings.SettingsRepository
 import com.michaldrabik.showly2.BuildConfig
-import com.michaldrabik.ui_base.common.AppCountry
+import com.michaldrabik.ui_model.locale.AppCountry
 import com.michaldrabik.ui_base.utilities.extensions.withApiAtLeast
-import com.michaldrabik.ui_settings.helpers.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLocale
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ViewModelScoped
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -60,7 +61,7 @@ class MainInitialsCase @Inject constructor(
     if (!country.isNullOrBlank()) {
       AppCountry.values().forEach { appCountry ->
         if (appCountry.code.equals(country, ignoreCase = true)) {
-          settingsRepository.country = appCountry.code
+          settingsRepository.locale = AppLocale(settingsRepository.locale.language, appCountry)
           return
         }
       }
@@ -77,7 +78,7 @@ class MainInitialsCase @Inject constructor(
   }
 
   fun setLanguage(appLanguage: AppLanguage) {
-    settingsRepository.language = appLanguage.code
+    settingsRepository.locale = AppLocale(appLanguage, settingsRepository.locale.country)
     val locales = LocaleListCompat.forLanguageTags(appLanguage.code)
     AppCompatDelegate.setApplicationLocales(locales)
   }

app/src/main/java/com/michaldrabik/showly2/ui/views/WelcomeLanguageView.kt

@@ -9,7 +9,7 @@ import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.FrameLayout
 import com.michaldrabik.showly2.databinding.ViewWelcomeLanguageBinding
 import com.michaldrabik.ui_base.utilities.extensions.onClick
-import com.michaldrabik.ui_settings.helpers.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLanguage
 
 class WelcomeLanguageView : FrameLayout {
 

app/src/main/java/com/michaldrabik/showly2/ui/views/WelcomeNoteView.kt

@@ -10,7 +10,7 @@ import com.michaldrabik.showly2.R
 import com.michaldrabik.showly2.databinding.ViewWelcomeNoteBinding
 import com.michaldrabik.ui_base.utilities.extensions.getLocaleStringResource
 import com.michaldrabik.ui_base.utilities.extensions.onClick
-import com.michaldrabik.ui_settings.helpers.AppLanguage
+import com.michaldrabik.ui_model.locale.AppLanguage
 import java.util.Locale
 
 class WelcomeNoteView : FrameLayout {

data-local/src/main/java/com/michaldrabik/data_local/database/dao/EpisodeTranslationsDao.kt

@@ -10,15 +10,18 @@ import com.michaldrabik.data_local.sources.EpisodeTranslationsLocalDataSource
 @Dao
 interface EpisodeTranslationsDao : BaseDao<EpisodeTranslation>, EpisodeTranslationsLocalDataSource {
 
-  @Query("SELECT * FROM episodes_translations WHERE id_trakt == :traktEpisodeId AND id_trakt_show == :traktShowId AND language == :language")
-  override suspend fun getById(traktEpisodeId: Long, traktShowId: Long, language: String): EpisodeTranslation?
+  @Query("SELECT * FROM episodes_translations WHERE id_trakt == :traktEpisodeId AND id_trakt_show == :traktShowId AND language == :language AND country == :country")
+  override suspend fun getById(traktEpisodeId: Long, traktShowId: Long, language: String, country: String): EpisodeTranslation?
 
-  @Query("SELECT * FROM episodes_translations WHERE id_trakt IN (:traktEpisodeIds) AND id_trakt_show == :traktShowId AND language == :language")
-  override suspend fun getByIds(traktEpisodeIds: List<Long>, traktShowId: Long, language: String): List<EpisodeTranslation>
+  @Query("SELECT * FROM episodes_translations WHERE id_trakt IN (:traktEpisodeIds) AND id_trakt_show == :traktShowId AND language == :language AND country == :country")
+  override suspend fun getByIds(traktEpisodeIds: List<Long>, traktShowId: Long, language: String, country: String): List<EpisodeTranslation>
 
   @Insert(onConflict = OnConflictStrategy.REPLACE)
   override suspend fun insertSingle(translation: EpisodeTranslation)
 
   @Query("DELETE FROM episodes_translations WHERE language IN (:languages)")
   override suspend fun deleteByLanguage(languages: List<String>)
+
+  @Query("DELETE FROM episodes_translations WHERE country IN (:countries)")
+  override suspend fun deleteByCountry(countries: List<String>)
 }

data-local/src/main/java/com/michaldrabik/data_local/database/dao/MovieTranslationsDao.kt

@@ -10,15 +10,18 @@ import com.michaldrabik.data_local.sources.MovieTranslationsLocalDataSource
 @Dao
 interface MovieTranslationsDao : BaseDao<MovieTranslation>, MovieTranslationsLocalDataSource {
 
-  @Query("SELECT * FROM movies_translations WHERE id_trakt == :traktId AND language == :language")
-  override suspend fun getById(traktId: Long, language: String): MovieTranslation?
+  @Query("SELECT * FROM movies_translations WHERE id_trakt == :traktId AND language == :language AND country == :country")
+  override suspend fun getById(traktId: Long, language: String, country: String): MovieTranslation?
 
-  @Query("SELECT * FROM movies_translations WHERE language == :language")
-  override suspend fun getAll(language: String): List<MovieTranslation>
+  @Query("SELECT * FROM movies_translations WHERE language == :language AND country == :country")
+  override suspend fun getAll(language: String, country: String): List<MovieTranslation>
 
   @Insert(onConflict = OnConflictStrategy.REPLACE)
   override suspend fun insertSingle(translation: MovieTranslation)
 
   @Query("DELETE FROM movies_translations WHERE language IN (:languages)")
   override suspend fun deleteByLanguage(languages: List<String>)
+
+  @Query("DELETE FROM movies_translations WHERE country IN (:countries)")
+  override suspend fun deleteByCountry(countries: List<String>)
 }

data-local/src/main/java/com/michaldrabik/data_local/database/dao/ShowTranslationsDao.kt

@@ -10,15 +10,18 @@ import com.michaldrabik.data_local.sources.ShowTranslationsLocalDataSource
 @Dao
 interface ShowTranslationsDao : BaseDao<ShowTranslation>, ShowTranslationsLocalDataSource {
 
-  @Query("SELECT * FROM shows_translations WHERE id_trakt == :traktId AND language == :language")
-  override suspend fun getById(traktId: Long, language: String): ShowTranslation?
+  @Query("SELECT * FROM shows_translations WHERE id_trakt == :traktId AND language == :language AND country == :country")
+  override suspend fun getById(traktId: Long, language: String, country: String): ShowTranslation?
 
-  @Query("SELECT * FROM shows_translations WHERE language == :language")
-  override suspend fun getAll(language: String): List<ShowTranslation>
+  @Query("SELECT * FROM shows_translations WHERE language == :language AND country == :country")
+  override suspend fun getAll(language: String, country: String): List<ShowTranslation>
 
   @Insert(onConflict = REPLACE)
   override suspend fun insertSingle(translation: ShowTranslation)
 
   @Query("DELETE FROM shows_translations WHERE language IN (:languages)")
   override suspend fun deleteByLanguage(languages: List<String>)
+
+  @Query("DELETE FROM shows_translations WHERE country IN (:countries)")
+  override suspend fun deleteByCountry(countries: List<String>)
 }

data-local/src/main/java/com/michaldrabik/data_local/database/migrations/Migrations.kt

@@ -5,7 +5,7 @@ import android.content.Context.MODE_PRIVATE
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
-const val DATABASE_VERSION = 41
+const val DATABASE_VERSION = 42
 const val DATABASE_NAME = "SHOWLY2_DB_2"
 
 class Migrations(context: Context) {
@@ -770,6 +770,16 @@ class Migrations(context: Context) {
     }
   }
 
+  private val migration42 = object : Migration(41, 42) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+      with(database) {
+        execSQL("ALTER TABLE movies_translations ADD COLUMN country TEXT")
+        execSQL("ALTER TABLE shows_translations ADD COLUMN country TEXT")
+        execSQL("ALTER TABLE episodes_translations ADD COLUMN country TEXT")
+      }
+    }
+  }
+
   fun getAll() = listOf(
     migration2,
     migration3,
@@ -810,6 +820,7 @@ class Migrations(context: Context) {
     migration38,
     migration39,
     migration40,
-    migration41
+    migration41,
+    migration42
   )
 }

data-local/src/main/java/com/michaldrabik/data_local/database/model/EpisodeTranslation.kt

@@ -27,6 +27,7 @@ data class EpisodeTranslation(
   @ColumnInfo(name = "id_trakt_show") val idTraktShow: Long,
   @ColumnInfo(name = "title") val title: String,
   @ColumnInfo(name = "language") val language: String,
+  @ColumnInfo(name = "country") val country: String,
   @ColumnInfo(name = "overview") val overview: String,
   @ColumnInfo(name = "created_at") val createdAt: Long,
   @ColumnInfo(name = "updated_at") val updatedAt: Long
@@ -38,6 +39,7 @@ data class EpisodeTranslation(
       traktShowId: Long,
       title: String,
       language: String,
+      country: String,
       overview: String,
       createdAt: Long
     ) =
@@ -46,6 +48,7 @@ data class EpisodeTranslation(
         idTraktShow = traktShowId,
         title = title,
         language = language,
+        country = country,
         overview = overview,
         createdAt = createdAt,
         updatedAt = createdAt

data-local/src/main/java/com/michaldrabik/data_local/database/model/MovieTranslation.kt

@@ -23,6 +23,7 @@ data class MovieTranslation(
   @ColumnInfo(name = "id_trakt") val idTrakt: Long,
   @ColumnInfo(name = "title") val title: String,
   @ColumnInfo(name = "language") val language: String,
+  @ColumnInfo(name = "country") val country: String,
   @ColumnInfo(name = "overview") val overview: String,
   @ColumnInfo(name = "created_at") val createdAt: Long,
   @ColumnInfo(name = "updated_at") val updatedAt: Long
@@ -33,13 +34,15 @@ data class MovieTranslation(
       traktId: Long,
       title: String,
       language: String,
+      country: String,
       overview: String,
       createdAt: Long
     ) =
       MovieTranslation(
         idTrakt = traktId,
         title = title,
         language = language,
+        country = country,
         overview = overview,
         createdAt = createdAt,
         updatedAt = createdAt

data-local/src/main/java/com/michaldrabik/data_local/database/model/ShowTranslation.kt

@@ -23,6 +23,7 @@ data class ShowTranslation(
   @ColumnInfo(name = "id_trakt") val idTrakt: Long,
   @ColumnInfo(name = "title") val title: String,
   @ColumnInfo(name = "language") val language: String,
+  @ColumnInfo(name = "country") val country: String,
   @ColumnInfo(name = "overview") val overview: String,
   @ColumnInfo(name = "created_at") val createdAt: Long,
   @ColumnInfo(name = "updated_at") val updatedAt: Long
@@ -33,13 +34,15 @@ data class ShowTranslation(
       traktId: Long,
       title: String,
       language: String,
+      country: String,
       overview: String,
       createdAt: Long
     ) =
       ShowTranslation(
         idTrakt = traktId,
         title = title,
         language = language,
+        country = country,
         overview = overview,
         createdAt = createdAt,
         updatedAt = createdAt

data-local/src/main/java/com/michaldrabik/data_local/sources/EpisodeTranslationsLocalDataSource.kt

@@ -4,11 +4,13 @@ import com.michaldrabik.data_local.database.model.EpisodeTranslation
 
 interface EpisodeTranslationsLocalDataSource {
 
-  suspend fun getById(traktEpisodeId: Long, traktShowId: Long, language: String): EpisodeTranslation?
+  suspend fun getById(traktEpisodeId: Long, traktShowId: Long, language: String, country: String): EpisodeTranslation?
 
-  suspend fun getByIds(traktEpisodeIds: List<Long>, traktShowId: Long, language: String): List<EpisodeTranslation>
+  suspend fun getByIds(traktEpisodeIds: List<Long>, traktShowId: Long, language: String, country: String): List<EpisodeTranslation>
 
   suspend fun insertSingle(translation: EpisodeTranslation)
 
   suspend fun deleteByLanguage(languages: List<String>)
+
+  suspend fun deleteByCountry(countries: List<String>)
 }

data-local/src/main/java/com/michaldrabik/data_local/sources/MovieTranslationsLocalDataSource.kt

@@ -4,11 +4,13 @@ import com.michaldrabik.data_local.database.model.MovieTranslation
 
 interface MovieTranslationsLocalDataSource {
 
-  suspend fun getById(traktId: Long, language: String): MovieTranslation?
+  suspend fun getById(traktId: Long, language: String, country: String): MovieTranslation?
 
-  suspend fun getAll(language: String): List<MovieTranslation>
+  suspend fun getAll(language: String, country: String): List<MovieTranslation>
 
   suspend fun insertSingle(translation: MovieTranslation)
 
   suspend fun deleteByLanguage(languages: List<String>)
+
+  suspend fun deleteByCountry(countries: List<String>)
 }

data-local/src/main/java/com/michaldrabik/data_local/sources/ShowTranslationsLocalDataSource.kt

@@ -4,11 +4,13 @@ import com.michaldrabik.data_local.database.model.ShowTranslation
 
 interface ShowTranslationsLocalDataSource {
 
-  suspend fun getById(traktId: Long, language: String): ShowTranslation?
+  suspend fun getById(traktId: Long, language: String, country: String): ShowTranslation?
 
-  suspend fun getAll(language: String): List<ShowTranslation>
+  suspend fun getAll(language: String, country: String): List<ShowTranslation>
 
   suspend fun insertSingle(translation: ShowTranslation)
 
   suspend fun deleteByLanguage(languages: List<String>)
+
+  suspend fun deleteByCountry(countries: List<String>)
 }

repository/src/main/java/com/michaldrabik/repository/PeopleRepository.kt

@@ -44,7 +44,7 @@ class PeopleRepository @Inject constructor(
       return mappers.person.fromDatabase(local, person.characters)
     }
 
-    val language = settingsRepository.language
+    val language = settingsRepository.locale.language.code
     val remotePerson = remoteSource.tmdb.fetchPersonDetails(person.ids.tmdb.id)
     var bioTranslation: String? = null
     if (language != Config.DEFAULT_LANGUAGE) {