diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt index 3b0c40478..9330c6cc3 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -281,8 +281,6 @@ object PreferenceKeys { const val latest_tab_position = "latest_tab_position" - const val latest_tab_language_code = "latest_tab_language_code" - const val sources_tab_categories = "sources_tab_categories" const val sources_tab_categories_filter = "sources_tab_categories_filter" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 17de26ff4..09571e280 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -401,8 +401,6 @@ class PreferencesHelper(val context: Context) { fun latestTabInFront() = flowPrefs.getBoolean(Keys.latest_tab_position, false) - fun latestTabDisplayLanguageCode() = flowPrefs.getBoolean(Keys.latest_tab_language_code, false) - fun sourcesTabCategories() = flowPrefs.getStringSet(Keys.sources_tab_categories, mutableSetOf()) fun sourcesTabCategoriesFilter() = flowPrefs.getBoolean(Keys.sources_tab_categories_filter, false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestHolder.kt index 3630a99db..460629418 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestHolder.kt @@ -4,15 +4,14 @@ import android.view.View import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import eu.kanade.tachiyomi.data.database.models.Manga -import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder +import eu.kanade.tachiyomi.util.system.LocaleHelper import kotlinx.android.synthetic.main.latest_controller_card.no_results_found import kotlinx.android.synthetic.main.latest_controller_card.progress import kotlinx.android.synthetic.main.latest_controller_card.recycler +import kotlinx.android.synthetic.main.latest_controller_card.subtitle import kotlinx.android.synthetic.main.latest_controller_card.title import kotlinx.android.synthetic.main.latest_controller_card.title_wrapper -import uy.kohesive.injekt.Injekt -import uy.kohesive.injekt.api.get /** * Holder that binds the [LatestItem] containing catalogue cards. @@ -52,10 +51,10 @@ class LatestHolder(view: View, val adapter: LatestAdapter) : val results = item.results val titlePrefix = if (item.highlighted) "▶ " else "" - val langSuffix = if (source.lang.isNotEmpty() && Injekt.get().latestTabDisplayLanguageCode().get()) " (${source.lang})" else "" - // Set Title with country code if available. - title.text = titlePrefix + source.name + langSuffix + title.text = titlePrefix + source.name + subtitle.isVisible = true + subtitle.text = LocaleHelper.getDisplayName(source.lang) when { results == null -> { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt index 42b23619e..c6010581f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt @@ -64,12 +64,6 @@ class SettingsBrowseController : SettingsController() { summaryRes = R.string.pref_latest_position_summery defaultValue = false } - - switchPreference { - key = Keys.latest_tab_language_code - titleRes = R.string.pref_latest_tab_language_code - defaultValue = false - } } // SY <-- diff --git a/app/src/main/res/layout/latest_controller_card.xml b/app/src/main/res/layout/latest_controller_card.xml index 76450e182..cf643268e 100644 --- a/app/src/main/res/layout/latest_controller_card.xml +++ b/app/src/main/res/layout/latest_controller_card.xml @@ -17,13 +17,30 @@ style="@style/TextAppearance.Regular.SubHeading" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="@dimen/material_component_text_fields_padding_above_and_below_label" - app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginStart="16dp" + app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintEnd_toStartOf="@+id/title_more_icon" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" tools:text="Title" /> + + Lancer des mises à jour de catégorie tout le temps - Afficher le code de langue à côté du nom Dernière position de l\'onglet Voulez-vous que le dernier onglet soit le premier onglet de la navigation? Cela en fera l\'onglet par défaut lors de l\'ouverture de la navigation, non recommandé si vous êtes sur des données ou un réseau mesuré Remplacer le dernier bouton diff --git a/app/src/main/res/values-pt-rBR/strings_sy.xml b/app/src/main/res/values-pt-rBR/strings_sy.xml index 9945448de..3040b0d63 100644 --- a/app/src/main/res/values-pt-rBR/strings_sy.xml +++ b/app/src/main/res/values-pt-rBR/strings_sy.xml @@ -174,7 +174,6 @@ Launch category updates all the time - Exibir código do idioma ao lado do nome Posição da aba "Recentes" Quer que a aba Recentes seja a primeira em Navegar? Isso fará a aba padrão ao tocar em Navegar, não recomendável se estiver usando com dados móveis ou uma rede medida Replace latest button diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml index e55589b54..ea41ecf50 100644 --- a/app/src/main/res/values/strings_sy.xml +++ b/app/src/main/res/values/strings_sy.xml @@ -178,7 +178,6 @@ Launch category updates all the time - Display language code next to name Latest tab position Do you want the latest tab to be the first tab in browse? This will make it the default tab when opening browse, not recommended if you\'re on data or a metered network Filter sources in categories