Cleanup some hitomi leftovers

This commit is contained in:
Jobobby04 2020-08-10 23:32:39 -04:00
parent d978b6d088
commit 8b53568fc8
7 changed files with 0 additions and 62 deletions

View File

@ -241,8 +241,6 @@ object PreferenceKeys {
const val eh_aggressivePageLoading = "eh_aggressive_page_loading" 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_preload_size = "eh_preload_size"
const val eh_tag_filtering_value = "eh_tag_filtering_value" const val eh_tag_filtering_value = "eh_tag_filtering_value"
@ -277,8 +275,6 @@ object PreferenceKeys {
const val recommendsInOverflow = "recommends_in_overflow" const val recommendsInOverflow = "recommends_in_overflow"
const val hitomiAlwaysWebp = "hitomi_always_webp"
const val enhancedEHentaiView = "enhanced_e_hentai_view" const val enhancedEHentaiView = "enhanced_e_hentai_view"
const val webtoonEnableZoomOut = "webtoon_enable_zoom_out" const val webtoonEnableZoomOut = "webtoon_enable_zoom_out"

View File

@ -356,8 +356,6 @@ class PreferencesHelper(val context: Context) {
fun eh_aggressivePageLoading() = flowPrefs.getBoolean(Keys.eh_aggressivePageLoading, false) 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_preload_size() = flowPrefs.getInt(Keys.eh_preload_size, 4)
fun eh_useAutoWebtoon() = flowPrefs.getBoolean(Keys.eh_use_auto_webtoon, true) 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 recommendsInOverflow() = flowPrefs.getBoolean(Keys.recommendsInOverflow, false)
fun hitomiAlwaysWebp() = flowPrefs.getBoolean(Keys.hitomiAlwaysWebp, true)
fun enhancedEHentaiView() = flowPrefs.getBoolean(Keys.enhancedEHentaiView, true) fun enhancedEHentaiView() = flowPrefs.getBoolean(Keys.enhancedEHentaiView, true)
fun webtoonEnableZoomOut() = flowPrefs.getBoolean(Keys.webtoonEnableZoomOut, false) fun webtoonEnableZoomOut() = flowPrefs.getBoolean(Keys.webtoonEnableZoomOut, false)

View File

@ -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
}
}
}

View File

@ -79,12 +79,6 @@ class SettingsMainController : SettingsController() {
titleRes = R.string.pref_category_nh titleRes = R.string.pref_category_nh
onClick { navigateTo(SettingsNhController()) } onClick { navigateTo(SettingsNhController()) }
} }
preference {
iconRes = R.drawable.eh_ic_hllogo
iconTint = tintColor
titleRes = R.string.pref_category_hl
onClick { navigateTo(SettingsHlController()) }
}
} }
// SY <-- // SY <--
preference { preference {

View File

@ -23,7 +23,6 @@ const val NHENTAI_SOURCE_ID = LEWD_SOURCE_SERIES + 7
val HENTAI_CAFE_SOURCE_ID = delegatedSourceId<HentaiCafe>() val HENTAI_CAFE_SOURCE_ID = delegatedSourceId<HentaiCafe>()
val PURURIN_SOURCE_ID = delegatedSourceId<Pururin>() val PURURIN_SOURCE_ID = delegatedSourceId<Pururin>()
val TSUMINO_SOURCE_ID = delegatedSourceId<Tsumino>() val TSUMINO_SOURCE_ID = delegatedSourceId<Tsumino>()
const val HITOMI_OLD_SOURCE_ID = LEWD_SOURCE_SERIES + 10
val EIGHTMUSES_SOURCE_ID = delegatedSourceId<EightMuses>() val EIGHTMUSES_SOURCE_ID = delegatedSourceId<EightMuses>()
val HBROWSE_SOURCE_ID = delegatedSourceId<HBrowse>() val HBROWSE_SOURCE_ID = delegatedSourceId<HBrowse>()
const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69 const val MERGED_SOURCE_ID = LEWD_SOURCE_SERIES + 69

View File

@ -25,7 +25,6 @@
<string name="pref_category_all_sources">Todas as fontes</string> <string name="pref_category_all_sources">Todas as fontes</string>
<string name="pref_category_eh">E-Hentai</string> <string name="pref_category_eh">E-Hentai</string>
<string name="pref_category_nh">nhentai</string> <string name="pref_category_nh">nhentai</string>
<string name="pref_category_hl">hitomi.la</string>
<string name="pref_category_fork">Configurações do fork</string> <string name="pref_category_fork">Configurações do fork</string>
<!-- EH Settings --> <!-- EH Settings -->
@ -137,12 +136,6 @@
<!-- Library settings --> <!-- Library settings -->
<string name="pref_skip_pre_migration_summary">Use as últimas fontes e preferências da pré-migração salvas para migrar em massa</string> <string name="pref_skip_pre_migration_summary">Use as últimas fontes e preferências da pré-migração salvas para migrar em massa</string>
<!-- Hitomi.la settings -->
<string name="always_download_webp">Sempre baixar em webp</string>
<string name="always_download_webp_summary_on">Sempre tentará baixar imagens como webp quando possível</string>
<string name="always_download_webp_summary_off">Apenas baixará imagens webp se for a única opção, a maioria das imagens será jpg</string>
<!-- Other Settings --> <!-- Other Settings -->
<string name="high_quality_thumbnails">Usar miniaturas de alta qualidade</string> <string name="high_quality_thumbnails">Usar miniaturas de alta qualidade</string>
<string name="high_quality_thumbnails_summary">Pode carregar os resultados da pesquisa mais lentamente</string> <string name="high_quality_thumbnails_summary">Pode carregar os resultados da pesquisa mais lentamente</string>

View File

@ -30,7 +30,6 @@
<string name="pref_category_all_sources">All Sources</string> <string name="pref_category_all_sources">All Sources</string>
<string name="pref_category_eh">E-Hentai</string> <string name="pref_category_eh">E-Hentai</string>
<string name="pref_category_nh">nhentai</string> <string name="pref_category_nh">nhentai</string>
<string name="pref_category_hl">hitomi.la</string>
<string name="pref_category_fork">Fork Settings</string> <string name="pref_category_fork">Fork Settings</string>
<!-- EH Settings --> <!-- EH Settings -->
@ -152,11 +151,6 @@
<!-- Library settings --> <!-- Library settings -->
<string name="pref_skip_pre_migration_summary">Use last saved pre-migration preferences and sources to mass migrate</string> <string name="pref_skip_pre_migration_summary">Use last saved pre-migration preferences and sources to mass migrate</string>
<!-- Hitomi.la settings -->
<string name="always_download_webp">Always download webp</string>
<string name="always_download_webp_summary_on">Will always try to download images as webp when possible</string>
<string name="always_download_webp_summary_off">Will only download images as webp if its the only option, most images will be jpg</string>
<!-- Other Settings --> <!-- Other Settings -->
<string name="high_quality_thumbnails">Use high-quality thumbnails</string> <string name="high_quality_thumbnails">Use high-quality thumbnails</string>
<string name="high_quality_thumbnails_summary">May slow down search results</string> <string name="high_quality_thumbnails_summary">May slow down search results</string>