Selaa lähdekoodia

Update image decoder library. Remove deprecated ask update tracking setting

inorichi 6 vuotta sitten
vanhempi
commit
da8b870670
27 muutettua tiedostoa jossa 11 lisäystä ja 38 poistoa
  1. 3 4
      app/build.gradle
  2. 0 2
      app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
  3. 0 2
      app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
  4. 1 2
      app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueGridHolder.kt
  5. 0 1
      app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueListHolder.kt
  6. 3 0
      app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
  7. 3 0
      app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
  8. 1 8
      app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt
  9. 0 1
      app/src/main/res/values-ar/strings.xml
  10. 0 1
      app/src/main/res/values-bg/strings.xml
  11. 0 1
      app/src/main/res/values-bn/strings.xml
  12. 0 1
      app/src/main/res/values-de/strings.xml
  13. 0 1
      app/src/main/res/values-es/strings.xml
  14. 0 1
      app/src/main/res/values-fr/strings.xml
  15. 0 1
      app/src/main/res/values-hi/strings.xml
  16. 0 1
      app/src/main/res/values-hu/strings.xml
  17. 0 1
      app/src/main/res/values-in/strings.xml
  18. 0 1
      app/src/main/res/values-it/strings.xml
  19. 0 1
      app/src/main/res/values-ms/strings.xml
  20. 0 1
      app/src/main/res/values-nl/strings.xml
  21. 0 1
      app/src/main/res/values-pl/strings.xml
  22. 0 1
      app/src/main/res/values-pt-rBR/strings.xml
  23. 0 1
      app/src/main/res/values-pt/strings.xml
  24. 0 1
      app/src/main/res/values-ro/strings.xml
  25. 0 1
      app/src/main/res/values-ru/strings.xml
  26. 0 1
      app/src/main/res/values-vi/strings.xml
  27. 0 1
      app/src/main/res/values/strings.xml

+ 3 - 4
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'

+ 0 - 2
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"

+ 0 - 2
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)

+ 1 - 2
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))
         }
     }
-}
+}

+ 0 - 1
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)
         }

+ 3 - 0
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<Drawable> {
                 override fun onLoadFailed(
                         e: GlideException?,

+ 3 - 0
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<Drawable> {
                 override fun onLoadFailed(
                         e: GlideException?,

+ 1 - 8
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)
     }
 
-}
+}

+ 0 - 1
app/src/main/res/values-ar/strings.xml

@@ -119,7 +119,6 @@
     <string name="charging">أثناء الشحن</string>
     <string name="pref_update_only_non_completed">تحديث المانجا المستمرة فقط</string>
     <string name="pref_auto_update_manga_sync">مزامنة الفصول بعد القراءة</string>
-    <string name="pref_ask_update_manga_sync">التأكيد قبل التحديث</string>
     <string name="pref_theme">سمة التطبيق</string>
     <string name="light_theme">السمة الرئيسية</string>
     <string name="dark_theme">السمة الليلية</string>

+ 0 - 1
app/src/main/res/values-bg/strings.xml

@@ -108,7 +108,6 @@
     <string name="charging">На зарядно устройство</string>
     <string name="pref_update_only_non_completed">Обновявай само текуща манга</string>
     <string name="pref_auto_update_manga_sync">Синхронизирай глави след прочитане</string>
-    <string name="pref_ask_update_manga_sync">Искане за потвърждение преди обновяване</string>
     <string name="pref_theme">Тема на приложението</string>
     <string name="light_theme">Основна тема</string>
     <string name="dark_theme">Тъмна тема</string>

+ 0 - 1
app/src/main/res/values-bn/strings.xml

@@ -123,7 +123,6 @@
     <string name="charging">চার্জ হচ্ছে</string>
     <string name="pref_update_only_non_completed">কেবল চলমান মাংগা আপডেট করুন</string>
     <string name="pref_auto_update_manga_sync">পড়ার পর অধ্যায়গুলো সুসংগত করুন</string>
-    <string name="pref_ask_update_manga_sync">আপডেটের আগে নিশ্চিত করুন</string>
     <string name="pref_theme">এপ্লিকেশন থিম</string>
     <string name="light_theme">প্রধান থিম</string>
     <string name="dark_theme">কালো থিম</string>

+ 0 - 1
app/src/main/res/values-de/strings.xml

@@ -116,7 +116,6 @@
     <string name="charging">Am Laden</string>
     <string name="pref_update_only_non_completed">Nur fortlaufende Manga aktualisieren</string>
     <string name="pref_auto_update_manga_sync">Kapitel nach dem Lesen synchronisieren</string>
