From da8b87067044d57cbdcd3f13f55e6715d600ca25 Mon Sep 17 00:00:00 2001 From: inorichi Date: Mon, 17 Sep 2018 14:50:44 +0200 Subject: [PATCH] Update image decoder library. Remove deprecated ask update tracking setting --- app/build.gradle | 7 +++---- .../kanade/tachiyomi/data/preference/PreferenceKeys.kt | 2 -- .../tachiyomi/data/preference/PreferencesHelper.kt | 2 -- .../tachiyomi/ui/catalogue/browse/CatalogueGridHolder.kt | 3 +-- .../tachiyomi/ui/catalogue/browse/CatalogueListHolder.kt | 1 - .../tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt | 3 +++ .../ui/reader/viewer/webtoon/WebtoonPageHolder.kt | 3 +++ .../tachiyomi/ui/setting/SettingsTrackingController.kt | 9 +-------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 27 files changed, 11 insertions(+), 38 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 49005a5359..68703e5a6c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,7 +102,7 @@ android { dependencies { // Modified dependencies - implementation('com.github.inorichi:subsampling-scale-image-view:caad3e4') + implementation 'com.github.inorichi:subsampling-scale-image-view:b1cfae3' implementation 'com.github.inorichi:junrar-android:634c1f5' // Android support library @@ -205,9 +205,8 @@ dependencies { implementation 'com.github.inorichi:DirectionalViewPager:3acc51a' // Conductor - implementation "com.github.inorichi.Conductor:conductor:be8b3c5" - implementation ("com.bluelinelabs:conductor-support:2.1.5-SNAPSHOT") { - exclude group: "com.bluelinelabs", module: "conductor" + implementation 'com.bluelinelabs:conductor:2.1.5' + implementation ("com.bluelinelabs:conductor-support:2.1.5") { exclude group: "com.android.support" } implementation 'com.github.inorichi:conductor-support-preference:27.0.2' 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 985187f773..7596a6ae5e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt @@ -53,8 +53,6 @@ object PreferenceKeys { const val autoUpdateTrack = "pref_auto_update_manga_sync_key" - const val askUpdateTrack = "pref_ask_update_manga_sync_key" - const val lastUsedCatalogueSource = "last_catalogue_source" const val lastUsedCategory = "last_used_category" 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 5de266b6a1..b9ab93f441 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -81,8 +81,6 @@ class PreferencesHelper(val context: Context) { fun autoUpdateTrack() = prefs.getBoolean(Keys.autoUpdateTrack, true) - fun askUpdateTrack() = prefs.getBoolean(Keys.askUpdateTrack, false) - fun lastUsedCatalogueSource() = rxPrefs.getLong(Keys.lastUsedCatalogueSource, -1) fun lastUsedCategory() = rxPrefs.getInteger(Keys.lastUsedCategory, 0) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueGridHolder.kt index c2ef105fe2..8daad99477 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueGridHolder.kt @@ -42,9 +42,8 @@ class CatalogueGridHolder(private val view: View, private val adapter: FlexibleA .load(manga) .diskCacheStrategy(DiskCacheStrategy.DATA) .centerCrop() - .skipMemoryCache(true) .placeholder(android.R.color.transparent) .into(StateImageViewTarget(thumbnail, progress)) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueListHolder.kt index c0bb0f0ece..2624215574 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueListHolder.kt @@ -44,7 +44,6 @@ class CatalogueListHolder(private val view: View, adapter: FlexibleAdapter<*>) : .centerCrop() .circleCrop() .dontAnimate() - .skipMemoryCache(true) .placeholder(android.R.color.transparent) .into(thumbnail) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index 176891d7d4..b6fc4c54a1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -18,8 +18,10 @@ import android.widget.TextView import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target +import com.bumptech.glide.request.transition.NoTransition import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.github.chrisbanes.photoview.PhotoView @@ -436,6 +438,7 @@ class PagerPageHolder( .load(stream) .skipMemoryCache(true) .diskCacheStrategy(DiskCacheStrategy.NONE) + .transition(DrawableTransitionOptions.with(NoTransition.getFactory())) .listener(object : RequestListener { override fun onLoadFailed( e: GlideException?, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index c6c1876628..40ab711a4d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -17,8 +17,10 @@ import android.widget.TextView import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target +import com.bumptech.glide.request.transition.NoTransition import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import eu.kanade.tachiyomi.R @@ -476,6 +478,7 @@ class WebtoonPageHolder( .load(stream) .skipMemoryCache(true) .diskCacheStrategy(DiskCacheStrategy.NONE) + .transition(DrawableTransitionOptions.with(NoTransition.getFactory())) .listener(object : RequestListener { override fun onLoadFailed( e: GlideException?, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt index 0f7251bbf4..699c253d23 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt @@ -27,13 +27,6 @@ class SettingsTrackingController : SettingsController(), titleRes = R.string.pref_auto_update_manga_sync defaultValue = true } - switchPreference { - key = Keys.askUpdateTrack - titleRes = R.string.pref_ask_update_manga_sync - defaultValue = false - }.apply { - dependency = Keys.autoUpdateTrack // the preference needs to be attached. - } preferenceCategory { titleRes = R.string.services @@ -88,4 +81,4 @@ class SettingsTrackingController : SettingsController(), updatePreference(service.id) } -} \ No newline at end of file +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 948a173fda..f23a73b197 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -119,7 +119,6 @@ أثناء الشحن تحديث المانجا المستمرة فقط مزامنة الفصول بعد القراءة - التأكيد قبل التحديث سمة التطبيق السمة الرئيسية السمة الليلية diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 668a8005b8..694538b0f1 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -108,7 +108,6 @@ На зарядно устройство Обновявай само текуща манга Синхронизирай глави след прочитане - Искане за потвърждение преди обновяване Тема на приложението Основна тема Тъмна тема diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index e0a16bfc8c..8d349b86a2 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -123,7 +123,6 @@ চার্জ হচ্ছে কেবল চলমান মাংগা আপডেট করুন পড়ার পর অধ্যায়গুলো সুসংগত করুন - আপডেটের আগে নিশ্চিত করুন এপ্লিকেশন থিম প্রধান থিম কালো থিম diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7878122ae2..5b0147fc2b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -116,7 +116,6 @@ Am Laden Nur fortlaufende Manga aktualisieren Kapitel nach dem Lesen synchronisieren - Vor Update bestätigen App Design Hauptdesign Dunkles Design diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 0b51a2828d..f513055883 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -88,7 +88,6 @@ Cargando Solo actualizar el manga en curso Sincronizar capítulos después de leerlos - Confirmar antes de actualizar Tema de la aplicación Tema principal Tema oscuro diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4f2e668040..e782c88183 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -107,7 +107,6 @@ En charge Ne mettre à jour que les mangas en cours Synchroniser les chapitres après les avoir lus - Confirmez avant de mettre à jour Thème de l\'application Thème principal Thème sombre diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0fb316477b..a162364640 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -123,7 +123,6 @@ चार्ज होते समय केवल चालू मंगा का अद्यतन करे अध्याय पढ़ने के बाद समकालीन करे - अद्यतन करने से पहले पुष्टि करे एप्पलीकेशन थीम मुख्य थीम गहरी थीम diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4ac9c74528..7db8dcfc02 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -161,7 +161,6 @@ Frissítések Olvasás után a fejezetek szinkronizálása - Megerősítést kér frissítés előtt Elforgatás zárolása Áttűnés lapozáskor Szegélyek vágása diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8af920ba52..27ba1c7a74 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -118,7 +118,6 @@ Pengisian Hanya perbaharui saja manga yang masih berlanjut Sinkronkan bab setelah membaca - Konfirmasikan sebelum memperbarui Tema aplikasi Tema utama Tema gelap diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ed96b665ae..2c10269c54 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,7 +104,6 @@ Caricamento Aggiorna solo manga in corso Sincronizza capitoli dopo la lettura - Chiedi prima di aggiornare Tema dell\'applicazione Tema principale Tema scuro diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ee1b8e5da3..941fa03890 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -122,7 +122,6 @@ Ketika mengecas Hanya kemas kini manga yang masih berterusan Sinkronkan bab setelah dibaca - Minta pengesahan sebelum kemas kini Tema aplikasi Tema utama Tema gelap diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index dae9a9986a..0d5e552e24 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -309,7 +309,6 @@ Update alleen wanneer de voorwaarden zijn voldaan Wi-Fi Aan het opladen - Vraag om bevestiging alvorens te updaten Thema Hoofdthema Navigatie diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a729975be4..554539e16e 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -214,7 +214,6 @@ Ładowanie baterii Aktualizuj tylko nieukończone mangi Aktualizuj postęp po przeczytaniu rozdziału - Potwierdź przed aktualizacją Motyw aplikacji Główny motyw Ciemny motyw diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index edf436ff24..12af08915a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -118,7 +118,6 @@ Carregando Atualizar apenas mangás em andamento Sincronizar capítulos após leitura - Confirmar antes de atualizar Tema do aplicativo Tema principal Tema escuro diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5205a312c0..301fb7c692 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -91,7 +91,6 @@ A carregar Atualizar apenas manga em curso Sincronizar capítulos após leitura - Confirmar antes da atualização Tema da aplicação Tema principal Tema escuro diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b6f266b95c..84cf1dffa0 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -122,7 +122,6 @@ Se încarcă Actualizează doar manga în curs de desfășurare Sincronizează capitolele după citire - Confirmă înainte de actualizare Temă aplicație Tema principală Tema întunecată diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a352cc5903..d534a0d00c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -183,7 +183,6 @@ Планирую прочитать Вертикальная Помогает исправлять любые баги. Личные данные не передаются - Подтвердите перед обновлением Синхронизировать главы после прочтения Информация Дополнительно diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 346e17e579..7dfa9e0459 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -107,7 +107,6 @@ Đang sạc Chỉ cập nhật truyện đang tiến hành Đồng bộ các chương sau khi đọc - Xác nhận trước khi cập nhật Chủ đề ứng dụng Chủ đề chính Chủ đề tối diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 73e735cf7f..ddd00452a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -135,7 +135,6 @@ Charging Only update ongoing manga Sync chapters after reading - Confirm before updating Application theme Main theme Dark theme