Add text translations by country

michaldrabik · May 4, 2024 · a5ddcb9 · a5ddcb9
1 parent f823e3c
commit a5ddcb9
Show file tree

Hide file tree

Showing 34 changed files with 208 additions and 116 deletions.
diff --git a/app/src/main/java/com/michaldrabik/showly2/ui/main/MainViewModel.kt b/app/src/main/java/com/michaldrabik/showly2/ui/main/MainViewModel.kt
@@ -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.languageCode)
       AppCompatDelegate.setApplicationLocales(locale)
     }
   }

diff --git a/app/src/main/java/com/michaldrabik/showly2/ui/main/cases/MainInitialsCase.kt b/app/src/main/java/com/michaldrabik/showly2/ui/main/cases/MainInitialsCase.kt
@@ -77,7 +77,7 @@ class MainInitialsCase @Inject constructor(
   }
 
   fun setLanguage(appLanguage: AppLanguage) {
-    settingsRepository.language = appLanguage.code
+    settingsRepository.languageCode = appLanguage.code
     val locales = LocaleListCompat.forLanguageTags(appLanguage.code)
     AppCompatDelegate.setApplicationLocales(locales)
   }
@@ -98,15 +98,15 @@ class MainInitialsCase @Inject constructor(
       val languagesCodes = arrayOf(locales[0], locales[1])
         .filterNotNull()
         .map { it.language.lowercase() }
-      if (languagesCodes.any { it != Locale(Config.DEFAULT_LANGUAGE).language }) {
+      if (languagesCodes.any { it != Locale(Config.DEFAULT_LANGUAGE_CODE).language }) {
         val languageCodes = appLanguages.map { it.code }
         languagesCodes.forEach { language ->
           if (language in languageCodes) {
             return appLanguages.first { it.code == language }
           }
         }
         appLanguages
-          .filter { it.code != Config.DEFAULT_LANGUAGE }
+          .filter { it.code != Config.DEFAULT_LANGUAGE_CODE }
           .forEach { appLanguage ->
             if (appLanguage.code in languagesCodes) {
               return appLanguage

diff --git a/common/src/main/java/com/michaldrabik/common/Config.kt b/common/src/main/java/com/michaldrabik/common/Config.kt
@@ -33,13 +33,15 @@ object Config {
   const val SEARCH_RECENTS_AMOUNT = 5
   const val FANART_GALLERY_IMAGES_LIMIT = 20
   const val PULL_TO_REFRESH_COOLDOWN_MS = 10_000
-  const val DEFAULT_LANGUAGE = "en"
+  const val DEFAULT_LANGUAGE_CODE = "en"
   const val DEFAULT_COUNTRY = "us"
   const val DEFAULT_DATE_FORMAT = "DEFAULT_24"
   const val DEFAULT_LIST_VIEW_MODE = "LIST_NORMAL"
   const val DEFAULT_LISTS_GRID_SPAN = 2
   const val HOST_ACTIVITY_NAME = "com.michaldrabik.showly2.ui.main.MainActivity"
 
+  val DEFAULT_LANGUAGE by lazy { Pair(DEFAULT_LANGUAGE_CODE, DEFAULT_COUNTRY)}
+
   const val SHOW_WHATS_NEW = true
   const val SHOW_TIPS_DEBUG = false
 

diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/dao/EpisodeTranslationsDao.kt b/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>)
 }
diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/dao/MovieTranslationsDao.kt b/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>)
 }
diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/dao/ShowTranslationsDao.kt b/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>)
 }
diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/migrations/Migrations.kt b/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
   )
 }
diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/model/EpisodeTranslation.kt b/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

diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/model/MovieTranslation.kt b/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

diff --git a/data-local/src/main/java/com/michaldrabik/data_local/database/model/ShowTranslation.kt b/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

diff --git a/...l/src/main/java/com/michaldrabik/data_local/sources/EpisodeTranslationsLocalDataSource.kt b/...l/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>)
 }
diff --git a/...cal/src/main/java/com/michaldrabik/data_local/sources/MovieTranslationsLocalDataSource.kt b/...cal/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>)
 }
diff --git a/...ocal/src/main/java/com/michaldrabik/data_local/sources/ShowTranslationsLocalDataSource.kt b/...ocal/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>)
 }
diff --git a/repository/src/main/java/com/michaldrabik/repository/PeopleRepository.kt b/repository/src/main/java/com/michaldrabik/repository/PeopleRepository.kt
@@ -44,10 +44,10 @@ class PeopleRepository @Inject constructor(
       return mappers.person.fromDatabase(local, person.characters)
     }
 
-    val language = settingsRepository.language
+    val language = settingsRepository.languageCode
     val remotePerson = remoteSource.tmdb.fetchPersonDetails(person.ids.tmdb.id)
     var bioTranslation: String? = null
-    if (language != Config.DEFAULT_LANGUAGE) {
+    if (language != Config.DEFAULT_LANGUAGE_CODE) {
       val translations = remoteSource.tmdb.fetchPersonTranslations(person.ids.tmdb.id)
       bioTranslation = translations[language]?.biography
     }