-    <string name="pref_ask_update_manga_sync">Vor Update bestätigen</string>
     <string name="pref_theme">App Design</string>
     <string name="light_theme">Hauptdesign</string>
     <string name="dark_theme">Dunkles Design</string>

+ 0 - 1
app/src/main/res/values-es/strings.xml

@@ -88,7 +88,6 @@
     <string name="charging">Cargando</string>
     <string name="pref_update_only_non_completed">Solo actualizar el manga en curso</string>
     <string name="pref_auto_update_manga_sync">Sincronizar capítulos después de leerlos</string>
-    <string name="pref_ask_update_manga_sync">Confirmar antes de actualizar</string>
     <string name="pref_theme">Tema de la aplicación</string>
     <string name="light_theme">Tema principal</string>
     <string name="dark_theme">Tema oscuro</string>

+ 0 - 1
app/src/main/res/values-fr/strings.xml

@@ -107,7 +107,6 @@
     <string name="charging">En charge</string>
     <string name="pref_update_only_non_completed">Ne mettre à jour que les mangas en cours</string>
     <string name="pref_auto_update_manga_sync">Synchroniser les chapitres après les avoir lus</string>
-    <string name="pref_ask_update_manga_sync">Confirmez avant de mettre à jour</string>
     <string name="pref_theme">Thème de l\'application</string>
     <string name="light_theme">Thème principal</string>
     <string name="dark_theme">Thème sombre</string>

+ 0 - 1
app/src/main/res/values-hi/strings.xml

@@ -123,7 +123,6 @@
     <string name="charging">चार्ज होते समय</string>
     <string name="pref_update_only_non_completed">केवल चालू मंगा का अद्यतन करे</string>
     <string name="pref_auto_update_manga_sync">अध्याय पढ़ने के बाद समकालीन करे</string>
-    <string name="pref_ask_update_manga_sync">अद्यतन करने से पहले पुष्टि करे</string>
     <string name="pref_theme">एप्पलीकेशन थीम</string>
     <string name="light_theme">मुख्य थीम</string>
     <string name="dark_theme">गहरी थीम</string>

+ 0 - 1
app/src/main/res/values-hu/strings.xml

@@ -161,7 +161,6 @@
     <string name="short_recent_updates">Frissítések</string>
 
     <string name="pref_auto_update_manga_sync">Olvasás után a fejezetek szinkronizálása</string>
-    <string name="pref_ask_update_manga_sync">Megerősítést kér frissítés előtt</string>
     <string name="pref_lock_orientation">Elforgatás zárolása</string>
     <string name="pref_page_transitions">Áttűnés lapozáskor</string>
     <string name="pref_crop_borders">Szegélyek vágása</string>

+ 0 - 1
app/src/main/res/values-in/strings.xml

@@ -118,7 +118,6 @@
     <string name="charging">Pengisian</string>
     <string name="pref_update_only_non_completed">Hanya perbaharui saja manga yang masih berlanjut</string>
     <string name="pref_auto_update_manga_sync">Sinkronkan bab setelah membaca</string>
-    <string name="pref_ask_update_manga_sync">Konfirmasikan sebelum memperbarui</string>
     <string name="pref_theme">Tema aplikasi</string>
     <string name="light_theme">Tema utama</string>
     <string name="dark_theme">Tema gelap</string>

+ 0 - 1
app/src/main/res/values-it/strings.xml

@@ -104,7 +104,6 @@
     <string name="charging">Caricamento</string>
     <string name="pref_update_only_non_completed">Aggiorna solo manga in corso</string>
     <string name="pref_auto_update_manga_sync">Sincronizza capitoli dopo la lettura</string>
-    <string name="pref_ask_update_manga_sync">Chiedi prima di aggiornare</string>
     <string name="pref_theme">Tema dell\'applicazione</string>
     <string name="light_theme">Tema principale</string>
     <string name="dark_theme">Tema scuro</string>

+ 0 - 1
app/src/main/res/values-ms/strings.xml

@@ -122,7 +122,6 @@
     <string name="charging">Ketika mengecas</string>
     <string name="pref_update_only_non_completed">Hanya kemas kini manga yang masih berterusan</string>
     <string name="pref_auto_update_manga_sync">Sinkronkan bab setelah dibaca</string>
-    <string name="pref_ask_update_manga_sync">Minta pengesahan sebelum kemas kini</string>
     <string name="pref_theme">Tema aplikasi</string>
     <string name="light_theme">Tema utama</string>
     <string name="dark_theme">Tema gelap</string>

+ 0 - 1
app/src/main/res/values-nl/strings.xml

@@ -309,7 +309,6 @@
     <string name="pref_library_update_restriction_summary">Update alleen wanneer de voorwaarden zijn voldaan</string>
     <string name="wifi">Wi-Fi</string>
     <string name="charging">Aan het opladen</string>
-    <string name="pref_ask_update_manga_sync">Vraag om bevestiging alvorens te updaten</string>
     <string name="pref_theme">Thema</string>
     <string name="light_theme">Hoofdthema</string>
     <string name="pref_reader_navigation">Navigatie</string>

+ 0 - 1
app/src/main/res/values-pl/strings.xml

@@ -214,7 +214,6 @@
     <string name="charging">Ładowanie baterii</string>
     <string name="pref_update_only_non_completed">Aktualizuj tylko nieukończone mangi</string>
     <string name="pref_auto_update_manga_sync">Aktualizuj postęp po przeczytaniu rozdziału</string>
-    <string name="pref_ask_update_manga_sync">Potwierdź przed aktualizacją</string>
     <string name="pref_theme">Motyw aplikacji</string>
     <string name="light_theme">Główny motyw</string>
     <string name="dark_theme">Ciemny motyw</string>

+ 0 - 1
app/src/main/res/values-pt-rBR/strings.xml

@@ -118,7 +118,6 @@
     <string name="charging">Carregando</string>
     <string name="pref_update_only_non_completed">Atualizar apenas mangás em andamento</string>
     <string name="pref_auto_update_manga_sync">Sincronizar capítulos após leitura</string>
-    <string name="pref_ask_update_manga_sync">Confirmar antes de atualizar</string>
     <string name="pref_theme">Tema do aplicativo</string>
     <string name="light_theme">Tema principal</string>
     <string name="dark_theme">Tema escuro</string>

+ 0 - 1
app/src/main/res/values-pt/strings.xml

@@ -91,7 +91,6 @@
     <string name="charging">A carregar</string>
     <string name="pref_update_only_non_completed">Atualizar apenas manga em curso</string>
     <string name="pref_auto_update_manga_sync">Sincronizar capítulos após leitura</string>
-    <string name="pref_ask_update_manga_sync">Confirmar antes da atualização</string>
     <string name="pref_theme">Tema da aplicação</string>
     <string name="light_theme">Tema principal</string>
     <string name="dark_theme">Tema escuro</string>

+ 0 - 1
app/src/main/res/values-ro/strings.xml

@@ -122,7 +122,6 @@
     <string name="charging">Se încarcă</string>
     <string name="pref_update_only_non_completed">Actualizează doar manga în curs de desfășurare</string>
     <string name="pref_auto_update_manga_sync">Sincronizează capitolele după citire</string>
-    <string name="pref_ask_update_manga_sync">Confirmă înainte de actualizare</string>
     <string name="pref_theme">Temă aplicație</string>
     <string name="light_theme">Tema principală</string>
     <string name="dark_theme">Tema întunecată</string>

+ 0 - 1
app/src/main/res/values-ru/strings.xml

@@ -183,7 +183,6 @@
     <string name="plan_to_read">Планирую прочитать</string>
     <string name="portrait">Вертикальная</string>
     <string name="pref_acra_summary">Помогает исправлять любые баги. Личные данные не передаются</string>
-    <string name="pref_ask_update_manga_sync">Подтвердите перед обновлением</string>
     <string name="pref_auto_update_manga_sync">Синхронизировать главы после прочтения</string>
     <string name="pref_category_about">Информация</string>
     <string name="pref_category_advanced">Дополнительно</string>

+ 0 - 1
app/src/main/res/values-vi/strings.xml

@@ -107,7 +107,6 @@
     <string name="charging">Đang sạc</string>
     <string name="pref_update_only_non_completed">Chỉ cập nhật truyện đang tiến hành</string>
     <string name="pref_auto_update_manga_sync">Đồng bộ các chương sau khi đọc</string>
-    <string name="pref_ask_update_manga_sync">Xác nhận trước khi cập nhật</string>
     <string name="pref_theme">Chủ đề ứng dụng</string>
     <string name="light_theme">Chủ đề chính</string>
     <string name="dark_theme">Chủ đề tối</string>

+ 0 - 1
app/src/main/res/values/strings.xml

@@ -135,7 +135,6 @@
     <string name="charging">Charging</string>
     <string name="pref_update_only_non_completed">Only update ongoing manga</string>
     <string name="pref_auto_update_manga_sync">Sync chapters after reading</string>
-    <string name="pref_ask_update_manga_sync">Confirm before updating</string>
     <string name="pref_theme">Application theme</string>
     <string name="light_theme">Main theme</string>
     <string name="dark_theme">Dark theme</string>