From dc7a492d7556272a8b8d37a1ca4cc0fd9557c16d Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 30 Sep 2020 22:55:13 -0400 Subject: [PATCH 01/14] Update subsampling-scale-image-view (cherry picked from commit 969b57ade9f2ff6222c694f969149a62ac4ae298) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 35f8f5ead..fc6dcd200 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -233,7 +233,7 @@ dependencies { implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version" kapt "com.github.bumptech.glide:compiler:$glide_version" - implementation 'com.github.tachiyomiorg:subsampling-scale-image-view:bff2806' + implementation 'com.github.tachiyomiorg:subsampling-scale-image-view:6caf219' // Logging implementation 'com.jakewharton.timber:timber:4.7.1' From e1fc94e6d34790906125f5bbbb9098eec7a12501 Mon Sep 17 00:00:00 2001 From: Unlocked <10186337+TheUnlocked@users.noreply.github.com> Date: Fri, 2 Oct 2020 06:02:34 -0700 Subject: [PATCH 02/14] Fix visual issue with bottom padding in filters sheet (#3881) (cherry picked from commit 25d1c40cda4ece4321137a366c7f4de8418091b7) --- app/src/main/res/layout/source_filter_sheet.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/source_filter_sheet.xml b/app/src/main/res/layout/source_filter_sheet.xml index 4081c59f9..3b211053f 100644 --- a/app/src/main/res/layout/source_filter_sheet.xml +++ b/app/src/main/res/layout/source_filter_sheet.xml @@ -69,6 +69,8 @@ android:layout_height="0dp" android:layout_gravity="top" android:layout_weight="1" - android:paddingBottom="8dp" /> + android:paddingBottom="8dp" + android:clipChildren="false" + android:clipToPadding="false" /> From a0cf7730f55731de3bb6a8e8bb09a0a6c6495c2d Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 2 Oct 2020 22:01:25 -0400 Subject: [PATCH 03/14] Undo some weird thing SY had --- .../eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt index 94795ccb5..fd09f703b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt @@ -160,9 +160,8 @@ fun syncChaptersWithSource( // Fix order in source. db.fixChaptersSourceOrder(sourceChapters).executeAsBlocking() - // Set manga's last update time to latest chapter's fetch time if possible - val newestChapter = db.getChapters(manga).executeAsBlocking().maxBy { it.date_fetch } - manga.last_update = newestChapter?.date_fetch ?: Date().time + // Set this manga as updated since chapters were changed + manga.last_update = Date().time db.updateLastUpdated(manga).executeAsBlocking() } From 925e9d951642395cf99aa0f5a2a0ed60feade002 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 3 Oct 2020 10:18:39 -0400 Subject: [PATCH 04/14] Update AndroidX dependencies (cherry picked from commit 2df6a4dde80ee98932e79eec807cc25e1b72741a) --- app/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fc6dcd200..c111b5c83 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -141,7 +141,7 @@ dependencies { // AndroidX libraries implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.appcompat:appcompat:1.3.0-alpha02' - implementation 'androidx.biometric:biometric:1.1.0-alpha02' + implementation 'androidx.biometric:biometric:1.1.0-beta01' implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.1' @@ -149,10 +149,10 @@ dependencies { implementation 'androidx.core:core-ktx:1.4.0-alpha01' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha05' + implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha06' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01' - final lifecycle_version = '2.3.0-alpha07' + final lifecycle_version = '2.3.0-beta01' implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" From e1d7713f1416f96f8599b85037feb92597d0857d Mon Sep 17 00:00:00 2001 From: Platiplus Date: Sat, 3 Oct 2020 11:43:01 -0300 Subject: [PATCH 05/14] [Feature Request] Option to turn off History - #3772 (#3855) * Implementing do not save chapter history preference * Refactor of labels * Changing incognito mode from Readers section to More * Fixing imports and removing unused strings (cherry picked from commit 79ccfcd55397f3df7ce91d88e93a7c879a3360ab) --- .../tachiyomi/data/preference/PreferenceKeys.kt | 2 ++ .../tachiyomi/data/preference/PreferencesHelper.kt | 2 ++ .../eu/kanade/tachiyomi/ui/more/MoreController.kt | 10 ++++++++++ .../eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt | 12 +++++++----- app/src/main/res/values/strings.xml | 2 ++ 5 files changed, 23 insertions(+), 5 deletions(-) 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 f14f31dce..6538db8cc 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 @@ -187,6 +187,8 @@ object PreferenceKeys { const val defaultChapterDisplayByNameOrNumber = "default_chapter_display_by_name_or_number" + const val incognitoMode = "incognito_mode" + fun trackUsername(syncId: Int) = "pref_mangasync_username_$syncId" fun trackPassword(syncId: Int) = "pref_mangasync_password_$syncId" 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 d35ddba03..64d9b4ed1 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 @@ -275,6 +275,8 @@ class PreferencesHelper(val context: Context) { fun sortChapterByAscendingOrDescending() = prefs.getInt(Keys.defaultChapterSortByAscendingOrDescending, Manga.SORT_DESC) + fun incognitoMode() = prefs.getBoolean(Keys.incognitoMode, false) + fun setChapterSettingsDefault(manga: Manga) { prefs.edit { putInt(Keys.defaultChapterFilterByRead, manga.readFilter) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 4e0c56f17..b55df1a75 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory import eu.kanade.tachiyomi.util.preference.summaryRes import eu.kanade.tachiyomi.util.preference.switchPreference import eu.kanade.tachiyomi.util.preference.titleRes +import eu.kanade.tachiyomi.util.preference.defaultValue import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.openInBrowser import exh.ui.batchadd.BatchAddController @@ -54,6 +55,15 @@ class MoreController : iconTint = tintColor } + switchPreference { + key = Keys.incognitoMode + summaryRes = R.string.pref_incognito_mode_summary + titleRes = R.string.pref_incognito_mode + iconRes = R.drawable.ic_glasses_black_24dp + iconTint = tintColor + defaultValue = false + } + preferenceCategory { preference { titleRes = R.string.label_download_queue diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index 4a1366b41..887e2a489 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -470,11 +470,13 @@ class ReaderPresenter( * Saves this [chapter] last read history. */ private fun saveChapterHistory(chapter: ReaderChapter) { - val history = History.create(chapter.chapter).apply { last_read = Date().time } - db.updateHistoryLastRead(history).asRxCompletable() - .onErrorComplete() - .subscribeOn(Schedulers.io()) - .subscribe() + if (!preferences.incognitoMode()) { + val history = History.create(chapter.chapter).apply { last_read = Date().time } + db.updateHistoryLastRead(history).asRxCompletable() + .onErrorComplete() + .subscribeOn(Schedulers.io()) + .subscribe() + } } /** diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0c854f3f2..bee1b97c3 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -319,6 +319,8 @@ 15% 20% 25% + Incognito mode + Disables recording history in History tab Download location From 6a3a5c58d406a545b1cf0eef3db8a164b9d4cecc Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 3 Oct 2020 10:44:34 -0400 Subject: [PATCH 06/14] Minor string cleanup for Incognito Mode (cherry picked from commit 4b78ff324dcce13e3f159b1067aad46391cfcce3) --- .../main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt | 2 +- app/src/main/res/values/strings.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index b55df1a75..da30335ef 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -15,6 +15,7 @@ import eu.kanade.tachiyomi.ui.download.DownloadController import eu.kanade.tachiyomi.ui.setting.SettingsController import eu.kanade.tachiyomi.ui.setting.SettingsMainController import eu.kanade.tachiyomi.util.preference.add +import eu.kanade.tachiyomi.util.preference.defaultValue import eu.kanade.tachiyomi.util.preference.iconRes import eu.kanade.tachiyomi.util.preference.iconTint import eu.kanade.tachiyomi.util.preference.onClick @@ -23,7 +24,6 @@ import eu.kanade.tachiyomi.util.preference.preferenceCategory import eu.kanade.tachiyomi.util.preference.summaryRes import eu.kanade.tachiyomi.util.preference.switchPreference import eu.kanade.tachiyomi.util.preference.titleRes -import eu.kanade.tachiyomi.util.preference.defaultValue import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.openInBrowser import exh.ui.batchadd.BatchAddController diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bee1b97c3..f1774c807 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -319,8 +319,6 @@ 15% 20% 25% - Incognito mode - Disables recording history in History tab Download location @@ -423,6 +421,8 @@ Downloaded only + Incognito mode + Pauses reading history Filters all manga in your library 1 remaining From 085722e077751faae5701dae3ea05676572f514c Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 3 Oct 2020 10:48:53 -0400 Subject: [PATCH 07/14] Show downloaded only banner in all views (cherry picked from commit 7194f6520327d5419cfbe1fd226e094bf227f13b) --- .../tachiyomi/ui/library/LibraryController.kt | 4 ---- .../kanade/tachiyomi/ui/main/MainActivity.kt | 4 ++++ .../main/res/layout/library_controller.xml | 18 ------------------ app/src/main/res/layout/main_activity.xml | 19 +++++++++++++++++++ 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 4c37ed05d..59d4136e9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -226,10 +226,6 @@ class LibraryController( } } - if (preferences.downloadedOnly().get()) { - binding.downloadedOnly.isVisible = true - } - binding.btnGlobalSearch.clicks() .onEach { router.pushController( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 14fb9e97d..37b80fc68 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -230,6 +230,10 @@ class MainActivity : BaseActivity() { preferences.extensionUpdatesCount() .asImmediateFlow { setExtensionsBadge() } .launchIn(scope) + + preferences.downloadedOnly() + .asImmediateFlow { binding.downloadedOnly.isVisible = it } + .launchIn(scope) } override fun onNewIntent(intent: Intent) { diff --git a/app/src/main/res/layout/library_controller.xml b/app/src/main/res/layout/library_controller.xml index 1bae7b217..b60444697 100644 --- a/app/src/main/res/layout/library_controller.xml +++ b/app/src/main/res/layout/library_controller.xml @@ -10,24 +10,6 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - -