From 8b53568fc83c31497d93a6589f2c54bf9cf1f844 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 10 Aug 2020 23:32:39 -0400 Subject: [PATCH] Cleanup some hitomi leftovers --- .../data/preference/PreferenceKeys.kt | 4 --- .../data/preference/PreferencesHelper.kt | 4 --- .../ui/setting/SettingsHlController.kt | 34 ------------------- .../ui/setting/SettingsMainController.kt | 6 ---- app/src/main/java/exh/EHSourceHelpers.kt | 1 - app/src/main/res/values-pt-rBR/strings_sy.xml | 7 ---- app/src/main/res/values/strings_sy.xml | 6 ---- 7 files changed, 62 deletions(-) delete mode 100755 app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt 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 7528f1754..85e0adf0e 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 @@ -241,8 +241,6 @@ object PreferenceKeys { const val eh_aggressivePageLoading = "eh_aggressive_page_loading" - const val eh_hl_useHighQualityThumbs = "eh_hl_hq_thumbs" - const val eh_preload_size = "eh_preload_size" const val eh_tag_filtering_value = "eh_tag_filtering_value" @@ -277,8 +275,6 @@ object PreferenceKeys { const val recommendsInOverflow = "recommends_in_overflow" - const val hitomiAlwaysWebp = "hitomi_always_webp" - const val enhancedEHentaiView = "enhanced_e_hentai_view" const val webtoonEnableZoomOut = "webtoon_enable_zoom_out" 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 d10750958..a685ee782 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 @@ -356,8 +356,6 @@ class PreferencesHelper(val context: Context) { fun eh_aggressivePageLoading() = flowPrefs.getBoolean(Keys.eh_aggressivePageLoading, false) - fun eh_hl_useHighQualityThumbs() = flowPrefs.getBoolean(Keys.eh_hl_useHighQualityThumbs, false) - fun eh_preload_size() = flowPrefs.getInt(Keys.eh_preload_size, 4) fun eh_useAutoWebtoon() = flowPrefs.getBoolean(Keys.eh_use_auto_webtoon, true) @@ -382,8 +380,6 @@ class PreferencesHelper(val context: Context) { fun recommendsInOverflow() = flowPrefs.getBoolean(Keys.recommendsInOverflow, false) - fun hitomiAlwaysWebp() = flowPrefs.getBoolean(Keys.hitomiAlwaysWebp, true) - fun enhancedEHentaiView() = flowPrefs.getBoolean(Keys.enhancedEHentaiView, true) fun webtoonEnableZoomOut() = flowPrefs.getBoolean(Keys.webtoonEnableZoomOut, false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt deleted file mode 100755 index 1703e341a..000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt +++ /dev/null @@ -1,34 +0,0 @@ -package eu.kanade.tachiyomi.ui.setting - -import androidx.preference.PreferenceScreen -import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.data.preference.PreferenceKeys -import eu.kanade.tachiyomi.util.preference.defaultValue -import eu.kanade.tachiyomi.util.preference.summaryRes -import eu.kanade.tachiyomi.util.preference.switchPreference -import eu.kanade.tachiyomi.util.preference.titleRes - -/** - * hitomi.la Settings fragment - */ - -class SettingsHlController : SettingsController() { - override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) { - titleRes = R.string.pref_category_hl - - switchPreference { - titleRes = R.string.high_quality_thumbnails - summaryRes = R.string.high_quality_thumbnails_summary - key = PreferenceKeys.eh_hl_useHighQualityThumbs - defaultValue = false - } - - switchPreference { - titleRes = R.string.always_download_webp - summaryOn = context.getString(R.string.always_download_webp_summary_on) - summaryOff = context.getString(R.string.always_download_webp_summary_off) - key = PreferenceKeys.hitomiAlwaysWebp - defaultValue = true - } - } -} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt index 90fc3f550..961f45001 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt @@ -79,12 +79,6 @@ class SettingsMainController : SettingsController() { titleRes = R.string.pref_category_nh onClick { navigateTo(SettingsNhController()) } } - preference { - iconRes = R.drawable.eh_ic_hllogo - iconTint = tintColor - titleRes = R.string.pref_category_hl - onClick { navigateTo(SettingsHlController()) } - } } // SY <-- preference { diff --git a/app/src/main/java/exh/EHSourceHelpers.kt b/app/src/main/java/exh/EHSourceHelpers.kt index f41755018..d19377288 100755 --- a/app/src/main/java/exh/EHSourceHelpers.kt +++ b/app/src/main/java/exh/EHSourceHelpers.kt @@ -23,7 +23,6 @@ const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7 val HENTAI_CAFE_SOURCE_ID = delegatedSourceId() val PURURIN_SOURCE_ID = delegatedSourceId() val TSUMINO_SOURCE_ID = delegatedSourceId() -const val HITOMI_OLD_SOURCE_ID = LEWD_SOURCE_SERIES + 10 val EIGHTMUSES_SOURCE_ID = delegatedSourceId() val HBROWSE_SOURCE_ID = delegatedSourceId() const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69 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 296dc4fca..c08e0033f 100644 --- a/app/src/main/res/values-pt-rBR/strings_sy.xml +++ b/app/src/main/res/values-pt-rBR/strings_sy.xml @@ -25,7 +25,6 @@ Todas as fontes E-Hentai nhentai - hitomi.la Configurações do fork @@ -137,12 +136,6 @@ Use as últimas fontes e preferências da pré-migração salvas para migrar em massa - - - Sempre baixar em webp - Sempre tentará baixar imagens como webp quando possível - Apenas baixará imagens webp se for a única opção, a maioria das imagens será jpg - Usar miniaturas de alta qualidade Pode carregar os resultados da pesquisa mais lentamente diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml index a8b564728..f3c26fd71 100644 --- a/app/src/main/res/values/strings_sy.xml +++ b/app/src/main/res/values/strings_sy.xml @@ -30,7 +30,6 @@ All Sources E-Hentai nhentai - hitomi.la Fork Settings @@ -152,11 +151,6 @@ Use last saved pre-migration preferences and sources to mass migrate - - Always download webp - Will always try to download images as webp when possible - Will only download images as webp if its the only option, most images will be jpg - Use high-quality thumbnails May slow down search results