From 2e17efe82b48f394615b243b9ff22e74ca08b1af Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 11 Apr 2022 18:43:52 +0300
Subject: [PATCH 001/104] Update parsers

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1225098d7..6c004a16c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 400
-		versionName '3.0'
+		versionCode 401
+		versionName '3.1'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:0ee689cd2f') {
+	implementation('com.github.nv95:kotatsu-parsers:8e23a7fcd4') {
 		exclude group: 'org.json', module: 'json'
 	}
 

From 1b3af7069062f52cb8faf26486d8b47f924b5b4c Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 14 Apr 2022 08:06:16 +0300
Subject: [PATCH 002/104] Add WindowInsetHolder view

---
 .../base/ui/widgets/WindowInsetHolder.kt      | 72 +++++++++++++++++++
 .../res/layout-w720dp-land/activity_main.xml  |  3 +-
 app/src/main/res/layout/activity_main.xml     |  2 -
 3 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
new file mode 100644
index 000000000..0d915dc4f
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/WindowInsetHolder.kt
@@ -0,0 +1,72 @@
+package org.koitharu.kotatsu.base.ui.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.view.WindowInsets
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.annotation.AttrRes
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import androidx.core.view.WindowInsetsCompat
+
+class WindowInsetHolder @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = 0,
+) : View(context, attrs, defStyleAttr) {
+
+	private var desiredHeight = 0
+	private var desiredWidth = 0
+
+	@SuppressLint("RtlHardcoded")
+	override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
+		val barsInsets = WindowInsetsCompat.toWindowInsetsCompat(insets, this)
+			.getInsets(WindowInsetsCompat.Type.systemBars())
+		val gravity = getLayoutGravity()
+		val newWidth = when (gravity and Gravity.HORIZONTAL_GRAVITY_MASK) {
+			Gravity.LEFT -> barsInsets.left
+			Gravity.RIGHT -> barsInsets.right
+			else -> 0
+		}
+		val newHeight = when (gravity and Gravity.VERTICAL_GRAVITY_MASK) {
+			Gravity.TOP -> barsInsets.top
+			Gravity.BOTTOM -> barsInsets.bottom
+			else -> 0
+		}
+		if (newWidth != desiredWidth || newHeight != desiredHeight) {
+			desiredWidth = newWidth
+			desiredHeight = newHeight
+			requestLayout()
+		}
+		return super.dispatchApplyWindowInsets(insets)
+	}
+
+	override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+		val widthMode = MeasureSpec.getMode(widthMeasureSpec)
+		val heightMode = MeasureSpec.getMode(heightMeasureSpec)
+		super.onMeasure(
+			if (desiredWidth == 0 || widthMode == MeasureSpec.EXACTLY) {
+				widthMeasureSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(desiredWidth, widthMode)
+			},
+			if (desiredHeight == 0 || heightMode == MeasureSpec.EXACTLY) {
+				heightMeasureSpec
+			} else {
+				MeasureSpec.makeMeasureSpec(desiredHeight, heightMode)
+			},
+		)
+	}
+
+	private fun getLayoutGravity(): Int {
+		return when (val lp = layoutParams) {
+			is FrameLayout.LayoutParams -> lp.gravity
+			is LinearLayout.LayoutParams -> lp.gravity
+			is CoordinatorLayout.LayoutParams -> lp.gravity
+			else -> Gravity.NO_GRAVITY
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml
index 10570546c..1e507fbdc 100644
--- a/app/src/main/res/layout-w720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w720dp-land/activity_main.xml
@@ -32,6 +32,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:paddingLeft="16dp"
+			android:background="@null"
 			android:paddingRight="16dp"
 			app:elevation="0dp"
 			app:liftOnScroll="false">
@@ -81,8 +82,6 @@
 			android:text="@string/_continue"
 			android:visibility="gone"
 			app:backgroundTint="?attr/colorContainer"
-			app:behavior_autoHide="true"
-			app:behavior_autoShrink="true"
 			app:icon="@drawable/ic_read"
 			app:layout_anchor="@id/container"
 			app:layout_anchorGravity="bottom|end"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 78c3d932c..5b1c1571f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -75,8 +75,6 @@
 			android:text="@string/_continue"
 			android:visibility="gone"
 			app:backgroundTint="?attr/colorContainer"
-			app:behavior_autoHide="true"
-			app:behavior_autoShrink="true"
 			app:icon="@drawable/ic_read"
 			app:layout_anchor="@id/container"
 			app:layout_anchorGravity="bottom|end"

From 9c9a389aa55a26a7b487ed6a4c018e9e6a5a0385 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 14 Apr 2022 08:07:57 +0300
Subject: [PATCH 003/104] Rethrow CancellationException

---
 .../org/koitharu/kotatsu/download/domain/DownloadManager.kt    | 3 ++-
 .../java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt     | 3 ++-
 .../org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index e1933a683..0b3c67ccb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -141,8 +141,9 @@ class DownloadManager(
 			}
 			val localManga = localMangaRepository.getFromFile(output.file)
 			outState.value = DownloadState.Done(startId, data, cover, localManga)
-		} catch (_: CancellationException) {
+		} catch (e: CancellationException) {
 			outState.value = DownloadState.Cancelled(startId, manga, cover)
+			throw e
 		} catch (e: Throwable) {
 			if (BuildConfig.DEBUG) {
 				e.printStackTrace()
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
index 9f1f18983..688cca84f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
@@ -143,7 +143,8 @@ class ReaderViewModel(
 				val page = getCurrentPage() ?: error("Page not found")
 				externalStorageHelper.savePage(page, destination)
 				onPageSaved.postCall(destination)
-			} catch (_: CancellationException) {
+			} catch (e: CancellationException) {
+				throw e
 			} catch (e: Exception) {
 				if (BuildConfig.DEBUG) {
 					e.printStackTrace()
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
index 9ce52f4fe..5630cb1ba 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt
@@ -109,7 +109,7 @@ class PageHolderDelegate(
 			state = State.LOADED
 			callback.onImageReady(file.toUri())
 		} catch (e: CancellationException) {
-			// do nothing
+			throw e
 		} catch (e: Exception) {
 			state = State.ERROR
 			error = e

From 5e82c758930b2c5f8fd7dd5c5268d2f1e7168bee Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 15 Apr 2022 09:09:40 +0300
Subject: [PATCH 004/104] Cleanup extensions

---
 .idea/gradle.xml                              |  2 +-
 .../koitharu/kotatsu/base/ui/BaseActivity.kt  |  5 ++-
 .../base/ui/dialog/StorageSelectDialog.kt     |  4 +-
 .../base/ui/widgets/ListItemTextView.kt       |  7 ++-
 .../kotatsu/core/prefs/AppSettings.kt         | 10 ++---
 .../kotatsu/details/ui/DetailsFragment.kt     | 12 +++--
 .../ui/FavouritesContainerFragment.kt         | 16 ++++---
 .../ui/categories/CategoriesActivity.kt       | 29 ++++++------
 .../kotatsu/list/ui/ListModeSelectDialog.kt   |  2 +-
 .../list/ui/MangaSelectionDecoration.kt       |  2 +-
 .../ui/pager/webtoon/WebtoonReaderFragment.kt |  6 +--
 .../SearchSuggestionItemCallback.kt           |  2 +-
 .../settings/AppearanceSettingsFragment.kt    |  5 ++-
 .../kotatsu/settings/SettingsModule.kt        |  2 +-
 .../utils/BottomSheetToolbarController.kt     |  6 +--
 .../org/koitharu/kotatsu/utils/FileSize.kt    |  2 +-
 .../koitharu/kotatsu/utils/GridTouchHelper.kt |  6 ++-
 .../kotatsu/utils/SelectionController.kt      | 10 -----
 .../org/koitharu/kotatsu/utils/WordSet.kt     |  9 ----
 .../koitharu/kotatsu/utils/ext/CommonExt.kt   | 14 +-----
 .../kotatsu/utils/ext/CoroutineExt.kt         |  4 +-
 .../org/koitharu/kotatsu/utils/ext/DateExt.kt |  2 +-
 .../koitharu/kotatsu/utils/ext/FragmentExt.kt |  7 +--
 .../koitharu/kotatsu/utils/ext/LiveDataExt.kt |  4 +-
 .../kotatsu/utils/ext/PreferencesExt.kt       |  6 +--
 .../koitharu/kotatsu/utils/ext/TextViewExt.kt | 10 ++---
 .../koitharu/kotatsu/utils/ext/ThemeExt.kt    | 26 ++++++-----
 .../org/koitharu/kotatsu/utils/ext/ViewExt.kt | 45 +++++++------------
 .../progress/IntPercentLabelFormatter.kt      |  9 +++-
 29 files changed, 119 insertions(+), 145 deletions(-)
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/SelectionController.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/WordSet.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a152..6e5389ed9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="Android Studio default JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
index 54cae9713..2fcfeac76 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseActivity.kt
@@ -26,7 +26,8 @@ import org.koitharu.kotatsu.base.ui.util.WindowInsetsDelegate
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
 import org.koitharu.kotatsu.core.prefs.AppSettings
 
-abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(),
+abstract class BaseActivity<B : ViewBinding> :
+	AppCompatActivity(),
 	WindowInsetsDelegate.WindowInsetsListener {
 
 	protected lateinit var binding: B
@@ -123,4 +124,4 @@ abstract class BaseActivity<B : ViewBinding> : AppCompatActivity(),
 			super.onBackPressed()
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt
index 3c048aa54..58e353ca8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/StorageSelectDialog.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.base.ui.dialog
 
 import android.content.Context
 import android.content.DialogInterface
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
@@ -12,7 +13,6 @@ import kotlinx.coroutines.runBlocking
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.databinding.ItemStorageBinding
 import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.utils.ext.inflate
 import java.io.File
 
 class StorageSelectDialog private constructor(private val delegate: AlertDialog) :
@@ -66,7 +66,7 @@ class StorageSelectDialog private constructor(private val delegate: AlertDialog)
 		val volumes = getAvailableVolumes(storageManager)
 
 		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-			val view = convertView ?: parent.inflate(R.layout.item_storage)
+			val view = convertView ?: LayoutInflater.from(parent.context).inflate(R.layout.item_storage, parent, false)
 			val binding = (view.tag as? ItemStorageBinding) ?: ItemStorageBinding.bind(view).also {
 				view.tag = it
 			}
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
index 7004192ad..18d7262dc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt
@@ -13,12 +13,12 @@ import android.graphics.drawable.shapes.RectShape
 import android.util.AttributeSet
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatCheckedTextView
-import androidx.core.content.res.use
 import androidx.core.content.withStyledAttributes
 import com.google.android.material.ripple.RippleUtils
 import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.utils.ext.getThemeColorStateList
 
 @SuppressLint("RestrictedApi")
 class ListItemTextView @JvmOverloads constructor(
@@ -119,8 +119,7 @@ class ListItemTextView @JvmOverloads constructor(
 	}
 
 	private fun getRippleColorFallback(context: Context): ColorStateList {
-		return context.obtainStyledAttributes(intArrayOf(android.R.attr.colorControlHighlight)).use {
-			it.getColorStateList(0)
-		} ?: ColorStateList.valueOf(Color.TRANSPARENT)
+		return context.getThemeColorStateList(android.R.attr.colorControlHighlight)
+			?: ColorStateList.valueOf(Color.TRANSPARENT)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index de191e304..89cbc1aaf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -11,6 +11,10 @@ import androidx.collection.arraySetOf
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.google.android.material.color.DynamicColors
+import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
@@ -19,10 +23,6 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.getEnumValue
 import org.koitharu.kotatsu.utils.ext.putEnumValue
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
-import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
 
 class AppSettings(context: Context) {
 
@@ -281,4 +281,4 @@ class AppSettings(context: Context) {
 		private val isSamsung
 			get() = Build.MANUFACTURER.equals("samsung", ignoreCase = true)
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index ab4ae21e1..df4fc2de9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import android.view.*
+import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.net.toUri
@@ -224,14 +225,16 @@ class DetailsFragment :
 				if (viewModel.readingHistory.value == null) {
 					return false
 				}
-				v.showPopupMenu(R.menu.popup_read) {
-					when (it.itemId) {
+				val menu = PopupMenu(v.context, v)
+				menu.inflate(R.menu.popup_read)
+				menu.setOnMenuItemClickListener { menuItem ->
+					when (menuItem.itemId) {
 						R.id.action_read -> {
 							val branch = viewModel.selectedBranchValue
 							startActivity(
 								ReaderActivity.newIntent(
-									context = context ?: return@showPopupMenu false,
-									manga = viewModel.manga.value ?: return@showPopupMenu false,
+									context = context ?: return@setOnMenuItemClickListener false,
+									manga = viewModel.manga.value ?: return@setOnMenuItemClickListener false,
 									state = viewModel.chapters.value?.firstOrNull { c ->
 										c.chapter.branch == branch
 									}?.let { c ->
@@ -244,6 +247,7 @@ class DetailsFragment :
 						else -> false
 					}
 				}
+				menu.show()
 				return true
 			}
 			else -> return false
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index 9fc69a228..27ae2696d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.favourites.ui
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.view.ActionMode
+import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.view.children
 import androidx.core.view.updateLayoutParams
@@ -10,7 +11,6 @@ import androidx.core.view.updatePadding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import java.util.*
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -25,7 +25,7 @@ import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
-import org.koitharu.kotatsu.utils.ext.showPopupMenu
+import java.util.*
 
 class FavouritesContainerFragment :
 	BaseFragment<FragmentFavouritesBinding>(),
@@ -123,22 +123,24 @@ class FavouritesContainerFragment :
 
 	override fun onTabLongClick(tabView: View, category: FavouriteCategory): Boolean {
 		val menuRes = if (category.id == 0L) R.menu.popup_category_empty else R.menu.popup_category
-		tabView.showPopupMenu(menuRes, { menu ->
-			createOrderSubmenu(menu, category)
-		}) {
+		val menu = PopupMenu(tabView.context, tabView)
+		menu.inflate(menuRes)
+		createOrderSubmenu(menu.menu, category)
+		menu.setOnMenuItemClickListener {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(category)
 				R.id.action_rename -> editDelegate.renameCategory(category)
 				R.id.action_create -> editDelegate.createCategory()
-				R.id.action_order -> return@showPopupMenu false
+				R.id.action_order -> return@setOnMenuItemClickListener false
 				else -> {
 					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)
-						?: return@showPopupMenu false
+						?: return@setOnMenuItemClickListener false
 					viewModel.setCategoryOrder(category.id, order)
 				}
 			}
 			true
 		}
+		menu.show()
 		return true
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index c147351b0..9caeb87c8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
@@ -23,11 +24,12 @@ import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
-import org.koitharu.kotatsu.utils.ext.showPopupMenu
 
-class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
+class CategoriesActivity :
+	BaseActivity<ActivityCategoriesBinding>(),
 	OnListItemClickListener<FavouriteCategory>,
-	View.OnClickListener, CategoriesEditDelegate.CategoriesEditCallback {
+	View.OnClickListener,
+	CategoriesEditDelegate.CategoriesEditCallback {
 
 	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
 
@@ -58,26 +60,27 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 	}
 
 	override fun onItemClick(item: FavouriteCategory, view: View) {
-		view.showPopupMenu(R.menu.popup_category, { menu ->
-			createOrderSubmenu(menu, item)
-		}) {
-			when (it.itemId) {
+		val menu = PopupMenu(view.context, view)
+		menu.inflate(R.menu.popup_category)
+		createOrderSubmenu(menu.menu, item)
+		menu.setOnMenuItemClickListener { menuItem ->
+			when (menuItem.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(item)
 				R.id.action_rename -> editDelegate.renameCategory(item)
-				R.id.action_order -> return@showPopupMenu false
+				R.id.action_order -> return@setOnMenuItemClickListener false
 				else -> {
-					val order = SORT_ORDERS.getOrNull(it.order) ?: return@showPopupMenu false
+					val order = SORT_ORDERS.getOrNull(menuItem.order) ?: return@setOnMenuItemClickListener false
 					viewModel.setCategoryOrder(item.id, order)
 				}
 			}
 			true
 		}
+		menu.show()
 	}
 
 	override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
-		reorderHelper.startDrag(
-			binding.recyclerView.findContainingViewHolder(view) ?: return false
-		)
+		val viewHolder = binding.recyclerView.findContainingViewHolder(view) ?: return false
+		reorderHelper.startDrag(viewHolder)
 		return true
 	}
 
@@ -90,7 +93,7 @@ class CategoriesActivity : BaseActivity<ActivityCategoriesBinding>(),
 		binding.recyclerView.updatePadding(
 			left = insets.left,
 			right = insets.right,
-			bottom = 2 * insets.bottom + binding.fabAdd.measureHeight()
+			bottom = 2 * insets.bottom + binding.fabAdd.measureHeight(),
 		)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/ListModeSelectDialog.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/ListModeSelectDialog.kt
index 46dfaefd5..a7ae219e8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/ListModeSelectDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/ListModeSelectDialog.kt
@@ -43,7 +43,7 @@ class ListModeSelectDialog : AlertDialogFragment<DialogListModeBinding>(),
 		binding.textViewGridTitle.isVisible = mode == ListMode.GRID
 		binding.sliderGrid.isVisible = mode == ListMode.GRID
 
-		binding.sliderGrid.setLabelFormatter(IntPercentLabelFormatter())
+		binding.sliderGrid.setLabelFormatter(IntPercentLabelFormatter(view.context))
 		binding.sliderGrid.setValueRounded(settings.gridSize.toFloat())
 		binding.sliderGrid.addOnSliderTouchListener(this)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
index 939d5b256..106d141f4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
@@ -40,7 +40,7 @@ class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecorati
 
 	override fun getItemId(parent: RecyclerView, child: View): Long {
 		val holder = parent.getChildViewHolder(child) ?: return NO_ID
-		val item = holder.getItem<MangaItemModel>() ?: return NO_ID
+		val item = holder.getItem(MangaItemModel::class.java) ?: return NO_ID
 		return item.id
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
index ddaa63b5e..5a9721124 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonReaderFragment.kt
@@ -14,7 +14,7 @@ import org.koitharu.kotatsu.reader.ui.pager.BaseReaderAdapter
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.doOnCurrentItemChanged
 import org.koitharu.kotatsu.utils.ext.findCenterViewPosition
-import org.koitharu.kotatsu.utils.ext.firstItem
+import org.koitharu.kotatsu.utils.ext.firstVisibleItemPosition
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 
 class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
@@ -52,7 +52,7 @@ class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
 				setItems.await() ?: return@launchWhenCreated
 				if (position != -1) {
 					with(binding.recyclerView) {
-						firstItem = position
+						firstVisibleItemPosition = position
 						post {
 							(findViewHolderForAdapterPosition(position) as? WebtoonHolder)
 								?.restoreScroll(pendingState.scroll)
@@ -91,6 +91,6 @@ class WebtoonReaderFragment : BaseReader<FragmentReaderWebtoonBinding>() {
 	}
 
 	override fun switchPageTo(position: Int, smooth: Boolean) {
-		binding.recyclerView.firstItem = position
+		binding.recyclerView.firstVisibleItemPosition = position
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt
index 64e53dc6b..7c65c7c42 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionItemCallback.kt
@@ -31,7 +31,7 @@ class SearchSuggestionItemCallback(
 	): Boolean = false
 
 	override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-		val item = viewHolder.getItem<SearchSuggestionItem.RecentQuery>() ?: return
+		val item = viewHolder.getItem(SearchSuggestionItem.RecentQuery::class.java) ?: return
 		listener.onRemoveQuery(item.query)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
index aca880ea1..36031ec21 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/AppearanceSettingsFragment.kt
@@ -25,9 +25,10 @@ class AppearanceSettingsFragment :
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_appearance)
 		findPreference<SliderPreference>(AppSettings.KEY_GRID_SIZE)?.run {
-			summary = "%d%%".format(value)
+			val pattern = context.getString(R.string.percent_string_pattern)
+			summary = pattern.format(value.toString())
 			setOnPreferenceChangeListener { preference, newValue ->
-				preference.summary = "%d%%".format(newValue)
+				preference.summary = pattern.format(newValue.toString())
 				true
 			}
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
index 6d9f543c4..e8e7f97ae 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
@@ -18,7 +18,7 @@ val settingsModule
 
 		single { BackupRepository(get()) }
 		single { RestoreRepository(get()) }
-		single { AppSettings(androidContext()) }
+		single(createdAtStart = true) { AppSettings(androidContext()) }
 
 		viewModel { BackupViewModel(get(), androidContext()) }
 		viewModel { params ->
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt b/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt
index 9a703ffd7..17d62d3a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt
@@ -2,8 +2,8 @@ package org.koitharu.kotatsu.utils
 
 import android.view.View
 import androidx.appcompat.widget.Toolbar
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.R as materialR
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 
 open class BottomSheetToolbarController(
 	protected val toolbar: Toolbar,
@@ -17,7 +17,5 @@ open class BottomSheetToolbarController(
 		}
 	}
 
-	override fun onSlide(bottomSheet: View, slideOffset: Float) {
-
-	}
+	override fun onSlide(bottomSheet: View, slideOffset: Float) = Unit
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/FileSize.kt b/app/src/main/java/org/koitharu/kotatsu/utils/FileSize.kt
index f06200dbd..cb558edfe 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/FileSize.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/FileSize.kt
@@ -32,4 +32,4 @@ enum class FileSize(private val multiplier: Int) {
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/GridTouchHelper.kt b/app/src/main/java/org/koitharu/kotatsu/utils/GridTouchHelper.kt
index 86c6cccf0..13ccd3fa7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/GridTouchHelper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/GridTouchHelper.kt
@@ -5,8 +5,10 @@ import android.view.GestureDetector
 import android.view.MotionEvent
 import kotlin.math.roundToInt
 
-class GridTouchHelper(context: Context, private val listener: OnGridTouchListener) :
-	GestureDetector.SimpleOnGestureListener() {
+class GridTouchHelper(
+	context: Context,
+	private val listener: OnGridTouchListener
+) : GestureDetector.SimpleOnGestureListener() {
 
 	private val detector = GestureDetector(context, this)
 	private val width = context.resources.displayMetrics.widthPixels
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/SelectionController.kt b/app/src/main/java/org/koitharu/kotatsu/utils/SelectionController.kt
deleted file mode 100644
index f3274af2e..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/SelectionController.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import kotlinx.coroutines.flow.MutableStateFlow
-
-class SelectionController {
-
-	private val state = MutableStateFlow(emptySet<Int>())
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/WordSet.kt b/app/src/main/java/org/koitharu/kotatsu/utils/WordSet.kt
deleted file mode 100644
index 214c934dd..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/WordSet.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-class WordSet(private vararg val words: String) {
-
-	fun anyWordIn(dateString: String): Boolean = words.any {
-		dateString.contains(it, ignoreCase = true)
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
index 67ca43114..dc6974749 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
@@ -1,16 +1,14 @@
 package org.koitharu.kotatsu.utils.ext
 
 import android.content.res.Resources
-import android.util.Log
-import java.io.FileNotFoundException
-import java.net.SocketTimeoutException
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
 import org.koitharu.kotatsu.parsers.exception.AuthRequiredException
-import org.koitharu.kotatsu.parsers.util.format
+import java.io.FileNotFoundException
+import java.net.SocketTimeoutException
 
 fun Throwable.getDisplayMessage(resources: Resources) = when (this) {
 	is AuthRequiredException -> resources.getString(R.string.auth_required)
@@ -22,12 +20,4 @@ fun Throwable.getDisplayMessage(resources: Resources) = when (this) {
 	is SocketTimeoutException -> resources.getString(R.string.network_error)
 	is WrongPasswordException -> resources.getString(R.string.wrong_password)
 	else -> localizedMessage ?: resources.getString(R.string.error_occurred)
-}
-
-inline fun <T> measured(tag: String, block: () -> T): T {
-	val time = System.currentTimeMillis()
-	val res = block()
-	val spent = System.currentTimeMillis() - time
-	Log.d("measured", "$tag ${spent.format(1)} ms")
-	return res
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoroutineExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoroutineExt.kt
index 40f1268b9..412ead77c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoroutineExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CoroutineExt.kt
@@ -3,10 +3,8 @@ package org.koitharu.kotatsu.utils.ext
 import androidx.lifecycle.LifecycleCoroutineScope
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineExceptionHandler
 import org.koitharu.kotatsu.BuildConfig
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
 
 val IgnoreErrors
 	get() = CoroutineExceptionHandler { _, e ->
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt
index 89a076473..0cc08fd55 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/DateExt.kt
@@ -15,6 +15,6 @@ fun Date.formatRelative(minResolution: Long): CharSequence = DateUtils.getRelati
 
 fun Date.daysDiff(other: Long): Int {
 	val thisDay = time / TimeUnit.DAYS.toMillis(1L)
-	val otherDay = other/ TimeUnit.DAYS.toMillis(1L)
+	val otherDay = other / TimeUnit.DAYS.toMillis(1L)
 	return (thisDay - otherDay).toInt()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
index cae599f8a..d881d3b1d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/FragmentExt.kt
@@ -26,11 +26,12 @@ fun <T : Parcelable> Fragment.parcelableArgument(name: String): Lazy<T> {
 	}
 }
 
-inline fun <reified T : Serializable> Fragment.serializableArgument(name: String): Lazy<T> {
+fun <T : Serializable> Fragment.serializableArgument(name: String): Lazy<T> {
 	return lazy(LazyThreadSafetyMode.NONE) {
-		requireNotNull(arguments?.getSerializable(name) as? T) {
+		@Suppress("UNCHECKED_CAST")
+		requireNotNull(arguments?.getSerializable(name)) {
 			"No argument $name passed into ${javaClass.simpleName}"
-		}
+		} as T
 	}
 }
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
index 03123c692..ad1fe8b39 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/LiveDataExt.kt
@@ -4,10 +4,10 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.liveData
-import kotlinx.coroutines.flow.Flow
-import org.koitharu.kotatsu.utils.BufferedObserver
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
+import kotlinx.coroutines.flow.Flow
+import org.koitharu.kotatsu.utils.BufferedObserver
 
 fun <T> LiveData<T?>.observeNotNull(owner: LifecycleOwner, observer: Observer<T>) {
 	this.observe(owner) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/PreferencesExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/PreferencesExt.kt
index 2bbdd6498..d20c1eca6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/PreferencesExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/PreferencesExt.kt
@@ -9,17 +9,17 @@ fun ListPreference.setDefaultValueCompat(defaultValue: String) {
 	}
 }
 
-fun <E: Enum<E>> SharedPreferences.getEnumValue(key: String, enumClass: Class<E>): E? {
+fun <E : Enum<E>> SharedPreferences.getEnumValue(key: String, enumClass: Class<E>): E? {
 	val stringValue = getString(key, null) ?: return null
 	return enumClass.enumConstants?.find {
 		it.name == stringValue
 	}
 }
 
-fun <E: Enum<E>> SharedPreferences.getEnumValue(key: String, defaultValue: E): E {
+fun <E : Enum<E>> SharedPreferences.getEnumValue(key: String, defaultValue: E): E {
 	return getEnumValue(key, defaultValue.javaClass) ?: defaultValue
 }
 
-fun <E: Enum<E>> SharedPreferences.Editor.putEnumValue(key: String, value: E?) {
+fun <E : Enum<E>> SharedPreferences.Editor.putEnumValue(key: String, value: E?) {
 	putString(key, value?.name)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/TextViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/TextViewExt.kt
index 59620f2b0..bca90a845 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/TextViewExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/TextViewExt.kt
@@ -5,12 +5,11 @@ import android.view.View
 import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.StringRes
-import androidx.core.content.res.use
 import androidx.core.view.isGone
 
 var TextView.textAndVisible: CharSequence?
-	inline get() = text?.takeIf { visibility == View.VISIBLE }
-	inline set(value) {
+	get() = text?.takeIf { visibility == View.VISIBLE }
+	set(value) {
 		text = value
 		isGone = value.isNullOrEmpty()
 	}
@@ -40,8 +39,5 @@ fun TextView.setTextAndVisible(@StringRes textResId: Int) {
 }
 
 fun TextView.setTextColorAttr(@AttrRes attrResId: Int) {
-	val colors = context.obtainStyledAttributes(intArrayOf(attrResId)).use {
-		it.getColorStateList(0)
-	}
-	setTextColor(colors)
+	setTextColor(context.getThemeColorStateList(attrResId))
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThemeExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThemeExt.kt
index 795fd3979..85ee5ea39 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThemeExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ThemeExt.kt
@@ -4,20 +4,24 @@ import android.content.Context
 import android.graphics.Color
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
-import androidx.annotation.Px
 import androidx.core.content.res.use
 
-@Px
-fun Context.getThemeDimen(@AttrRes resId: Int) = obtainStyledAttributes(intArrayOf(resId)).use {
-	it.getDimension(0, 0f)
-}
-
-fun Context.getThemeDrawable(@AttrRes resId: Int) = obtainStyledAttributes(intArrayOf(resId)).use {
+fun Context.getThemeDrawable(
+	@AttrRes resId: Int,
+) = obtainStyledAttributes(intArrayOf(resId)).use {
 	it.getDrawable(0)
 }
 
 @ColorInt
-fun Context.getThemeColor(@AttrRes resId: Int, @ColorInt default: Int = Color.TRANSPARENT) =
-	obtainStyledAttributes(intArrayOf(resId)).use {
-		it.getColor(0, default)
-	}
\ No newline at end of file
+fun Context.getThemeColor(
+	@AttrRes resId: Int,
+	@ColorInt default: Int = Color.TRANSPARENT
+) = obtainStyledAttributes(intArrayOf(resId)).use {
+	it.getColor(0, default)
+}
+
+fun Context.getThemeColorStateList(
+	@AttrRes resId: Int,
+) = obtainStyledAttributes(intArrayOf(resId)).use {
+	it.getColorStateList(0)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
index c52d50290..021c77859 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/ViewExt.kt
@@ -2,20 +2,15 @@ package org.koitharu.kotatsu.utils.ext
 
 import android.app.Activity
 import android.graphics.Rect
-import android.view.LayoutInflater
-import android.view.Menu
 import android.view.View
-import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
-import androidx.annotation.LayoutRes
-import androidx.annotation.MenuRes
-import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.children
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.slider.Slider
 import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewBindingViewHolder
+import com.hannesdorfmann.adapterdelegates4.dsl.AdapterDelegateViewHolder
 import kotlin.math.roundToInt
 
 fun View.hideKeyboard() {
@@ -28,19 +23,15 @@ fun View.showKeyboard() {
 	imm.showSoftInput(this, 0)
 }
 
-inline fun <reified T : View> ViewGroup.inflate(@LayoutRes resId: Int) =
-	LayoutInflater.from(context).inflate(resId, this, false) as T
-
-val RecyclerView.hasItems: Boolean
-	get() = (adapter?.itemCount ?: 0) > 0
-
 fun RecyclerView.clearItemDecorations() {
+	suppressLayout(true)
 	while (itemDecorationCount > 0) {
 		removeItemDecorationAt(0)
 	}
+	suppressLayout(false)
 }
 
-var RecyclerView.firstItem: Int
+var RecyclerView.firstVisibleItemPosition: Int
 	get() = (layoutManager as? LinearLayoutManager)?.findFirstVisibleItemPosition()
 		?: RecyclerView.NO_POSITION
 	set(value) {
@@ -49,18 +40,6 @@ var RecyclerView.firstItem: Int
 		}
 	}
 
-inline fun View.showPopupMenu(
-	@MenuRes menuRes: Int,
-	onPrepare: (Menu) -> Unit = {},
-	onItemClick: PopupMenu.OnMenuItemClickListener,
-) {
-	val menu = PopupMenu(context, this)
-	menu.inflate(menuRes)
-	menu.setOnMenuItemClickListener(onItemClick)
-	onPrepare(menu.menu)
-	menu.show()
-}
-
 fun View.hasGlobalPoint(x: Int, y: Int): Boolean {
 	if (visibility != View.VISIBLE) {
 		return false
@@ -97,7 +76,7 @@ inline fun ViewPager2.doOnPageChanged(crossinline callback: (Int) -> Unit) {
 }
 
 val ViewPager2.recyclerView: RecyclerView?
-	inline get() = children.find { it is RecyclerView } as? RecyclerView
+	get() = children.firstNotNullOfOrNull { it as? RecyclerView }
 
 fun View.resetTransformations() {
 	alpha = 1f
@@ -106,6 +85,7 @@ fun View.resetTransformations() {
 	translationZ = 0f
 	scaleX = 1f
 	scaleY = 1f
+	rotation = 0f
 	rotationX = 0f
 	rotationY = 0f
 }
@@ -133,8 +113,17 @@ fun RecyclerView.findCenterViewPosition(): Int {
 	return getChildAdapterPosition(view)
 }
 
-inline fun <reified T> RecyclerView.ViewHolder.getItem(): T? {
-	return ((this as? AdapterDelegateViewBindingViewHolder<*, *>)?.item as? T)
+fun <T> RecyclerView.ViewHolder.getItem(clazz: Class<T>): T? {
+	val rawItem = when (this) {
+		is AdapterDelegateViewBindingViewHolder<*, *> -> item
+		is AdapterDelegateViewHolder<*> -> item
+		else -> null
+	} ?: return null
+	return if (clazz.isAssignableFrom(rawItem.javaClass)) {
+		clazz.cast(rawItem)
+	} else {
+		null
+	}
 }
 
 fun Slider.setValueRounded(newValue: Float) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/progress/IntPercentLabelFormatter.kt b/app/src/main/java/org/koitharu/kotatsu/utils/progress/IntPercentLabelFormatter.kt
index ed9773c99..5456ae5b0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/progress/IntPercentLabelFormatter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/progress/IntPercentLabelFormatter.kt
@@ -1,7 +1,12 @@
 package org.koitharu.kotatsu.utils.progress
 
+import android.content.Context
 import com.google.android.material.slider.LabelFormatter
+import org.koitharu.kotatsu.R
 
-class IntPercentLabelFormatter : LabelFormatter {
-	override fun getFormattedValue(value: Float) = "%d%%".format(value.toInt())
+class IntPercentLabelFormatter(context: Context) : LabelFormatter {
+
+	private val pattern = context.getString(R.string.percent_string_pattern)
+
+	override fun getFormattedValue(value: Float) = pattern.format(value.toInt().toString())
 }
\ No newline at end of file

From 507f2e883c330ffbdaad8177edc6116d99fee096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aliaksiej=20Razuma=C5=AD?= <belarusaed@gmail.com>
Date: Fri, 15 Apr 2022 12:57:28 +0200
Subject: [PATCH 005/104] Translated using Weblate (Belarusian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (270 of 270 strings)

Co-authored-by: Aliaksiej Razumaŭ <belarusaed@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/be/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-be/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 0e8ab0bad..728b3c8b6 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -263,4 +263,5 @@
     <string name="various_languages">Розныя мовы</string>
     <string name="search_chapters">Знайсці главу</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="chapters_empty">У гэтай манзе няма глаў</string>
 </resources>
\ No newline at end of file

From aec1d4e0d6c0e791affa49b180455639ae5d6bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Fri, 15 Apr 2022 12:57:28 +0200
Subject: [PATCH 006/104] Translated using Weblate (Turkish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (274 of 274 strings)

Added translation using Weblate (Turkish)

Translated using Weblate (Turkish)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (269 of 269 strings)

Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/tr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-tr/plurals.xml | 35 ++++++++++++++++++++++++++
 app/src/main/res/values-tr/strings.xml | 16 +++++++++---
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-tr/plurals.xml

diff --git a/app/src/main/res/values-tr/plurals.xml b/app/src/main/res/values-tr/plurals.xml
new file mode 100644
index 000000000..5dc9f9e0b
--- /dev/null
+++ b/app/src/main/res/values-tr/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Toplam %1$d sayfa</item>
+        <item quantity="other">Toplam %1$d sayfa</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d öge</item>
+        <item quantity="other">%1$d öge</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d bölüm</item>
+        <item quantity="other">%1$d bölüm</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d saat önce</item>
+        <item quantity="other">%1$d saat önce</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d yeni bölüm</item>
+        <item quantity="other">%1$d yeni bölüm</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d gün önce</item>
+        <item quantity="other">%1$d gün önce</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%2$d\'den %1$d bölüm</item>
+        <item quantity="other">%2$d\'den %1$d bölüm</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d dakika önce</item>
+        <item quantity="other">%1$d dakika önce</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index eb03a51d6..f7b8c300f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -131,7 +131,7 @@
     <string name="restore_backup">Yedekten geri yükle</string>
     <string name="update">Güncelle</string>
     <string name="sign_in">Oturum aç</string>
-	<string name="state_finished">Bitti</string>
+    <string name="state_finished">Bitti</string>
     <string name="about">Hakkında</string>
     <string name="auth_required">Bu içeriği görüntülemek için oturum açın</string>
     <string name="confirm">Onayla</string>
@@ -184,7 +184,7 @@
     <string name="about_app_translation">Çeviri</string>
     <string name="search_only_on_s">Yalnızca %s içinde ara</string>
     <string name="about_feedback_4pda">4PDA\'daki konu</string>
-	<string name="state_ongoing">Devam ediyor</string>
+    <string name="state_ongoing">Devam ediyor</string>
     <string name="text_clear_cookies_prompt">Tüm kaynaklardaki oturumunuz kapatılacak</string>
     <string name="enabled_sources">Kullanılan kaynaklar</string>
     <string name="available_sources">Kullanılabilir kaynaklar</string>
@@ -223,13 +223,13 @@
     <string name="captcha_required">CAPTCHA gerekli</string>
     <string name="cookies_cleared">Tüm çerezler kaldırıldı</string>
     <string name="reader_mode_hint">Seçilen yapılandırma bu manga için hatırlanacak</string>
-	<string name="text_clear_updates_feed_prompt">Tüm güncelleme geçmişi kalıcı olarak silinsin mi\?</string>
+    <string name="text_clear_updates_feed_prompt">Tüm güncelleme geçmişi kalıcı olarak silinsin mi\?</string>
     <string name="_and_x_more">…ve %1$d daha fazlası</string>
     <string name="protect_application_subtitle">Uygulamayı başlatmak için bir parola girin</string>
     <string name="text_clear_search_history_prompt">Tüm son arama sorguları kalıcı olarak kaldırılsın mı\?</string>
     <string name="about_feedback">Geri bildirim</string>
     <string name="backup_saved">Yedek kaydedildi</string>
-	<string name="genres">Türler</string>
+    <string name="genres">Türler</string>
     <string name="date_format">Tarih biçimi</string>
     <string name="system_default">Öntanımlı</string>
     <string name="error_empty_name">Bir ad girmelisiniz</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Bölüm bul</string>
     <string name="chapters_empty">Bu mangada bölüm yok</string>
     <string name="percent_string_pattern">%%%1$s</string>
+    <string name="content">İçerik</string>
+    <string name="suggestions_updating">Öneriler güncelleniyor</string>
+    <string name="appearance">Görünüm</string>
+    <string name="suggestions_excluded_genres">Türleri hariç tut</string>
+    <string name="suggestions_excluded_genres_summary">Önerilerde görmek istemediğiniz türleri belirtin</string>
+    <string name="text_delete_local_manga_batch">Seçilen ögeler aygıttan kalıcı olarak silinsin mi\?</string>
+    <string name="batch_manga_save_confirm">Seçilen tüm mangaları tüm bölümleriyle birlikte indirmek istediğinizden emin misiniz\? Bu işlem çok fazla trafik ve depolama alanı tüketebilir</string>
+    <string name="removal_completed">Kaldırma tamamlandı</string>
 </resources>
\ No newline at end of file

From a60df582a209f9a9b2159070db904c6454404f91 Mon Sep 17 00:00:00 2001
From: kuragehime <kuragehime641@gmail.com>
Date: Fri, 15 Apr 2022 12:57:29 +0200
Subject: [PATCH 007/104] Translated using Weblate (Japanese)

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Japanese)

Translated using Weblate (Japanese)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (269 of 269 strings)

Co-authored-by: kuragehime <kuragehime641@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/ja/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-ja/plurals.xml | 27 ++++++++++++++++++++++++++
 app/src/main/res/values-ja/strings.xml | 16 +++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-ja/plurals.xml

diff --git a/app/src/main/res/values-ja/plurals.xml b/app/src/main/res/values-ja/plurals.xml
new file mode 100644
index 000000000..497057c19
--- /dev/null
+++ b/app/src/main/res/values-ja/plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="chapters_from_x">
+        <item quantity="other">%1$dから%2$dの章</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="other">%1$d 1分前</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="other">%1$d 項目</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="other">%1$d 1時間前</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="other">%1$d 1日前</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="other">%1$dチャプター</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="other">合計%1$dページ</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="other">%1$d新しい章</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4e3fdfcd5..047d27672 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -163,7 +163,7 @@
     <string name="prefer_rtl_reader">右から左（←）の読書を好む</string>
     <string name="about_feedback">フィードバック</string>
     <string name="about_feedback_4pda">4PDAに関する話題</string>
-	<string name="auth_complete">承認済み</string>
+    <string name="auth_complete">承認済み</string>
     <string name="auth_not_supported_by">%sへのログインはサポートされていません</string>
     <string name="state_finished">完成</string>
     <string name="state_ongoing">進行中</string>
@@ -209,10 +209,10 @@
     <string name="about_app_translation">このアプリを翻訳</string>
     <string name="data_restored_success">全てのデータが復元されました</string>
     <string name="data_restored">復元</string>
-	<string name="preparing_">準備中…</string>
+    <string name="preparing_">準備中…</string>
     <string name="zoom_mode_keep_start">開始時に維持</string>
     <string name="backup_restore">バックアップと復元</string>
-	<string name="reverse">リバース</string>
+    <string name="reverse">リバース</string>
     <string name="reader_mode_hint">選択した構成はこの漫画のために記憶されます</string>
     <string name="clear_cookies">クッキーを削除</string>
     <string name="report_github">GitHubでissueを作成する(GitHubのアカウントが必要です)</string>
@@ -230,7 +230,7 @@
     <string name="scale_mode">スケールモード</string>
     <string name="error_empty_name">名前を入力する必要があります</string>
     <string name="today">今日</string>
-	<string name="about_app_translation_summary">Kotatsuを翻訳する(Weblateのサイトに移動します)</string>
+    <string name="about_app_translation_summary">Kotatsuを翻訳する(Weblateのサイトに移動します)</string>
     <string name="next">次のページ</string>
     <string name="silent">サイレント</string>
     <string name="sign_in">サインイン</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">チャプターを検索</string>
     <string name="chapters_empty">この漫画の章はありません</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="content">コンテンツ</string>
+    <string name="suggestions_updating">更新のご提案</string>
+    <string name="appearance">外観</string>
+    <string name="suggestions_excluded_genres">ジャンルを除く</string>
+    <string name="suggestions_excluded_genres_summary">サジェストで表示したくないジャンルを指定</string>
+    <string name="text_delete_local_manga_batch">選択した項目をデバイスから完全に削除しますか？</string>
+    <string name="removal_completed">削除が完了しました</string>
+    <string name="batch_manga_save_confirm">本当に選択したマンガを全編ダウンロードしますか？この動作は多くのトラフィックとストレージを消費する可能性があります</string>
 </resources>
\ No newline at end of file

From 93eaaac08481ddae858996448567d040eb73c553 Mon Sep 17 00:00:00 2001
From: Luiz-bro <luiznneto1@gmail.com>
Date: Fri, 15 Apr 2022 12:57:29 +0200
Subject: [PATCH 008/104] Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (268 of 269 strings)

Co-authored-by: Luiz-bro <luiznneto1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-pt-rBR/plurals.xml | 2 ++
 app/src/main/res/values-pt-rBR/strings.xml | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-pt-rBR/plurals.xml

diff --git a/app/src/main/res/values-pt-rBR/plurals.xml b/app/src/main/res/values-pt-rBR/plurals.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/plurals.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 25bc9f483..c677ff53a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -183,7 +183,7 @@
     <string name="about_app_translation">Tradução</string>
     <string name="about_feedback">Comentar</string>
     <string name="about_feedback_4pda">Tópico no 4PDA</string>
-	<string name="auth_complete">Autorizado</string>
+    <string name="auth_complete">Autorizado</string>
     <string name="auth_not_supported_by">O login em %s não é suportado</string>
     <string name="text_clear_cookies_prompt">Você será desconectado de todas as fontes</string>
     <string name="genres">Gêneros</string>
@@ -261,7 +261,9 @@
     <string name="data_restored_with_errors">Os dados foram restaurados, mas há erros</string>
     <string name="report_github">Criar problema no GitHub</string>
     <string name="file_not_found">Arquivo não encontrado</string>
-	<string name="search_chapters">Localizar capítulo</string>
+    <string name="search_chapters">Localizar capítulo</string>
     <string name="chapters_empty">Não há capítulos neste mangá</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="suggestions_updating">Atualização de sugestões</string>
+    <string name="appearance">Aparência</string>
 </resources>
\ No newline at end of file

From fea667b87c3b3a385120ddd677eb5ecfee1b5100 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Fri, 15 Apr 2022 12:57:30 +0200
Subject: [PATCH 009/104] Translated using Weblate (Italian)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (German)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (French)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Finnish)

Currently translated at 99.2% (272 of 274 strings)

Translated using Weblate (French)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (German)

Currently translated at 100.0% (274 of 274 strings)

Added translation using Weblate (Italian)

Added translation using Weblate (German)

Added translation using Weblate (French)

Translated using Weblate (Finnish)

Currently translated at 99.6% (270 of 271 strings)

Translated using Weblate (French)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (German)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (French)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (German)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Belarusian)

Currently translated at 98.8% (266 of 269 strings)

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/de/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/fr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/it/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/be/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/de/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/es/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/it/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-be/strings.xml     | 10 +++----
 app/src/main/res/values-de/plurals.xml     | 35 ++++++++++++++++++++++
 app/src/main/res/values-de/strings.xml     | 10 ++++++-
 app/src/main/res/values-es/strings.xml     | 11 +++++--
 app/src/main/res/values-fi/strings.xml     |  9 +++++-
 app/src/main/res/values-fr/plurals.xml     | 35 ++++++++++++++++++++++
 app/src/main/res/values-fr/strings.xml     | 10 ++++++-
 app/src/main/res/values-it/plurals.xml     | 35 ++++++++++++++++++++++
 app/src/main/res/values-it/strings.xml     | 10 ++++++-
 app/src/main/res/values-ja/strings.xml     |  4 +--
 app/src/main/res/values-pt-rBR/strings.xml |  9 +++---
 app/src/main/res/values-pt/strings.xml     | 18 +++++++----
 app/src/main/res/values-tr/strings.xml     |  8 ++---
 13 files changed, 176 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/values-de/plurals.xml
 create mode 100644 app/src/main/res/values-fr/plurals.xml
 create mode 100644 app/src/main/res/values-it/plurals.xml

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 728b3c8b6..cbd9de9a7 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -53,8 +53,8 @@
     <string name="clear">Ачысціць</string>
     <string name="text_clear_history_prompt">Вы ўпэўненыя, што жадаеце ачысціць гісторыю\?</string>
     <string name="remove">Выдаліць</string>
-    <string name="_s_removed_from_history">\"%s\" выдалена з гiсторыi</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" выдалена з прылады</string>
+    <string name="_s_removed_from_history">«%s» выдалена з гiсторыi</string>
+    <string name="_s_deleted_from_local_storage">«%s» выдалена з прылады</string>
     <string name="wait_for_loading_finish">Дачакайцеся заканчэння загрузкі…</string>
     <string name="save_page">Захаваць старонку</string>
     <string name="page_saved">Старонка захавана</string>
@@ -76,7 +76,7 @@
     <string name="delete_manga">Выдаліць мангу</string>
     <string name="reader_settings">Налады чытання</string>
     <string name="switch_pages">Гартанне старонак</string>
-    <string name="text_delete_local_manga">Вы ўпэўненыя, што жадаеце выдаліць \"%s\" з прылады\?</string>
+    <string name="text_delete_local_manga">Вы ўпэўненыя, што жадаеце выдаліць «%s» з прылады\?</string>
     <string name="taps_on_edges">Націск па краях</string>
     <string name="volume_buttons">Кнопкі гучнасці</string>
     <string name="_continue">Працягнцуць</string>
@@ -112,7 +112,7 @@
     <string name="favourites_categories">Катэгорыі абранага</string>
     <string name="categories_">Катэгорыi…</string>
     <string name="rename">Перайменаваць</string>
-    <string name="category_delete_confirm">Вы ўпэўнены, што хочаце выдаліць катэгорыю \"%s\"\?
+    <string name="category_delete_confirm">Вы ўпэўнены, што хочаце выдаліць катэгорыю «%s»\?
 \nУся манга з дадзенай катэгорыі будзе страчана.</string>
     <string name="remove_category">Выдаліць катэгорыю</string>
     <string name="text_categories_holder">Катэгорыі дапамагаюць упарадкоўваць абраную мангу. Націсніце «+», каб стварыць катэгорыю</string>
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Гэтая глава адсутнічае на вашай прыладзе. Спампуйце ціпрачытайце яе онлайн.</string>
     <string name="text_downloads_holder">На дадзены момант няма актыўных спамповак</string>
     <string name="queued">У чарзе</string>
-	<string name="about_feedback_4pda">Тэма на 4PDA</string>
+    <string name="about_feedback_4pda">Тэма на 4PDA</string>
     <string name="about_feedback">Зваротная сувязь</string>
     <string name="about_app_translation_summary">Дапамагчы з перакладам праграмы</string>
     <string name="about_app_translation">Пераклад</string>
diff --git a/app/src/main/res/values-de/plurals.xml b/app/src/main/res/values-de/plurals.xml
new file mode 100644
index 000000000..9f0386d23
--- /dev/null
+++ b/app/src/main/res/values-de/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Insgesamt %1$d Seite</item>
+        <item quantity="other">Insgesamt %1$d Seiten</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d Element</item>
+        <item quantity="other">%1$d Elemente</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d neues Kapitel</item>
+        <item quantity="other">%1$d neue Kapitel</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d Kapitel</item>
+        <item quantity="other">%1$d Kapitel</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d Kapitel aus %2$d</item>
+        <item quantity="other">%1$d Kapitel aus %2$d</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">Vor %1$d Minute</item>
+        <item quantity="other">Vor %1$d Minuten</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">Vor %1$d Stunde</item>
+        <item quantity="other">Vor %1$d Stunden</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">Vor %1$d Tag</item>
+        <item quantity="other">Vor %1$d Tage</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d25f7be80..a26fd04e6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Dieses Kapitel fehlt auf deinem Gerät. Lade ihn herunter oder lese ihn online.</string>
     <string name="text_downloads_holder">Zurzeit sind keine aktiven Datenübertragungen vorhanden</string>
     <string name="queued">In Warteschlange</string>
-	<string name="about_feedback_4pda">Thema auf 4PDA</string>
+    <string name="about_feedback_4pda">Thema auf 4PDA</string>
     <string name="about_feedback">Rückmeldung</string>
     <string name="about_app_translation">Übersetzung</string>
     <string name="about_app_translation_summary">Diese Anwendung übersetzen</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Kapitel suchen</string>
     <string name="chapters_empty">Keine Kapitel in diesem Manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aussehen</string>
+    <string name="content">Inhalt</string>
+    <string name="suggestions_updating">Vorschläge werden aktualisiert</string>
+    <string name="suggestions_excluded_genres">Genres ausschließen</string>
+    <string name="suggestions_excluded_genres_summary">Geben Sie Genres an, die Sie nicht in den Vorschlägen sehen möchten</string>
+    <string name="text_delete_local_manga_batch">Ausgewählte Elemente dauerhaft vom Gerät löschen\?</string>
+    <string name="batch_manga_save_confirm">Sind Sie sicher, dass Sie alle ausgewählten Mangas mit allen Kapiteln herunterladen möchten\? Diese Aktion kann eine Menge Datenverkehr und Speicherplatz verbrauchen</string>
+    <string name="removal_completed">Entfernung abgeschlossen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 44bb53494..37748a5f1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -205,8 +205,8 @@
     <string name="text_history_holder_secondary">Encuentra qué leer en el menú lateral.</string>
     <string name="text_history_holder_primary">Lo que leas se mostrará aquí</string>
     <string name="text_empty_holder_primary">Está un poco vacío aquí…</string>
-	<string name="search_only_on_s">Buscar sólo en %s</string>
-	<string name="chapter_is_missing">Falta un capítulo</string>
+    <string name="search_only_on_s">Buscar sólo en %s</string>
+    <string name="chapter_is_missing">Falta un capítulo</string>
     <string name="about_app_translation_summary">Traducir esta aplicación</string>
     <string name="about_feedback">Comentarios</string>
     <string name="about_app_translation">Traducción</string>
@@ -253,7 +253,7 @@
     <string name="screenshots_block_nsfw">Bloqueo en NSFW</string>
     <string name="logged_in_as">Conectado como %s</string>
     <string name="find_genre">Encontrar el género</string>
-    <string name="onboard_text">Selecciona los idiomas en los que quieres leer el manga. Puedes cambiarlo más tarde en los ajustes.</string>
+    <string name="onboard_text">Selecciona los idiomas en los que quieres leer mangas. Puedes cambiarlo más tarde en los ajustes.</string>
     <string name="reset_filter">Reiniciar el filtro</string>
     <string name="never">Nunca</string>
     <string name="nsfw">18+</string>
@@ -264,4 +264,9 @@
     <string name="search_chapters">Buscar capítulo</string>
     <string name="chapters_empty">No hay capítulos en este manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aspecto</string>
+    <string name="content">Contenido</string>
+    <string name="suggestions_updating">Actualización de las sugerencias</string>
+    <string name="suggestions_excluded_genres">Excluir géneros</string>
+    <string name="suggestions_excluded_genres_summary">Especifica los géneros que no quieres ver en las sugerencias</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 69ef71847..c6cc64414 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -4,7 +4,7 @@
     <string name="genres">Tyylilajit</string>
     <string name="auth_not_supported_by">%s -valtuutusta ei tueta</string>
     <string name="auth_complete">Valtuutus valmis</string>
-	<string name="about_feedback_4pda">Aihe 4PDA: ssa</string>
+    <string name="about_feedback_4pda">Aihe 4PDA: ssa</string>
     <string name="about_feedback">Palaute</string>
     <string name="about_app_translation">Käännös</string>
     <string name="about_app_translation_summary">Käännä tämä sovellus</string>
@@ -264,4 +264,11 @@
     <string name="percent_string_pattern">%1$s%%</string>
     <string name="various_languages">Eri kieliä</string>
     <string name="chapters_empty">Ei lukuja tässä mangassa</string>
+    <string name="appearance">Ulkonäkö</string>
+    <string name="content">Sisältö</string>
+    <string name="suggestions_updating">Ehdotukset päivitetään</string>
+    <string name="suggestions_excluded_genres_summary">Määritä genret, joita et halua nähdä ehdotuksissa</string>
+    <string name="suggestions_excluded_genres">Sulje pois genrejä</string>
+    <string name="text_delete_local_manga_batch">Poista valitut kohteet laitteesta pysyvästi\?</string>
+    <string name="removal_completed">Poisto valmis</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml
new file mode 100644
index 000000000..f5fb67d73
--- /dev/null
+++ b/app/src/main/res/values-fr/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="minutes_ago">
+        <item quantity="one">Il y a %1$d minute</item>
+        <item quantity="other">Il y a %1$d minutes</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">%1$d page au total</item>
+        <item quantity="other">%1$d pages au total</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d élément</item>
+        <item quantity="other">%1$d éléments</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nouveau chapitre</item>
+        <item quantity="other">%1$d nouveaux chapitres</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d chapitre</item>
+        <item quantity="other">%1$d chapitres</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d chapitre de %2$d</item>
+        <item quantity="other">%1$d chapitres de %2$d</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">Il y a %1$d heure</item>
+        <item quantity="other">Il y a %1$d heures</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">Il y a %1$d jour</item>
+        <item quantity="other">Il y a %1$d jours</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c76fb6027..08206fec0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Téléchargez ou lisez ce chapitre manquant en ligne.</string>
     <string name="text_downloads_holder">Aucun téléchargement actif</string>
     <string name="queued">En file d\'attente</string>
-	<string name="about_feedback_4pda">Sujet sur 4PDA</string>
+    <string name="about_feedback_4pda">Sujet sur 4PDA</string>
     <string name="about_feedback">Remarques</string>
     <string name="about_app_translation">Traduction</string>
     <string name="about_app_translation_summary">Traduire cette application</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Trouver un chapitre</string>
     <string name="chapters_empty">Pas de chapitres dans ce manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Apparence</string>
+    <string name="content">Contenu</string>
+    <string name="suggestions_updating">Mise à jour des suggestions</string>
+    <string name="suggestions_excluded_genres">Exclure des genres</string>
+    <string name="suggestions_excluded_genres_summary">Spécifiez les genres que vous ne voulez pas voir apparaître dans les suggestions</string>
+    <string name="text_delete_local_manga_batch">Supprimer définitivement les éléments sélectionnés de l\'appareil \?</string>
+    <string name="removal_completed">Suppression terminée</string>
+    <string name="batch_manga_save_confirm">Voulez-vous vraiment télécharger tous les mangas sélectionnés avec tous leurs chapitres \? Cette action peut consommer beaucoup de trafic et de stockage</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/plurals.xml b/app/src/main/res/values-it/plurals.xml
new file mode 100644
index 000000000..3a0163201
--- /dev/null
+++ b/app/src/main/res/values-it/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d capitolo da %2$d</item>
+        <item quantity="other">%1$d capitoli da %2$d</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">%1$d pagina in totale</item>
+        <item quantity="other">%1$d pagine in totale</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nuovo capitolo</item>
+        <item quantity="other">%1$d nuovi capitoli</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d élément</item>
+        <item quantity="other">%1$d éléments</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capitolo</item>
+        <item quantity="other">%1$d capitoli</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minuto fa</item>
+        <item quantity="other">%1$d minuti fa</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d ora fa</item>
+        <item quantity="other">%1$d ore fa</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d giorno fa</item>
+        <item quantity="other">%1$d giorni fa</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a1586ed71..7c508afc2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Questo capitolo manca sul tuo dispositivo. Scaricalo o leggilo in linea.</string>
     <string name="text_downloads_holder">Attualmente non ci sono scaricamenti attivi</string>
     <string name="queued">In coda</string>
-	<string name="about_feedback_4pda">Argomento su 4PDA</string>
+    <string name="about_feedback_4pda">Argomento su 4PDA</string>
     <string name="about_feedback">Commenti</string>
     <string name="about_app_translation">Traduzione</string>
     <string name="about_app_translation_summary">Traduci questa applicazione</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Trova un capitolo</string>
     <string name="chapters_empty">Nessun capitolo in questo manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aspetto</string>
+    <string name="content">Contenuto</string>
+    <string name="suggestions_updating">Aggiornamento dei suggerimenti</string>
+    <string name="suggestions_excluded_genres_summary">Specifica i generi che non vuoi vedere nei suggerimenti</string>
+    <string name="suggestions_excluded_genres">Escludi generi</string>
+    <string name="removal_completed">Rimozione completata</string>
+    <string name="text_delete_local_manga_batch">Eliminare gli elementi selezionati dal dispositivo in modo permanente\?</string>
+    <string name="batch_manga_save_confirm">Vuoi davvero scaricare tutti i manga selezionati con tutti i loro capitoli\? Questa azione può consumare molto traffico e memoria</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 047d27672..7aa767327 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -42,8 +42,8 @@
     <string name="clear">クリア</string>
     <string name="text_clear_history_prompt">すべての履歴を永久にクリアしますか？</string>
     <string name="remove">削除</string>
-    <string name="_s_removed_from_history">\"%s\"が履歴から削除されました</string>
-    <string name="_s_deleted_from_local_storage">\"%s \"がローカルストレージから削除されました</string>
+    <string name="_s_removed_from_history">「%s」が履歴から削除されました</string>
+    <string name="_s_deleted_from_local_storage">「%s 」がローカルストレージから削除されました</string>
     <string name="wait_for_loading_finish">読み込みが完了するまでお待ちください…</string>
     <string name="save_page">ページを保存</string>
     <string name="page_saved">保存しました</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c677ff53a..1e49f0f52 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -51,8 +51,8 @@
     <string name="pages">Páginas</string>
     <string name="clear">Limpar</string>
     <string name="remove">Remover</string>
-    <string name="_s_removed_from_history">\"%s\" removido do histórico</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" excluído do armazenamento local</string>
+    <string name="_s_removed_from_history">“%s” removido do histórico</string>
+    <string name="_s_deleted_from_local_storage">“%s” excluído do armazenamento local</string>
     <string name="wait_for_loading_finish">Aguarde o carregamento terminar…</string>
     <string name="save_page">Salvar página</string>
     <string name="page_saved">Salvou</string>
@@ -70,7 +70,7 @@
     <string name="grid_size">Tamanho da grade</string>
     <string name="search_on_s">Pesquisar em %s</string>
     <string name="delete_manga">Excluir mangá</string>
-    <string name="text_delete_local_manga">Excluir \"%s\" do dispositivo permanentemente\?</string>
+    <string name="text_delete_local_manga">Excluir “%s” do dispositivo permanentemente\?</string>
     <string name="reader_settings">Configurações do leitor</string>
     <string name="taps_on_edges">Toques de borda</string>
     <string name="volume_buttons">Botões de volume</string>
@@ -233,7 +233,7 @@
     <string name="application_update">Verifique se há novas versões do aplicativo</string>
     <string name="favourites_categories">Categorias favoritas</string>
     <string name="show_notification_new_chapters">Notificar sobre atualizações de mangá que você está lendo</string>
-    <string name="category_delete_confirm">Remover a categoria \"%s\" dos seus favoritos\?
+    <string name="category_delete_confirm">Remover a categoria “%s” dos seus favoritos\?
 \nTodos os mangás nela serão perdidos.</string>
     <string name="no_update_available">Nenhuma atualização disponível</string>
     <string name="create_category">Nova categoria</string>
@@ -266,4 +266,5 @@
     <string name="percent_string_pattern">%1$s%%</string>
     <string name="suggestions_updating">Atualização de sugestões</string>
     <string name="appearance">Aparência</string>
+    <string name="content">Conteúdo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0f0d99fc0..b23edc825 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -41,8 +41,8 @@
     <string name="clear">Limpar</string>
     <string name="text_clear_history_prompt">Limpar todo o histórico de leitura permanentemente\?</string>
     <string name="remove">Remover</string>
-    <string name="_s_removed_from_history">\"%s\" removido do histórico</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" deletado do armazenamento local</string>
+    <string name="_s_removed_from_history">«%s» removido do histórico</string>
+    <string name="_s_deleted_from_local_storage">«%s» deletado do armazenamento local</string>
     <string name="wait_for_loading_finish">Aguarde o carregamento terminar…</string>
     <string name="save_page">Salvar página</string>
     <string name="page_saved">Salvou</string>
@@ -103,7 +103,7 @@
     <string name="chapters">Capítulos</string>
     <string name="add_new_category">Nova categoria</string>
     <string name="warning">Aviso</string>
-    <string name="text_delete_local_manga">Excluir \"%s\" do dispositivo permanentemente\?</string>
+    <string name="text_delete_local_manga">Excluir «%s» do dispositivo permanentemente\?</string>
     <string name="text_file_not_supported">Escolha um arquivo ZIP ou CBZ.</string>
     <string name="clear_search_history">Limpar histórico de pesquisa</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Ativado %1$d de %2$d</string>
@@ -185,7 +185,7 @@
     <string name="about_app_translation_summary">Traduzir esta aplicação</string>
     <string name="about_feedback">Comentar</string>
     <string name="about_feedback_4pda">Tópico no 4PDA</string>
-	<string name="chapter_is_missing_text">Baixe ou leia este capítulo perdido online.</string>
+    <string name="chapter_is_missing_text">Baixe ou leia este capítulo perdido online.</string>
     <string name="chapter_is_missing">O capítulo está em falta</string>
     <string name="auth_complete">Autorizado</string>
     <string name="auth_not_supported_by">O login em %s não é suportado</string>
@@ -195,8 +195,8 @@
     <string name="vibration">Vibração</string>
     <string name="cannot_find_available_storage">Sem armazenamento disponível</string>
     <string name="favourites_categories">Categorias favoritas</string>
-    <string name="category_delete_confirm">Remover a categoria \"%s\" dos seus favoritos\?
-\nTodos os mangás nela serão perdidos..</string>
+    <string name="category_delete_confirm">Remover a categoria «%s» dos seus favoritos\?
+\nTodos os mangás nela serão perdidos.</string>
     <string name="text_history_holder_secondary">Encontre o que ler no menu lateral.</string>
     <string name="text_local_holder_secondary">Salve-o de fontes online ou importe arquivos.</string>
     <string name="recent_manga">Recente</string>
@@ -261,4 +261,10 @@
     <string name="logged_in_as">Conectado como %s</string>
     <string name="nsfw">18+</string>
     <string name="various_languages">Vários idiomas</string>
+    <string name="suggestions_updating">Atualização das sugestões</string>
+    <string name="appearance">Aparência</string>
+    <string name="search_chapters">Encontrar capítulo</string>
+    <string name="content">Conteúdo</string>
+    <string name="chapters_empty">Não há capítulos nesta manga</string>
+    <string name="percent_string_pattern">%1$s%%</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f7b8c300f..fcd97d286 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -45,8 +45,8 @@
     <string name="clear">Temizle</string>
     <string name="text_clear_history_prompt">Tüm okuma geçmişi kalıcı olarak silinsin mi\?</string>
     <string name="remove">Kaldır</string>
-    <string name="_s_removed_from_history">\"%s\" geçmişinden kaldırıldı</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" yerel depolama alanından sil</string>
+    <string name="_s_removed_from_history">“%s” geçmişinden kaldırıldı</string>
+    <string name="_s_deleted_from_local_storage">“%s” yerel depolama alanından sil</string>
     <string name="wait_for_loading_finish">Lütfen bitmesini bekleyin…</string>
     <string name="save_page">Sayfayı kaydet</string>
     <string name="share_image">Resmi paylaş</string>
@@ -117,7 +117,7 @@
     <string name="pages_animation">Sayfa animasyonu</string>
     <string name="cannot_find_available_storage">Kullanılabilir depolama alanı yok</string>
     <string name="rename">Yeniden adlandır</string>
-    <string name="text_delete_local_manga">\"%s\" cihazdan kalıcı olarak silinsin mi\?</string>
+    <string name="text_delete_local_manga">“%s” cihazdan kalıcı olarak silinsin mi\?</string>
     <string name="clear_search_history">Arama geçmişini temizle</string>
     <string name="text_empty_holder_primary">Burası biraz boş…</string>
     <string name="rotate_screen">Ekranı döndür</string>
@@ -140,7 +140,7 @@
     <string name="taps_on_edges">Kenar dokunuşları</string>
     <string name="large_manga_save_confirm">Bu mangada %s var. Hepsi kaydedilsin mi\?</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d / %2$d açık</string>
-    <string name="category_delete_confirm">\"%s\" kategorisi favorilerinizden kaldırılsın mı\?
+    <string name="category_delete_confirm">“%s” kategorisi favorilerinizden kaldırılsın mı\?
 \nİçindeki tüm mangalar kaybolacak.</string>
     <string name="text_search_holder_secondary">Sorguyu yeniden biçimlendirmeyi deneyin.</string>
     <string name="text_history_holder_primary">Okuduklarınız burada görüntülenecek</string>

From 3e437c2ecbaba74cb43d8618b10405d19ed1eeec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 15 Apr 2022 12:57:30 +0200
Subject: [PATCH 010/104] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Norwegian Bokmål)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/nb_NO/
Translation: Kotatsu/plurals
---
 app/src/main/res/values-nb-rNO/plurals.xml | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/src/main/res/values-nb-rNO/plurals.xml

diff --git a/app/src/main/res/values-nb-rNO/plurals.xml b/app/src/main/res/values-nb-rNO/plurals.xml
new file mode 100644
index 000000000..e25bf53dd
--- /dev/null
+++ b/app/src/main/res/values-nb-rNO/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Totalt %1$d side</item>
+        <item quantity="other">Totalt %1$d sider</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nytt kapittel</item>
+        <item quantity="other">%1$d nye kapitler</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d kapittel</item>
+        <item quantity="other">%1$d kapitler</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d kapitler fra %2$d</item>
+        <item quantity="other">%1$d kapitler fra %2$d</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d time siden</item>
+        <item quantity="other">%1$d timer siden</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d dag siden</item>
+        <item quantity="other">%1$d dager siden</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d element</item>
+        <item quantity="other">%1$d elementer</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minutt siden</item>
+        <item quantity="other">%1$d minutter siden</item>
+    </plurals>
+</resources>
\ No newline at end of file

From 15a08ad6ae10f281b4fb8b716a3cb10d8ab16858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Jos=C3=A9=20Guti=C3=A9rrez=20Llanos?=
 <gutierrezapata17@gmail.com>
Date: Fri, 15 Apr 2022 12:57:31 +0200
Subject: [PATCH 011/104] Translated using Weblate (Spanish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (274 of 274 strings)

Co-authored-by: Santiago José Gutiérrez Llanos <gutierrezapata17@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/es/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/es/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-es/plurals.xml | 66 +++++++++++++-------------
 app/src/main/res/values-es/strings.xml |  3 ++
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/values-es/plurals.xml b/app/src/main/res/values-es/plurals.xml
index d68590bf5..4228a55bc 100644
--- a/app/src/main/res/values-es/plurals.xml
+++ b/app/src/main/res/values-es/plurals.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="pages">
-		<item quantity="one">Total %1$d página</item>
-		<item quantity="other">Total %1$d páginas</item>
-	</plurals>
-	<plurals name="items">
-		<item quantity="one">%1$d elemento</item>
-		<item quantity="other">%1$d elementos</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d nuevo capítulo</item>
-		<item quantity="other">%1$d nuevos capítulos</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d capítulo</item>
-		<item quantity="other">%1$d capítulos</item>
-	</plurals>
-	<plurals name="chapters_from_x">
-		<item quantity="one">%1$d capítulo desde %2$d</item>
-		<item quantity="other">%1$d capítulos desde %2$d</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">%hace 1$d minuto</item>
-		<item quantity="other">hace %1$d minutos</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">hace %1$d hora</item>
-		<item quantity="other">hace %1$d horas</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">hace %1$d día</item>
-		<item quantity="other">hace %1$d días</item>
-	</plurals>
-</resources>
+    <plurals name="pages">
+        <item quantity="one">Total %1$d página</item>
+        <item quantity="other">Total %1$d páginas</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d elemento</item>
+        <item quantity="other">%1$d elementos</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nuevo capítulo</item>
+        <item quantity="other">%1$d nuevos capítulos</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capítulo</item>
+        <item quantity="other">%1$d capítulos</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d capítulo desde %2$d</item>
+        <item quantity="other">%1$d capítulos desde %2$d</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">hace %1$d minuto</item>
+        <item quantity="other">hace %1$d minutos</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">hace %1$d hora</item>
+        <item quantity="other">hace %1$d horas</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">hace %1$d día</item>
+        <item quantity="other">hace %1$d días</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 37748a5f1..9cde0edc3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -269,4 +269,7 @@
     <string name="suggestions_updating">Actualización de las sugerencias</string>
     <string name="suggestions_excluded_genres">Excluir géneros</string>
     <string name="suggestions_excluded_genres_summary">Especifica los géneros que no quieres ver en las sugerencias</string>
+    <string name="removal_completed">Remoción completada</string>
+    <string name="batch_manga_save_confirm">¿Estás seguro de que quieres descargar todos los manga seleccionados con todos sus capítulos\? Esta acción puede consumir mucho tráfico y almacenamiento</string>
+    <string name="text_delete_local_manga_batch">¿Eliminar elementos seleccionados del dispositivo de forma permanente\?</string>
 </resources>
\ No newline at end of file

From 05eb96e7c0ef8abbd67103058dbd5972a3672d84 Mon Sep 17 00:00:00 2001
From: Luiz-bro <luiznneto1@gmail.com>
Date: Fri, 15 Apr 2022 12:57:31 +0200
Subject: [PATCH 012/104] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (274 of 274 strings)

Co-authored-by: Luiz-bro <luiznneto1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-pt-rBR/plurals.xml | 35 +++++++++++++++++++++-
 app/src/main/res/values-pt-rBR/strings.xml |  5 ++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/plurals.xml b/app/src/main/res/values-pt-rBR/plurals.xml
index a6b3daec9..350c1c932 100644
--- a/app/src/main/res/values-pt-rBR/plurals.xml
+++ b/app/src/main/res/values-pt-rBR/plurals.xml
@@ -1,2 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <plurals name="items">
+        <item quantity="one">%1$d item</item>
+        <item quantity="other">%1$d itens</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capítulo</item>
+        <item quantity="other">%1$d capítulos</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d capítulo de %2$d</item>
+        <item quantity="other">%1$d capítulos de %2$d</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">Total de %1$d página</item>
+        <item quantity="other">Total de %1$d páginas</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d novo capítulo</item>
+        <item quantity="other">%1$d novos capítulos</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minuto atrás</item>
+        <item quantity="other">%1$d minutos atrás</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d hora atrás</item>
+        <item quantity="other">%1$d horas atrás</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d dia atrás</item>
+        <item quantity="other">%1$d dias atrás</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1e49f0f52..5097c09fe 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -267,4 +267,9 @@
     <string name="suggestions_updating">Atualização de sugestões</string>
     <string name="appearance">Aparência</string>
     <string name="content">Conteúdo</string>
+    <string name="suggestions_excluded_genres">Excluir gêneros</string>
+    <string name="suggestions_excluded_genres_summary">Especifique os gêneros que você não deseja ver nas sugestões</string>
+    <string name="removal_completed">Remoção concluída</string>
+    <string name="text_delete_local_manga_batch">Excluir itens selecionados do dispositivo permanentemente\?</string>
+    <string name="batch_manga_save_confirm">Tem certeza de que deseja baixar todos os mangás selecionados com todos os seus capítulos\? Essa ação pode consumir muito tráfego e armazenamento</string>
 </resources>
\ No newline at end of file

From 10a2589c10d2e51e0ae86fc1f998df67834f9a17 Mon Sep 17 00:00:00 2001
From: lowak <lowak@pm.me>
Date: Fri, 15 Apr 2022 12:57:31 +0200
Subject: [PATCH 013/104] Translated using Weblate (Swedish)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (Swedish)

Currently translated at 41.6% (114 of 274 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Swedish)

Added translation using Weblate (Swedish)

Co-authored-by: lowak <lowak@pm.me>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/sv/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/sv/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-sv/plurals.xml |  35 ++++
 app/src/main/res/values-sv/strings.xml | 275 +++++++++++++++++++++++++
 2 files changed, 310 insertions(+)
 create mode 100644 app/src/main/res/values-sv/plurals.xml
 create mode 100644 app/src/main/res/values-sv/strings.xml

diff --git a/app/src/main/res/values-sv/plurals.xml b/app/src/main/res/values-sv/plurals.xml
new file mode 100644
index 000000000..3c89683d3
--- /dev/null
+++ b/app/src/main/res/values-sv/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Totalt %1$d sida</item>
+        <item quantity="other">Totalt %1$d sidor</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d artikel</item>
+        <item quantity="other">%1$d artiklar</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nytt kapitel</item>
+        <item quantity="other">%1$d nya kapitel</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d kapitel</item>
+        <item quantity="other">%1$d kapitel</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d kapitel från %2$d</item>
+        <item quantity="other">%1$d kapitel från %2$d</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minut sedan</item>
+        <item quantity="other">%1$d minuter sedan</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d timme sedan</item>
+        <item quantity="other">%1$d timmar sedan</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d dag sedan</item>
+        <item quantity="other">%1$d dagar sedan</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 000000000..6a84c9707
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="light">Ljust</string>
+    <string name="pages">Sidor</string>
+    <string name="text_file_not_supported">Välj en ZIP- eller CBZ-fil.</string>
+    <string name="close_menu">Stäng meny</string>
+    <string name="open_menu">Öppna meny</string>
+    <string name="local_storage">Lokal lagring</string>
+    <string name="favourites">Favoriter</string>
+    <string name="history">Historik</string>
+    <string name="error_occurred">Ett fel har inträffat</string>
+    <string name="network_error">Lyckades inte ansluta till internet</string>
+    <string name="details">Detaljer</string>
+    <string name="chapters">Kapitel</string>
+    <string name="list">Lista</string>
+    <string name="detailed_list">Detaljerad lista</string>
+    <string name="grid">Rutnät</string>
+    <string name="list_mode">Listläge</string>
+    <string name="settings">Inställningar</string>
+    <string name="remote_sources">Källor</string>
+    <string name="loading_">Laddar…</string>
+    <string name="computing_">Beräknar…</string>
+    <string name="chapter_d_of_d">Kapitel %1$d av %2$d</string>
+    <string name="close">Stäng</string>
+    <string name="try_again">Försök igen</string>
+    <string name="clear_history">Rensa historik</string>
+    <string name="nothing_found">Ingenting hittades</string>
+    <string name="history_is_empty">Ingen historik än</string>
+    <string name="download_complete">Nedladdat</string>
+    <string name="downloads">Nedladdningar</string>
+    <string name="by_name">Namn</string>
+    <string name="popular">Populärt</string>
+    <string name="updated">Uppdaterat</string>
+    <string name="add_to_favourites">Lägg till som favorit</string>
+    <string name="filter">Filter</string>
+    <string name="standard">Standard</string>
+    <string name="read">Läs</string>
+    <string name="enter_category_name">Ange kategorins namn</string>
+    <string name="you_have_not_favourites_yet">Inga favoriter än</string>
+    <string name="save">Spara</string>
+    <string name="create_shortcut">Skapa genväg…</string>
+    <string name="manga_downloading_">Laddar ned…</string>
+    <string name="processing_">Behandlar…</string>
+    <string name="theme">Tema</string>
+    <string name="automatic">Systemtema</string>
+    <string name="remove">Ta bort</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="add_new_category">Ny kategori</string>
+    <string name="search">Sök</string>
+    <string name="by_rating">Betyg</string>
+    <string name="add">Lägg till</string>
+    <string name="share">Dela</string>
+    <string name="share_s">Dela %s</string>
+    <string name="search_manga">Sök manga</string>
+    <string name="cache">Cache</string>
+    <string name="show_notification_app_update">Visa en notifikation om en nyare version av äpplen finns tillgänglig</string>
+    <string name="newest">Nyaste</string>
+    <string name="sort_order">Sorteringsordning</string>
+    <string name="dark">Mörkt</string>
+    <string name="operation_not_supported">Denna åtgärden stöds inte</string>
+    <string name="no_description">Ingen beskrivning</string>
+    <string name="history_and_cache">Historik och cache</string>
+    <string name="clear">Rensa</string>
+    <string name="text_clear_history_prompt">Rensa all läshistorik permanent\?</string>
+    <string name="_s_removed_from_history">\"%s\" borttagen från historik</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" borttaget från lokal lagring</string>
+    <string name="wait_for_loading_finish">Vänta tills laddningen är klar…</string>
+    <string name="save_page">Spara sida</string>
+    <string name="page_saved">Sparad</string>
+    <string name="share_image">Dela bild</string>
+    <string name="_import">Importera</string>
+    <string name="delete">Ta bort</string>
+    <string name="clear_pages_cache">Rensa sidcache</string>
+    <string name="text_delete_local_manga">Ta permanent bort \"%s\" från den här enheten\?</string>
+    <string name="volume_buttons">Volymknappar</string>
+    <string name="cancelling_">Avbryter…</string>
+    <string name="error">Error</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="read_mode">Läsläge</string>
+    <string name="grid_size">Rutnätsstorlek</string>
+    <string name="search_on_s">Sök på %s</string>
+    <string name="delete_manga">Ta bort manga</string>
+    <string name="reader_settings">Läsarinställningar</string>
+    <string name="switch_pages">Byt sida</string>
+    <string name="taps_on_edges">Kanttryck</string>
+    <string name="_continue">Fortsätt</string>
+    <string name="warning">Varning</string>
+    <string name="network_consumption_warning">Detta kan kräva mycket dataöverföring</string>
+    <string name="dont_ask_again">Fråga inte igen</string>
+    <string name="search_history_cleared">Rensat</string>
+    <string name="clear_thumbs_cache">Rensa cache för miniatyrer</string>
+    <string name="open_in_browser">Öppna i webbläsare</string>
+    <string name="notifications">Notifikationer</string>
+    <string name="clear_search_history">Rensa sökhistorik</string>
+    <string name="domain">Domän</string>
+    <string name="gestures_only">Endast gester</string>
+    <string name="internal_storage">Internlagring</string>
+    <string name="external_storage">Externlagring</string>
+    <string name="application_update">Kolla om det finns en nyare version av appen</string>
+    <string name="app_update_available">En ny version av appen finns tillgänglig</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d av %2$d aktiva</string>
+    <string name="new_chapters">Nya kapitel</string>
+    <string name="large_manga_save_confirm">Den här mangan har %s. Spara hela\?</string>
+    <string name="save_manga">Spara</string>
+    <string name="download">Ladda ned</string>
+    <string name="notifications_settings">Notifikationsinställningar</string>
+    <string name="light_indicator">LED-indikator</string>
+    <string name="show_notification_new_chapters">Notifiera om uppdateringar på manga du läser</string>
+    <string name="read_from_start">Läs från början</string>
+    <string name="restart">Starta om</string>
+    <string name="notification_sound">Notifikationsljud</string>
+    <string name="vibration">Vibration</string>
+    <string name="favourites_categories">Favoritkategorier</string>
+    <string name="no_update_available">Inga tillgängliga uppdateringar</string>
+    <string name="backup_information">Du kan säkerhetskopiera din historik och dina favoriter och återställa senare</string>
+    <string name="just_now">Just nu</string>
+    <string name="yesterday">Igår</string>
+    <string name="long_ago">Länge sedan</string>
+    <string name="group">Grupp</string>
+    <string name="today">Idag</string>
+    <string name="tap_to_try_again">Tryck för att försöka igen</string>
+    <string name="reader_mode_hint">Den valda konfigurationen kommer att bli ihågkommen för denna manga</string>
+    <string name="silent">Tyst</string>
+    <string name="cookies_cleared">Alla kakor rensades</string>
+    <string name="chapters_checking_progress">Letar efter nya kapitel: %1$d av %2$d</string>
+    <string name="clear_feed">Rensa flöde</string>
+    <string name="text_clear_updates_feed_prompt">Permanent rensa all uppdateringshistorik\?</string>
+    <string name="check_for_new_chapters">Leta efter nya kapitel</string>
+    <string name="reverse">Omvänt</string>
+    <string name="sign_in">Logga in</string>
+    <string name="auth_required">Logga in för att visa innehåll</string>
+    <string name="default_s">Standard: %s</string>
+    <string name="_and_x_more">...och %1$d till</string>
+    <string name="next">Nästa</string>
+    <string name="password_length_hint">Lösenordet måste vara minst 4 tecken</string>
+    <string name="search_only_on_s">Sök endast på %s</string>
+    <string name="text_clear_search_history_prompt">Permanent rensa alla senaste sökfrågor\?</string>
+    <string name="other">Annat</string>
+    <string name="welcome">Välkommen</string>
+    <string name="tracker_warning">Vissa enheter har olika systembeteende vilket kan ha sönder bakgrundsjobb.</string>
+    <string name="read_more">Läs mer</string>
+    <string name="queued">Köad</string>
+    <string name="text_downloads_holder">Inga aktiva nedladdningar</string>
+    <string name="chapter_is_missing_text">Ladda ned eller läs det saknade kapitlet online.</string>
+    <string name="chapter_is_missing">Kapitlet saknas</string>
+    <string name="about_app_translation_summary">Översätt denna app</string>
+    <string name="about_app_translation">Översättning</string>
+    <string name="about_feedback">Feedback</string>
+    <string name="about_feedback_4pda">Ämne på 4PDA</string>
+    <string name="auth_complete">Auktoriserad</string>
+    <string name="auth_not_supported_by">Inloggning på %s stöds inte</string>
+    <string name="state_finished">Färdig</string>
+    <string name="exclude_nsfw_from_history">Exkludera vuxeninnehåll från historiken</string>
+    <string name="error_empty_name">Du måste ange ett namn</string>
+    <string name="show_pages_numbers">Numrerade sidor</string>
+    <string name="enabled_sources">Aktiva källor</string>
+    <string name="available_sources">Tillgängliga källor</string>
+    <string name="dynamic_theme">Dynamiskt tema</string>
+    <string name="dynamic_theme_summary">Tillämpar ett tema skapat utifrån din bakgrundsbild</string>
+    <string name="importing_progress">Importerar manga: %1$d av %2$d</string>
+    <string name="screenshots_policy">Policy för skärmdumpar</string>
+    <string name="screenshots_allow">Tillåt</string>
+    <string name="screenshots_block_nsfw">Blockera på vuxeninnehåll</string>
+    <string name="screenshots_block_all">Blockera alltid</string>
+    <string name="suggestions">Förslag</string>
+    <string name="suggestions_enable">Aktivera förslag</string>
+    <string name="suggestions_summary">Föreslå manga baserat på dina preferenser</string>
+    <string name="suggestions_info">Alla data analyseras lokalt på denna enhet. Dina personuppgifter kommer inte överföras till någon tjänst</string>
+    <string name="text_suggestion_holder">Börja läsa manga för att få personliga förslag</string>
+    <string name="exclude_nsfw_from_suggestions">Föreslå inte manga med vuxeninnehåll</string>
+    <string name="enabled">Aktiverad</string>
+    <string name="disabled">Inaktiverad</string>
+    <string name="filter_load_error">Kunde inte ladda genrelistan</string>
+    <string name="reset_filter">Återställ filter</string>
+    <string name="find_genre">Hitta genre</string>
+    <string name="onboard_text">Välj det språk som du vill läsa manga på. Du kan ändra detta i inställningarna senare.</string>
+    <string name="never">Aldrig</string>
+    <string name="only_using_wifi">Endast på Wi-Fi</string>
+    <string name="always">Alltid</string>
+    <string name="preload_pages">Förladdning av sidor</string>
+    <string name="logged_in_as">Inloggad som %s</string>
+    <string name="nsfw">18+</string>
+    <string name="various_languages">Olika språk</string>
+    <string name="search_chapters">Hitta kapitel</string>
+    <string name="chapters_empty">Inga kapitel i denna manga</string>
+    <string name="appearance">Utseende</string>
+    <string name="content">Innehåll</string>
+    <string name="suggestions_updating">Uppdaterar förslag</string>
+    <string name="suggestions_excluded_genres">Uteslut genrer</string>
+    <string name="suggestions_excluded_genres_summary">Ange genrer som du inte vill få förslag på</string>
+    <string name="removal_completed">Borttagningen slutförd</string>
+    <string name="text_empty_holder_primary">Här var det tomt…</string>
+    <string name="rename">Byt namn</string>
+    <string name="category_delete_confirm">Ta bort kategorin \"%s\" från dina favoriter\?
+\nAllt innehåll kommer förloras.</string>
+    <string name="text_categories_holder">Du kan använda kategorier för att organisera din a favoriter. Tryck på «+» för att skapa en ny kategori</string>
+    <string name="categories_">Kategorier…</string>
+    <string name="feed_will_update_soon">Flödesuppdatering påbörjas snart</string>
+    <string name="restore_backup">Återställ från säkerhetskopia</string>
+    <string name="text_search_holder_secondary">Försök att omformulera frågan.</string>
+    <string name="text_history_holder_primary">Det du läser kommer att visas här</string>
+    <string name="text_local_holder_primary">Spara något först</string>
+    <string name="manga_shelf">Hylla</string>
+    <string name="remove_category">Ta bort</string>
+    <string name="create_category">Ny kategori</string>
+    <string name="text_history_holder_secondary">Hitta ny läsning i sidomenyn.</string>
+    <string name="pages_animation">Sidanimation</string>
+    <string name="favourites_category_empty">Tom kategori</string>
+    <string name="read_later">Läs senare</string>
+    <string name="updates">Uppdateringar</string>
+    <string name="new_version_s">Ny version: %s</string>
+    <string name="text_local_holder_secondary">Hämta från onlinekällor eller importera filer.</string>
+    <string name="recent_manga">Nytt</string>
+    <string name="manga_save_location">Mapp för nedladdningar</string>
+    <string name="not_available">Ej tillgänglig</string>
+    <string name="other_storage">Annan lagring</string>
+    <string name="text_feed_holder">Nya kapitel av det du läser visas här</string>
+    <string name="rotate_screen">Rotera skärm</string>
+    <string name="cannot_find_available_storage">Inget tillgängligt lagringsutrymme</string>
+    <string name="done">Färdig</string>
+    <string name="related">Relaterat</string>
+    <string name="size_s">Storlek: %s</string>
+    <string name="waiting_for_network">Väntar på nätverk…</string>
+    <string name="update">Uppdatera</string>
+    <string name="enter_password">Ange lösenord</string>
+    <string name="checking_for_updates">Letar efter uppdateringar…</string>
+    <string name="all_favourites">Alla favoriter</string>
+    <string name="protect_application_summary">Fråga efter lösenord när appen startas</string>
+    <string name="search_results">Sökresultat</string>
+    <string name="clear_updates_feed">Rensa uppdateringsflödet</string>
+    <string name="track_sources">Leta efter uppdateringar</string>
+    <string name="updates_feed_cleared">Rensat</string>
+    <string name="dont_check">Kontrollera inte</string>
+    <string name="protect_application">Skydda appen</string>
+    <string name="wrong_password">Fel lösenord</string>
+    <string name="repeat_password">Repetera lösenord</string>
+    <string name="passwords_mismatch">Lösenord stämmer inte överens</string>
+    <string name="about">Om</string>
+    <string name="app_version">Version %s</string>
+    <string name="check_for_updates">Leta efter uppdateringar</string>
+    <string name="right_to_left">Höger-till-vänster (←)</string>
+    <string name="update_check_failed">Kunde inte leta efter uppdateringar</string>
+    <string name="scale_mode">Skalningsläge</string>
+    <string name="zoom_mode_fit_center">Centrera</string>
+    <string name="zoom_mode_fit_height">Anpassa mot höjd</string>
+    <string name="zoom_mode_keep_start">Anpassa till start</string>
+    <string name="prefer_rtl_reader">Föredra höger-till-vänster (←) läsare</string>
+    <string name="preparing_">Förbereder…</string>
+    <string name="prefer_rtl_reader_summary">Läsläge kan sättas up separat för varje serie</string>
+    <string name="zoom_mode_fit_width">Anpassa mot bredd</string>
+    <string name="black_dark_theme">Svart</string>
+    <string name="black_dark_theme_summary">Använder mindre ström på AMOLED-skärmar</string>
+    <string name="restart_required">Omstart krävs</string>
+    <string name="backup_restore">Säkerhetskopiering och återställning</string>
+    <string name="create_backup">Skapa säkerhetskopia</string>
+    <string name="data_restored">Återställd</string>
+    <string name="report_github">Skapa en felrapport på GitHub</string>
+    <string name="data_restored_with_errors">Datan återställdes men det förekommer fel</string>
+    <string name="data_restored_success">All data återställdes</string>
+    <string name="file_not_found">Filen hittades inte</string>
+    <string name="captcha_required">CAPTCHA krävs</string>
+    <string name="captcha_solve">Lös</string>
+    <string name="clear_cookies">Rensa kakor</string>
+    <string name="confirm">Bekräfta</string>
+    <string name="protect_application_subtitle">Ange ett lösenord för att starta appen med</string>
+    <string name="backup_saved">Säkerhetskopia sparad</string>
+    <string name="genres">Genrer</string>
+    <string name="state_ongoing">Pågående</string>
+    <string name="date_format">Datumformat</string>
+    <string name="system_default">Standard</string>
+    <string name="text_clear_cookies_prompt">Du kommer loggas ut från alla källor</string>
+    <string name="text_delete_local_manga_batch">Vill du ta bort markerade objekt från enheten permanent\?</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="batch_manga_save_confirm">Är du säker på att du vill ladda ner alla utvalda manga med alla kapitel\? Den här åtgärden kan kräva mycket nätverkstrafik och lagringsutrymme</string>
+</resources>
\ No newline at end of file

From c2fa27712c55d43fd323576b3f9a349a3b4d14cd Mon Sep 17 00:00:00 2001
From: Sergio Varela <sergitroll9@gmail.com>
Date: Fri, 15 Apr 2022 12:57:32 +0200
Subject: [PATCH 014/104] Added translation using Weblate (Basque)

Added translation using Weblate (Basque)

Co-authored-by: Sergio Varela <sergitroll9@gmail.com>
---
 app/src/main/res/values-eu/plurals.xml | 2 ++
 app/src/main/res/values-eu/strings.xml | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 app/src/main/res/values-eu/plurals.xml
 create mode 100644 app/src/main/res/values-eu/strings.xml

diff --git a/app/src/main/res/values-eu/plurals.xml b/app/src/main/res/values-eu/plurals.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-eu/plurals.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-eu/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From d37eb07301b96790aad0d9d5cb7cd725fc2c7032 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 16 Apr 2022 09:19:10 +0300
Subject: [PATCH 015/104] Fix startForeground for DownloadService

---
 .../ui/service/ForegroundNotificationSwitcher.kt     | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt
index c7d0b0191..679405295 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/ForegroundNotificationSwitcher.kt
@@ -24,7 +24,7 @@ class ForegroundNotificationSwitcher(
 	@Synchronized
 	fun notify(startId: Int, notification: Notification) {
 		if (notifications.isEmpty()) {
-			StartForegroundRunnable(startId, notification)
+			service.startForeground(startId, notification)
 		} else {
 			notificationManager.notify(startId, notification)
 		}
@@ -46,16 +46,6 @@ class ForegroundNotificationSwitcher(
 		handler.postDelayed(NotifyRunnable(startId, notification), DEFAULT_DELAY)
 	}
 
-	private inner class StartForegroundRunnable(
-		private val startId: Int,
-		private val notification: Notification,
-	) : Runnable {
-
-		override fun run() {
-			service.startForeground(startId, notification)
-		}
-	}
-
 	private inner class NotifyRunnable(
 		private val startId: Int,
 		private val notification: Notification?,

From b0515033da866a53c5881387cc44a1ce3bfef116 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 16 Apr 2022 09:40:50 +0300
Subject: [PATCH 016/104] Increase version

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6c004a16c..09993f26b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 401
-		versionName '3.1'
+		versionCode 402
+		versionName '3.1.1'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

From 54f60040b5d46600667c5ad3505c5e26bbc5d34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aliaksiej=20Razuma=C5=AD?= <belarusaed@gmail.com>
Date: Fri, 15 Apr 2022 12:57:28 +0200
Subject: [PATCH 017/104] Translated using Weblate (Belarusian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (270 of 270 strings)

Co-authored-by: Aliaksiej Razumaŭ <belarusaed@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/be/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-be/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 0e8ab0bad..728b3c8b6 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -263,4 +263,5 @@
     <string name="various_languages">Розныя мовы</string>
     <string name="search_chapters">Знайсці главу</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="chapters_empty">У гэтай манзе няма глаў</string>
 </resources>
\ No newline at end of file

From 414f43876290a81c7d1804dd9f9d967b8b1cfb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Fri, 15 Apr 2022 12:57:28 +0200
Subject: [PATCH 018/104] Translated using Weblate (Turkish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (274 of 274 strings)

Added translation using Weblate (Turkish)

Translated using Weblate (Turkish)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (269 of 269 strings)

Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/tr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-tr/plurals.xml | 35 ++++++++++++++++++++++++++
 app/src/main/res/values-tr/strings.xml | 16 +++++++++---
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-tr/plurals.xml

diff --git a/app/src/main/res/values-tr/plurals.xml b/app/src/main/res/values-tr/plurals.xml
new file mode 100644
index 000000000..5dc9f9e0b
--- /dev/null
+++ b/app/src/main/res/values-tr/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Toplam %1$d sayfa</item>
+        <item quantity="other">Toplam %1$d sayfa</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d öge</item>
+        <item quantity="other">%1$d öge</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d bölüm</item>
+        <item quantity="other">%1$d bölüm</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d saat önce</item>
+        <item quantity="other">%1$d saat önce</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d yeni bölüm</item>
+        <item quantity="other">%1$d yeni bölüm</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d gün önce</item>
+        <item quantity="other">%1$d gün önce</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%2$d\'den %1$d bölüm</item>
+        <item quantity="other">%2$d\'den %1$d bölüm</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d dakika önce</item>
+        <item quantity="other">%1$d dakika önce</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index eb03a51d6..f7b8c300f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -131,7 +131,7 @@
     <string name="restore_backup">Yedekten geri yükle</string>
     <string name="update">Güncelle</string>
     <string name="sign_in">Oturum aç</string>
-	<string name="state_finished">Bitti</string>
+    <string name="state_finished">Bitti</string>
     <string name="about">Hakkında</string>
     <string name="auth_required">Bu içeriği görüntülemek için oturum açın</string>
     <string name="confirm">Onayla</string>
@@ -184,7 +184,7 @@
     <string name="about_app_translation">Çeviri</string>
     <string name="search_only_on_s">Yalnızca %s içinde ara</string>
     <string name="about_feedback_4pda">4PDA\'daki konu</string>
-	<string name="state_ongoing">Devam ediyor</string>
+    <string name="state_ongoing">Devam ediyor</string>
     <string name="text_clear_cookies_prompt">Tüm kaynaklardaki oturumunuz kapatılacak</string>
     <string name="enabled_sources">Kullanılan kaynaklar</string>
     <string name="available_sources">Kullanılabilir kaynaklar</string>
@@ -223,13 +223,13 @@
     <string name="captcha_required">CAPTCHA gerekli</string>
     <string name="cookies_cleared">Tüm çerezler kaldırıldı</string>
     <string name="reader_mode_hint">Seçilen yapılandırma bu manga için hatırlanacak</string>
-	<string name="text_clear_updates_feed_prompt">Tüm güncelleme geçmişi kalıcı olarak silinsin mi\?</string>
+    <string name="text_clear_updates_feed_prompt">Tüm güncelleme geçmişi kalıcı olarak silinsin mi\?</string>
     <string name="_and_x_more">…ve %1$d daha fazlası</string>
     <string name="protect_application_subtitle">Uygulamayı başlatmak için bir parola girin</string>
     <string name="text_clear_search_history_prompt">Tüm son arama sorguları kalıcı olarak kaldırılsın mı\?</string>
     <string name="about_feedback">Geri bildirim</string>
     <string name="backup_saved">Yedek kaydedildi</string>
-	<string name="genres">Türler</string>
+    <string name="genres">Türler</string>
     <string name="date_format">Tarih biçimi</string>
     <string name="system_default">Öntanımlı</string>
     <string name="error_empty_name">Bir ad girmelisiniz</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Bölüm bul</string>
     <string name="chapters_empty">Bu mangada bölüm yok</string>
     <string name="percent_string_pattern">%%%1$s</string>
+    <string name="content">İçerik</string>
+    <string name="suggestions_updating">Öneriler güncelleniyor</string>
+    <string name="appearance">Görünüm</string>
+    <string name="suggestions_excluded_genres">Türleri hariç tut</string>
+    <string name="suggestions_excluded_genres_summary">Önerilerde görmek istemediğiniz türleri belirtin</string>
+    <string name="text_delete_local_manga_batch">Seçilen ögeler aygıttan kalıcı olarak silinsin mi\?</string>
+    <string name="batch_manga_save_confirm">Seçilen tüm mangaları tüm bölümleriyle birlikte indirmek istediğinizden emin misiniz\? Bu işlem çok fazla trafik ve depolama alanı tüketebilir</string>
+    <string name="removal_completed">Kaldırma tamamlandı</string>
 </resources>
\ No newline at end of file

From 6b2666c701da66fb0881b52e4d9e76c492c190cd Mon Sep 17 00:00:00 2001
From: kuragehime <kuragehime641@gmail.com>
Date: Fri, 15 Apr 2022 12:57:29 +0200
Subject: [PATCH 019/104] Translated using Weblate (Japanese)

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Japanese)

Translated using Weblate (Japanese)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (269 of 269 strings)

Co-authored-by: kuragehime <kuragehime641@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/ja/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-ja/plurals.xml | 27 ++++++++++++++++++++++++++
 app/src/main/res/values-ja/strings.xml | 16 +++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/values-ja/plurals.xml

diff --git a/app/src/main/res/values-ja/plurals.xml b/app/src/main/res/values-ja/plurals.xml
new file mode 100644
index 000000000..497057c19
--- /dev/null
+++ b/app/src/main/res/values-ja/plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="chapters_from_x">
+        <item quantity="other">%1$dから%2$dの章</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="other">%1$d 1分前</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="other">%1$d 項目</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="other">%1$d 1時間前</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="other">%1$d 1日前</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="other">%1$dチャプター</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="other">合計%1$dページ</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="other">%1$d新しい章</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4e3fdfcd5..047d27672 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -163,7 +163,7 @@
     <string name="prefer_rtl_reader">右から左（←）の読書を好む</string>
     <string name="about_feedback">フィードバック</string>
     <string name="about_feedback_4pda">4PDAに関する話題</string>
-	<string name="auth_complete">承認済み</string>
+    <string name="auth_complete">承認済み</string>
     <string name="auth_not_supported_by">%sへのログインはサポートされていません</string>
     <string name="state_finished">完成</string>
     <string name="state_ongoing">進行中</string>
@@ -209,10 +209,10 @@
     <string name="about_app_translation">このアプリを翻訳</string>
     <string name="data_restored_success">全てのデータが復元されました</string>
     <string name="data_restored">復元</string>
-	<string name="preparing_">準備中…</string>
+    <string name="preparing_">準備中…</string>
     <string name="zoom_mode_keep_start">開始時に維持</string>
     <string name="backup_restore">バックアップと復元</string>
-	<string name="reverse">リバース</string>
+    <string name="reverse">リバース</string>
     <string name="reader_mode_hint">選択した構成はこの漫画のために記憶されます</string>
     <string name="clear_cookies">クッキーを削除</string>
     <string name="report_github">GitHubでissueを作成する(GitHubのアカウントが必要です)</string>
@@ -230,7 +230,7 @@
     <string name="scale_mode">スケールモード</string>
     <string name="error_empty_name">名前を入力する必要があります</string>
     <string name="today">今日</string>
-	<string name="about_app_translation_summary">Kotatsuを翻訳する(Weblateのサイトに移動します)</string>
+    <string name="about_app_translation_summary">Kotatsuを翻訳する(Weblateのサイトに移動します)</string>
     <string name="next">次のページ</string>
     <string name="silent">サイレント</string>
     <string name="sign_in">サインイン</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">チャプターを検索</string>
     <string name="chapters_empty">この漫画の章はありません</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="content">コンテンツ</string>
+    <string name="suggestions_updating">更新のご提案</string>
+    <string name="appearance">外観</string>
+    <string name="suggestions_excluded_genres">ジャンルを除く</string>
+    <string name="suggestions_excluded_genres_summary">サジェストで表示したくないジャンルを指定</string>
+    <string name="text_delete_local_manga_batch">選択した項目をデバイスから完全に削除しますか？</string>
+    <string name="removal_completed">削除が完了しました</string>
+    <string name="batch_manga_save_confirm">本当に選択したマンガを全編ダウンロードしますか？この動作は多くのトラフィックとストレージを消費する可能性があります</string>
 </resources>
\ No newline at end of file

From 22d48fce8f8165ed5456267f1aabce4a6e4f77ba Mon Sep 17 00:00:00 2001
From: Luiz-bro <luiznneto1@gmail.com>
Date: Fri, 15 Apr 2022 12:57:29 +0200
Subject: [PATCH 020/104] Added translation using Weblate (Portuguese (Brazil))

Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (268 of 269 strings)

Co-authored-by: Luiz-bro <luiznneto1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-pt-rBR/plurals.xml | 2 ++
 app/src/main/res/values-pt-rBR/strings.xml | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/values-pt-rBR/plurals.xml

diff --git a/app/src/main/res/values-pt-rBR/plurals.xml b/app/src/main/res/values-pt-rBR/plurals.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/plurals.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 25bc9f483..c677ff53a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -183,7 +183,7 @@
     <string name="about_app_translation">Tradução</string>
     <string name="about_feedback">Comentar</string>
     <string name="about_feedback_4pda">Tópico no 4PDA</string>
-	<string name="auth_complete">Autorizado</string>
+    <string name="auth_complete">Autorizado</string>
     <string name="auth_not_supported_by">O login em %s não é suportado</string>
     <string name="text_clear_cookies_prompt">Você será desconectado de todas as fontes</string>
     <string name="genres">Gêneros</string>
@@ -261,7 +261,9 @@
     <string name="data_restored_with_errors">Os dados foram restaurados, mas há erros</string>
     <string name="report_github">Criar problema no GitHub</string>
     <string name="file_not_found">Arquivo não encontrado</string>
-	<string name="search_chapters">Localizar capítulo</string>
+    <string name="search_chapters">Localizar capítulo</string>
     <string name="chapters_empty">Não há capítulos neste mangá</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="suggestions_updating">Atualização de sugestões</string>
+    <string name="appearance">Aparência</string>
 </resources>
\ No newline at end of file

From b1c069f62f97ed11e7531a3579d564d6f6623f71 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Fri, 15 Apr 2022 12:57:30 +0200
Subject: [PATCH 021/104] Translated using Weblate (Italian)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (German)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (French)

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Finnish)

Currently translated at 99.2% (272 of 274 strings)

Translated using Weblate (French)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (German)

Currently translated at 100.0% (274 of 274 strings)

Added translation using Weblate (Italian)

Added translation using Weblate (German)

Added translation using Weblate (French)

Translated using Weblate (Finnish)

Currently translated at 99.6% (270 of 271 strings)

Translated using Weblate (French)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (German)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (French)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (German)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (269 of 269 strings)

Translated using Weblate (Belarusian)

Currently translated at 98.8% (266 of 269 strings)

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/de/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/fr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/it/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/be/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/de/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/es/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/it/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-be/strings.xml     | 10 +++----
 app/src/main/res/values-de/plurals.xml     | 35 ++++++++++++++++++++++
 app/src/main/res/values-de/strings.xml     | 10 ++++++-
 app/src/main/res/values-es/strings.xml     | 11 +++++--
 app/src/main/res/values-fi/strings.xml     |  9 +++++-
 app/src/main/res/values-fr/plurals.xml     | 35 ++++++++++++++++++++++
 app/src/main/res/values-fr/strings.xml     | 10 ++++++-
 app/src/main/res/values-it/plurals.xml     | 35 ++++++++++++++++++++++
 app/src/main/res/values-it/strings.xml     | 10 ++++++-
 app/src/main/res/values-ja/strings.xml     |  4 +--
 app/src/main/res/values-pt-rBR/strings.xml |  9 +++---
 app/src/main/res/values-pt/strings.xml     | 18 +++++++----
 app/src/main/res/values-tr/strings.xml     |  8 ++---
 13 files changed, 176 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/values-de/plurals.xml
 create mode 100644 app/src/main/res/values-fr/plurals.xml
 create mode 100644 app/src/main/res/values-it/plurals.xml

diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 728b3c8b6..cbd9de9a7 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -53,8 +53,8 @@
     <string name="clear">Ачысціць</string>
     <string name="text_clear_history_prompt">Вы ўпэўненыя, што жадаеце ачысціць гісторыю\?</string>
     <string name="remove">Выдаліць</string>
-    <string name="_s_removed_from_history">\"%s\" выдалена з гiсторыi</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" выдалена з прылады</string>
+    <string name="_s_removed_from_history">«%s» выдалена з гiсторыi</string>
+    <string name="_s_deleted_from_local_storage">«%s» выдалена з прылады</string>
     <string name="wait_for_loading_finish">Дачакайцеся заканчэння загрузкі…</string>
     <string name="save_page">Захаваць старонку</string>
     <string name="page_saved">Старонка захавана</string>
@@ -76,7 +76,7 @@
     <string name="delete_manga">Выдаліць мангу</string>
     <string name="reader_settings">Налады чытання</string>
     <string name="switch_pages">Гартанне старонак</string>
-    <string name="text_delete_local_manga">Вы ўпэўненыя, што жадаеце выдаліць \"%s\" з прылады\?</string>
+    <string name="text_delete_local_manga">Вы ўпэўненыя, што жадаеце выдаліць «%s» з прылады\?</string>
     <string name="taps_on_edges">Націск па краях</string>
     <string name="volume_buttons">Кнопкі гучнасці</string>
     <string name="_continue">Працягнцуць</string>
@@ -112,7 +112,7 @@
     <string name="favourites_categories">Катэгорыі абранага</string>
     <string name="categories_">Катэгорыi…</string>
     <string name="rename">Перайменаваць</string>
-    <string name="category_delete_confirm">Вы ўпэўнены, што хочаце выдаліць катэгорыю \"%s\"\?
+    <string name="category_delete_confirm">Вы ўпэўнены, што хочаце выдаліць катэгорыю «%s»\?
 \nУся манга з дадзенай катэгорыі будзе страчана.</string>
     <string name="remove_category">Выдаліць катэгорыю</string>
     <string name="text_categories_holder">Катэгорыі дапамагаюць упарадкоўваць абраную мангу. Націсніце «+», каб стварыць катэгорыю</string>
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Гэтая глава адсутнічае на вашай прыладзе. Спампуйце ціпрачытайце яе онлайн.</string>
     <string name="text_downloads_holder">На дадзены момант няма актыўных спамповак</string>
     <string name="queued">У чарзе</string>
-	<string name="about_feedback_4pda">Тэма на 4PDA</string>
+    <string name="about_feedback_4pda">Тэма на 4PDA</string>
     <string name="about_feedback">Зваротная сувязь</string>
     <string name="about_app_translation_summary">Дапамагчы з перакладам праграмы</string>
     <string name="about_app_translation">Пераклад</string>
diff --git a/app/src/main/res/values-de/plurals.xml b/app/src/main/res/values-de/plurals.xml
new file mode 100644
index 000000000..9f0386d23
--- /dev/null
+++ b/app/src/main/res/values-de/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Insgesamt %1$d Seite</item>
+        <item quantity="other">Insgesamt %1$d Seiten</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d Element</item>
+        <item quantity="other">%1$d Elemente</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d neues Kapitel</item>
+        <item quantity="other">%1$d neue Kapitel</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d Kapitel</item>
+        <item quantity="other">%1$d Kapitel</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d Kapitel aus %2$d</item>
+        <item quantity="other">%1$d Kapitel aus %2$d</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">Vor %1$d Minute</item>
+        <item quantity="other">Vor %1$d Minuten</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">Vor %1$d Stunde</item>
+        <item quantity="other">Vor %1$d Stunden</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">Vor %1$d Tag</item>
+        <item quantity="other">Vor %1$d Tage</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d25f7be80..a26fd04e6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Dieses Kapitel fehlt auf deinem Gerät. Lade ihn herunter oder lese ihn online.</string>
     <string name="text_downloads_holder">Zurzeit sind keine aktiven Datenübertragungen vorhanden</string>
     <string name="queued">In Warteschlange</string>
-	<string name="about_feedback_4pda">Thema auf 4PDA</string>
+    <string name="about_feedback_4pda">Thema auf 4PDA</string>
     <string name="about_feedback">Rückmeldung</string>
     <string name="about_app_translation">Übersetzung</string>
     <string name="about_app_translation_summary">Diese Anwendung übersetzen</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Kapitel suchen</string>
     <string name="chapters_empty">Keine Kapitel in diesem Manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aussehen</string>
+    <string name="content">Inhalt</string>
+    <string name="suggestions_updating">Vorschläge werden aktualisiert</string>
+    <string name="suggestions_excluded_genres">Genres ausschließen</string>
+    <string name="suggestions_excluded_genres_summary">Geben Sie Genres an, die Sie nicht in den Vorschlägen sehen möchten</string>
+    <string name="text_delete_local_manga_batch">Ausgewählte Elemente dauerhaft vom Gerät löschen\?</string>
+    <string name="batch_manga_save_confirm">Sind Sie sicher, dass Sie alle ausgewählten Mangas mit allen Kapiteln herunterladen möchten\? Diese Aktion kann eine Menge Datenverkehr und Speicherplatz verbrauchen</string>
+    <string name="removal_completed">Entfernung abgeschlossen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 44bb53494..37748a5f1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -205,8 +205,8 @@
     <string name="text_history_holder_secondary">Encuentra qué leer en el menú lateral.</string>
     <string name="text_history_holder_primary">Lo que leas se mostrará aquí</string>
     <string name="text_empty_holder_primary">Está un poco vacío aquí…</string>
-	<string name="search_only_on_s">Buscar sólo en %s</string>
-	<string name="chapter_is_missing">Falta un capítulo</string>
+    <string name="search_only_on_s">Buscar sólo en %s</string>
+    <string name="chapter_is_missing">Falta un capítulo</string>
     <string name="about_app_translation_summary">Traducir esta aplicación</string>
     <string name="about_feedback">Comentarios</string>
     <string name="about_app_translation">Traducción</string>
@@ -253,7 +253,7 @@
     <string name="screenshots_block_nsfw">Bloqueo en NSFW</string>
     <string name="logged_in_as">Conectado como %s</string>
     <string name="find_genre">Encontrar el género</string>
-    <string name="onboard_text">Selecciona los idiomas en los que quieres leer el manga. Puedes cambiarlo más tarde en los ajustes.</string>
+    <string name="onboard_text">Selecciona los idiomas en los que quieres leer mangas. Puedes cambiarlo más tarde en los ajustes.</string>
     <string name="reset_filter">Reiniciar el filtro</string>
     <string name="never">Nunca</string>
     <string name="nsfw">18+</string>
@@ -264,4 +264,9 @@
     <string name="search_chapters">Buscar capítulo</string>
     <string name="chapters_empty">No hay capítulos en este manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aspecto</string>
+    <string name="content">Contenido</string>
+    <string name="suggestions_updating">Actualización de las sugerencias</string>
+    <string name="suggestions_excluded_genres">Excluir géneros</string>
+    <string name="suggestions_excluded_genres_summary">Especifica los géneros que no quieres ver en las sugerencias</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 69ef71847..c6cc64414 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -4,7 +4,7 @@
     <string name="genres">Tyylilajit</string>
     <string name="auth_not_supported_by">%s -valtuutusta ei tueta</string>
     <string name="auth_complete">Valtuutus valmis</string>
-	<string name="about_feedback_4pda">Aihe 4PDA: ssa</string>
+    <string name="about_feedback_4pda">Aihe 4PDA: ssa</string>
     <string name="about_feedback">Palaute</string>
     <string name="about_app_translation">Käännös</string>
     <string name="about_app_translation_summary">Käännä tämä sovellus</string>
@@ -264,4 +264,11 @@
     <string name="percent_string_pattern">%1$s%%</string>
     <string name="various_languages">Eri kieliä</string>
     <string name="chapters_empty">Ei lukuja tässä mangassa</string>
+    <string name="appearance">Ulkonäkö</string>
+    <string name="content">Sisältö</string>
+    <string name="suggestions_updating">Ehdotukset päivitetään</string>
+    <string name="suggestions_excluded_genres_summary">Määritä genret, joita et halua nähdä ehdotuksissa</string>
+    <string name="suggestions_excluded_genres">Sulje pois genrejä</string>
+    <string name="text_delete_local_manga_batch">Poista valitut kohteet laitteesta pysyvästi\?</string>
+    <string name="removal_completed">Poisto valmis</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml
new file mode 100644
index 000000000..f5fb67d73
--- /dev/null
+++ b/app/src/main/res/values-fr/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="minutes_ago">
+        <item quantity="one">Il y a %1$d minute</item>
+        <item quantity="other">Il y a %1$d minutes</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">%1$d page au total</item>
+        <item quantity="other">%1$d pages au total</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d élément</item>
+        <item quantity="other">%1$d éléments</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nouveau chapitre</item>
+        <item quantity="other">%1$d nouveaux chapitres</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d chapitre</item>
+        <item quantity="other">%1$d chapitres</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d chapitre de %2$d</item>
+        <item quantity="other">%1$d chapitres de %2$d</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">Il y a %1$d heure</item>
+        <item quantity="other">Il y a %1$d heures</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">Il y a %1$d jour</item>
+        <item quantity="other">Il y a %1$d jours</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c76fb6027..08206fec0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Téléchargez ou lisez ce chapitre manquant en ligne.</string>
     <string name="text_downloads_holder">Aucun téléchargement actif</string>
     <string name="queued">En file d\'attente</string>
-	<string name="about_feedback_4pda">Sujet sur 4PDA</string>
+    <string name="about_feedback_4pda">Sujet sur 4PDA</string>
     <string name="about_feedback">Remarques</string>
     <string name="about_app_translation">Traduction</string>
     <string name="about_app_translation_summary">Traduire cette application</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Trouver un chapitre</string>
     <string name="chapters_empty">Pas de chapitres dans ce manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Apparence</string>
+    <string name="content">Contenu</string>
+    <string name="suggestions_updating">Mise à jour des suggestions</string>
+    <string name="suggestions_excluded_genres">Exclure des genres</string>
+    <string name="suggestions_excluded_genres_summary">Spécifiez les genres que vous ne voulez pas voir apparaître dans les suggestions</string>
+    <string name="text_delete_local_manga_batch">Supprimer définitivement les éléments sélectionnés de l\'appareil \?</string>
+    <string name="removal_completed">Suppression terminée</string>
+    <string name="batch_manga_save_confirm">Voulez-vous vraiment télécharger tous les mangas sélectionnés avec tous leurs chapitres \? Cette action peut consommer beaucoup de trafic et de stockage</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/plurals.xml b/app/src/main/res/values-it/plurals.xml
new file mode 100644
index 000000000..3a0163201
--- /dev/null
+++ b/app/src/main/res/values-it/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d capitolo da %2$d</item>
+        <item quantity="other">%1$d capitoli da %2$d</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">%1$d pagina in totale</item>
+        <item quantity="other">%1$d pagine in totale</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nuovo capitolo</item>
+        <item quantity="other">%1$d nuovi capitoli</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d élément</item>
+        <item quantity="other">%1$d éléments</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capitolo</item>
+        <item quantity="other">%1$d capitoli</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minuto fa</item>
+        <item quantity="other">%1$d minuti fa</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d ora fa</item>
+        <item quantity="other">%1$d ore fa</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d giorno fa</item>
+        <item quantity="other">%1$d giorni fa</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a1586ed71..7c508afc2 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -217,7 +217,7 @@
     <string name="chapter_is_missing_text">Questo capitolo manca sul tuo dispositivo. Scaricalo o leggilo in linea.</string>
     <string name="text_downloads_holder">Attualmente non ci sono scaricamenti attivi</string>
     <string name="queued">In coda</string>
-	<string name="about_feedback_4pda">Argomento su 4PDA</string>
+    <string name="about_feedback_4pda">Argomento su 4PDA</string>
     <string name="about_feedback">Commenti</string>
     <string name="about_app_translation">Traduzione</string>
     <string name="about_app_translation_summary">Traduci questa applicazione</string>
@@ -264,4 +264,12 @@
     <string name="search_chapters">Trova un capitolo</string>
     <string name="chapters_empty">Nessun capitolo in questo manga</string>
     <string name="percent_string_pattern">%1$s%%</string>
+    <string name="appearance">Aspetto</string>
+    <string name="content">Contenuto</string>
+    <string name="suggestions_updating">Aggiornamento dei suggerimenti</string>
+    <string name="suggestions_excluded_genres_summary">Specifica i generi che non vuoi vedere nei suggerimenti</string>
+    <string name="suggestions_excluded_genres">Escludi generi</string>
+    <string name="removal_completed">Rimozione completata</string>
+    <string name="text_delete_local_manga_batch">Eliminare gli elementi selezionati dal dispositivo in modo permanente\?</string>
+    <string name="batch_manga_save_confirm">Vuoi davvero scaricare tutti i manga selezionati con tutti i loro capitoli\? Questa azione può consumare molto traffico e memoria</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 047d27672..7aa767327 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -42,8 +42,8 @@
     <string name="clear">クリア</string>
     <string name="text_clear_history_prompt">すべての履歴を永久にクリアしますか？</string>
     <string name="remove">削除</string>
-    <string name="_s_removed_from_history">\"%s\"が履歴から削除されました</string>
-    <string name="_s_deleted_from_local_storage">\"%s \"がローカルストレージから削除されました</string>
+    <string name="_s_removed_from_history">「%s」が履歴から削除されました</string>
+    <string name="_s_deleted_from_local_storage">「%s 」がローカルストレージから削除されました</string>
     <string name="wait_for_loading_finish">読み込みが完了するまでお待ちください…</string>
     <string name="save_page">ページを保存</string>
     <string name="page_saved">保存しました</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c677ff53a..1e49f0f52 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -51,8 +51,8 @@
     <string name="pages">Páginas</string>
     <string name="clear">Limpar</string>
     <string name="remove">Remover</string>
-    <string name="_s_removed_from_history">\"%s\" removido do histórico</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" excluído do armazenamento local</string>
+    <string name="_s_removed_from_history">“%s” removido do histórico</string>
+    <string name="_s_deleted_from_local_storage">“%s” excluído do armazenamento local</string>
     <string name="wait_for_loading_finish">Aguarde o carregamento terminar…</string>
     <string name="save_page">Salvar página</string>
     <string name="page_saved">Salvou</string>
@@ -70,7 +70,7 @@
     <string name="grid_size">Tamanho da grade</string>
     <string name="search_on_s">Pesquisar em %s</string>
     <string name="delete_manga">Excluir mangá</string>
-    <string name="text_delete_local_manga">Excluir \"%s\" do dispositivo permanentemente\?</string>
+    <string name="text_delete_local_manga">Excluir “%s” do dispositivo permanentemente\?</string>
     <string name="reader_settings">Configurações do leitor</string>
     <string name="taps_on_edges">Toques de borda</string>
     <string name="volume_buttons">Botões de volume</string>
@@ -233,7 +233,7 @@
     <string name="application_update">Verifique se há novas versões do aplicativo</string>
     <string name="favourites_categories">Categorias favoritas</string>
     <string name="show_notification_new_chapters">Notificar sobre atualizações de mangá que você está lendo</string>
-    <string name="category_delete_confirm">Remover a categoria \"%s\" dos seus favoritos\?
+    <string name="category_delete_confirm">Remover a categoria “%s” dos seus favoritos\?
 \nTodos os mangás nela serão perdidos.</string>
     <string name="no_update_available">Nenhuma atualização disponível</string>
     <string name="create_category">Nova categoria</string>
@@ -266,4 +266,5 @@
     <string name="percent_string_pattern">%1$s%%</string>
     <string name="suggestions_updating">Atualização de sugestões</string>
     <string name="appearance">Aparência</string>
+    <string name="content">Conteúdo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 0f0d99fc0..b23edc825 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -41,8 +41,8 @@
     <string name="clear">Limpar</string>
     <string name="text_clear_history_prompt">Limpar todo o histórico de leitura permanentemente\?</string>
     <string name="remove">Remover</string>
-    <string name="_s_removed_from_history">\"%s\" removido do histórico</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" deletado do armazenamento local</string>
+    <string name="_s_removed_from_history">«%s» removido do histórico</string>
+    <string name="_s_deleted_from_local_storage">«%s» deletado do armazenamento local</string>
     <string name="wait_for_loading_finish">Aguarde o carregamento terminar…</string>
     <string name="save_page">Salvar página</string>
     <string name="page_saved">Salvou</string>
@@ -103,7 +103,7 @@
     <string name="chapters">Capítulos</string>
     <string name="add_new_category">Nova categoria</string>
     <string name="warning">Aviso</string>
-    <string name="text_delete_local_manga">Excluir \"%s\" do dispositivo permanentemente\?</string>
+    <string name="text_delete_local_manga">Excluir «%s» do dispositivo permanentemente\?</string>
     <string name="text_file_not_supported">Escolha um arquivo ZIP ou CBZ.</string>
     <string name="clear_search_history">Limpar histórico de pesquisa</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Ativado %1$d de %2$d</string>
@@ -185,7 +185,7 @@
     <string name="about_app_translation_summary">Traduzir esta aplicação</string>
     <string name="about_feedback">Comentar</string>
     <string name="about_feedback_4pda">Tópico no 4PDA</string>
-	<string name="chapter_is_missing_text">Baixe ou leia este capítulo perdido online.</string>
+    <string name="chapter_is_missing_text">Baixe ou leia este capítulo perdido online.</string>
     <string name="chapter_is_missing">O capítulo está em falta</string>
     <string name="auth_complete">Autorizado</string>
     <string name="auth_not_supported_by">O login em %s não é suportado</string>
@@ -195,8 +195,8 @@
     <string name="vibration">Vibração</string>
     <string name="cannot_find_available_storage">Sem armazenamento disponível</string>
     <string name="favourites_categories">Categorias favoritas</string>
-    <string name="category_delete_confirm">Remover a categoria \"%s\" dos seus favoritos\?
-\nTodos os mangás nela serão perdidos..</string>
+    <string name="category_delete_confirm">Remover a categoria «%s» dos seus favoritos\?
+\nTodos os mangás nela serão perdidos.</string>
     <string name="text_history_holder_secondary">Encontre o que ler no menu lateral.</string>
     <string name="text_local_holder_secondary">Salve-o de fontes online ou importe arquivos.</string>
     <string name="recent_manga">Recente</string>
@@ -261,4 +261,10 @@
     <string name="logged_in_as">Conectado como %s</string>
     <string name="nsfw">18+</string>
     <string name="various_languages">Vários idiomas</string>
+    <string name="suggestions_updating">Atualização das sugestões</string>
+    <string name="appearance">Aparência</string>
+    <string name="search_chapters">Encontrar capítulo</string>
+    <string name="content">Conteúdo</string>
+    <string name="chapters_empty">Não há capítulos nesta manga</string>
+    <string name="percent_string_pattern">%1$s%%</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f7b8c300f..fcd97d286 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -45,8 +45,8 @@
     <string name="clear">Temizle</string>
     <string name="text_clear_history_prompt">Tüm okuma geçmişi kalıcı olarak silinsin mi\?</string>
     <string name="remove">Kaldır</string>
-    <string name="_s_removed_from_history">\"%s\" geçmişinden kaldırıldı</string>
-    <string name="_s_deleted_from_local_storage">\"%s\" yerel depolama alanından sil</string>
+    <string name="_s_removed_from_history">“%s” geçmişinden kaldırıldı</string>
+    <string name="_s_deleted_from_local_storage">“%s” yerel depolama alanından sil</string>
     <string name="wait_for_loading_finish">Lütfen bitmesini bekleyin…</string>
     <string name="save_page">Sayfayı kaydet</string>
     <string name="share_image">Resmi paylaş</string>
@@ -117,7 +117,7 @@
     <string name="pages_animation">Sayfa animasyonu</string>
     <string name="cannot_find_available_storage">Kullanılabilir depolama alanı yok</string>
     <string name="rename">Yeniden adlandır</string>
-    <string name="text_delete_local_manga">\"%s\" cihazdan kalıcı olarak silinsin mi\?</string>
+    <string name="text_delete_local_manga">“%s” cihazdan kalıcı olarak silinsin mi\?</string>
     <string name="clear_search_history">Arama geçmişini temizle</string>
     <string name="text_empty_holder_primary">Burası biraz boş…</string>
     <string name="rotate_screen">Ekranı döndür</string>
@@ -140,7 +140,7 @@
     <string name="taps_on_edges">Kenar dokunuşları</string>
     <string name="large_manga_save_confirm">Bu mangada %s var. Hepsi kaydedilsin mi\?</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d / %2$d açık</string>
-    <string name="category_delete_confirm">\"%s\" kategorisi favorilerinizden kaldırılsın mı\?
+    <string name="category_delete_confirm">“%s” kategorisi favorilerinizden kaldırılsın mı\?
 \nİçindeki tüm mangalar kaybolacak.</string>
     <string name="text_search_holder_secondary">Sorguyu yeniden biçimlendirmeyi deneyin.</string>
     <string name="text_history_holder_primary">Okuduklarınız burada görüntülenecek</string>

From 3f2ee2a9252536def70ce4a6d5e9e2c9f529204b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Fri, 15 Apr 2022 12:57:30 +0200
Subject: [PATCH 022/104] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Norwegian Bokmål)

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/nb_NO/
Translation: Kotatsu/plurals
---
 app/src/main/res/values-nb-rNO/plurals.xml | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/src/main/res/values-nb-rNO/plurals.xml

diff --git a/app/src/main/res/values-nb-rNO/plurals.xml b/app/src/main/res/values-nb-rNO/plurals.xml
new file mode 100644
index 000000000..e25bf53dd
--- /dev/null
+++ b/app/src/main/res/values-nb-rNO/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Totalt %1$d side</item>
+        <item quantity="other">Totalt %1$d sider</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nytt kapittel</item>
+        <item quantity="other">%1$d nye kapitler</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d kapittel</item>
+        <item quantity="other">%1$d kapitler</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d kapitler fra %2$d</item>
+        <item quantity="other">%1$d kapitler fra %2$d</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d time siden</item>
+        <item quantity="other">%1$d timer siden</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d dag siden</item>
+        <item quantity="other">%1$d dager siden</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d element</item>
+        <item quantity="other">%1$d elementer</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minutt siden</item>
+        <item quantity="other">%1$d minutter siden</item>
+    </plurals>
+</resources>
\ No newline at end of file

From f7f9c5346626626a3af909864204f3e16a7f4a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Santiago=20Jos=C3=A9=20Guti=C3=A9rrez=20Llanos?=
 <gutierrezapata17@gmail.com>
Date: Fri, 15 Apr 2022 12:57:31 +0200
Subject: [PATCH 023/104] Translated using Weblate (Spanish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (274 of 274 strings)

Co-authored-by: Santiago José Gutiérrez Llanos <gutierrezapata17@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/es/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/es/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-es/plurals.xml | 66 +++++++++++++-------------
 app/src/main/res/values-es/strings.xml |  3 ++
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/app/src/main/res/values-es/plurals.xml b/app/src/main/res/values-es/plurals.xml
index d68590bf5..4228a55bc 100644
--- a/app/src/main/res/values-es/plurals.xml
+++ b/app/src/main/res/values-es/plurals.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<plurals name="pages">
-		<item quantity="one">Total %1$d página</item>
-		<item quantity="other">Total %1$d páginas</item>
-	</plurals>
-	<plurals name="items">
-		<item quantity="one">%1$d elemento</item>
-		<item quantity="other">%1$d elementos</item>
-	</plurals>
-	<plurals name="new_chapters">
-		<item quantity="one">%1$d nuevo capítulo</item>
-		<item quantity="other">%1$d nuevos capítulos</item>
-	</plurals>
-	<plurals name="chapters">
-		<item quantity="one">%1$d capítulo</item>
-		<item quantity="other">%1$d capítulos</item>
-	</plurals>
-	<plurals name="chapters_from_x">
-		<item quantity="one">%1$d capítulo desde %2$d</item>
-		<item quantity="other">%1$d capítulos desde %2$d</item>
-	</plurals>
-	<plurals name="minutes_ago">
-		<item quantity="one">%hace 1$d minuto</item>
-		<item quantity="other">hace %1$d minutos</item>
-	</plurals>
-	<plurals name="hours_ago">
-		<item quantity="one">hace %1$d hora</item>
-		<item quantity="other">hace %1$d horas</item>
-	</plurals>
-	<plurals name="days_ago">
-		<item quantity="one">hace %1$d día</item>
-		<item quantity="other">hace %1$d días</item>
-	</plurals>
-</resources>
+    <plurals name="pages">
+        <item quantity="one">Total %1$d página</item>
+        <item quantity="other">Total %1$d páginas</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d elemento</item>
+        <item quantity="other">%1$d elementos</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nuevo capítulo</item>
+        <item quantity="other">%1$d nuevos capítulos</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capítulo</item>
+        <item quantity="other">%1$d capítulos</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d capítulo desde %2$d</item>
+        <item quantity="other">%1$d capítulos desde %2$d</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">hace %1$d minuto</item>
+        <item quantity="other">hace %1$d minutos</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">hace %1$d hora</item>
+        <item quantity="other">hace %1$d horas</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">hace %1$d día</item>
+        <item quantity="other">hace %1$d días</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 37748a5f1..9cde0edc3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -269,4 +269,7 @@
     <string name="suggestions_updating">Actualización de las sugerencias</string>
     <string name="suggestions_excluded_genres">Excluir géneros</string>
     <string name="suggestions_excluded_genres_summary">Especifica los géneros que no quieres ver en las sugerencias</string>
+    <string name="removal_completed">Remoción completada</string>
+    <string name="batch_manga_save_confirm">¿Estás seguro de que quieres descargar todos los manga seleccionados con todos sus capítulos\? Esta acción puede consumir mucho tráfico y almacenamiento</string>
+    <string name="text_delete_local_manga_batch">¿Eliminar elementos seleccionados del dispositivo de forma permanente\?</string>
 </resources>
\ No newline at end of file

From 36e21caf96e7528cdf38ad9b2f1f56d6146e9352 Mon Sep 17 00:00:00 2001
From: Luiz-bro <luiznneto1@gmail.com>
Date: Fri, 15 Apr 2022 12:57:31 +0200
Subject: [PATCH 024/104] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (8 of 8 strings)

Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (274 of 274 strings)

Co-authored-by: Luiz-bro <luiznneto1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-pt-rBR/plurals.xml | 35 +++++++++++++++++++++-
 app/src/main/res/values-pt-rBR/strings.xml |  5 ++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-pt-rBR/plurals.xml b/app/src/main/res/values-pt-rBR/plurals.xml
index a6b3daec9..350c1c932 100644
--- a/app/src/main/res/values-pt-rBR/plurals.xml
+++ b/app/src/main/res/values-pt-rBR/plurals.xml
@@ -1,2 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <plurals name="items">
+        <item quantity="one">%1$d item</item>
+        <item quantity="other">%1$d itens</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d capítulo</item>
+        <item quantity="other">%1$d capítulos</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d capítulo de %2$d</item>
+        <item quantity="other">%1$d capítulos de %2$d</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">Total de %1$d página</item>
+        <item quantity="other">Total de %1$d páginas</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d novo capítulo</item>
+        <item quantity="other">%1$d novos capítulos</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minuto atrás</item>
+        <item quantity="other">%1$d minutos atrás</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d hora atrás</item>
+        <item quantity="other">%1$d horas atrás</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d dia atrás</item>
+        <item quantity="other">%1$d dias atrás</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1e49f0f52..5097c09fe 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -267,4 +267,9 @@
     <string name="suggestions_updating">Atualização de sugestões</string>
     <string name="appearance">Aparência</string>
     <string name="content">Conteúdo</string>
+    <string name="suggestions_excluded_genres">Excluir gêneros</string>
+    <string name="suggestions_excluded_genres_summary">Especifique os gêneros que você não deseja ver nas sugestões</string>
+    <string name="removal_completed">Remoção concluída</string>
+    <string name="text_delete_local_manga_batch">Excluir itens selecionados do dispositivo permanentemente\?</string>
+    <string name="batch_manga_save_confirm">Tem certeza de que deseja baixar todos os mangás selecionados com todos os seus capítulos\? Essa ação pode consumir muito tráfego e armazenamento</string>
 </resources>
\ No newline at end of file

From 1c73d54a9434c1fb43c9131eb41a952271f4299a Mon Sep 17 00:00:00 2001
From: lowak <lowak@pm.me>
Date: Fri, 15 Apr 2022 12:57:31 +0200
Subject: [PATCH 025/104] Translated using Weblate (Swedish)

Currently translated at 100.0% (274 of 274 strings)

Translated using Weblate (Swedish)

Currently translated at 41.6% (114 of 274 strings)

Translated using Weblate (Swedish)

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Swedish)

Added translation using Weblate (Swedish)

Co-authored-by: lowak <lowak@pm.me>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/sv/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/sv/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-sv/plurals.xml |  35 ++++
 app/src/main/res/values-sv/strings.xml | 275 +++++++++++++++++++++++++
 2 files changed, 310 insertions(+)
 create mode 100644 app/src/main/res/values-sv/plurals.xml
 create mode 100644 app/src/main/res/values-sv/strings.xml

diff --git a/app/src/main/res/values-sv/plurals.xml b/app/src/main/res/values-sv/plurals.xml
new file mode 100644
index 000000000..3c89683d3
--- /dev/null
+++ b/app/src/main/res/values-sv/plurals.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="pages">
+        <item quantity="one">Totalt %1$d sida</item>
+        <item quantity="other">Totalt %1$d sidor</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d artikel</item>
+        <item quantity="other">%1$d artiklar</item>
+    </plurals>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d nytt kapitel</item>
+        <item quantity="other">%1$d nya kapitel</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d kapitel</item>
+        <item quantity="other">%1$d kapitel</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d kapitel från %2$d</item>
+        <item quantity="other">%1$d kapitel från %2$d</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d minut sedan</item>
+        <item quantity="other">%1$d minuter sedan</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d timme sedan</item>
+        <item quantity="other">%1$d timmar sedan</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d dag sedan</item>
+        <item quantity="other">%1$d dagar sedan</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 000000000..6a84c9707
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="light">Ljust</string>
+    <string name="pages">Sidor</string>
+    <string name="text_file_not_supported">Välj en ZIP- eller CBZ-fil.</string>
+    <string name="close_menu">Stäng meny</string>
+    <string name="open_menu">Öppna meny</string>
+    <string name="local_storage">Lokal lagring</string>
+    <string name="favourites">Favoriter</string>
+    <string name="history">Historik</string>
+    <string name="error_occurred">Ett fel har inträffat</string>
+    <string name="network_error">Lyckades inte ansluta till internet</string>
+    <string name="details">Detaljer</string>
+    <string name="chapters">Kapitel</string>
+    <string name="list">Lista</string>
+    <string name="detailed_list">Detaljerad lista</string>
+    <string name="grid">Rutnät</string>
+    <string name="list_mode">Listläge</string>
+    <string name="settings">Inställningar</string>
+    <string name="remote_sources">Källor</string>
+    <string name="loading_">Laddar…</string>
+    <string name="computing_">Beräknar…</string>
+    <string name="chapter_d_of_d">Kapitel %1$d av %2$d</string>
+    <string name="close">Stäng</string>
+    <string name="try_again">Försök igen</string>
+    <string name="clear_history">Rensa historik</string>
+    <string name="nothing_found">Ingenting hittades</string>
+    <string name="history_is_empty">Ingen historik än</string>
+    <string name="download_complete">Nedladdat</string>
+    <string name="downloads">Nedladdningar</string>
+    <string name="by_name">Namn</string>
+    <string name="popular">Populärt</string>
+    <string name="updated">Uppdaterat</string>
+    <string name="add_to_favourites">Lägg till som favorit</string>
+    <string name="filter">Filter</string>
+    <string name="standard">Standard</string>
+    <string name="read">Läs</string>
+    <string name="enter_category_name">Ange kategorins namn</string>
+    <string name="you_have_not_favourites_yet">Inga favoriter än</string>
+    <string name="save">Spara</string>
+    <string name="create_shortcut">Skapa genväg…</string>
+    <string name="manga_downloading_">Laddar ned…</string>
+    <string name="processing_">Behandlar…</string>
+    <string name="theme">Tema</string>
+    <string name="automatic">Systemtema</string>
+    <string name="remove">Ta bort</string>
+    <string name="text_file_sizes">B|kB|MB|GB|TB</string>
+    <string name="add_new_category">Ny kategori</string>
+    <string name="search">Sök</string>
+    <string name="by_rating">Betyg</string>
+    <string name="add">Lägg till</string>
+    <string name="share">Dela</string>
+    <string name="share_s">Dela %s</string>
+    <string name="search_manga">Sök manga</string>
+    <string name="cache">Cache</string>
+    <string name="show_notification_app_update">Visa en notifikation om en nyare version av äpplen finns tillgänglig</string>
+    <string name="newest">Nyaste</string>
+    <string name="sort_order">Sorteringsordning</string>
+    <string name="dark">Mörkt</string>
+    <string name="operation_not_supported">Denna åtgärden stöds inte</string>
+    <string name="no_description">Ingen beskrivning</string>
+    <string name="history_and_cache">Historik och cache</string>
+    <string name="clear">Rensa</string>
+    <string name="text_clear_history_prompt">Rensa all läshistorik permanent\?</string>
+    <string name="_s_removed_from_history">\"%s\" borttagen från historik</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" borttaget från lokal lagring</string>
+    <string name="wait_for_loading_finish">Vänta tills laddningen är klar…</string>
+    <string name="save_page">Spara sida</string>
+    <string name="page_saved">Sparad</string>
+    <string name="share_image">Dela bild</string>
+    <string name="_import">Importera</string>
+    <string name="delete">Ta bort</string>
+    <string name="clear_pages_cache">Rensa sidcache</string>
+    <string name="text_delete_local_manga">Ta permanent bort \"%s\" från den här enheten\?</string>
+    <string name="volume_buttons">Volymknappar</string>
+    <string name="cancelling_">Avbryter…</string>
+    <string name="error">Error</string>
+    <string name="webtoon">Webtoon</string>
+    <string name="read_mode">Läsläge</string>
+    <string name="grid_size">Rutnätsstorlek</string>
+    <string name="search_on_s">Sök på %s</string>
+    <string name="delete_manga">Ta bort manga</string>
+    <string name="reader_settings">Läsarinställningar</string>
+    <string name="switch_pages">Byt sida</string>
+    <string name="taps_on_edges">Kanttryck</string>
+    <string name="_continue">Fortsätt</string>
+    <string name="warning">Varning</string>
+    <string name="network_consumption_warning">Detta kan kräva mycket dataöverföring</string>
+    <string name="dont_ask_again">Fråga inte igen</string>
+    <string name="search_history_cleared">Rensat</string>
+    <string name="clear_thumbs_cache">Rensa cache för miniatyrer</string>
+    <string name="open_in_browser">Öppna i webbläsare</string>
+    <string name="notifications">Notifikationer</string>
+    <string name="clear_search_history">Rensa sökhistorik</string>
+    <string name="domain">Domän</string>
+    <string name="gestures_only">Endast gester</string>
+    <string name="internal_storage">Internlagring</string>
+    <string name="external_storage">Externlagring</string>
+    <string name="application_update">Kolla om det finns en nyare version av appen</string>
+    <string name="app_update_available">En ny version av appen finns tillgänglig</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d av %2$d aktiva</string>
+    <string name="new_chapters">Nya kapitel</string>
+    <string name="large_manga_save_confirm">Den här mangan har %s. Spara hela\?</string>
+    <string name="save_manga">Spara</string>
+    <string name="download">Ladda ned</string>
+    <string name="notifications_settings">Notifikationsinställningar</string>
+    <string name="light_indicator">LED-indikator</string>
+    <string name="show_notification_new_chapters">Notifiera om uppdateringar på manga du läser</string>
+    <string name="read_from_start">Läs från början</string>
+    <string name="restart">Starta om</string>
+    <string name="notification_sound">Notifikationsljud</string>
+    <string name="vibration">Vibration</string>
+    <string name="favourites_categories">Favoritkategorier</string>
+    <string name="no_update_available">Inga tillgängliga uppdateringar</string>
+    <string name="backup_information">Du kan säkerhetskopiera din historik och dina favoriter och återställa senare</string>
+    <string name="just_now">Just nu</string>
+    <string name="yesterday">Igår</string>
+    <string name="long_ago">Länge sedan</string>
+    <string name="group">Grupp</string>
+    <string name="today">Idag</string>
+    <string name="tap_to_try_again">Tryck för att försöka igen</string>
+    <string name="reader_mode_hint">Den valda konfigurationen kommer att bli ihågkommen för denna manga</string>
+    <string name="silent">Tyst</string>
+    <string name="cookies_cleared">Alla kakor rensades</string>
+    <string name="chapters_checking_progress">Letar efter nya kapitel: %1$d av %2$d</string>
+    <string name="clear_feed">Rensa flöde</string>
+    <string name="text_clear_updates_feed_prompt">Permanent rensa all uppdateringshistorik\?</string>
+    <string name="check_for_new_chapters">Leta efter nya kapitel</string>
+    <string name="reverse">Omvänt</string>
+    <string name="sign_in">Logga in</string>
+    <string name="auth_required">Logga in för att visa innehåll</string>
+    <string name="default_s">Standard: %s</string>
+    <string name="_and_x_more">...och %1$d till</string>
+    <string name="next">Nästa</string>
+    <string name="password_length_hint">Lösenordet måste vara minst 4 tecken</string>
+    <string name="search_only_on_s">Sök endast på %s</string>
+    <string name="text_clear_search_history_prompt">Permanent rensa alla senaste sökfrågor\?</string>
+    <string name="other">Annat</string>
+    <string name="welcome">Välkommen</string>
+    <string name="tracker_warning">Vissa enheter har olika systembeteende vilket kan ha sönder bakgrundsjobb.</string>
+    <string name="read_more">Läs mer</string>
+    <string name="queued">Köad</string>
+    <string name="text_downloads_holder">Inga aktiva nedladdningar</string>
+    <string name="chapter_is_missing_text">Ladda ned eller läs det saknade kapitlet online.</string>
+    <string name="chapter_is_missing">Kapitlet saknas</string>
+    <string name="about_app_translation_summary">Översätt denna app</string>
+    <string name="about_app_translation">Översättning</string>
+    <string name="about_feedback">Feedback</string>
+    <string name="about_feedback_4pda">Ämne på 4PDA</string>
+    <string name="auth_complete">Auktoriserad</string>
+    <string name="auth_not_supported_by">Inloggning på %s stöds inte</string>
+    <string name="state_finished">Färdig</string>
+    <string name="exclude_nsfw_from_history">Exkludera vuxeninnehåll från historiken</string>
+    <string name="error_empty_name">Du måste ange ett namn</string>
+    <string name="show_pages_numbers">Numrerade sidor</string>
+    <string name="enabled_sources">Aktiva källor</string>
+    <string name="available_sources">Tillgängliga källor</string>
+    <string name="dynamic_theme">Dynamiskt tema</string>
+    <string name="dynamic_theme_summary">Tillämpar ett tema skapat utifrån din bakgrundsbild</string>
+    <string name="importing_progress">Importerar manga: %1$d av %2$d</string>
+    <string name="screenshots_policy">Policy för skärmdumpar</string>
+    <string name="screenshots_allow">Tillåt</string>
+    <string name="screenshots_block_nsfw">Blockera på vuxeninnehåll</string>
+    <string name="screenshots_block_all">Blockera alltid</string>
+    <string name="suggestions">Förslag</string>
+    <string name="suggestions_enable">Aktivera förslag</string>
+    <string name="suggestions_summary">Föreslå manga baserat på dina preferenser</string>
+    <string name="suggestions_info">Alla data analyseras lokalt på denna enhet. Dina personuppgifter kommer inte överföras till någon tjänst</string>
+    <string name="text_suggestion_holder">Börja läsa manga för att få personliga förslag</string>
+    <string name="exclude_nsfw_from_suggestions">Föreslå inte manga med vuxeninnehåll</string>
+    <string name="enabled">Aktiverad</string>
+    <string name="disabled">Inaktiverad</string>
+    <string name="filter_load_error">Kunde inte ladda genrelistan</string>
+    <string name="reset_filter">Återställ filter</string>
+    <string name="find_genre">Hitta genre</string>
+    <string name="onboard_text">Välj det språk som du vill läsa manga på. Du kan ändra detta i inställningarna senare.</string>
+    <string name="never">Aldrig</string>
+    <string name="only_using_wifi">Endast på Wi-Fi</string>
+    <string name="always">Alltid</string>
+    <string name="preload_pages">Förladdning av sidor</string>
+    <string name="logged_in_as">Inloggad som %s</string>
+    <string name="nsfw">18+</string>
+    <string name="various_languages">Olika språk</string>
+    <string name="search_chapters">Hitta kapitel</string>
+    <string name="chapters_empty">Inga kapitel i denna manga</string>
+    <string name="appearance">Utseende</string>
+    <string name="content">Innehåll</string>
+    <string name="suggestions_updating">Uppdaterar förslag</string>
+    <string name="suggestions_excluded_genres">Uteslut genrer</string>
+    <string name="suggestions_excluded_genres_summary">Ange genrer som du inte vill få förslag på</string>
+    <string name="removal_completed">Borttagningen slutförd</string>
+    <string name="text_empty_holder_primary">Här var det tomt…</string>
+    <string name="rename">Byt namn</string>
+    <string name="category_delete_confirm">Ta bort kategorin \"%s\" från dina favoriter\?
+\nAllt innehåll kommer förloras.</string>
+    <string name="text_categories_holder">Du kan använda kategorier för att organisera din a favoriter. Tryck på «+» för att skapa en ny kategori</string>
+    <string name="categories_">Kategorier…</string>
+    <string name="feed_will_update_soon">Flödesuppdatering påbörjas snart</string>
+    <string name="restore_backup">Återställ från säkerhetskopia</string>
+    <string name="text_search_holder_secondary">Försök att omformulera frågan.</string>
+    <string name="text_history_holder_primary">Det du läser kommer att visas här</string>
+    <string name="text_local_holder_primary">Spara något först</string>
+    <string name="manga_shelf">Hylla</string>
+    <string name="remove_category">Ta bort</string>
+    <string name="create_category">Ny kategori</string>
+    <string name="text_history_holder_secondary">Hitta ny läsning i sidomenyn.</string>
+    <string name="pages_animation">Sidanimation</string>
+    <string name="favourites_category_empty">Tom kategori</string>
+    <string name="read_later">Läs senare</string>
+    <string name="updates">Uppdateringar</string>
+    <string name="new_version_s">Ny version: %s</string>
+    <string name="text_local_holder_secondary">Hämta från onlinekällor eller importera filer.</string>
+    <string name="recent_manga">Nytt</string>
+    <string name="manga_save_location">Mapp för nedladdningar</string>
+    <string name="not_available">Ej tillgänglig</string>
+    <string name="other_storage">Annan lagring</string>
+    <string name="text_feed_holder">Nya kapitel av det du läser visas här</string>
+    <string name="rotate_screen">Rotera skärm</string>
+    <string name="cannot_find_available_storage">Inget tillgängligt lagringsutrymme</string>
+    <string name="done">Färdig</string>
+    <string name="related">Relaterat</string>
+    <string name="size_s">Storlek: %s</string>
+    <string name="waiting_for_network">Väntar på nätverk…</string>
+    <string name="update">Uppdatera</string>
+    <string name="enter_password">Ange lösenord</string>
+    <string name="checking_for_updates">Letar efter uppdateringar…</string>
+    <string name="all_favourites">Alla favoriter</string>
+    <string name="protect_application_summary">Fråga efter lösenord när appen startas</string>
+    <string name="search_results">Sökresultat</string>
+    <string name="clear_updates_feed">Rensa uppdateringsflödet</string>
+    <string name="track_sources">Leta efter uppdateringar</string>
+    <string name="updates_feed_cleared">Rensat</string>
+    <string name="dont_check">Kontrollera inte</string>
+    <string name="protect_application">Skydda appen</string>
+    <string name="wrong_password">Fel lösenord</string>
+    <string name="repeat_password">Repetera lösenord</string>
+    <string name="passwords_mismatch">Lösenord stämmer inte överens</string>
+    <string name="about">Om</string>
+    <string name="app_version">Version %s</string>
+    <string name="check_for_updates">Leta efter uppdateringar</string>
+    <string name="right_to_left">Höger-till-vänster (←)</string>
+    <string name="update_check_failed">Kunde inte leta efter uppdateringar</string>
+    <string name="scale_mode">Skalningsläge</string>
+    <string name="zoom_mode_fit_center">Centrera</string>
+    <string name="zoom_mode_fit_height">Anpassa mot höjd</string>
+    <string name="zoom_mode_keep_start">Anpassa till start</string>
+    <string name="prefer_rtl_reader">Föredra höger-till-vänster (←) läsare</string>
+    <string name="preparing_">Förbereder…</string>
+    <string name="prefer_rtl_reader_summary">Läsläge kan sättas up separat för varje serie</string>
+    <string name="zoom_mode_fit_width">Anpassa mot bredd</string>
+    <string name="black_dark_theme">Svart</string>
+    <string name="black_dark_theme_summary">Använder mindre ström på AMOLED-skärmar</string>
+    <string name="restart_required">Omstart krävs</string>
+    <string name="backup_restore">Säkerhetskopiering och återställning</string>
+    <string name="create_backup">Skapa säkerhetskopia</string>
+    <string name="data_restored">Återställd</string>
+    <string name="report_github">Skapa en felrapport på GitHub</string>
+    <string name="data_restored_with_errors">Datan återställdes men det förekommer fel</string>
+    <string name="data_restored_success">All data återställdes</string>
+    <string name="file_not_found">Filen hittades inte</string>
+    <string name="captcha_required">CAPTCHA krävs</string>
+    <string name="captcha_solve">Lös</string>
+    <string name="clear_cookies">Rensa kakor</string>
+    <string name="confirm">Bekräfta</string>
+    <string name="protect_application_subtitle">Ange ett lösenord för att starta appen med</string>
+    <string name="backup_saved">Säkerhetskopia sparad</string>
+    <string name="genres">Genrer</string>
+    <string name="state_ongoing">Pågående</string>
+    <string name="date_format">Datumformat</string>
+    <string name="system_default">Standard</string>
+    <string name="text_clear_cookies_prompt">Du kommer loggas ut från alla källor</string>
+    <string name="text_delete_local_manga_batch">Vill du ta bort markerade objekt från enheten permanent\?</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="batch_manga_save_confirm">Är du säker på att du vill ladda ner alla utvalda manga med alla kapitel\? Den här åtgärden kan kräva mycket nätverkstrafik och lagringsutrymme</string>
+</resources>
\ No newline at end of file

From 6b99e360e0e57e9e7207cb41217721e89f7c0c96 Mon Sep 17 00:00:00 2001
From: Sergio Varela <sergitroll9@gmail.com>
Date: Fri, 15 Apr 2022 12:57:32 +0200
Subject: [PATCH 026/104] Added translation using Weblate (Basque)

Added translation using Weblate (Basque)

Co-authored-by: Sergio Varela <sergitroll9@gmail.com>
---
 app/src/main/res/values-eu/plurals.xml | 2 ++
 app/src/main/res/values-eu/strings.xml | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 app/src/main/res/values-eu/plurals.xml
 create mode 100644 app/src/main/res/values-eu/strings.xml

diff --git a/app/src/main/res/values-eu/plurals.xml b/app/src/main/res/values-eu/plurals.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-eu/plurals.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-eu/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 74c9fa94886bcc26e611d8293b874c9a8ec77c72 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 16 Apr 2022 14:54:31 +0300
Subject: [PATCH 027/104] Option to save manga from history and favourites
 lists

---
 .../ui/list/FavouritesListFragment.kt          |  8 ++++++++
 .../kotatsu/history/ui/HistoryListFragment.kt  |  8 ++++++++
 app/src/main/res/menu/mode_favourites.xml      |  6 ++++++
 app/src/main/res/menu/mode_history.xml         | 18 ++++++++++++------
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
index 1bfd8766a..f2748622c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
@@ -7,6 +7,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.withArgs
 
 class FavouritesListFragment : MangaListFragment() {
@@ -27,6 +28,13 @@ class FavouritesListFragment : MangaListFragment() {
 		return super.onCreateActionMode(mode, menu)
 	}
 
+	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none {
+			it.source == MangaSource.LOCAL
+		}
+		return super.onPrepareActionMode(mode, menu)
+	}
+
 	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
index bdc5cc5c2..6980b80ee 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/ui/HistoryListFragment.kt
@@ -10,6 +10,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.list.ui.MangaListFragment
+import org.koitharu.kotatsu.parsers.model.MangaSource
 
 class HistoryListFragment : MangaListFragment() {
 
@@ -61,6 +62,13 @@ class HistoryListFragment : MangaListFragment() {
 		return super.onCreateActionMode(mode, menu)
 	}
 
+	override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+		menu.findItem(R.id.action_save)?.isVisible = selectedItems.none {
+			it.source == MangaSource.LOCAL
+		}
+		return super.onPrepareActionMode(mode, menu)
+	}
+
 	override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.action_remove -> {
diff --git a/app/src/main/res/menu/mode_favourites.xml b/app/src/main/res/menu/mode_favourites.xml
index 8718fee23..a9aabe62e 100644
--- a/app/src/main/res/menu/mode_favourites.xml
+++ b/app/src/main/res/menu/mode_favourites.xml
@@ -15,6 +15,12 @@
 		android:title="@string/remove"
 		app:showAsAction="ifRoom|withText" />
 
+	<item
+		android:id="@+id/action_save"
+		android:icon="@drawable/ic_save"
+		android:title="@string/save"
+		app:showAsAction="ifRoom|withText" />
+
 	<item
 		android:id="@+id/action_select_all"
 		android:icon="?actionModeSelectAllDrawable"
diff --git a/app/src/main/res/menu/mode_history.xml b/app/src/main/res/menu/mode_history.xml
index 90459c9ac..0f15dd2cb 100644
--- a/app/src/main/res/menu/mode_history.xml
+++ b/app/src/main/res/menu/mode_history.xml
@@ -9,16 +9,22 @@
 		android:title="@string/share"
 		app:showAsAction="ifRoom|withText" />
 
-	<item
-		android:id="@+id/action_favourite"
-		android:icon="@drawable/ic_heart_outline"
-		android:title="@string/add_to_favourites"
-		app:showAsAction="ifRoom|withText" />
-
 	<item
 		android:id="@+id/action_remove"
 		android:icon="@drawable/ic_delete"
 		android:title="@string/remove"
 		app:showAsAction="ifRoom|withText" />
 
+	<item
+		android:id="@+id/action_save"
+		android:icon="@drawable/ic_save"
+		android:title="@string/save"
+		app:showAsAction="ifRoom|withText" />
+
+	<item
+		android:id="@+id/action_favourite"
+		android:icon="@drawable/ic_heart_outline"
+		android:title="@string/add_to_favourites"
+		app:showAsAction="ifRoom|withText" />
+
 </menu>
\ No newline at end of file

From d61ba80bf6be095673c81fc29f18dfd1a4da67dc Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 17 Apr 2022 09:47:21 +0300
Subject: [PATCH 028/104] Add additional checks to download task #50

---
 .../org/koitharu/kotatsu/core/model/Manga.kt  |  22 ----
 .../core/model/parcelable/ParcelableManga.kt  |   9 +-
 .../kotatsu/details/ui/DetailsActivity.kt     |   2 +-
 .../download/domain/DownloadManager.kt        | 102 ++++++++++--------
 .../download/ui/service/DownloadService.kt    |  12 +--
 .../select/FavouriteCategoriesDialog.kt       |   3 +-
 .../kotatsu/reader/ui/ReaderActivity.kt       |   6 +-
 .../kotatsu/utils/ext/CollectionExt.kt        |   2 -
 8 files changed, 73 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
index 3079b6c76..ed5594c42 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/Manga.kt
@@ -3,26 +3,4 @@ package org.koitharu.kotatsu.core.model
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.util.mapToSet
 
-fun Manga.withoutChapters() = if (chapters.isNullOrEmpty()) {
-	this
-} else {
-	Manga(
-		id = id,
-		title = title,
-		altTitle = altTitle,
-		url = url,
-		publicUrl = publicUrl,
-		rating = rating,
-		isNsfw = isNsfw,
-		coverUrl = coverUrl,
-		tags = tags,
-		state = state,
-		author = author,
-		largeCoverUrl = largeCoverUrl,
-		description = description,
-		chapters = null,
-		source = source,
-	)
-}
-
 fun Collection<Manga>.ids() = mapToSet { it.id }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
index fd9b6cfa1..b302ce634 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
@@ -10,13 +10,18 @@ private const val MAX_SAFE_CHAPTERS_COUNT = 40 // this is 100% safe
 
 class ParcelableManga(
 	val manga: Manga,
+	private val withChapters: Boolean,
 ) : Parcelable {
 
-	constructor(parcel: Parcel) : this(parcel.readManga())
+	constructor(parcel: Parcel) : this(parcel.readManga(), true)
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {
 		val chapters = manga.chapters
-		if (chapters == null || chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
+		if (!withChapters || chapters == null) {
+			manga.writeToParcel(parcel, flags, withChapters = false)
+			return
+		}
+		if (chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
 			// fast path
 			manga.writeToParcel(parcel, flags, withChapters = true)
 			return
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index ef427f091..3ef3d8517 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -332,7 +332,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 
 		fun newIntent(context: Context, manga: Manga): Intent {
 			return Intent(context, DetailsActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
 		}
 
 		fun newIntent(context: Context, mangaId: Long): Intent {
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index 0b3c67ccb..3373273ea 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -7,6 +7,7 @@ import android.webkit.MimeTypeMap
 import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.size.Scale
+import java.io.File
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.sync.Semaphore
@@ -21,12 +22,12 @@ import org.koitharu.kotatsu.local.data.MangaZip
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.waitForNetwork
 import org.koitharu.kotatsu.utils.progress.ProgressJob
-import java.io.File
 
 private const val MAX_DOWNLOAD_ATTEMPTS = 3
 private const val MAX_PARALLEL_DOWNLOADS = 2
@@ -55,22 +56,24 @@ class DownloadManager(
 
 	fun downloadManga(
 		manga: Manga,
-		chaptersIds: Set<Long>?,
+		chaptersIds: LongArray?,
 		startId: Int,
 	): ProgressJob<DownloadState> {
 		val stateFlow = MutableStateFlow<DownloadState>(
 			DownloadState.Queued(startId = startId, manga = manga, cover = null)
 		)
-		val job = downloadMangaImpl(manga, chaptersIds, stateFlow, startId)
+		val job = downloadMangaImpl(manga, chaptersIds?.takeUnless { it.isEmpty() }, stateFlow, startId)
 		return ProgressJob(job, stateFlow)
 	}
 
 	private fun downloadMangaImpl(
 		manga: Manga,
-		chaptersIds: Set<Long>?,
+		chaptersIds: LongArray?,
 		outState: MutableStateFlow<DownloadState>,
 		startId: Int,
 	): Job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(outState)) {
+		@Suppress("NAME_SHADOWING") var manga = manga
+		val chaptersIdsSet = chaptersIds?.toMutableSet()
 		semaphore.acquire()
 		coroutineContext[WakeLockNode]?.acquire()
 		outState.value = DownloadState.Preparing(startId, manga, null)
@@ -79,6 +82,9 @@ class DownloadManager(
 		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
 		var output: MangaZip? = null
 		try {
+			if (manga.source == MangaSource.LOCAL) {
+				manga = localMangaRepository.getRemoteManga(manga) ?: error("Cannot obtain remote manga instance")
+			}
 			val repo = MangaRepository(manga.source)
 			cover = runCatching {
 				imageLoader.execute(
@@ -91,48 +97,51 @@ class DownloadManager(
 				).drawable
 			}.getOrNull()
 			outState.value = DownloadState.Preparing(startId, manga, cover)
-			val data = if (manga.chapters == null) repo.getDetails(manga) else manga
+			val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
 			output = MangaZip.findInDir(destination, data)
 			output.prepare(data)
 			val coverUrl = data.largeCoverUrl ?: data.coverUrl
 			downloadFile(coverUrl, data.publicUrl, destination).let { file ->
 				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
 			}
-			val chapters = if (chaptersIds == null) {
-				data.chapters.orEmpty()
-			} else {
-				data.chapters.orEmpty().filter { x -> x.id in chaptersIds }
+			val chapters = checkNotNull(
+				if (chaptersIdsSet == null) {
+					data.chapters
+				} else {
+					data.chapters?.filter { x -> chaptersIdsSet.remove(x.id) }
+				}
+			) { "Chapters list must not be null" }
+			check(chapters.isNotEmpty()) { "Chapters list must not be empty" }
+			check(chaptersIdsSet.isNullOrEmpty()) {
+				"${chaptersIdsSet?.size} of ${chaptersIds?.size} requested chapters not found in manga"
 			}
 			for ((chapterIndex, chapter) in chapters.withIndex()) {
-				if (chaptersIds == null || chapter.id in chaptersIds) {
-					val pages = repo.getPages(chapter)
-					for ((pageIndex, page) in pages.withIndex()) {
-						failsafe@ do {
-							try {
-								val url = repo.getPageUrl(page)
-								val file =
-									cache[url] ?: downloadFile(url, page.referer, destination)
-								output.addPage(
-									chapter,
-									file,
-									pageIndex,
-									MimeTypeMap.getFileExtensionFromUrl(url)
-								)
-							} catch (e: IOException) {
-								outState.value = DownloadState.WaitingForNetwork(startId, data, cover)
-								connectivityManager.waitForNetwork()
-								continue@failsafe
-							}
-						} while (false)
+				val pages = repo.getPages(chapter)
+				for ((pageIndex, page) in pages.withIndex()) {
+					failsafe@ do {
+						try {
+							val url = repo.getPageUrl(page)
+							val file = cache[url] ?: downloadFile(url, page.referer, destination)
+							output.addPage(
+								chapter = chapter,
+								file = file,
+								pageNumber = pageIndex,
+								ext = MimeTypeMap.getFileExtensionFromUrl(url),
+							)
+						} catch (e: IOException) {
+							outState.value = DownloadState.WaitingForNetwork(startId, data, cover)
+							connectivityManager.waitForNetwork()
+							continue@failsafe
+						}
+					} while (false)
 
-						outState.value = DownloadState.Progress(
-							startId, data, cover,
-							totalChapters = chapters.size,
-							currentChapter = chapterIndex,
-							totalPages = pages.size,
-							currentPage = pageIndex,
-						)
-					}
+					outState.value = DownloadState.Progress(
+						startId, data, cover,
+						totalChapters = chapters.size,
+						currentChapter = chapterIndex,
+						totalPages = pages.size,
+						currentPage = pageIndex,
+					)
 				}
 			}
 			outState.value = DownloadState.PostProcessing(startId, data, cover)
@@ -189,13 +198,14 @@ class DownloadManager(
 		}
 	}
 
-	private fun errorStateHandler(outState: MutableStateFlow<DownloadState>) = CoroutineExceptionHandler { _, throwable ->
-		val prevValue = outState.value
-		outState.value = DownloadState.Error(
-			startId = prevValue.startId,
-			manga = prevValue.manga,
-			cover = prevValue.cover,
-			error = throwable,
-		)
-	}
+	private fun errorStateHandler(outState: MutableStateFlow<DownloadState>) =
+		CoroutineExceptionHandler { _, throwable ->
+			val prevValue = outState.value
+			outState.value = DownloadState.Error(
+				startId = prevValue.startId,
+				manga = prevValue.manga,
+				cover = prevValue.cover,
+				error = throwable,
+			)
+		}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index a005346f4..41bb3e273 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -24,7 +24,6 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseService
 import org.koitharu.kotatsu.base.ui.dialog.CheckBoxAlertDialog
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.model.withoutChapters
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.download.domain.DownloadManager
 import org.koitharu.kotatsu.download.domain.DownloadState
@@ -32,7 +31,6 @@ import org.koitharu.kotatsu.download.domain.WakeLockNode
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.connectivityManager
 import org.koitharu.kotatsu.utils.ext.throttle
-import org.koitharu.kotatsu.utils.ext.toArraySet
 import org.koitharu.kotatsu.utils.progress.ProgressJob
 import java.util.concurrent.TimeUnit
 
@@ -66,7 +64,7 @@ class DownloadService : BaseService() {
 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
 		super.onStartCommand(intent, flags, startId)
 		val manga = intent?.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga
-		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toArraySet()
+		val chapters = intent?.getLongArrayExtra(EXTRA_CHAPTERS_IDS)
 		return if (manga != null) {
 			jobs[startId] = downloadManga(startId, manga, chapters)
 			jobCount.value = jobs.size
@@ -96,7 +94,7 @@ class DownloadService : BaseService() {
 	private fun downloadManga(
 		startId: Int,
 		manga: Manga,
-		chaptersIds: Set<Long>?,
+		chaptersIds: LongArray?,
 	): ProgressJob<DownloadState> {
 		val job = downloadManager.downloadManga(manga, chaptersIds, startId)
 		listenJob(job)
@@ -118,7 +116,7 @@ class DownloadService : BaseService() {
 			(job.progressValue as? DownloadState.Done)?.let {
 				sendBroadcast(
 					Intent(ACTION_DOWNLOAD_COMPLETE)
-						.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga.withoutChapters()))
+						.putExtra(EXTRA_MANGA, ParcelableManga(it.localManga, withChapters = false))
 				)
 			}
 			notificationSwitcher.detach(
@@ -178,7 +176,7 @@ class DownloadService : BaseService() {
 			}
 			confirmDataTransfer(context) {
 				val intent = Intent(context, DownloadService::class.java)
-				intent.putExtra(EXTRA_MANGA, ParcelableManga(manga))
+				intent.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
 				if (chaptersIds != null) {
 					intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
 				}
@@ -194,7 +192,7 @@ class DownloadService : BaseService() {
 			confirmDataTransfer(context) {
 				for (item in manga) {
 					val intent = Intent(context, DownloadService::class.java)
-					intent.putExtra(EXTRA_MANGA, ParcelableManga(item))
+					intent.putExtra(EXTRA_MANGA, ParcelableManga(item, withChapters = false))
 					ContextCompat.startForegroundService(context, intent)
 				}
 			}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
index 184c6cfe6..43eec185e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
@@ -15,7 +15,6 @@ import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
-import org.koitharu.kotatsu.core.model.withoutChapters
 import org.koitharu.kotatsu.databinding.DialogFavoriteCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
@@ -99,7 +98,7 @@ class FavouriteCategoriesDialog :
 		fun show(fm: FragmentManager, manga: Collection<Manga>) = FavouriteCategoriesDialog().withArgs(1) {
 			putParcelableArrayList(
 				KEY_MANGA_LIST,
-				manga.mapTo(ArrayList(manga.size)) { ParcelableManga(it.withoutChapters()) }
+				manga.mapTo(ArrayList(manga.size)) { ParcelableManga(it, withChapters = false) }
 			)
 		}.show(fm, TAG)
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
index 6a363cf4b..914b96ae3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
@@ -410,18 +410,18 @@ class ReaderActivity :
 
 		fun newIntent(context: Context, manga: Manga): Intent {
 			return Intent(context, ReaderActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
 		}
 
 		fun newIntent(context: Context, manga: Manga, branch: String?): Intent {
 			return Intent(context, ReaderActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
 				.putExtra(EXTRA_BRANCH, branch)
 		}
 
 		fun newIntent(context: Context, manga: Manga, state: ReaderState?): Intent {
 			return Intent(context, ReaderActivity::class.java)
-				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga))
+				.putExtra(MangaIntent.KEY_MANGA, ParcelableManga(manga, withChapters = true))
 				.putExtra(EXTRA_STATE, state)
 		}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt
index 916d83491..04bc82e1d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/CollectionExt.kt
@@ -3,8 +3,6 @@ package org.koitharu.kotatsu.utils.ext
 import androidx.collection.ArraySet
 import java.util.*
 
-fun LongArray.toArraySet(): Set<Long> = createSet(size) { i -> this[i] }
-
 fun <T : Enum<T>> Array<T>.names() = Array(size) { i ->
 	this[i].name
 }

From 5fbae1256b2b67e32328f1386cbac144f10030d6 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 17 Apr 2022 09:58:52 +0300
Subject: [PATCH 029/104] Fix branch detection #143

---
 .../java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 7c5fe8574..afc0129ac 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -191,7 +191,8 @@ class DetailsViewModel(
 		// find default branch
 		val hist = historyRepository.getOne(manga)
 		selectedBranch.value = if (hist != null) {
-			manga.chapters?.find { it.id == hist.chapterId }?.branch
+			val currentChapter = manga.chapters?.find { it.id == hist.chapterId }
+			if (currentChapter != null) currentChapter.branch else predictBranch(manga.chapters)
 		} else {
 			predictBranch(manga.chapters)
 		}
@@ -203,6 +204,8 @@ class DetailsViewModel(
 			} else {
 				localMangaRepository.findSavedManga(manga)
 			}
+		}.onFailure { error ->
+			if (BuildConfig.DEBUG) error.printStackTrace()
 		}.getOrNull()
 	}
 

From c2276eb2cb402260d0b3568abb743993561c2491 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 17 Apr 2022 10:24:49 +0300
Subject: [PATCH 030/104] Fix cover size changes in details

---
 app/src/main/res/layout-w600dp/fragment_details.xml | 8 +++++---
 app/src/main/res/layout/fragment_details.xml        | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout-w600dp/fragment_details.xml b/app/src/main/res/layout-w600dp/fragment_details.xml
index 598d86e8b..936a0ac6c 100644
--- a/app/src/main/res/layout-w600dp/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp/fragment_details.xml
@@ -13,15 +13,16 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
-		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+		<com.google.android.material.imageview.ShapeableImageView
 			android:id="@+id/imageView_cover"
 			android:layout_width="0dp"
-			android:layout_height="wrap_content"
+			android:layout_height="0dp"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:foreground="?selectableItemBackground"
 			android:scaleType="centerCrop"
 			android:transitionName="cover"
+			app:layout_constraintDimensionRatio="H,13:18"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0"
 			app:layout_constraintStart_toStartOf="parent"
@@ -107,10 +108,11 @@
 
 				<com.google.android.material.button.MaterialButton
 					android:id="@+id/button_favorite"
-					style="@style/Widget.Material3.Button.OutlinedButton"
+					style="@style/Widget.Material3.Button.OutlinedButton.Icon"
 					android:layout_width="0dp"
 					android:layout_height="0dp"
 					android:layout_marginStart="16dp"
+					android:contentDescription="@string/add_to_favourites"
 					android:paddingStart="0dp"
 					android:paddingEnd="0dp"
 					app:icon="@drawable/ic_heart_outline"
diff --git a/app/src/main/res/layout/fragment_details.xml b/app/src/main/res/layout/fragment_details.xml
index ebab4bfb3..e001bb43d 100644
--- a/app/src/main/res/layout/fragment_details.xml
+++ b/app/src/main/res/layout/fragment_details.xml
@@ -13,15 +13,16 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent">
 
-		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+		<com.google.android.material.imageview.ShapeableImageView
 			android:id="@+id/imageView_cover"
 			android:layout_width="0dp"
-			android:layout_height="wrap_content"
+			android:layout_height="0dp"
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:foreground="?selectableItemBackground"
 			android:scaleType="centerCrop"
 			android:transitionName="cover"
+			app:layout_constraintDimensionRatio="H,13:18"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintHorizontal_bias="0"
 			app:layout_constraintStart_toStartOf="parent"
@@ -115,10 +116,11 @@
 
 		<com.google.android.material.button.MaterialButton
 			android:id="@+id/button_favorite"
-			style="@style/Widget.Material3.Button.OutlinedButton"
+			style="@style/Widget.Material3.Button.OutlinedButton.Icon"
 			android:layout_width="0dp"
 			android:layout_height="0dp"
 			android:layout_marginStart="16dp"
+			android:contentDescription="@string/add_to_favourites"
 			android:paddingStart="0dp"
 			android:paddingEnd="0dp"
 			app:icon="@drawable/ic_heart_outline"

From aaf9c6a0bf01c45a328964dce7aad9c67a7aeba2 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 18 Apr 2022 09:26:48 +0300
Subject: [PATCH 031/104] Update parsers

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 09993f26b..4cd4b8cf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:8e23a7fcd4') {
+	implementation('com.github.nv95:kotatsu-parsers:dd9ace35d1') {
 		exclude group: 'org.json', module: 'json'
 	}
 

From d3e9ce874a663179da2fcd6a91af94a7a07128e8 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 18 Apr 2022 16:42:37 +0300
Subject: [PATCH 032/104] Download manga to cbz directly

---
 app/build.gradle                              |   6 +-
 .../kotatsu/core/backup/BackupArchive.kt      |  51 --------
 .../kotatsu/core/backup/BackupZipInput.kt     |  25 ++++
 .../kotatsu/core/backup/BackupZipOutput.kt    |  45 +++++++
 .../koitharu/kotatsu/core/zip/ZipOutput.kt    |  61 ++++++++++
 .../org/koitharu/kotatsu/core/zip/ZipUtils.kt |  37 ++++++
 .../download/domain/DownloadManager.kt        |  14 +--
 .../koitharu/kotatsu/local/data/CbzFetcher.kt |   2 +-
 .../koitharu/kotatsu/local/data/MangaIndex.kt |  17 +--
 .../koitharu/kotatsu/local/data/MangaZip.kt   |  70 -----------
 .../koitharu/kotatsu/local/data/PagesCache.kt |   6 +-
 .../kotatsu/local/data/WritableCbzFile.kt     |  99 ----------------
 .../kotatsu/local/domain/CbzMangaOutput.kt    | 111 ++++++++++++++++++
 .../local/domain/LocalMangaRepository.kt      |   9 +-
 .../kotatsu/settings/backup/AppBackupAgent.kt |  31 ++---
 .../settings/backup/BackupViewModel.kt        |  30 ++---
 .../settings/backup/RestoreViewModel.kt       |  17 +--
 .../koitharu/kotatsu/utils/MutableZipFile.kt  | 103 ----------------
 18 files changed, 340 insertions(+), 394 deletions(-)
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/local/data/WritableCbzFile.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/MutableZipFile.kt

diff --git a/app/build.gradle b/app/build.gradle
index 4cd4b8cf9..69e2b2373 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,14 +6,14 @@ plugins {
 }
 
 android {
-	compileSdkVersion 32
-	buildToolsVersion '32.0.0'
+	compileSdkVersion 31
+	buildToolsVersion '31.0.0'
 	namespace 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 32
+		targetSdkVersion 31
 		versionCode 402
 		versionName '3.1.1'
 		generatedDensities = []
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt
deleted file mode 100644
index 6a90243fa..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupArchive.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.koitharu.kotatsu.core.backup
-
-import android.content.Context
-import java.io.File
-import java.util.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.withContext
-import org.json.JSONArray
-import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.utils.MutableZipFile
-import org.koitharu.kotatsu.utils.ext.format
-
-class BackupArchive(file: File) : MutableZipFile(file) {
-
-	init {
-		if (!dir.exists()) {
-			dir.mkdirs()
-		}
-	}
-
-	suspend fun put(entry: BackupEntry) {
-		put(entry.name, entry.data.toString(2))
-	}
-
-	suspend fun getEntry(name: String): BackupEntry {
-		val json = withContext(Dispatchers.Default) {
-			JSONArray(getContent(name))
-		}
-		return BackupEntry(name, json)
-	}
-
-	companion object {
-
-		private const val DIR_BACKUPS = "backups"
-
-		suspend fun createNew(context: Context): BackupArchive = runInterruptible(Dispatchers.IO) {
-			val dir = context.run {
-				getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
-			}
-			dir.mkdirs()
-			val filename = buildString {
-				append(context.getString(R.string.app_name).lowercase(Locale.ROOT))
-				append('_')
-				append(Date().format("ddMMyyyy"))
-				append(".bak")
-			}
-			BackupArchive(File(dir, filename))
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipInput.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
new file mode 100644
index 000000000..25e1d3688
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipInput.kt
@@ -0,0 +1,25 @@
+package org.koitharu.kotatsu.core.backup
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.Closeable
+import org.json.JSONArray
+import java.io.File
+import java.util.zip.ZipFile
+
+class BackupZipInput(val file: File) : Closeable {
+
+	private val zipFile = ZipFile(file)
+
+	suspend fun getEntry(name: String): BackupEntry = runInterruptible(Dispatchers.IO) {
+		val entry = zipFile.getEntry(name)
+		val json = zipFile.getInputStream(entry).use {
+			JSONArray(it.bufferedReader().readText())
+		}
+		BackupEntry(name, json)
+	}
+
+	override fun close() {
+		zipFile.close()
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
new file mode 100644
index 000000000..f01dc73d9
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupZipOutput.kt
@@ -0,0 +1,45 @@
+package org.koitharu.kotatsu.core.backup
+
+import android.content.Context
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.Closeable
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.zip.ZipOutput
+import org.koitharu.kotatsu.utils.ext.format
+import java.io.File
+import java.util.*
+import java.util.zip.Deflater
+
+class BackupZipOutput(val file: File) : Closeable {
+
+	private val output = ZipOutput(file, Deflater.BEST_COMPRESSION)
+
+	suspend fun put(entry: BackupEntry) {
+		output.put(entry.name, entry.data.toString(2))
+	}
+
+	suspend fun finish() {
+		output.finish()
+	}
+
+	override fun close() {
+		output.close()
+	}
+}
+
+private const val DIR_BACKUPS = "backups"
+
+suspend fun BackupZipOutput(context: Context): BackupZipOutput = runInterruptible(Dispatchers.IO) {
+	val dir = context.run {
+		getExternalFilesDir(DIR_BACKUPS) ?: File(filesDir, DIR_BACKUPS)
+	}
+	dir.mkdirs()
+	val filename = buildString {
+		append(context.getString(R.string.app_name).replace(' ', '_').lowercase(Locale.ROOT))
+		append('_')
+		append(Date().format("ddMMyyyy"))
+		append(".bk.zip")
+	}
+	BackupZipOutput(File(dir, filename))
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
new file mode 100644
index 000000000..bcdc5b0ee
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
@@ -0,0 +1,61 @@
+package org.koitharu.kotatsu.core.zip
+
+import androidx.annotation.WorkerThread
+import androidx.collection.ArraySet
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.Closeable
+import java.io.File
+import java.util.zip.Deflater
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import java.util.zip.ZipOutputStream
+
+class ZipOutput(
+	val file: File,
+	compressionLevel: Int = Deflater.DEFAULT_COMPRESSION,
+) : Closeable {
+
+	private val entryNames = ArraySet<String>()
+	private var isClosed = false
+	private val output = ZipOutputStream(file.outputStream()).apply {
+		setLevel(compressionLevel)
+	}
+
+	suspend fun put(name: String, file: File): Unit = runInterruptible(Dispatchers.IO) {
+		entryNames.add(name)
+		output.appendFile(file, name)
+	}
+
+	suspend fun put(name: String, content: String): Unit = runInterruptible(Dispatchers.IO) {
+		entryNames.add(name)
+		output.appendText(content, name)
+	}
+
+	@WorkerThread
+	fun copyEntryFrom(other: ZipFile, entry: ZipEntry): Boolean {
+		return if (entryNames.add(entry.name)) {
+			val zipEntry = ZipEntry(entry.name)
+			output.putNextEntry(zipEntry)
+			other.getInputStream(entry).use { input ->
+				input.copyTo(output)
+			}
+			output.closeEntry()
+			true
+		} else {
+			false
+		}
+	}
+
+	suspend fun finish() = runInterruptible(Dispatchers.IO) {
+		output.finish()
+		output.flush()
+	}
+
+	override fun close() {
+		if (!isClosed) {
+			output.close()
+			isClosed = true
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt
new file mode 100644
index 000000000..c42f47142
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt
@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.core.zip
+
+import androidx.annotation.WorkerThread
+import java.io.File
+import java.io.FileInputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+
+@WorkerThread
+fun ZipOutputStream.appendFile(fileToZip: File, name: String) {
+	if (fileToZip.isDirectory) {
+		if (name.endsWith("/")) {
+			putNextEntry(ZipEntry(name))
+		} else {
+			putNextEntry(ZipEntry("$name/"))
+		}
+		closeEntry()
+		fileToZip.listFiles()?.forEach { childFile ->
+			appendFile(childFile, "$name/${childFile.name}")
+		}
+	} else {
+		FileInputStream(fileToZip).use { fis ->
+			val zipEntry = ZipEntry(name)
+			putNextEntry(zipEntry)
+			fis.copyTo(this)
+			closeEntry()
+		}
+	}
+}
+
+@WorkerThread
+fun ZipOutputStream.appendText(content: String, name: String) {
+	val zipEntry = ZipEntry(name)
+	putNextEntry(zipEntry)
+	content.byteInputStream().copyTo(this)
+	closeEntry()
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index 3373273ea..aba04e350 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -7,7 +7,6 @@ import android.webkit.MimeTypeMap
 import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.size.Scale
-import java.io.File
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.sync.Semaphore
@@ -18,8 +17,8 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
-import org.koitharu.kotatsu.local.data.MangaZip
 import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.local.domain.CbzMangaOutput
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -28,6 +27,7 @@ import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.waitForNetwork
 import org.koitharu.kotatsu.utils.progress.ProgressJob
+import java.io.File
 
 private const val MAX_DOWNLOAD_ATTEMPTS = 3
 private const val MAX_PARALLEL_DOWNLOADS = 2
@@ -80,7 +80,7 @@ class DownloadManager(
 		var cover: Drawable? = null
 		val destination = localMangaRepository.getOutputDir()
 		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
-		var output: MangaZip? = null
+		var output: CbzMangaOutput? = null
 		try {
 			if (manga.source == MangaSource.LOCAL) {
 				manga = localMangaRepository.getRemoteManga(manga) ?: error("Cannot obtain remote manga instance")
@@ -98,8 +98,7 @@ class DownloadManager(
 			}.getOrNull()
 			outState.value = DownloadState.Preparing(startId, manga, cover)
 			val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-			output = MangaZip.findInDir(destination, data)
-			output.prepare(data)
+			output = CbzMangaOutput.createNew(destination, data)
 			val coverUrl = data.largeCoverUrl ?: data.coverUrl
 			downloadFile(coverUrl, data.publicUrl, destination).let { file ->
 				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
@@ -145,9 +144,8 @@ class DownloadManager(
 				}
 			}
 			outState.value = DownloadState.PostProcessing(startId, data, cover)
-			if (!output.compress()) {
-				throw RuntimeException("Cannot create target file")
-			}
+			output.mergeWithExisting()
+			output.finalize()
 			val localManga = localMangaRepository.getFromFile(output.file)
 			outState.value = DownloadState.Done(startId, data, cover, localManga)
 		} catch (e: CancellationException) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
index 4e2746cec..ff04a2eff 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
@@ -9,11 +9,11 @@ import coil.fetch.FetchResult
 import coil.fetch.Fetcher
 import coil.fetch.SourceResult
 import coil.size.Size
+import java.util.zip.ZipFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.buffer
 import okio.source
-import java.util.zip.ZipFile
 
 class CbzFetcher : Fetcher<Uri> {
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
index f7d1a8aaf..07bbbce98 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
@@ -28,14 +28,17 @@ class MangaIndex(source: String?) {
 		json.put("state", manga.state?.name)
 		json.put("source", manga.source.name)
 		json.put("cover_large", manga.largeCoverUrl)
-		json.put("tags", JSONArray().also { a ->
-			for (tag in manga.tags) {
-				val jo = JSONObject()
-				jo.put("key", tag.key)
-				jo.put("title", tag.title)
-				a.put(jo)
+		json.put(
+			"tags",
+			JSONArray().also { a ->
+				for (tag in manga.tags) {
+					val jo = JSONObject()
+					jo.put("key", tag.key)
+					jo.put("title", tag.title)
+					a.put(jo)
+				}
 			}
-		})
+		)
 		if (!append || !json.has("chapters")) {
 			json.put("chapters", JSONObject())
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
deleted file mode 100644
index 0aacb4ee7..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaZip.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.koitharu.kotatsu.local.data
-
-import androidx.annotation.CheckResult
-import androidx.annotation.WorkerThread
-import org.koitharu.kotatsu.parsers.model.Manga
-import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.parsers.util.toFileNameSafe
-import org.koitharu.kotatsu.utils.ext.takeIfReadable
-import java.io.File
-
-@WorkerThread
-class MangaZip(val file: File) {
-
-	private val writableCbz = WritableCbzFile(file)
-
-	private var index = MangaIndex(null)
-
-	suspend fun prepare(manga: Manga) {
-		writableCbz.prepare(overwrite = true)
-		index = MangaIndex(writableCbz[INDEX_ENTRY].takeIfReadable()?.readText())
-		index.setMangaInfo(manga, append = true)
-	}
-
-	suspend fun cleanup() {
-		writableCbz.cleanup()
-	}
-
-	@CheckResult
-	suspend fun compress(): Boolean {
-		writableCbz[INDEX_ENTRY].writeText(index.toString())
-		return writableCbz.flush()
-	}
-
-	suspend fun addCover(file: File, ext: String) {
-		val name = buildString {
-			append(FILENAME_PATTERN.format(0, 0))
-			if (ext.isNotEmpty() && ext.length <= 4) {
-				append('.')
-				append(ext)
-			}
-		}
-		writableCbz.put(name, file)
-		index.setCoverEntry(name)
-	}
-
-	suspend fun addPage(chapter: MangaChapter, file: File, pageNumber: Int, ext: String) {
-		val name = buildString {
-			append(FILENAME_PATTERN.format(chapter.number, pageNumber))
-			if (ext.isNotEmpty() && ext.length <= 4) {
-				append('.')
-				append(ext)
-			}
-		}
-		writableCbz.put(name, file)
-		index.addChapter(chapter)
-	}
-
-	companion object {
-
-		private const val FILENAME_PATTERN = "%03d%03d"
-
-		const val INDEX_ENTRY = "index.json"
-
-		fun findInDir(root: File, manga: Manga): MangaZip {
-			val name = manga.title.toFileNameSafe() + ".cbz"
-			val file = File(root, name)
-			return MangaZip(file)
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
index bf0da97f9..73dd83bb4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.local.data
 
 import android.content.Context
 import com.tomclaw.cache.DiskLruCache
+import java.io.File
+import java.io.InputStream
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.utils.FileSize
 import org.koitharu.kotatsu.utils.ext.subdir
 import org.koitharu.kotatsu.utils.ext.takeIfReadable
-import java.io.File
-import java.io.InputStream
 
 class PagesCache(context: Context) {
 
@@ -60,4 +60,4 @@ class PagesCache(context: Context) {
 			progress.value = (bytesCopied.toDouble() / contentLength.toDouble()).toFloat()
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/WritableCbzFile.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/WritableCbzFile.kt
deleted file mode 100644
index fe61169b2..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/WritableCbzFile.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.koitharu.kotatsu.local.data
-
-import androidx.annotation.CheckResult
-import kotlinx.coroutines.*
-import org.koitharu.kotatsu.utils.ext.deleteAwait
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-class WritableCbzFile(private val file: File) {
-
-	private val dir = File(file.parentFile, file.nameWithoutExtension)
-
-	suspend fun prepare(overwrite: Boolean) = withContext(Dispatchers.IO) {
-		if (!dir.list().isNullOrEmpty()) {
-			if (overwrite) {
-				dir.deleteRecursively()
-			} else {
-				throw IllegalStateException("Dir ${dir.name} is not empty")
-			}
-		}
-		if (!dir.exists()) {
-			dir.mkdir()
-		}
-		if (!file.exists()) {
-			return@withContext
-		}
-		ZipInputStream(FileInputStream(file)).use { zip ->
-			var entry = zip.nextEntry
-			while (entry != null && currentCoroutineContext().isActive) {
-				val target = File(dir.path + File.separator + entry.name)
-				runInterruptible {
-					target.parentFile?.mkdirs()
-					target.outputStream().use { out ->
-						zip.copyTo(out)
-					}
-				}
-				zip.closeEntry()
-				entry = zip.nextEntry
-			}
-		}
-	}
-
-	suspend fun cleanup() = withContext(Dispatchers.IO) {
-		dir.deleteRecursively()
-	}
-
-	@CheckResult
-	suspend fun flush() = withContext(Dispatchers.IO) {
-		val tempFile = File(file.path + ".tmp")
-		if (tempFile.exists()) {
-			tempFile.deleteAwait()
-		}
-		try {
-			runInterruptible {
-				ZipOutputStream(FileOutputStream(tempFile)).use { zip ->
-					dir.listFiles()?.forEach {
-						zipFile(it, it.name, zip)
-					}
-					zip.flush()
-				}
-			}
-			tempFile.renameTo(file)
-		} finally {
-			if (tempFile.exists()) {
-				tempFile.deleteAwait()
-			}
-		}
-	}
-
-	operator fun get(name: String) = File(dir, name)
-
-	suspend fun put(name: String, file: File) = runInterruptible(Dispatchers.IO) {
-		file.copyTo(this[name], overwrite = true)
-	}
-
-	private fun zipFile(fileToZip: File, fileName: String, zipOut: ZipOutputStream) {
-		if (fileToZip.isDirectory) {
-			if (fileName.endsWith("/")) {
-				zipOut.putNextEntry(ZipEntry(fileName))
-			} else {
-				zipOut.putNextEntry(ZipEntry("$fileName/"))
-			}
-			zipOut.closeEntry()
-			fileToZip.listFiles()?.forEach { childFile ->
-				zipFile(childFile, "$fileName/${childFile.name}", zipOut)
-			}
-		} else {
-			FileInputStream(fileToZip).use { fis ->
-				val zipEntry = ZipEntry(fileName)
-				zipOut.putNextEntry(zipEntry)
-				fis.copyTo(zipOut)
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
new file mode 100644
index 000000000..87b772bb7
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
@@ -0,0 +1,111 @@
+package org.koitharu.kotatsu.local.domain
+
+import androidx.annotation.WorkerThread
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import okio.Closeable
+import org.koitharu.kotatsu.core.zip.ZipOutput
+import org.koitharu.kotatsu.local.data.MangaIndex
+import org.koitharu.kotatsu.parsers.model.Manga
+import org.koitharu.kotatsu.parsers.model.MangaChapter
+import org.koitharu.kotatsu.parsers.util.toFileNameSafe
+import org.koitharu.kotatsu.utils.ext.deleteAwait
+import java.io.File
+import java.util.zip.ZipFile
+
+class CbzMangaOutput(
+	val file: File,
+	manga: Manga,
+) : Closeable {
+
+	private val output = ZipOutput(File(file.path + ".tmp"))
+	private val index = MangaIndex(null)
+
+	init {
+		index.setMangaInfo(manga, false)
+	}
+
+	suspend fun mergeWithExisting() {
+		if (file.exists()) {
+			runInterruptible(Dispatchers.IO) {
+				mergeWith(file)
+			}
+		}
+	}
+
+	suspend fun addCover(file: File, ext: String) {
+		val name = buildString {
+			append(FILENAME_PATTERN.format(0, 0))
+			if (ext.isNotEmpty() && ext.length <= 4) {
+				append('.')
+				append(ext)
+			}
+		}
+		output.put(name, file)
+		index.setCoverEntry(name)
+	}
+
+	suspend fun addPage(chapter: MangaChapter, file: File, pageNumber: Int, ext: String) {
+		val name = buildString {
+			append(FILENAME_PATTERN.format(chapter.number, pageNumber))
+			if (ext.isNotEmpty() && ext.length <= 4) {
+				append('.')
+				append(ext)
+			}
+		}
+		output.put(name, file)
+		index.addChapter(chapter)
+	}
+
+	suspend fun finalize() {
+		output.put(ENTRY_NAME_INDEX, index.toString())
+		output.finish()
+		output.close()
+		file.deleteAwait()
+		output.file.renameTo(file)
+	}
+
+	suspend fun cleanup() {
+		output.file.deleteAwait()
+	}
+
+	override fun close() {
+		output.close()
+	}
+
+	@WorkerThread
+	private fun mergeWith(other: File) {
+		var otherIndex: MangaIndex? = null
+		ZipFile(other).use { zip ->
+			for (entry in zip.entries()) {
+				if (entry.name == ENTRY_NAME_INDEX) {
+					otherIndex = MangaIndex(
+						zip.getInputStream(entry).use {
+							it.reader().readText()
+						}
+					)
+				} else {
+					output.copyEntryFrom(zip, entry)
+				}
+			}
+		}
+		otherIndex?.getMangaInfo()?.chapters?.let { chapters ->
+			for (chapter in chapters) {
+				index.addChapter(chapter)
+			}
+		}
+	}
+
+	companion object {
+
+		private const val FILENAME_PATTERN = "%03d%03d"
+
+		const val ENTRY_NAME_INDEX = "index.json"
+
+		fun createNew(root: File, manga: Manga): CbzMangaOutput {
+			val name = manga.title.toFileNameSafe() + ".cbz"
+			val file = File(root, name)
+			return CbzMangaOutput(file, manga)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index c6137a485..99d8f7ad9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -14,7 +14,6 @@ import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.data.MangaIndex
-import org.koitharu.kotatsu.local.data.MangaZip
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.parsers.util.toCamelCase
@@ -59,7 +58,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 			val uri = Uri.parse(chapter.url)
 			val file = uri.toFile()
 			val zip = ZipFile(file)
-			val index = zip.getEntry(MangaZip.INDEX_ENTRY)?.let(zip::readText)?.let(::MangaIndex)
+			val index = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)?.let(zip::readText)?.let(::MangaIndex)
 			var entries = zip.entries().asSequence()
 			entries = if (index != null) {
 				val pattern = index.getChapterNamesPattern(chapter)
@@ -97,7 +96,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 	@SuppressLint("DefaultLocale")
 	fun getFromFile(file: File): Manga = ZipFile(file).use { zip ->
 		val fileUri = file.toUri().toString()
-		val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
+		val entry = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)
 		val index = entry?.let(zip::readText)?.let(::MangaIndex)
 		val info = index?.getMangaInfo()
 		if (index != null && info != null) {
@@ -158,7 +157,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		}.getOrNull() ?: return null
 		return runInterruptible(Dispatchers.IO) {
 			ZipFile(file).use { zip ->
-				val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
+				val entry = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)
 				val index = entry?.let(zip::readText)?.let(::MangaIndex)
 				index?.getMangaInfo()
 			}
@@ -170,7 +169,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		return runInterruptible(Dispatchers.IO) {
 			for (file in files) {
 				val index = ZipFile(file).use { zip ->
-					val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
+					val entry = zip.getEntry(CbzMangaOutput.ENTRY_NAME_INDEX)
 					entry?.let(zip::readText)?.let(::MangaIndex)
 				} ?: continue
 				val info = index.getMangaInfo() ?: continue
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt b/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
index 9b59a983c..278995dab 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
@@ -5,12 +5,8 @@ import android.app.backup.BackupDataInput
 import android.app.backup.BackupDataOutput
 import android.app.backup.FullBackupDataOutput
 import android.os.ParcelFileDescriptor
-import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.runBlocking
-import org.koitharu.kotatsu.core.backup.BackupArchive
-import org.koitharu.kotatsu.core.backup.BackupEntry
-import org.koitharu.kotatsu.core.backup.BackupRepository
-import org.koitharu.kotatsu.core.backup.RestoreRepository
+import org.koitharu.kotatsu.core.backup.*
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import java.io.*
 
@@ -46,7 +42,7 @@ class AppBackupAgent : BackupAgent() {
 		mode: Long,
 		mtime: Long
 	) {
-		if (destination?.name?.endsWith(".bak") == true) {
+		if (destination?.name?.endsWith(".bk.zip") == true) {
 			restoreBackupFile(data.fileDescriptor, size)
 			destination.delete()
 		} else {
@@ -56,14 +52,14 @@ class AppBackupAgent : BackupAgent() {
 
 	private fun createBackupFile() = runBlocking {
 		val repository = BackupRepository(MangaDatabase.create(applicationContext))
-		val backup = BackupArchive.createNew(this@AppBackupAgent)
-		backup.put(repository.createIndex())
-		backup.put(repository.dumpHistory())
-		backup.put(repository.dumpCategories())
-		backup.put(repository.dumpFavourites())
-		backup.flush()
-		backup.cleanup()
-		backup.file
+		BackupZipOutput(this@AppBackupAgent).use { backup ->
+			backup.put(repository.createIndex())
+			backup.put(repository.dumpHistory())
+			backup.put(repository.dumpCategories())
+			backup.put(repository.dumpFavourites())
+			backup.finish()
+			backup.file
+		}
 	}
 
 	private fun restoreBackupFile(fd: FileDescriptor, size: Long) {
@@ -74,18 +70,15 @@ class AppBackupAgent : BackupAgent() {
 				input.copyLimitedTo(output, size)
 			}
 		}
-		val backup = BackupArchive(tempFile)
+		val backup = BackupZipInput(tempFile)
 		try {
 			runBlocking {
-				backup.unpack()
 				repository.upsertHistory(backup.getEntry(BackupEntry.HISTORY))
 				repository.upsertCategories(backup.getEntry(BackupEntry.CATEGORIES))
 				repository.upsertFavourites(backup.getEntry(BackupEntry.FAVOURITES))
 			}
 		} finally {
-			runBlocking(NonCancellable) {
-				backup.cleanup()
-			}
+			backup.close()
 			tempFile.delete()
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt
index 8c3ac36a9..2532dc8d2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/backup/BackupViewModel.kt
@@ -3,8 +3,8 @@ package org.koitharu.kotatsu.settings.backup
 import android.content.Context
 import androidx.lifecycle.MutableLiveData
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.backup.BackupArchive
 import org.koitharu.kotatsu.core.backup.BackupRepository
+import org.koitharu.kotatsu.core.backup.BackupZipOutput
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.progress.Progress
 import java.io.File
@@ -19,23 +19,25 @@ class BackupViewModel(
 
 	init {
 		launchLoadingJob {
-			val backup = BackupArchive.createNew(context)
-			backup.put(repository.createIndex())
+			val file = BackupZipOutput(context).use { backup ->
+				backup.put(repository.createIndex())
 
-			progress.value = Progress(0, 3)
-			backup.put(repository.dumpHistory())
+				progress.value = Progress(0, 3)
+				backup.put(repository.dumpHistory())
 
-			progress.value = Progress(1, 3)
-			backup.put(repository.dumpCategories())
+				progress.value = Progress(1, 3)
+				backup.put(repository.dumpCategories())
 
-			progress.value = Progress(2, 3)
-			backup.put(repository.dumpFavourites())
+				progress.value = Progress(2, 3)
+				backup.put(repository.dumpFavourites())
 
-			progress.value = Progress(3, 3)
-			backup.flush()
-			progress.value = null
-			backup.cleanup()
-			onBackupDone.call(backup.file)
+				progress.value = Progress(3, 3)
+				backup.finish()
+				progress.value = null
+				backup.close()
+				backup.file
+			}
+			onBackupDone.call(file)
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt
index e7d185eb2..79f2fc7c4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/backup/RestoreViewModel.kt
@@ -3,19 +3,17 @@ package org.koitharu.kotatsu.settings.backup
 import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
-import java.io.File
-import java.io.FileNotFoundException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.base.ui.BaseViewModel
-import org.koitharu.kotatsu.core.backup.BackupArchive
 import org.koitharu.kotatsu.core.backup.BackupEntry
+import org.koitharu.kotatsu.core.backup.BackupZipInput
 import org.koitharu.kotatsu.core.backup.CompositeResult
 import org.koitharu.kotatsu.core.backup.RestoreRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.progress.Progress
+import java.io.File
+import java.io.FileNotFoundException
 
 class RestoreViewModel(
 	uri: Uri?,
@@ -40,10 +38,9 @@ class RestoreViewModel(
 						input.copyTo(output)
 					}
 				}
-				BackupArchive(tempFile)
+				BackupZipInput(tempFile)
 			}
 			try {
-				backup.unpack()
 				val result = CompositeResult()
 
 				progress.value = Progress(0, 3)
@@ -58,10 +55,8 @@ class RestoreViewModel(
 				progress.value = Progress(3, 3)
 				onRestoreDone.call(result)
 			} finally {
-				withContext(NonCancellable) {
-					backup.cleanup()
-					backup.file.delete()
-				}
+				backup.close()
+				backup.file.delete()
 			}
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/MutableZipFile.kt b/app/src/main/java/org/koitharu/kotatsu/utils/MutableZipFile.kt
deleted file mode 100644
index 01eaf7118..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/MutableZipFile.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import androidx.annotation.WorkerThread
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-
-open class MutableZipFile(val file: File) {
-
-	protected val dir = File(file.parentFile, file.nameWithoutExtension)
-
-	suspend fun unpack(): Unit = runInterruptible(Dispatchers.IO) {
-		check(dir.list().isNullOrEmpty()) {
-			"Dir ${dir.name} is not empty"
-		}
-		if (!dir.exists()) {
-			dir.mkdir()
-		}
-		if (!file.exists()) {
-			return@runInterruptible
-		}
-		ZipInputStream(FileInputStream(file)).use { zip ->
-			var entry = zip.nextEntry
-			while (entry != null) {
-				val target = File(dir.path + File.separator + entry.name)
-				target.parentFile?.mkdirs()
-				target.outputStream().use { out ->
-					zip.copyTo(out)
-				}
-				zip.closeEntry()
-				entry = zip.nextEntry
-			}
-		}
-	}
-
-	suspend fun cleanup() = withContext(Dispatchers.IO) {
-		dir.deleteRecursively()
-	}
-
-	suspend fun flush(): Boolean = runInterruptible(Dispatchers.IO) {
-		val tempFile = File(file.path + ".tmp")
-		if (tempFile.exists()) {
-			tempFile.delete()
-		}
-		try {
-			ZipOutputStream(FileOutputStream(tempFile)).use { zip ->
-				dir.listFiles()?.forEach {
-					zipFile(it, it.name, zip)
-				}
-				zip.flush()
-			}
-			tempFile.renameTo(file)
-		} finally {
-			if (tempFile.exists()) {
-				tempFile.delete()
-			}
-		}
-	}
-
-	operator fun get(name: String) = File(dir, name)
-
-	suspend fun put(name: String, file: File): Unit = withContext(Dispatchers.IO) {
-		file.copyTo(this@MutableZipFile[name], overwrite = true)
-	}
-
-	suspend fun put(name: String, data: String): Unit = withContext(Dispatchers.IO) {
-		this@MutableZipFile[name].writeText(data)
-	}
-
-	suspend fun getContent(name: String): String = withContext(Dispatchers.IO) {
-		get(name).readText()
-	}
-
-	companion object {
-
-		@WorkerThread
-		private fun zipFile(fileToZip: File, fileName: String, zipOut: ZipOutputStream) {
-			if (fileToZip.isDirectory) {
-				if (fileName.endsWith("/")) {
-					zipOut.putNextEntry(ZipEntry(fileName))
-				} else {
-					zipOut.putNextEntry(ZipEntry("$fileName/"))
-				}
-				zipOut.closeEntry()
-				fileToZip.listFiles()?.forEach { childFile ->
-					zipFile(childFile, "$fileName/${childFile.name}", zipOut)
-				}
-			} else {
-				FileInputStream(fileToZip).use { fis ->
-					val zipEntry = ZipEntry(fileName)
-					zipOut.putNextEntry(zipEntry)
-					fis.copyTo(zipOut)
-				}
-			}
-		}
-	}
-}
\ No newline at end of file

From 16c8641a078b5e248af70c24da4e6f27ce754d30 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 18 Apr 2022 16:46:35 +0300
Subject: [PATCH 033/104] Fix concurrent downloading #146

---
 .../kotatsu/download/domain/DownloadManager.kt       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index aba04e350..4cc868344 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -32,7 +32,6 @@ import java.io.File
 private const val MAX_DOWNLOAD_ATTEMPTS = 3
 private const val MAX_PARALLEL_DOWNLOADS = 2
 private const val DOWNLOAD_ERROR_DELAY = 500L
-private const val TEMP_PAGE_FILE = "page.tmp"
 
 class DownloadManager(
 	private val coroutineScope: CoroutineScope,
@@ -80,6 +79,7 @@ class DownloadManager(
 		var cover: Drawable? = null
 		val destination = localMangaRepository.getOutputDir()
 		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
+		val tempFileName = "${manga.id}_$startId.tmp"
 		var output: CbzMangaOutput? = null
 		try {
 			if (manga.source == MangaSource.LOCAL) {
@@ -100,7 +100,7 @@ class DownloadManager(
 			val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
 			output = CbzMangaOutput.createNew(destination, data)
 			val coverUrl = data.largeCoverUrl ?: data.coverUrl
-			downloadFile(coverUrl, data.publicUrl, destination).let { file ->
+			downloadFile(coverUrl, data.publicUrl, destination, tempFileName).let { file ->
 				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
 			}
 			val chapters = checkNotNull(
@@ -120,7 +120,7 @@ class DownloadManager(
 					failsafe@ do {
 						try {
 							val url = repo.getPageUrl(page)
-							val file = cache[url] ?: downloadFile(url, page.referer, destination)
+							val file = cache[url] ?: downloadFile(url, page.referer, destination, tempFileName)
 							output.addPage(
 								chapter = chapter,
 								file = file,
@@ -159,14 +159,14 @@ class DownloadManager(
 		} finally {
 			withContext(NonCancellable) {
 				output?.cleanup()
-				File(destination, TEMP_PAGE_FILE).deleteAwait()
+				File(destination, tempFileName).deleteAwait()
 			}
 			coroutineContext[WakeLockNode]?.release()
 			semaphore.release()
 		}
 	}
 
-	private suspend fun downloadFile(url: String, referer: String, destination: File): File {
+	private suspend fun downloadFile(url: String, referer: String, destination: File, tempFileName: String): File {
 		val request = Request.Builder()
 			.url(url)
 			.header(CommonHeaders.REFERER, referer)
@@ -175,7 +175,7 @@ class DownloadManager(
 			.build()
 		val call = okHttp.newCall(request)
 		var attempts = MAX_DOWNLOAD_ATTEMPTS
-		val file = File(destination, TEMP_PAGE_FILE)
+		val file = File(destination, tempFileName)
 		while (true) {
 			try {
 				val response = call.clone().await()

From be661063367c744bdd202d87d13f0df74ae2da01 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 18 Apr 2022 20:00:43 +0300
Subject: [PATCH 034/104] Removing selected chapters from local storage

---
 .../koitharu/kotatsu/base/ui/BaseViewModel.kt |  4 +-
 .../base/ui/util/CountedBooleanLiveData.kt    | 20 +++++++
 .../koitharu/kotatsu/core/zip/ZipOutput.kt    | 18 +++++--
 .../kotatsu/details/ui/ChaptersFragment.kt    | 13 ++++-
 .../kotatsu/details/ui/DetailsActivity.kt     | 13 +++--
 .../kotatsu/details/ui/DetailsViewModel.kt    | 10 ++++
 .../details/ui/model/ChapterListItem.kt       |  3 +-
 .../download/domain/DownloadManager.kt        |  2 +-
 .../koitharu/kotatsu/local/data/MangaIndex.kt |  4 ++
 .../kotatsu/local/domain/CbzMangaOutput.kt    | 54 ++++++++++++++++---
 .../local/domain/LocalMangaRepository.kt      | 12 +++--
 app/src/main/res/menu/mode_chapters.xml       |  6 +++
 12 files changed, 136 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
index 50d8fe803..39233e28f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseViewModel.kt
@@ -1,18 +1,18 @@
 package org.koitharu.kotatsu.base.ui
 
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.*
 import org.koitharu.kotatsu.BuildConfig
+import org.koitharu.kotatsu.base.ui.util.CountedBooleanLiveData
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 
 abstract class BaseViewModel : ViewModel() {
 
 	val onError = SingleLiveEvent<Throwable>()
-	val isLoading = MutableLiveData(false)
+	val isLoading = CountedBooleanLiveData()
 
 	protected fun launchJob(
 		context: CoroutineContext = EmptyCoroutineContext,
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
new file mode 100644
index 000000000..fd7f1abf6
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.base.ui.util
+
+import androidx.lifecycle.MutableLiveData
+
+class CountedBooleanLiveData : MutableLiveData<Boolean>(false) {
+
+	private var counter = 0
+
+	override fun setValue(value: Boolean) {
+		if (value) {
+			counter++
+		} else {
+			counter--
+		}
+		val newValue = counter > 0
+		if (newValue != value) {
+			super.setValue(value)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
index bcdc5b0ee..23a030c4e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
@@ -2,8 +2,6 @@ package org.koitharu.kotatsu.core.zip
 
 import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
 import okio.Closeable
 import java.io.File
 import java.util.zip.Deflater
@@ -22,16 +20,26 @@ class ZipOutput(
 		setLevel(compressionLevel)
 	}
 
-	suspend fun put(name: String, file: File): Unit = runInterruptible(Dispatchers.IO) {
+	fun put(name: String, file: File) {
 		entryNames.add(name)
 		output.appendFile(file, name)
 	}
 
-	suspend fun put(name: String, content: String): Unit = runInterruptible(Dispatchers.IO) {
+	fun put(name: String, content: String) {
 		entryNames.add(name)
 		output.appendText(content, name)
 	}
 
+	fun addDirectory(name: String) {
+		entryNames.add(name)
+		val entry = if (name.endsWith("/")) {
+			ZipEntry(name)
+		} else {
+			ZipEntry("$name/")
+		}
+		output.putNextEntry(entry)
+	}
+
 	@WorkerThread
 	fun copyEntryFrom(other: ZipFile, entry: ZipEntry): Boolean {
 		return if (entryNames.add(entry.name)) {
@@ -47,7 +55,7 @@ class ZipOutput(
 		}
 	}
 
-	suspend fun finish() = runInterruptible(Dispatchers.IO) {
+	fun finish() {
 		output.finish()
 		output.flush()
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index 96f369c56..0dbf3eea5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -154,11 +154,19 @@ class ChaptersFragment :
 				DownloadService.start(
 					context ?: return false,
 					viewModel.getRemoteManga() ?: viewModel.manga.value ?: return false,
-					selectionDecoration?.checkedItemsIds
+					selectionDecoration?.checkedItemsIds?.toSet()
 				)
 				mode.finish()
 				true
 			}
+			R.id.action_delete -> {
+				val ids = selectionDecoration?.checkedItemsIds
+				if (!ids.isNullOrEmpty()) {
+					viewModel.deleteChapters(ids.toSet())
+				}
+				mode.finish()
+				true
+			}
 			R.id.action_select_all -> {
 				val ids = chaptersAdapter?.items?.map { it.chapter.id } ?: return false
 				selectionDecoration?.checkAll(ids)
@@ -188,6 +196,9 @@ class ChaptersFragment :
 		menu.findItem(R.id.action_save).isVisible = items.none { x ->
 			x.chapter.source == MangaSource.LOCAL
 		}
+		menu.findItem(R.id.action_delete).isVisible = items.all { x ->
+			x.chapter.source == MangaSource.LOCAL
+		}
 		mode.title = items.size.toString()
 		return true
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index 3ef3d8517..18e0e325b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -47,7 +47,9 @@ import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
 import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 
-class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediator.TabConfigurationStrategy,
+class DetailsActivity :
+	BaseActivity<ActivityDetailsBinding>(),
+	TabLayoutMediator.TabConfigurationStrategy,
 	AdapterView.OnItemSelectedListener {
 
 	private val viewModel by viewModel<DetailsViewModel> {
@@ -79,6 +81,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 		viewModel.manga.observe(this, ::onMangaUpdated)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
+		viewModel.onChaptersRemoved.observe(this, ::onChaptersRemoved)
 		viewModel.onError.observe(this, ::onError)
 
 		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
@@ -102,6 +105,10 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 		finishAfterTransition()
 	}
 
+	private fun onChaptersRemoved(count: Int) {
+		binding.snackbar.show(getString(R.string.removal_completed))
+	}
+
 	private fun onError(e: Throwable) {
 		when {
 			ExceptionResolver.canResolve(e) -> {
@@ -262,7 +269,7 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 	fun showChapterMissingDialog(chapterId: Long) {
 		val remoteManga = viewModel.getRemoteManga()
 		if (remoteManga == null) {
-			binding.snackbar.show(getString( R.string.chapter_is_missing))
+			binding.snackbar.show(getString(R.string.chapter_is_missing))
 			return
 		}
 		MaterialAlertDialogBuilder(this).apply {
@@ -340,4 +347,4 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 				.putExtra(MangaIntent.KEY_ID, mangaId)
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index afc0129ac..53a173369 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -85,6 +85,7 @@ class DetailsViewModel(
 		.asLiveData(viewModelScope.coroutineContext)
 
 	val onMangaRemoved = SingleLiveEvent<Manga>()
+	val onChaptersRemoved = SingleLiveEvent<Int>()
 
 	val branches = mangaData.map {
 		it?.chapters?.mapToSet { x -> x.branch }?.sortedBy { x -> x }.orEmpty()
@@ -183,6 +184,15 @@ class DetailsViewModel(
 		}
 	}
 
+	fun deleteChapters(ids: Set<Long>) {
+		launchLoadingJob {
+			val manga = checkNotNull(mangaData.value)
+			localMangaRepository.deleteChapters(manga, ids)
+			reload()
+			onChaptersRemoved.call(ids.size)
+		}
+	}
+
 	private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
 		var manga = mangaDataRepository.resolveIntent(intent)
 			?: throw MangaNotFoundException("Cannot find manga")
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
index 6f37c8e53..2d5b90840 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/model/ChapterListItem.kt
@@ -40,11 +40,10 @@ class ChapterListItem(
 	override fun hashCode(): Int {
 		var result = chapter.hashCode()
 		result = 31 * result + flags
-		result = 31 * result + uploadDate.hashCode()
+		result = 31 * result + (uploadDate?.hashCode() ?: 0)
 		return result
 	}
 
-
 	companion object {
 
 		const val FLAG_UNREAD = 2
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index 4cc868344..3a2067705 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -98,7 +98,7 @@ class DownloadManager(
 			}.getOrNull()
 			outState.value = DownloadState.Preparing(startId, manga, cover)
 			val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
-			output = CbzMangaOutput.createNew(destination, data)
+			output = CbzMangaOutput.get(destination, data)
 			val coverUrl = data.largeCoverUrl ?: data.coverUrl
 			downloadFile(coverUrl, data.publicUrl, destination, tempFileName).let { file ->
 				output.addCover(file, MimeTypeMap.getFileExtensionFromUrl(coverUrl))
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
index 07bbbce98..e0eb87865 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
@@ -92,6 +92,10 @@ class MangaIndex(source: String?) {
 		}
 	}
 
+	fun removeChapter(id: Long): Boolean {
+		return json.getJSONObject("chapters").remove(id.toString()) != null
+	}
+
 	fun setCoverEntry(name: String) {
 		json.put("cover_entry", name)
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
index 87b772bb7..9278dd83f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
@@ -10,6 +10,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.util.toFileNameSafe
 import org.koitharu.kotatsu.utils.ext.deleteAwait
+import org.koitharu.kotatsu.utils.ext.readText
 import java.io.File
 import java.util.zip.ZipFile
 
@@ -41,7 +42,9 @@ class CbzMangaOutput(
 				append(ext)
 			}
 		}
-		output.put(name, file)
+		runInterruptible(Dispatchers.IO) {
+			output.put(name, file)
+		}
 		index.setCoverEntry(name)
 	}
 
@@ -53,14 +56,18 @@ class CbzMangaOutput(
 				append(ext)
 			}
 		}
-		output.put(name, file)
+		runInterruptible(Dispatchers.IO) {
+			output.put(name, file)
+		}
 		index.addChapter(chapter)
 	}
 
 	suspend fun finalize() {
-		output.put(ENTRY_NAME_INDEX, index.toString())
-		output.finish()
-		output.close()
+		runInterruptible(Dispatchers.IO) {
+			output.put(ENTRY_NAME_INDEX, index.toString())
+			output.finish()
+			output.close()
+		}
 		file.deleteAwait()
 		output.file.renameTo(file)
 	}
@@ -102,10 +109,45 @@ class CbzMangaOutput(
 
 		const val ENTRY_NAME_INDEX = "index.json"
 
-		fun createNew(root: File, manga: Manga): CbzMangaOutput {
+		fun get(root: File, manga: Manga): CbzMangaOutput {
 			val name = manga.title.toFileNameSafe() + ".cbz"
 			val file = File(root, name)
 			return CbzMangaOutput(file, manga)
 		}
+
+		@WorkerThread
+		fun filterChapters(subject: CbzMangaOutput, idsToRemove: Set<Long>) {
+			ZipFile(subject.file).use { zip ->
+				val index = MangaIndex(zip.readText(zip.getEntry(ENTRY_NAME_INDEX)))
+				idsToRemove.forEach { id -> index.removeChapter(id) }
+				val patterns = requireNotNull(index.getMangaInfo()?.chapters).map {
+					index.getChapterNamesPattern(it)
+				}
+				val coverEntryName = index.getCoverEntry()
+				for (entry in zip.entries()) {
+					when {
+						entry.name == ENTRY_NAME_INDEX -> {
+							subject.output.put(ENTRY_NAME_INDEX, index.toString())
+						}
+						entry.isDirectory -> {
+							subject.output.addDirectory(entry.name)
+						}
+						entry.name == coverEntryName -> {
+							subject.output.copyEntryFrom(zip, entry)
+						}
+						else -> {
+							val name = entry.name.substringBefore('.')
+							if (patterns.any { it.matches(name) }) {
+								subject.output.copyEntryFrom(zip, entry)
+							}
+						}
+					}
+				}
+				subject.output.finish()
+				subject.output.close()
+				subject.file.delete()
+				subject.output.file.renameTo(subject.file)
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index 99d8f7ad9..bf2b69cc6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -49,12 +49,11 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		manga.source != MangaSource.LOCAL -> requireNotNull(findSavedManga(manga)) {
 			"Manga is not local or saved"
 		}
-		manga.chapters == null -> getFromFile(Uri.parse(manga.url).toFile())
-		else -> manga
+		else -> getFromFile(Uri.parse(manga.url).toFile())
 	}
 
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
-		return runInterruptible(Dispatchers.IO){
+		return runInterruptible(Dispatchers.IO) {
 			val uri = Uri.parse(chapter.url)
 			val file = uri.toFile()
 			val zip = ZipFile(file)
@@ -93,6 +92,13 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		return file.deleteAwait()
 	}
 
+	suspend fun deleteChapters(manga: Manga, ids: Set<Long>) = runInterruptible(Dispatchers.IO) {
+		val uri = Uri.parse(manga.url)
+		val file = uri.toFile()
+		val cbz = CbzMangaOutput(file, manga)
+		CbzMangaOutput.filterChapters(cbz, ids)
+	}
+
 	@SuppressLint("DefaultLocale")
 	fun getFromFile(file: File): Manga = ZipFile(file).use { zip ->
 		val fileUri = file.toUri().toString()
diff --git a/app/src/main/res/menu/mode_chapters.xml b/app/src/main/res/menu/mode_chapters.xml
index 2e9a6aff0..8e3d52bab 100644
--- a/app/src/main/res/menu/mode_chapters.xml
+++ b/app/src/main/res/menu/mode_chapters.xml
@@ -9,6 +9,12 @@
 		android:title="@string/save"
 		app:showAsAction="ifRoom|withText" />
 
+	<item
+		android:id="@+id/action_delete"
+		android:icon="@drawable/ic_delete"
+		android:title="@string/delete"
+		app:showAsAction="ifRoom|withText" />
+
 	<item
 		android:id="@+id/action_select_all"
 		android:icon="?actionModeSelectAllDrawable"

From ce8f57c3ca4b8e8cf5ca4a577bb3d68720c1ce0b Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 18 Apr 2022 20:11:23 +0300
Subject: [PATCH 035/104] Disable update checking if not supported #147

---
 .../main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 29f0c01ac..d1e033cb7 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -387,7 +387,9 @@ class MainActivity :
 		lifecycleScope.launch(Dispatchers.Default) {
 			TrackWorker.setup(applicationContext)
 			SuggestionsWorker.setup(applicationContext)
-			AppUpdateChecker(this@MainActivity).checkIfNeeded()
+			if (AppUpdateChecker.isUpdateSupported(this@MainActivity)) {
+				AppUpdateChecker(this@MainActivity).checkIfNeeded()
+			}
 			if (!get<AppSettings>().isSourcesSelected) {
 				withContext(Dispatchers.Main) {
 					OnboardDialogFragment.showWelcome(supportFragmentManager)

From 98f16774c4ecfe2e1e7d3b31dcfac30eca057a0f Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 08:22:54 +0300
Subject: [PATCH 036/104] Delete whole manga if all chapters are removed

---
 .../koitharu/kotatsu/details/ui/DetailsViewModel.kt    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 53a173369..4582e48ad 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -4,6 +4,7 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
+import java.io.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
@@ -29,7 +30,6 @@ import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.iterator
-import java.io.IOException
 
 class DetailsViewModel(
 	private val intent: MangaIntent,
@@ -185,9 +185,13 @@ class DetailsViewModel(
 	}
 
 	fun deleteChapters(ids: Set<Long>) {
+		val m = mangaData.value ?: return
+		if (m.chapters?.size == ids.size) {
+			deleteLocal(m)
+			return
+		}
 		launchLoadingJob {
-			val manga = checkNotNull(mangaData.value)
-			localMangaRepository.deleteChapters(manga, ids)
+			localMangaRepository.deleteChapters(m, ids)
 			reload()
 			onChaptersRemoved.call(ids.size)
 		}

From fa536220ebdc2fbdc031a7e893e8cffed72d9d92 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 09:25:12 +0300
Subject: [PATCH 037/104] Search and parallelism in
 LocalMangaRepository.getList

---
 .../local/domain/LocalMangaRepository.kt      | 51 +++++++++++++++----
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index bf2b69cc6..06b5757bf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -3,12 +3,17 @@ package org.koitharu.kotatsu.local.domain
 import android.annotation.SuppressLint
 import android.net.Uri
 import android.webkit.MimeTypeMap
+import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
 import androidx.core.net.toFile
 import androidx.core.net.toUri
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.IOException
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.*
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
@@ -21,11 +26,8 @@ import org.koitharu.kotatsu.utils.AlphanumComparator
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.readText
 import org.koitharu.kotatsu.utils.ext.resolveName
-import java.io.File
-import java.io.IOException
-import java.util.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
+
+private const val MAX_PARALLELISM = 4
 
 class LocalMangaRepository(private val storageManager: LocalStorageManager) : MangaRepository {
 
@@ -38,11 +40,28 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		tags: Set<MangaTag>?,
 		sortOrder: SortOrder?
 	): List<Manga> {
-		require(offset == 0) {
-			"LocalMangaRepository does not support pagination"
+		if (offset > 0) {
+			return emptyList()
 		}
 		val files = getAllFiles()
-		return files.mapNotNull { x -> runCatching { getFromFile(x) }.getOrNull() }
+		val list = coroutineScope {
+			val dispatcher = Dispatchers.IO.limitedParallelism(MAX_PARALLELISM)
+			files.map { file ->
+				getFromFileAsync(file, dispatcher)
+			}.awaitAll()
+		}.filterNotNullTo(ArrayList(files.size))
+		if (!query.isNullOrEmpty()) {
+			list.retainAll { x ->
+				x.title.contains(query, ignoreCase = true) ||
+					x.altTitle?.contains(query, ignoreCase = true) == true
+			}
+		}
+		if (!tags.isNullOrEmpty()) {
+			list.retainAll { x ->
+				x.tags.containsAll(tags)
+			}
+		}
+		return list
 	}
 
 	override suspend fun getDetails(manga: Manga) = when {
@@ -99,6 +118,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		CbzMangaOutput.filterChapters(cbz, ids)
 	}
 
+	@WorkerThread
 	@SuppressLint("DefaultLocale")
 	fun getFromFile(file: File): Manga = ZipFile(file).use { zip ->
 		val fileUri = file.toUri().toString()
@@ -192,6 +212,15 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		}
 	}
 
+	private fun CoroutineScope.getFromFileAsync(
+		file: File,
+		context: CoroutineContext,
+	): Deferred<Manga?> = async(context) {
+		runInterruptible {
+			runCatching { getFromFile(file) }.getOrNull()
+		}
+	}
+
 	private fun zipUri(file: File, entryName: String) = "cbz://${file.path}#$entryName"
 
 	private fun findFirstImageEntry(entries: Enumeration<out ZipEntry>): ZipEntry? {

From 8fc9b27840b787e04e264797998aeee53b2f8a92 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 10:27:22 +0300
Subject: [PATCH 038/104] Option to slowdown downloads and configure
 parallelism

---
 .../kotatsu/core/prefs/AppSettings.kt         |  8 +++++
 .../download/domain/DownloadManager.kt        | 32 +++++++++++++++++--
 .../download/ui/service/DownloadService.kt    |  7 +---
 .../org/koitharu/kotatsu/local/LocalModule.kt |  3 ++
 .../settings/ContentSettingsFragment.kt       | 10 +++++-
 .../koitharu/kotatsu/utils/ext/AndroidExt.kt  |  1 +
 app/src/main/res/layout/preference_slider.xml | 19 ++++++-----
 app/src/main/res/values-ru/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  3 ++
 app/src/main/res/xml/pref_content.xml         | 25 ++++++++++++---
 10 files changed, 86 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 89cbc1aaf..45232e2ef 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -141,6 +141,12 @@ class AppSettings(context: Context) {
 			}
 		}
 
+	val isDownloadsSlowdownEnabled: Boolean
+		get() = prefs.getBoolean(KEY_DOWNLOADS_SLOWDOWN, false)
+
+	val downloadsParallelism: Int
+		get() = prefs.getInt(KEY_DOWNLOADS_PARALLELISM, 2)
+
 	val isSuggestionsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_SUGGESTIONS, false)
 
@@ -261,6 +267,8 @@ class AppSettings(context: Context) {
 		const val KEY_SUGGESTIONS_EXCLUDE_NSFW = "suggestions_exclude_nsfw"
 		const val KEY_SUGGESTIONS_EXCLUDE_TAGS = "suggestions_exclude_tags"
 		const val KEY_SEARCH_SINGLE_SOURCE = "search_single_source"
+		const val KEY_DOWNLOADS_PARALLELISM = "downloads_parallelism"
+		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index 3a2067705..4708c0849 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.network.CommonHeaders
 import org.koitharu.kotatsu.core.parser.MangaRepository
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.local.domain.CbzMangaOutput
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
@@ -30,8 +31,8 @@ import org.koitharu.kotatsu.utils.progress.ProgressJob
 import java.io.File
 
 private const val MAX_DOWNLOAD_ATTEMPTS = 3
-private const val MAX_PARALLEL_DOWNLOADS = 2
 private const val DOWNLOAD_ERROR_DELAY = 500L
+private const val SLOWDOWN_DELAY = 200L
 
 class DownloadManager(
 	private val coroutineScope: CoroutineScope,
@@ -40,9 +41,10 @@ class DownloadManager(
 	private val okHttp: OkHttpClient,
 	private val cache: PagesCache,
 	private val localMangaRepository: LocalMangaRepository,
+	private val settings: AppSettings,
 ) {
 
-	private val connectivityManager = context.applicationContext.getSystemService(
+	private val connectivityManager = context.getSystemService(
 		Context.CONNECTIVITY_SERVICE
 	) as ConnectivityManager
 	private val coverWidth = context.resources.getDimensionPixelSize(
@@ -51,7 +53,7 @@ class DownloadManager(
 	private val coverHeight = context.resources.getDimensionPixelSize(
 		androidx.core.R.dimen.compat_notification_large_icon_max_height
 	)
-	private val semaphore = Semaphore(MAX_PARALLEL_DOWNLOADS)
+	private val semaphore = Semaphore(settings.downloadsParallelism)
 
 	fun downloadManga(
 		manga: Manga,
@@ -141,6 +143,10 @@ class DownloadManager(
 						totalPages = pages.size,
 						currentPage = pageIndex,
 					)
+
+					if (settings.isDownloadsSlowdownEnabled) {
+						delay(SLOWDOWN_DELAY)
+					}
 				}
 			}
 			outState.value = DownloadState.PostProcessing(startId, data, cover)
@@ -206,4 +212,24 @@ class DownloadManager(
 				error = throwable,
 			)
 		}
+
+	class Factory(
+		private val context: Context,
+		private val imageLoader: ImageLoader,
+		private val okHttp: OkHttpClient,
+		private val cache: PagesCache,
+		private val localMangaRepository: LocalMangaRepository,
+		private val settings: AppSettings,
+	) {
+
+		fun create(coroutineScope: CoroutineScope) = DownloadManager(
+			coroutineScope = coroutineScope,
+			context = context,
+			imageLoader = imageLoader,
+			okHttp = okHttp,
+			cache = cache,
+			localMangaRepository = localMangaRepository,
+			settings = settings,
+		)
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index 41bb3e273..13365094c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -49,13 +49,8 @@ class DownloadService : BaseService() {
 		notificationSwitcher = ForegroundNotificationSwitcher(this)
 		val wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
 			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
-		downloadManager = DownloadManager(
+		downloadManager = get<DownloadManager.Factory>().create(
 			coroutineScope = lifecycleScope + WakeLockNode(wakeLock, TimeUnit.HOURS.toMillis(1)),
-			context = this,
-			imageLoader = get(),
-			okHttp = get(),
-			cache = get(),
-			localMangaRepository = get(),
 		)
 		DownloadNotification.createChannel(this)
 		registerReceiver(controlReceiver, IntentFilter(ACTION_DOWNLOAD_CANCEL))
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
index cda2dbad6..928fe706b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.local
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
+import org.koitharu.kotatsu.download.domain.DownloadManager
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.local.ui.LocalListViewModel
@@ -16,5 +17,7 @@ val localModule
 
 		factory { ExternalStorageHelper(androidContext()) }
 
+		factory { DownloadManager.Factory(androidContext(), get(), get(), get(), get(), get()) }
+
 		viewModel { LocalListViewModel(get(), get(), get(), get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
index 5e4c7555b..d9c8da758 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
@@ -4,7 +4,6 @@ import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
-import java.io.File
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.R
@@ -13,8 +12,10 @@ import org.koitharu.kotatsu.base.ui.dialog.StorageSelectDialog
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.settings.utils.SliderPreference
 import org.koitharu.kotatsu.utils.ext.getStorageName
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
+import java.io.File
 
 class ContentSettingsFragment :
 	BasePreferenceFragment(R.string.content),
@@ -29,6 +30,13 @@ class ContentSettingsFragment :
 		findPreference<Preference>(AppSettings.KEY_SUGGESTIONS)?.setSummary(
 			if (settings.isSuggestionsEnabled) R.string.enabled else R.string.disabled
 		)
+		findPreference<SliderPreference>(AppSettings.KEY_DOWNLOADS_PARALLELISM)?.run {
+			summary = value.toString()
+			setOnPreferenceChangeListener { preference, newValue ->
+				preference.summary = newValue.toString()
+				true
+			}
+		}
 		bindRemoteSourcesSummary()
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index 21140be00..d1ff7ae6c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -17,6 +17,7 @@ suspend fun ConnectivityManager.waitForNetwork(): Network {
 	return suspendCancellableCoroutine { cont ->
 		val callback = object : ConnectivityManager.NetworkCallback() {
 			override fun onAvailable(network: Network) {
+				unregisterNetworkCallback(this)
 				if (cont.isActive) {
 					cont.resume(network)
 				}
diff --git a/app/src/main/res/layout/preference_slider.xml b/app/src/main/res/layout/preference_slider.xml
index f3dfdc29a..dc98ba093 100644
--- a/app/src/main/res/layout/preference_slider.xml
+++ b/app/src/main/res/layout/preference_slider.xml
@@ -5,13 +5,12 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?android:attr/selectableItemBackground"
 	android:baselineAligned="false"
 	android:clipChildren="false"
 	android:clipToPadding="false"
-	android:orientation="horizontal"
 	android:gravity="center_vertical"
 	android:minHeight="?android:attr/listPreferredItemHeightSmall"
+	android:orientation="horizontal"
 	android:paddingStart="?android:attr/listPreferredItemPaddingStart"
 	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
 	tools:ignore="PrivateResource">
@@ -27,17 +26,18 @@
 		android:clipToPadding="false"
 		android:orientation="vertical">
 
-		<RelativeLayout
-			android:layout_width="wrap_content"
-			android:layout_height="0dp"
-			android:layout_weight="1">
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:orientation="horizontal"
+			android:baselineAligned="true"
+			android:baselineAlignedChildIndex="0"
+			android:layout_height="wrap_content">
 
 			<TextView
 				android:id="@android:id/title"
 				android:layout_width="0dp"
+				android:layout_weight="1"
 				android:layout_height="wrap_content"
-				android:layout_alignParentStart="true"
-				android:layout_toStartOf="@android:id/summary"
 				android:ellipsize="marquee"
 				android:labelFor="@id/seekbar"
 				android:singleLine="true"
@@ -49,12 +49,11 @@
 				style="@style/PreferenceSummaryTextStyle"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_alignParentEnd="true"
 				android:singleLine="true"
 				android:textAlignment="viewStart"
 				android:textColor="?android:attr/textColorSecondary" />
 
-		</RelativeLayout>
+		</LinearLayout>
 
 		<com.google.android.material.slider.Slider
 			android:id="@+id/slider"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e42e5ec06..a4c27b6a0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -271,4 +271,7 @@
 	<string name="text_delete_local_manga_batch">Удалить выбранную мангу с накопителя?</string>
 	<string name="removal_completed">Удаление завершено</string>
 	<string name="batch_manga_save_confirm">Загрузить выбранную мангу со всеми главами? Это может привести к большому расходу трафика и места на накопителе</string>
+	<string name="parallel_downloads">Загружать параллельно</string>
+	<string name="download_slowdown">Замедление загрузки</string>
+	<string name="download_slowdown_summary">Помогает избежать блокировки IP-адреса</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a44dfec15..e249d13f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -274,4 +274,7 @@
 	<string name="text_delete_local_manga_batch">Delete selected items from device permanently?</string>
 	<string name="removal_completed">Removal completed</string>
 	<string name="batch_manga_save_confirm">Are you sure you want to download all selected manga with all its chapters? This action can consume a lot of traffic and storage</string>
+	<string name="parallel_downloads">Parallel downloads</string>
+	<string name="download_slowdown">Download slowdown</string>
+	<string name="download_slowdown_summary">Helps avoid blocking your IP address</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_content.xml b/app/src/main/res/xml/pref_content.xml
index 9508fdf58..53fee4124 100644
--- a/app/src/main/res/xml/pref_content.xml
+++ b/app/src/main/res/xml/pref_content.xml
@@ -8,17 +8,32 @@
 		android:key="remote_sources"
 		android:title="@string/remote_sources" />
 
-	<Preference
-		android:key="local_storage"
-		android:persistent="false"
-		android:title="@string/manga_save_location" />
-
 	<PreferenceScreen
 		android:fragment="org.koitharu.kotatsu.settings.SuggestionsSettingsFragment"
 		android:key="suggestions"
 		android:persistent="false"
 		android:title="@string/suggestions" />
 
+	<Preference
+		android:key="local_storage"
+		android:persistent="false"
+		android:title="@string/manga_save_location"
+		app:allowDividerAbove="true" />
+
+	<SwitchPreferenceCompat
+		android:defaultValue="false"
+		android:key="downloads_slowdown"
+		android:summary="@string/download_slowdown_summary"
+		android:title="@string/download_slowdown" />
+
+	<org.koitharu.kotatsu.settings.utils.SliderPreference
+		android:key="downloads_parallelism"
+		android:stepSize="1"
+		android:title="@string/parallel_downloads"
+		android:valueFrom="1"
+		android:valueTo="5"
+		app:defaultValue="2" />
+
 	<PreferenceScreen
 		android:fragment="org.koitharu.kotatsu.settings.backup.BackupSettingsFragment"
 		android:title="@string/backup_restore"

From 5b5e6cba57e31bf8cfe08f732349779d97c815c3 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 11:07:19 +0300
Subject: [PATCH 039/104] Fix download error retry

---
 app/build.gradle                              |  6 +--
 .../download/domain/DownloadManager.kt        | 39 ++++++++-----------
 .../koitharu/kotatsu/utils/ext/AndroidExt.kt  |  5 +++
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 69e2b2373..4cd4b8cf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,14 +6,14 @@ plugins {
 }
 
 android {
-	compileSdkVersion 31
-	buildToolsVersion '31.0.0'
+	compileSdkVersion 32
+	buildToolsVersion '32.0.0'
 	namespace 'org.koitharu.kotatsu'
 
 	defaultConfig {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
-		targetSdkVersion 31
+		targetSdkVersion 32
 		versionCode 402
 		versionName '3.1.1'
 		generatedDensities = []
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index 4708c0849..b8183a96b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -119,7 +119,8 @@ class DownloadManager(
 			for ((chapterIndex, chapter) in chapters.withIndex()) {
 				val pages = repo.getPages(chapter)
 				for ((pageIndex, page) in pages.withIndex()) {
-					failsafe@ do {
+					var retryCounter = 0
+					failsafe@ while (true) {
 						try {
 							val url = repo.getPageUrl(page)
 							val file = cache[url] ?: downloadFile(url, page.referer, destination, tempFileName)
@@ -129,12 +130,18 @@ class DownloadManager(
 								pageNumber = pageIndex,
 								ext = MimeTypeMap.getFileExtensionFromUrl(url),
 							)
+							break@failsafe
 						} catch (e: IOException) {
-							outState.value = DownloadState.WaitingForNetwork(startId, data, cover)
-							connectivityManager.waitForNetwork()
-							continue@failsafe
+							if (retryCounter < MAX_DOWNLOAD_ATTEMPTS) {
+								outState.value = DownloadState.WaitingForNetwork(startId, data, cover)
+								delay(DOWNLOAD_ERROR_DELAY)
+								connectivityManager.waitForNetwork()
+								retryCounter++
+							} else {
+								throw e
+							}
 						}
-					} while (false)
+					}
 
 					outState.value = DownloadState.Progress(
 						startId, data, cover,
@@ -180,26 +187,14 @@ class DownloadManager(
 			.get()
 			.build()
 		val call = okHttp.newCall(request)
-		var attempts = MAX_DOWNLOAD_ATTEMPTS
 		val file = File(destination, tempFileName)
-		while (true) {
-			try {
-				val response = call.clone().await()
-				runInterruptible(Dispatchers.IO) {
-					file.outputStream().use { out ->
-						checkNotNull(response.body).byteStream().copyTo(out)
-					}
-				}
-				return file
-			} catch (e: IOException) {
-				attempts--
-				if (attempts <= 0) {
-					throw e
-				} else {
-					delay(DOWNLOAD_ERROR_DELAY)
-				}
+		val response = call.clone().await()
+		runInterruptible(Dispatchers.IO) {
+			file.outputStream().use { out ->
+				checkNotNull(response.body).byteStream().copyTo(out)
 			}
 		}
+		return file
 	}
 
 	private fun errorStateHandler(outState: MutableStateFlow<DownloadState>) =
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index d1ff7ae6c..733bf17d4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -5,6 +5,7 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkRequest
 import android.net.Uri
+import android.os.Build
 import androidx.work.CoroutineWorker
 import kotlin.coroutines.resume
 import kotlinx.coroutines.suspendCancellableCoroutine
@@ -14,6 +15,10 @@ val Context.connectivityManager: ConnectivityManager
 
 suspend fun ConnectivityManager.waitForNetwork(): Network {
 	val request = NetworkRequest.Builder().build()
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+		// fast path
+		activeNetwork?.let { return it }
+	}
 	return suspendCancellableCoroutine { cont ->
 		val callback = object : ConnectivityManager.NetworkCallback() {
 			override fun onAvailable(network: Network) {

From d77646adf1921c9da31e999eac6e548f48d32e28 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 11:32:42 +0300
Subject: [PATCH 040/104] Fix duplicate zip entry error

---
 .../koitharu/kotatsu/core/zip/ZipOutput.kt    | 67 ++++++++++++++++---
 .../org/koitharu/kotatsu/core/zip/ZipUtils.kt | 37 ----------
 2 files changed, 58 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
index 23a030c4e..d34e753ab 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipOutput.kt
@@ -4,6 +4,7 @@ import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
 import okio.Closeable
 import java.io.File
+import java.io.FileInputStream
 import java.util.zip.Deflater
 import java.util.zip.ZipEntry
 import java.util.zip.ZipFile
@@ -20,24 +21,30 @@ class ZipOutput(
 		setLevel(compressionLevel)
 	}
 
-	fun put(name: String, file: File) {
-		entryNames.add(name)
-		output.appendFile(file, name)
+	@WorkerThread
+	fun put(name: String, file: File): Boolean {
+		return output.appendFile(file, name)
 	}
 
-	fun put(name: String, content: String) {
-		entryNames.add(name)
-		output.appendText(content, name)
+	@WorkerThread
+	fun put(name: String, content: String): Boolean {
+		return output.appendText(content, name)
 	}
 
-	fun addDirectory(name: String) {
-		entryNames.add(name)
+	@WorkerThread
+	fun addDirectory(name: String): Boolean {
 		val entry = if (name.endsWith("/")) {
 			ZipEntry(name)
 		} else {
 			ZipEntry("$name/")
 		}
-		output.putNextEntry(entry)
+		return if (entryNames.add(entry.name)) {
+			output.putNextEntry(entry)
+			output.closeEntry()
+			true
+		} else {
+			false
+		}
 	}
 
 	@WorkerThread
@@ -66,4 +73,46 @@ class ZipOutput(
 			isClosed = true
 		}
 	}
+
+	@WorkerThread
+	private fun ZipOutputStream.appendFile(fileToZip: File, name: String): Boolean {
+		if (fileToZip.isDirectory) {
+			val entry = if (name.endsWith("/")) {
+				ZipEntry(name)
+			} else {
+				ZipEntry("$name/")
+			}
+			if (!entryNames.add(entry.name)) {
+				return false
+			}
+			putNextEntry(entry)
+			closeEntry()
+			fileToZip.listFiles()?.forEach { childFile ->
+				appendFile(childFile, "$name/${childFile.name}")
+			}
+		} else {
+			FileInputStream(fileToZip).use { fis ->
+				if (!entryNames.add(name)) {
+					return false
+				}
+				val zipEntry = ZipEntry(name)
+				putNextEntry(zipEntry)
+				fis.copyTo(this)
+				closeEntry()
+			}
+		}
+		return true
+	}
+
+	@WorkerThread
+	private fun ZipOutputStream.appendText(content: String, name: String): Boolean {
+		if (!entryNames.add(name)) {
+			return false
+		}
+		val zipEntry = ZipEntry(name)
+		putNextEntry(zipEntry)
+		content.byteInputStream().copyTo(this)
+		closeEntry()
+		return true
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt b/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt
deleted file mode 100644
index c42f47142..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/core/zip/ZipUtils.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.koitharu.kotatsu.core.zip
-
-import androidx.annotation.WorkerThread
-import java.io.File
-import java.io.FileInputStream
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
-
-@WorkerThread
-fun ZipOutputStream.appendFile(fileToZip: File, name: String) {
-	if (fileToZip.isDirectory) {
-		if (name.endsWith("/")) {
-			putNextEntry(ZipEntry(name))
-		} else {
-			putNextEntry(ZipEntry("$name/"))
-		}
-		closeEntry()
-		fileToZip.listFiles()?.forEach { childFile ->
-			appendFile(childFile, "$name/${childFile.name}")
-		}
-	} else {
-		FileInputStream(fileToZip).use { fis ->
-			val zipEntry = ZipEntry(name)
-			putNextEntry(zipEntry)
-			fis.copyTo(this)
-			closeEntry()
-		}
-	}
-}
-
-@WorkerThread
-fun ZipOutputStream.appendText(content: String, name: String) {
-	val zipEntry = ZipEntry(name)
-	putNextEntry(zipEntry)
-	content.byteInputStream().copyTo(this)
-	closeEntry()
-}
\ No newline at end of file

From 3c739eed8e7af96fae20353b0d3abe706ece7cbc Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 12:43:51 +0300
Subject: [PATCH 041/104] Fix empty chapters label

---
 .../kotatsu/details/ui/ChaptersFragment.kt    |  7 ++-
 .../kotatsu/details/ui/DetailsViewModel.kt    | 13 ++---
 .../kotatsu/utils/PausingDispatcher.kt        | 50 +++++++++++++++++++
 app/src/main/res/drawable/ic_pause.xml        | 12 +++++
 app/src/main/res/drawable/ic_resume.xml       | 12 +++++
 app/src/main/res/menu/opt_downloads.xml       | 18 +++++++
 6 files changed, 102 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/PausingDispatcher.kt
 create mode 100644 app/src/main/res/drawable/ic_pause.xml
 create mode 100644 app/src/main/res/drawable/ic_resume.xml
 create mode 100644 app/src/main/res/menu/opt_downloads.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index 0dbf3eea5..143a87713 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
-import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -67,8 +66,8 @@ class ChaptersFragment :
 		viewModel.isChaptersReversed.observe(viewLifecycleOwner) {
 			activity?.invalidateOptionsMenu()
 		}
-		viewModel.hasChapters.observe(viewLifecycleOwner) {
-			binding.textViewHolder.isGone = it
+		viewModel.isChaptersEmpty.observe(viewLifecycleOwner) {
+			binding.textViewHolder.isVisible = it
 			activity?.invalidateOptionsMenu()
 		}
 	}
@@ -94,7 +93,7 @@ class ChaptersFragment :
 	override fun onPrepareOptionsMenu(menu: Menu) {
 		super.onPrepareOptionsMenu(menu)
 		menu.findItem(R.id.action_reversed).isChecked = viewModel.isChaptersReversed.value == true
-		menu.findItem(R.id.action_search).isVisible = viewModel.hasChapters.value == true
+		menu.findItem(R.id.action_search).isVisible = viewModel.isChaptersEmpty.value == false
 	}
 
 	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index 4582e48ad..d0318779b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -4,7 +4,6 @@ import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.asFlow
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
-import java.io.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
@@ -29,7 +28,9 @@ import org.koitharu.kotatsu.parsers.util.mapToSet
 import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.utils.SingleLiveEvent
+import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.ext.iterator
+import java.io.IOException
 
 class DetailsViewModel(
 	private val intent: MangaIntent,
@@ -89,18 +90,18 @@ class DetailsViewModel(
 
 	val branches = mangaData.map {
 		it?.chapters?.mapToSet { x -> x.branch }?.sortedBy { x -> x }.orEmpty()
-	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	val selectedBranchIndex = combine(
 		branches.asFlow(),
 		selectedBranch
 	) { branches, selected ->
 		branches.indexOf(selected)
-	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
-	val hasChapters = mangaData.map {
-		!(it?.chapters.isNullOrEmpty())
-	}.asLiveData(viewModelScope.coroutineContext + Dispatchers.Default)
+	val isChaptersEmpty = mangaData.mapNotNull { m ->
+		m?.run { chapters.isNullOrEmpty() }
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default, false)
 
 	val chapters = combine(
 		combine(
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/PausingDispatcher.kt b/app/src/main/java/org/koitharu/kotatsu/utils/PausingDispatcher.kt
new file mode 100644
index 000000000..57eb100a4
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/PausingDispatcher.kt
@@ -0,0 +1,50 @@
+package org.koitharu.kotatsu.utils
+
+import androidx.annotation.MainThread
+import java.util.concurrent.ConcurrentLinkedQueue
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Runnable
+
+class PausingDispatcher(
+	private val dispatcher: CoroutineDispatcher,
+) : CoroutineDispatcher() {
+
+	@Volatile
+	private var isPaused = false
+	private val queue = ConcurrentLinkedQueue<Task>()
+
+	override fun isDispatchNeeded(context: CoroutineContext): Boolean {
+		return isPaused || super.isDispatchNeeded(context)
+	}
+
+	override fun dispatch(context: CoroutineContext, block: Runnable) {
+		if (isPaused) {
+			queue.add(Task(context, block))
+		} else {
+			dispatcher.dispatch(context, block)
+		}
+	}
+
+	@MainThread
+	fun pause() {
+		isPaused = true
+	}
+
+	@MainThread
+	fun resume() {
+		if (!isPaused) {
+			return
+		}
+		isPaused = false
+		while (true) {
+			val task = queue.poll() ?: break
+			dispatcher.dispatch(task.context, task.block)
+		}
+	}
+
+	private class Task(
+		val context: CoroutineContext,
+		val block: Runnable,
+	)
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
new file mode 100644
index 000000000..e63766078
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M14,19H18V5H14M6,19H10V5H6V19Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_resume.xml b/app/src/main/res/drawable/ic_resume.xml
new file mode 100644
index 000000000..448628b18
--- /dev/null
+++ b/app/src/main/res/drawable/ic_resume.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M8,5.14V19.14L19,12.14L8,5.14Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/menu/opt_downloads.xml b/app/src/main/res/menu/opt_downloads.xml
new file mode 100644
index 000000000..f804ec53f
--- /dev/null
+++ b/app/src/main/res/menu/opt_downloads.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:icon="@drawable/ic_pause"
+		android:id="@+id/action_pause"
+		android:title="Pause"
+		app:showAsAction="ifRoom|withText" />
+
+	<item
+		android:icon="@drawable/ic_resume"
+		android:id="@+id/action_resume"
+		android:title="Resume"
+		app:showAsAction="ifRoom|withText" />
+
+</menu>
\ No newline at end of file

From 83eb0d9f2393778e6a1268443cf016aba6130873 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 12:50:30 +0300
Subject: [PATCH 042/104] Fix isLoading live data

---
 .../koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt   | 4 ++--
 .../org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
index fd7f1abf6..cb54ef7db 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/util/CountedBooleanLiveData.kt
@@ -13,8 +13,8 @@ class CountedBooleanLiveData : MutableLiveData<Boolean>(false) {
 			counter--
 		}
 		val newValue = counter > 0
-		if (newValue != value) {
-			super.setValue(value)
+		if (newValue != this.value) {
+			super.setValue(newValue)
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
index 6408c036e..b2a540baa 100644
--- a/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/remotelist/ui/RemoteListViewModel.kt
@@ -137,6 +137,9 @@ class RemoteListViewModel(
 					e.printStackTrace()
 				}
 				listError.value = e
+				if (!mangaList.value.isNullOrEmpty()) {
+					onError.postCall(e)
+				}
 			}
 		}
 	}

From cbd3d439cd61114d61cddcdb0210e308c03fd15f Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 13:09:44 +0300
Subject: [PATCH 043/104] Support multiple branches in saved manga

---
 .../kotatsu/details/ui/DetailsActivity.kt     | 51 ++++++++++++-------
 .../kotatsu/details/ui/DetailsViewModel.kt    | 24 +++++----
 .../koitharu/kotatsu/local/data/MangaIndex.kt |  2 +-
 .../kotatsu/local/domain/CbzMangaOutput.kt    |  6 +--
 4 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index 18e0e325b..b29596141 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -41,6 +41,7 @@ import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity
@@ -193,23 +194,9 @@ class DetailsActivity :
 		R.id.action_save -> {
 			viewModel.manga.value?.let {
 				val chaptersCount = it.chapters?.size ?: 0
-				if (chaptersCount > 5) {
-					MaterialAlertDialogBuilder(this)
-						.setTitle(R.string.save_manga)
-						.setMessage(
-							getString(
-								R.string.large_manga_save_confirm,
-								resources.getQuantityString(
-									R.plurals.chapters,
-									chaptersCount,
-									chaptersCount
-								)
-							)
-						)
-						.setNegativeButton(android.R.string.cancel, null)
-						.setPositiveButton(R.string.save) { _, _ ->
-							DownloadService.start(this, it)
-						}.show()
+				val branches = viewModel.branches.value.orEmpty()
+				if (chaptersCount > 5 || branches.size > 1) {
+					showSaveConfirmation(it, chaptersCount, branches)
 				} else {
 					DownloadService.start(this, it)
 				}
@@ -335,6 +322,36 @@ class DetailsActivity :
 		}
 	}
 
+	private fun showSaveConfirmation(manga: Manga, chaptersCount: Int, branches: List<String?>) {
+		val dialogBuilder = MaterialAlertDialogBuilder(this)
+			.setTitle(R.string.save_manga)
+			.setNegativeButton(android.R.string.cancel, null)
+		if (branches.size > 1) {
+			val items = Array(branches.size) { i -> branches[i].orEmpty() }
+			val currentBranch = viewModel.selectedBranchIndex.value ?: -1
+			val checkedIndices = BooleanArray(branches.size) { i -> i == currentBranch }
+			dialogBuilder.setMultiChoiceItems(items, checkedIndices) { _, i, checked ->
+				checkedIndices[i] = checked
+			}.setPositiveButton(R.string.save) { _, _ ->
+				val selectedBranches = branches.filterIndexedTo(HashSet()) { i, _ -> checkedIndices[i] }
+				val chaptersIds = manga.chapters?.mapNotNullToSet { c ->
+					if (c.branch in selectedBranches) c.id else null
+				}
+				DownloadService.start(this, manga, chaptersIds)
+			}
+		} else {
+			dialogBuilder.setMessage(
+				getString(
+					R.string.large_manga_save_confirm,
+					resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount)
+				)
+			).setPositiveButton(R.string.save) { _, _ ->
+				DownloadService.start(this, manga)
+			}
+		}
+		dialogBuilder.show()
+	}
+
 	companion object {
 
 		fun newIntent(context: Context, manga: Manga): Intent {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index d0318779b..cba0e11b6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -267,10 +267,10 @@ class DetailsViewModel(
 		val dateFormat = settings.getDateFormat()
 		for (i in sourceChapters.indices) {
 			val chapter = sourceChapters[i]
+			val localChapter = chaptersMap.remove(chapter.id)
 			if (chapter.branch != branch) {
 				continue
 			}
-			val localChapter = chaptersMap.remove(chapter.id)
 			result += localChapter?.toListItem(
 				isCurrent = i == currentIndex,
 				isUnread = i > currentIndex,
@@ -289,15 +289,19 @@ class DetailsViewModel(
 		}
 		if (chaptersMap.isNotEmpty()) { // some chapters on device but not online source
 			result.ensureCapacity(result.size + chaptersMap.size)
-			chaptersMap.values.mapTo(result) {
-				it.toListItem(
-					isCurrent = false,
-					isUnread = true,
-					isNew = false,
-					isMissing = false,
-					isDownloaded = false,
-					dateFormat = dateFormat,
-				)
+			chaptersMap.values.mapNotNullTo(result) {
+				if (it.branch == branch) {
+					it.toListItem(
+						isCurrent = false,
+						isUnread = true,
+						isNew = false,
+						isMissing = false,
+						isDownloaded = false,
+						dateFormat = dateFormat,
+					)
+				} else {
+					null
+				}
 			}
 			result.sortBy { it.chapter.number }
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
index e0eb87865..3a585be9c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/MangaIndex.kt
@@ -87,7 +87,7 @@ class MangaIndex(source: String?) {
 			jo.put("uploadDate", chapter.uploadDate)
 			jo.put("scanlator", chapter.scanlator)
 			jo.put("branch", chapter.branch)
-			jo.put("entries", "%03d\\d{3}".format(chapter.number))
+			jo.put("entries", "%08d_%03d\\d{3}".format(chapter.branch.hashCode(), chapter.number))
 			chapters.put(chapter.id.toString(), jo)
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
index 9278dd83f..53e2d474a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/CbzMangaOutput.kt
@@ -36,7 +36,7 @@ class CbzMangaOutput(
 
 	suspend fun addCover(file: File, ext: String) {
 		val name = buildString {
-			append(FILENAME_PATTERN.format(0, 0))
+			append(FILENAME_PATTERN.format(0, 0, 0))
 			if (ext.isNotEmpty() && ext.length <= 4) {
 				append('.')
 				append(ext)
@@ -50,7 +50,7 @@ class CbzMangaOutput(
 
 	suspend fun addPage(chapter: MangaChapter, file: File, pageNumber: Int, ext: String) {
 		val name = buildString {
-			append(FILENAME_PATTERN.format(chapter.number, pageNumber))
+			append(FILENAME_PATTERN.format(chapter.branch.hashCode(), chapter.number, pageNumber))
 			if (ext.isNotEmpty() && ext.length <= 4) {
 				append('.')
 				append(ext)
@@ -105,7 +105,7 @@ class CbzMangaOutput(
 
 	companion object {
 
-		private const val FILENAME_PATTERN = "%03d%03d"
+		private const val FILENAME_PATTERN = "%08d_%03d%03d"
 
 		const val ENTRY_NAME_INDEX = "index.json"
 

From e63ae12c8cca79823141b42119166314b315c125 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Tue, 19 Apr 2022 16:04:24 +0300
Subject: [PATCH 044/104] Delete local chapters in a service

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../kotatsu/base/ui/CoroutineIntentService.kt | 37 +++++++++
 .../kotatsu/details/ui/ChaptersFragment.kt    | 16 +++-
 .../kotatsu/details/ui/DetailsActivity.kt     | 24 +++---
 .../kotatsu/details/ui/DetailsViewModel.kt    | 19 +----
 .../local/ui/LocalChaptersRemoveService.kt    | 80 +++++++++++++++++++
 app/src/main/res/values-ru/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 8 files changed, 149 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6c6c112b8..bba1d89b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -102,6 +102,7 @@
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
 			android:foregroundServiceType="dataSync" />
+		<service android:name="org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService" />
 		<service
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfWidgetService"
 			android:permission="android.permission.BIND_REMOTEVIEWS" />
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
new file mode 100644
index 000000000..241d13f94
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/CoroutineIntentService.kt
@@ -0,0 +1,37 @@
+package org.koitharu.kotatsu.base.ui
+
+import android.app.Service
+import android.content.Intent
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+
+abstract class CoroutineIntentService : BaseService() {
+
+	private val mutex = Mutex()
+	protected open val dispatcher: CoroutineDispatcher = Dispatchers.Default
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		launchCoroutine(intent, startId)
+		return Service.START_REDELIVER_INTENT
+	}
+
+	private fun launchCoroutine(intent: Intent?, startId: Int) = lifecycleScope.launch {
+		mutex.withLock {
+			try {
+				withContext(dispatcher) {
+					processIntent(intent)
+				}
+			} finally {
+				stopSelf(startId)
+			}
+		}
+	}
+
+	protected abstract suspend fun processIntent(intent: Intent?)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
index 143a87713..91698a76b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/ChaptersFragment.kt
@@ -11,6 +11,7 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import com.google.android.material.snackbar.Snackbar
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -21,6 +22,7 @@ import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersSelectionDecoration
 import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.local.ui.LocalChaptersRemoveService
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
@@ -160,8 +162,18 @@ class ChaptersFragment :
 			}
 			R.id.action_delete -> {
 				val ids = selectionDecoration?.checkedItemsIds
-				if (!ids.isNullOrEmpty()) {
-					viewModel.deleteChapters(ids.toSet())
+				val manga = viewModel.manga.value
+				when {
+					ids.isNullOrEmpty() || manga == null -> Unit
+					ids.size == manga.chapters?.size -> viewModel.deleteLocal()
+					else -> {
+						LocalChaptersRemoveService.start(requireContext(), manga, ids)
+						Snackbar.make(
+							binding.recyclerViewChapters,
+							R.string.chapters_will_removed_background,
+							Snackbar.LENGTH_LONG
+						).show()
+					}
 				}
 				mode.finish()
 				true
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
index b29596141..a1920bf80 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsActivity.kt
@@ -82,7 +82,6 @@ class DetailsActivity :
 		viewModel.manga.observe(this, ::onMangaUpdated)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
 		viewModel.onMangaRemoved.observe(this, ::onMangaRemoved)
-		viewModel.onChaptersRemoved.observe(this, ::onChaptersRemoved)
 		viewModel.onError.observe(this, ::onError)
 
 		registerReceiver(downloadReceiver, IntentFilter(DownloadService.ACTION_DOWNLOAD_COMPLETE))
@@ -106,10 +105,6 @@ class DetailsActivity :
 		finishAfterTransition()
 	}
 
-	private fun onChaptersRemoved(count: Int) {
-		binding.snackbar.show(getString(R.string.removal_completed))
-	}
-
 	private fun onError(e: Throwable) {
 		when {
 			ExceptionResolver.canResolve(e) -> {
@@ -179,16 +174,15 @@ class DetailsActivity :
 			true
 		}
 		R.id.action_delete -> {
-			viewModel.manga.value?.let { m ->
-				MaterialAlertDialogBuilder(this)
-					.setTitle(R.string.delete_manga)
-					.setMessage(getString(R.string.text_delete_local_manga, m.title))
-					.setPositiveButton(R.string.delete) { _, _ ->
-						viewModel.deleteLocal(m)
-					}
-					.setNegativeButton(android.R.string.cancel, null)
-					.show()
-			}
+			val title = viewModel.manga.value?.title.orEmpty()
+			MaterialAlertDialogBuilder(this)
+				.setTitle(R.string.delete_manga)
+				.setMessage(getString(R.string.text_delete_local_manga, title))
+				.setPositiveButton(R.string.delete) { _, _ ->
+					viewModel.deleteLocal()
+				}
+				.setNegativeButton(android.R.string.cancel, null)
+				.show()
 			true
 		}
 		R.id.action_save -> {
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
index cba0e11b6..0ee363efd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsViewModel.kt
@@ -86,7 +86,6 @@ class DetailsViewModel(
 		.asLiveData(viewModelScope.coroutineContext)
 
 	val onMangaRemoved = SingleLiveEvent<Manga>()
-	val onChaptersRemoved = SingleLiveEvent<Int>()
 
 	val branches = mangaData.map {
 		it?.chapters?.mapToSet { x -> x.branch }?.sortedBy { x -> x }.orEmpty()
@@ -136,8 +135,11 @@ class DetailsViewModel(
 		loadingJob = doLoad()
 	}
 
-	fun deleteLocal(manga: Manga) {
+	fun deleteLocal() {
+		val m = mangaData.value ?: return
 		launchLoadingJob(Dispatchers.Default) {
+			val manga = if (m.source == MangaSource.LOCAL) m else localMangaRepository.findSavedManga(m)
+			checkNotNull(manga) { "Cannot find saved manga for ${m.title}" }
 			val original = localMangaRepository.getRemoteManga(manga)
 			localMangaRepository.delete(manga) || throw IOException("Unable to delete file")
 			runCatching {
@@ -185,19 +187,6 @@ class DetailsViewModel(
 		}
 	}
 
-	fun deleteChapters(ids: Set<Long>) {
-		val m = mangaData.value ?: return
-		if (m.chapters?.size == ids.size) {
-			deleteLocal(m)
-			return
-		}
-		launchLoadingJob {
-			localMangaRepository.deleteChapters(m, ids)
-			reload()
-			onChaptersRemoved.call(ids.size)
-		}
-	}
-
 	private fun doLoad() = launchLoadingJob(Dispatchers.Default) {
 		var manga = mangaDataRepository.resolveIntent(intent)
 			?: throw MangaNotFoundException("Cannot find manga")
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt
new file mode 100644
index 000000000..3bc53726c
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalChaptersRemoveService.kt
@@ -0,0 +1,80 @@
+package org.koitharu.kotatsu.local.ui
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import androidx.core.app.NotificationCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.content.ContextCompat
+import org.koin.android.ext.android.inject
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.CoroutineIntentService
+import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
+import org.koitharu.kotatsu.download.ui.service.DownloadService
+import org.koitharu.kotatsu.local.domain.LocalMangaRepository
+import org.koitharu.kotatsu.parsers.model.Manga
+
+class LocalChaptersRemoveService : CoroutineIntentService() {
+
+	private val localMangaRepository by inject<LocalMangaRepository>()
+
+	override suspend fun processIntent(intent: Intent?) {
+		val manga = intent?.getParcelableExtra<ParcelableManga>(EXTRA_MANGA)?.manga ?: return
+		val chaptersIds = intent.getLongArrayExtra(EXTRA_CHAPTERS_IDS)?.toSet() ?: return
+		startForeground()
+		val mangaWithChapters = localMangaRepository.getDetails(manga)
+		localMangaRepository.deleteChapters(mangaWithChapters, chaptersIds)
+		sendBroadcast(
+			Intent(DownloadService.ACTION_DOWNLOAD_COMPLETE)
+				.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
+		)
+		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+	}
+
+	private fun startForeground() {
+		val title = getString(R.string.local_manga_processing)
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+			val channel = NotificationChannel(CHANNEL_ID, title, NotificationManager.IMPORTANCE_LOW)
+			channel.setShowBadge(false)
+			channel.enableVibration(false)
+			channel.setSound(null, null)
+			channel.enableLights(false)
+			manager.createNotificationChannel(channel)
+		}
+
+		val notification = NotificationCompat.Builder(this, CHANNEL_ID)
+			.setContentTitle(title)
+			.setPriority(NotificationCompat.PRIORITY_MIN)
+			.setDefaults(0)
+			.setColor(ContextCompat.getColor(this, R.color.blue_primary_dark))
+			.setSilent(true)
+			.setProgress(0, 0, true)
+			.setSmallIcon(android.R.drawable.stat_notify_sync)
+			.setForegroundServiceBehavior(NotificationCompat.FOREGROUND_SERVICE_DEFERRED)
+			.setOngoing(true)
+			.build()
+		startForeground(NOTIFICATION_ID, notification)
+	}
+
+	companion object {
+
+		private const val CHANNEL_ID = "local_processing"
+		private const val NOTIFICATION_ID = 21
+
+		private const val EXTRA_MANGA = "manga"
+		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
+
+		fun start(context: Context, manga: Manga, chaptersIds: Collection<Long>) {
+			if (chaptersIds.isEmpty()) {
+				return
+			}
+			val intent = Intent(context, LocalChaptersRemoveService::class.java)
+			intent.putExtra(EXTRA_MANGA, ParcelableManga(manga, withChapters = false))
+			intent.putExtra(EXTRA_CHAPTERS_IDS, chaptersIds.toLongArray())
+			ContextCompat.startForegroundService(context, intent)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a4c27b6a0..3b28783b5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -274,4 +274,6 @@
 	<string name="parallel_downloads">Загружать параллельно</string>
 	<string name="download_slowdown">Замедление загрузки</string>
 	<string name="download_slowdown_summary">Помогает избежать блокировки IP-адреса</string>
+	<string name="local_manga_processing">Обработка сохранённой манги</string>
+	<string name="chapters_will_removed_background">Главы будут удалены в фоновом режиме. Это может занять какое-то время</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e249d13f7..828ad9fe6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -277,4 +277,6 @@
 	<string name="parallel_downloads">Parallel downloads</string>
 	<string name="download_slowdown">Download slowdown</string>
 	<string name="download_slowdown_summary">Helps avoid blocking your IP address</string>
+	<string name="local_manga_processing">Saved manga processing</string>
+	<string name="chapters_will_removed_background">Chapters will be removed in the background. It can take some time</string>
 </resources>
\ No newline at end of file

From f33dc8f79705b8b6051370525c67ffe88bfcc68e Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 20 Apr 2022 09:25:46 +0300
Subject: [PATCH 045/104] Update feed ui

---
 .../list/decor/TypedSpacingItemDecoration.kt  | 35 ++++++++
 .../koitharu/kotatsu/core/ui/DateTimeAgo.kt   | 29 ++++++-
 .../kotatsu/tracker/ui/FeedFragment.kt        |  8 +-
 .../kotatsu/tracker/ui/FeedViewModel.kt       | 38 +++++++--
 .../kotatsu/tracker/ui/adapter/FeedAdapter.kt |  8 +-
 .../kotatsu/tracker/ui/adapter/FeedItemAD.kt  | 13 ++-
 .../kotatsu/tracker/ui/model/FeedItem.kt      |  4 +-
 .../ui/model/ListModelConversionExt.kt        | 30 ++-----
 app/src/main/res/layout/fragment_feed.xml     |  2 +-
 app/src/main/res/layout/item_feed.xml         | 56 ++++++++++++
 app/src/main/res/layout/item_tracklog.xml     | 85 -------------------
 11 files changed, 178 insertions(+), 130 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/TypedSpacingItemDecoration.kt
 create mode 100644 app/src/main/res/layout/item_feed.xml
 delete mode 100644 app/src/main/res/layout/item_tracklog.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/TypedSpacingItemDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/TypedSpacingItemDecoration.kt
new file mode 100644
index 000000000..5662f026a
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/list/decor/TypedSpacingItemDecoration.kt
@@ -0,0 +1,35 @@
+package org.koitharu.kotatsu.base.ui.list.decor
+
+import android.graphics.Rect
+import android.util.SparseIntArray
+import android.view.View
+import androidx.core.util.getOrDefault
+import androidx.core.util.set
+import androidx.recyclerview.widget.RecyclerView
+
+class TypedSpacingItemDecoration(
+	vararg spacingMapping: Pair<Int, Int>,
+	private val fallbackSpacing: Int = 0,
+) : RecyclerView.ItemDecoration() {
+
+	private val mapping = SparseIntArray(spacingMapping.size)
+	
+	init {
+		spacingMapping.forEach { (k, v) -> mapping[k] = v }
+	}
+
+	override fun getItemOffsets(
+		outRect: Rect,
+		view: View,
+		parent: RecyclerView,
+		state: RecyclerView.State
+	) {
+		val itemType = parent.getChildViewHolder(view)?.itemViewType
+		val spacing = if (itemType == null) {
+			fallbackSpacing
+		} else {
+			mapping.getOrDefault(itemType, fallbackSpacing)
+		}
+		outRect.set(spacing, spacing, spacing, spacing)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
index 0d38d95ce..03bafa077 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/DateTimeAgo.kt
@@ -3,6 +3,9 @@ package org.koitharu.kotatsu.core.ui
 import android.content.res.Resources
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.list.ui.model.ListModel
+import org.koitharu.kotatsu.utils.ext.daysDiff
+import org.koitharu.kotatsu.utils.ext.format
+import java.util.*
 
 sealed class DateTimeAgo : ListModel {
 
@@ -72,9 +75,33 @@ sealed class DateTimeAgo : ListModel {
 		override fun hashCode(): Int = days
 	}
 
+	class Absolute(private val date: Date) : DateTimeAgo() {
+
+		private val day = date.daysDiff(0)
+
+		override fun format(resources: Resources): String {
+			return date.format("d MMMM")
+		}
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as Absolute
+
+			if (day != other.day) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			return day
+		}
+	}
+
 	object LongAgo : DateTimeAgo() {
 		override fun format(resources: Resources): String {
 			return resources.getString(R.string.long_ago)
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
index ae8d0ed5f..584e2a4ff 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt
@@ -11,7 +11,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
-import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.base.ui.list.decor.TypedSpacingItemDecoration
 import org.koitharu.kotatsu.databinding.FragmentFeedBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
 import org.koitharu.kotatsu.list.ui.adapter.MangaListListener
@@ -57,7 +57,11 @@ class FeedFragment :
 			val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
 			paddingHorizontal = spacing
 			paddingVertical = resources.getDimensionPixelOffset(R.dimen.grid_spacing_outer)
-			addItemDecoration(SpacingItemDecoration(spacing))
+			val decoration = TypedSpacingItemDecoration(
+				FeedAdapter.ITEM_TYPE_FEED to 0,
+				fallbackSpacing = spacing
+			)
+			addItemDecoration(decoration)
 		}
 
 		viewModel.content.observe(viewLifecycleOwner, this::onListChanged)
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt
index 898db478e..292d2c982 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedViewModel.kt
@@ -10,14 +10,15 @@ import kotlinx.coroutines.flow.filterNotNull
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.model.TrackingLogItem
-import org.koitharu.kotatsu.list.ui.model.EmptyState
-import org.koitharu.kotatsu.list.ui.model.ListHeader
-import org.koitharu.kotatsu.list.ui.model.LoadingFooter
-import org.koitharu.kotatsu.list.ui.model.LoadingState
+import org.koitharu.kotatsu.core.ui.DateTimeAgo
+import org.koitharu.kotatsu.list.ui.model.*
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.tracker.ui.model.toFeedItem
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import org.koitharu.kotatsu.utils.ext.daysDiff
+import java.util.*
+import java.util.concurrent.TimeUnit
 
 class FeedViewModel(
 	private val repository: TrackingRepository
@@ -34,8 +35,8 @@ class FeedViewModel(
 		hasNextPage
 	) { list, isHasNextPage ->
 		buildList(list.size + 2) {
-			add(header)
 			if (list.isEmpty()) {
+				add(header)
 				add(
 					EmptyState(
 						icon = R.drawable.ic_feed,
@@ -45,7 +46,7 @@ class FeedViewModel(
 					)
 				)
 			} else {
-				list.mapTo(this) { it.toFeedItem() }
+				list.mapListTo(this)
 				if (isHasNextPage) {
 					add(LoadingFooter)
 				}
@@ -85,4 +86,29 @@ class FeedViewModel(
 			onFeedCleared.postCall(Unit)
 		}
 	}
+
+	private fun List<TrackingLogItem>.mapListTo(destination: MutableList<ListModel>) {
+		var prevDate: DateTimeAgo? = null
+		for (item in this) {
+			val date = timeAgo(item.createdAt)
+			if (prevDate != date) {
+				destination += date
+			}
+			prevDate = date
+			destination += item.toFeedItem()
+		}
+	}
+
+	private fun timeAgo(date: Date): DateTimeAgo {
+		val diff = (System.currentTimeMillis() - date.time).coerceAtLeast(0L)
+		val diffMinutes = TimeUnit.MILLISECONDS.toMinutes(diff).toInt()
+		val diffDays = -date.daysDiff(System.currentTimeMillis())
+		return when {
+			diffMinutes < 3 -> DateTimeAgo.JustNow
+			diffDays < 1 -> DateTimeAgo.Today
+			diffDays == 1 -> DateTimeAgo.Yesterday
+			diffDays < 6 -> DateTimeAgo.DaysAgo(diffDays)
+			else -> DateTimeAgo.Absolute(date)
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedAdapter.kt
index 1c2d5f7fd..bebf7baae 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedAdapter.kt
@@ -4,10 +4,11 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.DiffUtil
 import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
-import kotlin.jvm.internal.Intrinsics
+import org.koitharu.kotatsu.core.ui.DateTimeAgo
 import org.koitharu.kotatsu.list.ui.adapter.*
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.tracker.ui.model.FeedItem
+import kotlin.jvm.internal.Intrinsics
 
 class FeedAdapter(
 	coil: ImageLoader,
@@ -24,6 +25,7 @@ class FeedAdapter(
 			.addDelegate(ITEM_TYPE_ERROR_STATE, errorStateListAD(listener))
 			.addDelegate(ITEM_TYPE_EMPTY, emptyStateListAD(listener))
 			.addDelegate(ITEM_TYPE_HEADER, listHeaderAD())
+			.addDelegate(ITEM_TYPE_DATE_HEADER, relatedDateItemAD())
 	}
 
 	private class DiffCallback : DiffUtil.ItemCallback<ListModel>() {
@@ -32,6 +34,9 @@ class FeedAdapter(
 			oldItem is FeedItem && newItem is FeedItem -> {
 				oldItem.id == newItem.id
 			}
+			oldItem is DateTimeAgo && newItem is DateTimeAgo -> {
+				oldItem == newItem
+			}
 			else -> oldItem.javaClass == newItem.javaClass
 		}
 
@@ -49,5 +54,6 @@ class FeedAdapter(
 		const val ITEM_TYPE_ERROR_FOOTER = 4
 		const val ITEM_TYPE_EMPTY = 5
 		const val ITEM_TYPE_HEADER = 6
+		const val ITEM_TYPE_DATE_HEADER = 7
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
index 77f465f45..7df8279fd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
@@ -12,7 +12,6 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.ui.model.FeedItem
 import org.koitharu.kotatsu.utils.ext.enqueueWith
 import org.koitharu.kotatsu.utils.ext.newImageRequest
-import org.koitharu.kotatsu.utils.ext.textAndVisible
 
 fun feedItemAD(
 	coil: ImageLoader,
@@ -38,13 +37,11 @@ fun feedItemAD(
 			.lifecycle(lifecycleOwner)
 			.enqueueWith(coil)
 		binding.textViewTitle.text = item.title
-		binding.badge.text = item.subtitle
-		binding.textViewChapters.text = item.chapters
-		binding.textViewTruncated.textAndVisible = if (item.truncated > 0) {
-			getString(R.string._and_x_more, item.truncated)
-		} else {
-			null
-		}
+		binding.textViewSummary.text = context.resources.getQuantityString(
+			R.plurals.new_chapters,
+			item.count,
+			item.count,
+		)
 	}
 
 	onViewRecycled {
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt
index daf0b5e60..1cdce1869 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/FeedItem.kt
@@ -7,8 +7,6 @@ data class FeedItem(
 	val id: Long,
 	val imageUrl: String,
 	val title: String,
-	val subtitle: String,
-	val chapters: CharSequence,
 	val manga: Manga,
-	val truncated: Int,
+	val count: Int,
 ) : ListModel
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt
index f4552b9a7..fc4bc6080 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/model/ListModelConversionExt.kt
@@ -2,26 +2,10 @@ package org.koitharu.kotatsu.tracker.ui.model
 
 import org.koitharu.kotatsu.core.model.TrackingLogItem
 
-fun TrackingLogItem.toFeedItem(): FeedItem {
-	val truncate = chapters.size > MAX_CHAPTERS
-	val chaptersString = if (truncate) {
-		chapters.joinToString(
-			separator = "\n",
-			limit = MAX_CHAPTERS - 1,
-			truncated = "",
-		).trimEnd()
-	} else {
-		chapters.joinToString("\n")
-	}
-	return FeedItem(
-		id = id,
-		imageUrl = manga.coverUrl,
-		title = manga.title,
-		subtitle = chapters.size.toString(),
-		chapters = chaptersString,
-		manga = manga,
-		truncated = chapters.size - MAX_CHAPTERS + 1,
-	)
-}
-
-private const val MAX_CHAPTERS = 6
\ No newline at end of file
+fun TrackingLogItem.toFeedItem() = FeedItem(
+	id = id,
+	imageUrl = manga.coverUrl,
+	title = manga.title,
+	count = chapters.size,
+	manga = manga,
+)
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index 1b60ef073..f95f84b1a 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -14,4 +14,4 @@
 	android:paddingBottom="@dimen/grid_spacing_outer"
 	app:fastScrollEnabled="true"
 	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-	tools:listitem="@layout/item_tracklog" />
\ No newline at end of file
+	tools:listitem="@layout/item_feed" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/item_feed.xml
new file mode 100644
index 000000000..7b29d3eee
--- /dev/null
+++ b/app/src/main/res/layout/item_feed.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="@drawable/list_selector"
+	android:clipChildren="false"
+	android:padding="@dimen/list_spacing">
+
+	<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+		android:id="@+id/imageView_cover"
+		android:layout_width="48dp"
+		android:layout_height="0dp"
+		android:contentDescription="@null"
+		android:scaleType="centerCrop"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintDimensionRatio="h,1:1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.0"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		tools:src="@tools:sample/backgrounds/scenic" />
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="2dp"
+		android:ellipsize="end"
+		android:singleLine="true"
+		android:textAppearance="?attr/textAppearanceBodyLarge"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/imageView_cover"
+		app:layout_constraintTop_toTopOf="@id/imageView_cover"
+		tools:text="@tools:sample/lorem" />
+
+	<TextView
+		android:id="@+id/textView_summary"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginTop="4dp"
+		android:layout_marginEnd="2dp"
+		android:ellipsize="end"
+		android:singleLine="true"
+		android:textAppearance="?attr/textAppearanceBodySmall"
+		app:layout_constraintBottom_toBottomOf="@id/imageView_cover"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/imageView_cover"
+		app:layout_constraintTop_toBottomOf="@id/textView_title"
+		tools:text="@string/new_chapters" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_tracklog.xml b/app/src/main/res/layout/item_tracklog.xml
deleted file mode 100644
index 2d073a0b6..000000000
--- a/app/src/main/res/layout/item_tracklog.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	app:cardCornerRadius="12dp">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="wrap_content"
-			android:layout_height="@dimen/manga_list_details_item_height"
-			android:orientation="vertical"
-			android:scaleType="centerCrop"
-			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
-			tools:src="@tools:sample/backgrounds/scenic" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_margin="16dp"
-			android:orientation="vertical">
-
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal">
-
-				<TextView
-					android:id="@+id/textView_title"
-					android:layout_width="0dp"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="4dp"
-					android:layout_marginEnd="4dp"
-					android:layout_weight="1"
-					android:ellipsize="end"
-					android:maxLines="2"
-					android:textAppearance="?attr/textAppearanceTitleMedium"
-					tools:text="@tools:sample/lorem/random" />
-
-				<TextView
-					android:id="@+id/badge"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="top|end"
-					android:background="@drawable/badge"
-					android:paddingHorizontal="6dp"
-					android:paddingVertical="2dp"
-					android:textColor="?attr/colorOnTertiary"
-					android:textSize="12sp"
-					android:textStyle="bold"
-					tools:text="54" />
-
-			</LinearLayout>
-
-			<TextView
-				android:id="@+id/textView_chapters"
-				android:layout_width="match_parent"
-				android:layout_height="0dp"
-				android:layout_weight="1"
-				android:ellipsize="none"
-				android:lineSpacingExtra="4sp"
-				android:textAppearance="?attr/textAppearanceBodySmall"
-				tools:text="@tools:sample/lorem[10]" />
-
-
-			<TextView
-				android:id="@+id/textView_truncated"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginTop="4dp"
-				android:textColor="?android:textColorHint"
-				tools:text="@string/_and_x_more" />
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</com.google.android.material.card.MaterialCardView>

From d64bd9d9d35e234ae9cca8565628e11d71b479cb Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 20 Apr 2022 11:17:35 +0300
Subject: [PATCH 046/104] Estimate remeaning download time

---
 .gitignore                                    |  1 +
 .../ui/service/DownloadNotification.kt        | 11 ++++-
 .../download/ui/service/DownloadService.kt    | 21 ++++++---
 .../kotatsu/utils/progress/Progress.kt        |  2 +-
 .../utils/progress/TimeLeftEstimator.kt       | 47 +++++++++++++++++++
 5 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt

diff --git a/.gitignore b/.gitignore
index a8c7b78f4..d4fcf16ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/kotlinScripting.xml
 .DS_Store
 /build
 /captures
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
index dd3fa3035..528908bfb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -6,6 +6,7 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.os.Build
+import android.text.format.DateUtils
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
@@ -49,7 +50,7 @@ class DownloadNotification(private val context: Context, startId: Int) {
 		builder.setSilent(true)
 	}
 
-	fun create(state: DownloadState): Notification {
+	fun create(state: DownloadState, timeLeft: Long): Notification {
 		builder.setContentTitle(state.manga.title)
 		builder.setContentText(context.getString(R.string.manga_downloading_))
 		builder.setProgress(1, 0, true)
@@ -117,7 +118,13 @@ class DownloadNotification(private val context: Context, startId: Int) {
 			}
 			is DownloadState.Progress -> {
 				builder.setProgress(state.max, state.progress, false)
-				builder.setContentText((state.percent * 100).format() + "%")
+				if (timeLeft > 0L) {
+					val eta = DateUtils.getRelativeTimeSpanString(timeLeft, 0L, DateUtils.SECOND_IN_MILLIS)
+					builder.setContentText(eta)
+				} else {
+					val percent = (state.percent * 100).format()
+					builder.setContentText(context.getString(R.string.percent_string_pattern, percent))
+				}
 				builder.setCategory(NotificationCompat.CATEGORY_PROGRESS)
 				builder.setStyle(null)
 				builder.setOngoing(true)
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index 13365094c..a88562989 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -11,10 +11,7 @@ import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.flow.transformWhile
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
 import org.koin.android.ext.android.get
@@ -32,6 +29,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.ext.connectivityManager
 import org.koitharu.kotatsu.utils.ext.throttle
 import org.koitharu.kotatsu.utils.progress.ProgressJob
+import org.koitharu.kotatsu.utils.progress.TimeLeftEstimator
 import java.util.concurrent.TimeUnit
 
 class DownloadService : BaseService() {
@@ -99,13 +97,22 @@ class DownloadService : BaseService() {
 	private fun listenJob(job: ProgressJob<DownloadState>) {
 		lifecycleScope.launch {
 			val startId = job.progressValue.startId
+			val timeLeftEstimator = TimeLeftEstimator()
 			val notification = DownloadNotification(this@DownloadService, startId)
-			notificationSwitcher.notify(startId, notification.create(job.progressValue))
+			notificationSwitcher.notify(startId, notification.create(job.progressValue, -1L))
 			job.progressAsFlow()
+				.onEach { state ->
+					if (state is DownloadState.Progress) {
+						timeLeftEstimator.tick(value = state.progress, total = state.max)
+					} else {
+						timeLeftEstimator.emptyTick()
+					}
+				}
 				.throttle { state -> if (state is DownloadState.Progress) 400L else 0L }
 				.whileActive()
 				.collect { state ->
-					notificationSwitcher.notify(startId, notification.create(state))
+					val timeLeft = timeLeftEstimator.getEstimatedTimeLeft()
+					notificationSwitcher.notify(startId, notification.create(state, timeLeft))
 				}
 			job.join()
 			(job.progressValue as? DownloadState.Done)?.let {
@@ -119,7 +126,7 @@ class DownloadService : BaseService() {
 				if (job.isCancelled) {
 					null
 				} else {
-					notification.create(job.progressValue)
+					notification.create(job.progressValue, -1L)
 				}
 			)
 			stopSelf(startId)
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/progress/Progress.kt b/app/src/main/java/org/koitharu/kotatsu/utils/progress/Progress.kt
index 7dff7fbf5..5723cae17 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/progress/Progress.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/progress/Progress.kt
@@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class Progress(
 	val value: Int,
-	val total: Int
+	val total: Int,
 ) : Parcelable, Comparable<Progress> {
 
 	override fun compareTo(other: Progress): Int {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt b/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt
new file mode 100644
index 000000000..5cb7aafc5
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt
@@ -0,0 +1,47 @@
+package org.koitharu.kotatsu.utils.progress
+
+import android.os.SystemClock
+import kotlin.math.roundToInt
+import kotlin.math.roundToLong
+
+private const val MIN_ESTIMATE_TICKS = 4
+private const val NO_TIME = -1L
+
+class TimeLeftEstimator {
+
+	private var times = ArrayList<Int>()
+	private var lastTick: Tick? = null
+
+	fun tick(value: Int, total: Int) {
+		if (total < 0) {
+			emptyTick()
+			return
+		}
+		val tick = Tick(value, total, SystemClock.elapsedRealtime())
+		lastTick?.let {
+			val ticksCount = value - it.value
+			times.add(((tick.time - it.time) / ticksCount.toDouble()).roundToInt())
+		}
+		lastTick = tick
+	}
+
+	fun emptyTick() {
+		lastTick = null
+	}
+
+	fun getEstimatedTimeLeft(): Long {
+		val progress = lastTick ?: return NO_TIME
+		if (times.size < MIN_ESTIMATE_TICKS) {
+			return NO_TIME
+		}
+		val timePerTick = times.average()
+		val ticksLeft = progress.total - progress.value
+		return (ticksLeft * timePerTick).roundToLong()
+	}
+
+	private class Tick(
+		val value: Int,
+		val total: Int,
+		val time: Long,
+	)
+}
\ No newline at end of file

From 1f411b753076523a2718b25887abe5b9e27141bf Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 20 Apr 2022 11:50:55 +0300
Subject: [PATCH 047/104] Cleanup temporary files

---
 .../download/ui/service/DownloadService.kt    | 11 ++++---
 .../koitharu/kotatsu/local/data/CbzFilter.kt  |  4 +++
 .../kotatsu/local/data/TempFileFilter.kt      | 11 +++++++
 .../local/domain/LocalMangaRepository.kt      | 31 ++++++++++++-------
 .../kotatsu/local/ui/LocalListViewModel.kt    | 20 +++++++++++-
 5 files changed, 60 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/local/data/TempFileFilter.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index a88562989..05c6df6bd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -44,6 +44,7 @@ class DownloadService : BaseService() {
 
 	override fun onCreate() {
 		super.onCreate()
+		isRunning = true
 		notificationSwitcher = ForegroundNotificationSwitcher(this)
 		val wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager)
 			.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "kotatsu:downloading")
@@ -81,6 +82,7 @@ class DownloadService : BaseService() {
 	override fun onDestroy() {
 		unregisterReceiver(controlReceiver)
 		binder = null
+		isRunning = false
 		super.onDestroy()
 	}
 
@@ -162,11 +164,12 @@ class DownloadService : BaseService() {
 
 	companion object {
 
-		const val ACTION_DOWNLOAD_COMPLETE =
-			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_COMPLETE"
+		var isRunning: Boolean = false
+			private set
 
-		private const val ACTION_DOWNLOAD_CANCEL =
-			"${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
+		const val ACTION_DOWNLOAD_COMPLETE = "${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_COMPLETE"
+
+		private const val ACTION_DOWNLOAD_CANCEL = "${BuildConfig.APPLICATION_ID}.action.ACTION_DOWNLOAD_CANCEL"
 
 		private const val EXTRA_MANGA = "manga"
 		private const val EXTRA_CHAPTERS_IDS = "chapters_ids"
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt
index 106cbaacd..8b8fca986 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFilter.kt
@@ -7,6 +7,10 @@ import java.util.*
 class CbzFilter : FilenameFilter {
 
 	override fun accept(dir: File, name: String): Boolean {
+		return isFileSupported(name)
+	}
+
+	fun isFileSupported(name: String): Boolean {
 		val ext = name.substringAfterLast('.', "").lowercase(Locale.ROOT)
 		return ext == "cbz" || ext == "zip"
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/TempFileFilter.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/TempFileFilter.kt
new file mode 100644
index 000000000..8aef4fead
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/TempFileFilter.kt
@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.local.data
+
+import java.io.File
+import java.io.FilenameFilter
+
+class TempFileFilter : FilenameFilter {
+
+	override fun accept(dir: File, name: String): Boolean {
+		return name.endsWith(".tmp", ignoreCase = true)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index 06b5757bf..43860e451 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -7,18 +7,13 @@ import androidx.annotation.WorkerThread
 import androidx.collection.ArraySet
 import androidx.core.net.toFile
 import androidx.core.net.toUri
-import java.io.File
-import java.io.IOException
-import java.util.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipFile
-import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.*
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.local.data.CbzFilter
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.data.MangaIndex
+import org.koitharu.kotatsu.local.data.TempFileFilter
 import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.parsers.util.toCamelCase
@@ -26,6 +21,12 @@ import org.koitharu.kotatsu.utils.AlphanumComparator
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.readText
 import org.koitharu.kotatsu.utils.ext.resolveName
+import java.io.File
+import java.io.IOException
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipFile
+import kotlin.coroutines.CoroutineContext
 
 private const val MAX_PARALLELISM = 4
 
@@ -245,7 +246,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		withContext(Dispatchers.IO) {
 			val name = contentResolver.resolveName(uri)
 				?: throw IOException("Cannot fetch name from uri: $uri")
-			if (!isFileSupported(name)) {
+			if (!filenameFilter.isFileSupported(name)) {
 				throw UnsupportedFileException("Unsupported file on $uri")
 			}
 			val dest = File(
@@ -262,15 +263,21 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		}
 	}
 
-	fun isFileSupported(name: String): Boolean {
-		val ext = name.substringAfterLast('.').lowercase(Locale.ROOT)
-		return ext == "cbz" || ext == "zip"
-	}
-
 	suspend fun getOutputDir(): File? {
 		return storageManager.getDefaultWriteableDir()
 	}
 
+	suspend fun cleanup() {
+		val dirs = storageManager.getWriteableDirs()
+		runInterruptible(Dispatchers.IO) {
+			dirs.flatMap { dir ->
+				dir.listFiles(TempFileFilter())?.toList().orEmpty()
+			}.forEach { file ->
+				file.delete()
+			}
+		}
+	}
+
 	private suspend fun getAllFiles() = storageManager.getReadableDirs().flatMap { dir ->
 		dir.listFiles(filenameFilter)?.toList().orEmpty()
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
index f4568b23f..07dea24b5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/ui/LocalListViewModel.kt
@@ -3,16 +3,18 @@ package org.koitharu.kotatsu.local.ui
 import android.net.Uri
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
-import java.io.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.history.domain.HistoryRepository
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.*
@@ -21,6 +23,7 @@ import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import org.koitharu.kotatsu.utils.progress.Progress
+import java.io.IOException
 
 class LocalListViewModel(
 	private val repository: LocalMangaRepository,
@@ -64,6 +67,7 @@ class LocalListViewModel(
 
 	init {
 		onRefresh()
+		cleanup()
 	}
 
 	override fun onRefresh() {
@@ -116,4 +120,18 @@ class LocalListViewModel(
 			listError.value = e
 		}
 	}
+
+	private fun cleanup() {
+		if (!DownloadService.isRunning) {
+			viewModelScope.launch {
+				runCatching {
+					repository.cleanup()
+				}.onFailure { error ->
+					if (BuildConfig.DEBUG) {
+						error.printStackTrace()
+					}
+				}
+			}
+		}
+	}
 }
\ No newline at end of file

From e617e8d6d30c0fc7b9e6cf387313b79804051fef Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 20 Apr 2022 12:06:49 +0300
Subject: [PATCH 048/104] Add password toggle to ProtectActivity

---
 .gitignore                                                  | 1 +
 app/build.gradle                                            | 2 +-
 .../org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt   | 6 +++---
 app/src/main/res/layout/activity_protect.xml                | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8c7b78f4..d4fcf16ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/kotlinScripting.xml
 .DS_Store
 /build
 /captures
diff --git a/app/build.gradle b/app/build.gradle
index 4cd4b8cf9..9e32665c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -86,7 +86,7 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'com.google.android.material:material:1.6.0-beta01'
+	implementation 'com.google.android.material:material:1.6.0-rc01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
index 7df8279fd..74e5468b9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
@@ -6,7 +6,7 @@ import coil.request.Disposable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.databinding.ItemTracklogBinding
+import org.koitharu.kotatsu.databinding.ItemFeedBinding
 import org.koitharu.kotatsu.list.ui.model.ListModel
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.tracker.ui.model.FeedItem
@@ -17,8 +17,8 @@ fun feedItemAD(
 	coil: ImageLoader,
 	lifecycleOwner: LifecycleOwner,
 	clickListener: OnListItemClickListener<Manga>
-) = adapterDelegateViewBinding<FeedItem, ListModel, ItemTracklogBinding>(
-	{ inflater, parent -> ItemTracklogBinding.inflate(inflater, parent, false) }
+) = adapterDelegateViewBinding<FeedItem, ListModel, ItemFeedBinding>(
+	{ inflater, parent -> ItemFeedBinding.inflate(inflater, parent, false) }
 ) {
 
 	var imageRequest: Disposable? = null
diff --git a/app/src/main/res/layout/activity_protect.xml b/app/src/main/res/layout/activity_protect.xml
index 3cba1f000..db3f7c3f7 100644
--- a/app/src/main/res/layout/activity_protect.xml
+++ b/app/src/main/res/layout/activity_protect.xml
@@ -40,10 +40,11 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginTop="30dp"
-		app:errorIconDrawable="@null"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@id/textView_subtitle">
+		app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
+		app:passwordToggleEnabled="true"
+		app:startIconDrawable="@android:color/transparent">
 
 		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/edit_password"

From 44d8d0f246f7187b7a1eb0b4bed8f5f6f7659975 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 20 Apr 2022 12:17:32 +0300
Subject: [PATCH 049/104] Fix search keyboard #150

---
 app/src/main/res/layout-w720dp-land/activity_main.xml | 3 +--
 app/src/main/res/layout/activity_main.xml             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml
index 1e507fbdc..80a34cfb5 100644
--- a/app/src/main/res/layout-w720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w720dp-land/activity_main.xml
@@ -63,9 +63,8 @@
 						android:drawablePadding="16dp"
 						android:gravity="center_vertical"
 						android:hint="@string/search_manga"
-						android:imeOptions="actionSearch|flagNoFullscreen"
+						android:imeOptions="actionSearch"
 						android:importantForAutofill="no"
-						android:inputType="textShortMessage"
 						android:singleLine="true" />
 
 				</com.google.android.material.appbar.MaterialToolbar>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5b1c1571f..1366af2c4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -54,9 +54,8 @@
 						android:background="@null"
 						android:gravity="center_vertical"
 						android:hint="@string/search_manga"
-						android:imeOptions="actionSearch|flagNoFullscreen"
+						android:imeOptions="actionSearch"
 						android:importantForAutofill="no"
-						android:inputType="textShortMessage"
 						android:paddingBottom="1dp"
 						android:singleLine="true"
 						tools:drawableEnd="@drawable/abc_ic_clear_material" />

From 6bf4e0cf8979798320efc473e4efb05d51595688 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 20 Apr 2022 12:57:07 +0300
Subject: [PATCH 050/104] Use PageLoader for thumbnails

---
 .../koitharu/kotatsu/local/data/PagesCache.kt |  6 +-
 .../kotatsu/reader/domain/PageLoader.kt       | 17 ++++--
 .../ui/thumbnails/PagesThumbnailsSheet.kt     | 28 +++++++---
 .../ui/thumbnails/adapter/PageThumbnailAD.kt  | 55 +++++++++++--------
 .../adapter/PageThumbnailAdapter.kt           |  6 +-
 5 files changed, 69 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
index bf0da97f9..73dd83bb4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/PagesCache.kt
@@ -2,13 +2,13 @@ package org.koitharu.kotatsu.local.data
 
 import android.content.Context
 import com.tomclaw.cache.DiskLruCache
+import java.io.File
+import java.io.InputStream
 import kotlinx.coroutines.flow.MutableStateFlow
 import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.utils.FileSize
 import org.koitharu.kotatsu.utils.ext.subdir
 import org.koitharu.kotatsu.utils.ext.takeIfReadable
-import java.io.File
-import java.io.InputStream
 
 class PagesCache(context: Context) {
 
@@ -60,4 +60,4 @@ class PagesCache(context: Context) {
 			progress.value = (bytesCopied.toDouble() / contentLength.toDouble()).toFloat()
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
index 250a63a49..523a18881 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
@@ -6,10 +6,6 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.collection.LongSparseArray
 import androidx.collection.set
-import java.io.File
-import java.util.*
-import java.util.concurrent.atomic.AtomicInteger
-import java.util.zip.ZipFile
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -31,6 +27,10 @@ import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.utils.ext.connectivityManager
 import org.koitharu.kotatsu.utils.progress.ProgressDeferred
+import java.io.File
+import java.util.*
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.zip.ZipFile
 
 private const val PROGRESS_UNDEFINED = -1f
 private const val PREFETCH_LIMIT_DEFAULT = 10
@@ -115,8 +115,13 @@ class PageLoader : KoinComponent, Closeable {
 
 	private fun onIdle() {
 		synchronized(prefetchQueue) {
-			val page = prefetchQueue.pollFirst() ?: return
-			tasks[page.id] = loadPageAsyncImpl(page)
+			while (prefetchQueue.isNotEmpty()) {
+				val page = prefetchQueue.pollFirst() ?: return
+				if (cache[page.url] == null) {
+					tasks[page.id] = loadPageAsyncImpl(page)
+					return
+				}
+			}
 		}
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
index c9a07f0fe..f9c6ea3d6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
@@ -19,17 +19,20 @@ import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.databinding.SheetPagesBinding
 import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
 import org.koitharu.kotatsu.utils.BottomSheetToolbarController
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
+class PagesThumbnailsSheet :
+	BaseBottomSheet<SheetPagesBinding>(),
 	OnListItemClickListener<MangaPage> {
 
 	private lateinit var thumbnails: List<PageThumbnail>
 	private val spanResolver = MangaListSpanResolver()
 	private var currentPageIndex = -1
+	private var pageLoader: PageLoader? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -75,11 +78,11 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 				SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing))
 			)
 			adapter = PageThumbnailAdapter(
-				thumbnails,
-				get(),
-				viewLifecycleScope,
-				get(),
-				this@PagesThumbnailsSheet
+				dataSet = thumbnails,
+				coil = get(),
+				scope = viewLifecycleScope,
+				loader = PageLoader().also { pageLoader = it },
+				clickListener = this@PagesThumbnailsSheet
 			)
 			addOnLayoutChangeListener(spanResolver)
 			spanResolver.setGridSize(get<AppSettings>().gridSize / 100f, this)
@@ -90,9 +93,17 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 		}
 	}
 
+	override fun onDestroyView() {
+		super.onDestroyView()
+		pageLoader?.close()
+		pageLoader = null
+	}
+
 	override fun onItemClick(item: MangaPage, view: View) {
-		((parentFragment as? OnPageSelectListener)
-			?: (activity as? OnPageSelectListener))?.run {
+		(
+			(parentFragment as? OnPageSelectListener)
+				?: (activity as? OnPageSelectListener)
+			)?.run {
 			onPageSelected(item)
 			dismiss()
 		}
@@ -127,6 +138,5 @@ class PagesThumbnailsSheet : BaseBottomSheet<SheetPagesBinding>(),
 				putString(ARG_TITLE, title)
 				putInt(ARG_CURRENT, currentPage)
 			}.show(fm, TAG)
-
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
index 416b520d2..201a4f4ae 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
@@ -1,27 +1,26 @@
 package org.koitharu.kotatsu.reader.ui.thumbnails.adapter
 
-import androidx.core.net.toUri
+import android.graphics.drawable.Drawable
 import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.size.PixelSize
+import com.google.android.material.R as materialR
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import kotlinx.coroutines.*
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.databinding.ItemPageThumbBinding
-import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
-import org.koitharu.kotatsu.utils.ext.IgnoreErrors
 import org.koitharu.kotatsu.utils.ext.referer
 import org.koitharu.kotatsu.utils.ext.setTextColorAttr
-import com.google.android.material.R as materialR
 
 fun pageThumbnailAD(
 	coil: ImageLoader,
 	scope: CoroutineScope,
-	cache: PagesCache,
-	clickListener: OnListItemClickListener<MangaPage>
+	loader: PageLoader,
+	clickListener: OnListItemClickListener<MangaPage>,
 ) = adapterDelegateViewBinding<PageThumbnail, PageThumbnail, ItemPageThumbBinding>(
 	{ inflater, parent -> ItemPageThumbBinding.inflate(inflater, parent, false) }
 ) {
@@ -33,6 +32,29 @@ fun pageThumbnailAD(
 		height = (gridWidth * 13f / 18f).toInt()
 	)
 
+	suspend fun loadPageThumbnail(item: PageThumbnail): Drawable? = withContext(Dispatchers.Default) {
+		item.page.preview?.let { url ->
+			coil.execute(
+				ImageRequest.Builder(context)
+					.data(url)
+					.referer(item.page.referer)
+					.size(thumbSize)
+					.allowRgb565(true)
+					.build()
+			).drawable
+		}?.let { drawable ->
+			return@withContext drawable
+		}
+		val file = loader.loadPage(item.page, force = false)
+		coil.execute(
+			ImageRequest.Builder(context)
+				.data(file)
+				.size(thumbSize)
+				.allowRgb565(true)
+				.build()
+		).drawable
+	}
+
 	binding.root.setOnClickListener {
 		clickListener.onItemClick(item.page, itemView)
 	}
@@ -45,22 +67,11 @@ fun pageThumbnailAD(
 			setTextColorAttr(if (item.isCurrent) materialR.attr.colorOnTertiary else android.R.attr.textColorPrimary)
 			text = (item.number).toString()
 		}
-		job = scope.launch(Dispatchers.Default + IgnoreErrors) {
-			val url = item.page.preview ?: item.page.url.let {
-				val pageUrl = item.repository.getPageUrl(item.page)
-				cache[pageUrl]?.toUri()?.toString() ?: pageUrl
-			}
-			val drawable = coil.execute(
-				ImageRequest.Builder(context)
-					.data(url)
-					.referer(item.page.referer)
-					.size(thumbSize)
-					.allowRgb565(true)
-					.build()
-			).drawable
-			withContext(Dispatchers.Main) {
-				binding.imageViewThumb.setImageDrawable(drawable)
-			}
+		job = scope.launch {
+			val drawable = runCatching {
+				loadPageThumbnail(item)
+			}.getOrNull()
+			binding.imageViewThumb.setImageDrawable(drawable)
 		}
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
index 0d8161670..b293d2865 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAdapter.kt
@@ -4,20 +4,20 @@ import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
 import kotlinx.coroutines.CoroutineScope
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
-import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.thumbnails.PageThumbnail
 
 class PageThumbnailAdapter(
 	dataSet: List<PageThumbnail>,
 	coil: ImageLoader,
 	scope: CoroutineScope,
-	cache: PagesCache,
+	loader: PageLoader,
 	clickListener: OnListItemClickListener<MangaPage>
 ) : ListDelegationAdapter<List<PageThumbnail>>() {
 
 	init {
-		delegatesManager.addDelegate(pageThumbnailAD(coil, scope, cache, clickListener))
+		delegatesManager.addDelegate(pageThumbnailAD(coil, scope, loader, clickListener))
 		setItems(dataSet)
 	}
 }
\ No newline at end of file

From 695feef4a6e4a061c5490191cc6c44d254ef2822 Mon Sep 17 00:00:00 2001
From: Xtimms <vp1984tanki@gmail.com>
Date: Thu, 21 Apr 2022 20:15:59 +0300
Subject: [PATCH 051/104] Improve simple manga list

---
 .../ui/FavouritesContainerFragment.kt         |  3 +-
 .../kotatsu/list/ui/MangaListFragment.kt      |  8 +-
 .../list/ui/MangaSelectionDecoration.kt       |  2 +-
 app/src/main/res/layout/fragment_list.xml     |  5 +-
 app/src/main/res/layout/item_feed.xml         | 28 +++---
 app/src/main/res/layout/item_manga_list.xml   | 89 +++++++++----------
 6 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index 27ae2696d..72b0566b8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -25,6 +25,7 @@ import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
+import org.koitharu.kotatsu.utils.ext.resolveDp
 import java.util.*
 
 class FavouritesContainerFragment :
@@ -85,7 +86,7 @@ class FavouritesContainerFragment :
 			top = headerHeight - insets.top
 		)
 		binding.pager.updatePadding(
-			top = -headerHeight
+			top = -headerHeight + resources.resolveDp(8) // 8 dp is needed so that the top of the list is not attached to tabs (visible when ActionMode is active)
 		)
 		binding.tabs.apply {
 			updatePadding(
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index d0f5f9d78..4b8c2b570 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -20,6 +20,7 @@ import org.koitharu.kotatsu.base.ui.list.FitHeightGridLayoutManager
 import org.koitharu.kotatsu.base.ui.list.FitHeightLinearLayoutManager
 import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
 import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
+import org.koitharu.kotatsu.base.ui.list.decor.TypedSpacingItemDecoration
 import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
 import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
 import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
@@ -243,8 +244,11 @@ abstract class MangaListFragment :
 				ListMode.LIST -> {
 					layoutManager = FitHeightLinearLayoutManager(context)
 					val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-					addItemDecoration(SpacingItemDecoration(spacing))
-					updatePadding(left = spacing, right = spacing)
+					val decoration = TypedSpacingItemDecoration(
+						MangaListAdapter.ITEM_TYPE_MANGA_LIST to 0,
+						fallbackSpacing = spacing
+					)
+					addItemDecoration(decoration)
 				}
 				ListMode.DETAILED_LIST -> {
 					layoutManager = FitHeightLinearLayoutManager(context)
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
index 106d141f4..5c0623e55 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
@@ -51,7 +51,7 @@ class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecorati
 		bounds: RectF,
 		state: RecyclerView.State,
 	) {
-		val radius = (child as? CardView)?.radius ?: 0f
+		val radius = (child as? CardView)?.radius ?: 32f
 		paint.color = fillColor
 		paint.style = Paint.Style.FILL
 		canvas.drawRoundRect(bounds, radius, radius, paint)
diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
index 75194b71d..6fd2271c0 100644
--- a/app/src/main/res/layout/fragment_list.xml
+++ b/app/src/main/res/layout/fragment_list.xml
@@ -13,7 +13,10 @@
 		android:layout_height="match_parent"
 		android:clipToPadding="false"
 		android:orientation="vertical"
-		android:padding="@dimen/grid_spacing_outer"
+		android:paddingLeft="@dimen/list_spacing"
+		android:paddingRight="@dimen/list_spacing"
+		android:paddingTop="@dimen/grid_spacing_outer"
+		android:paddingBottom="@dimen/grid_spacing_outer"
 		app:fastScrollEnabled="true"
 		tools:layoutManager="org.koitharu.kotatsu.base.ui.list.FitHeightLinearLayoutManager"
 		tools:listitem="@layout/item_manga_list" />
diff --git a/app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/item_feed.xml
index 7b29d3eee..1dcb660b8 100644
--- a/app/src/main/res/layout/item_feed.xml
+++ b/app/src/main/res/layout/item_feed.xml
@@ -9,17 +9,15 @@
 	android:clipChildren="false"
 	android:padding="@dimen/list_spacing">
 
-	<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
+	<com.google.android.material.imageview.ShapeableImageView
 		android:id="@+id/imageView_cover"
-		android:layout_width="48dp"
+		android:layout_width="42dp"
 		android:layout_height="0dp"
-		android:contentDescription="@null"
 		android:scaleType="centerCrop"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintDimensionRatio="h,1:1"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_bias="0.0"
 		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
 		tools:src="@tools:sample/backgrounds/scenic" />
 
@@ -28,13 +26,13 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
-		android:layout_marginEnd="2dp"
 		android:ellipsize="end"
-		android:singleLine="true"
-		android:textAppearance="?attr/textAppearanceBodyLarge"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		app:layout_constraintBottom_toTopOf="@+id/textView_summary"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/imageView_cover"
-		app:layout_constraintTop_toTopOf="@id/imageView_cover"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
 		tools:text="@tools:sample/lorem" />
 
 	<TextView
@@ -42,15 +40,13 @@
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginEnd="2dp"
 		android:ellipsize="end"
-		android:singleLine="true"
+		android:maxLines="1"
 		android:textAppearance="?attr/textAppearanceBodySmall"
-		app:layout_constraintBottom_toBottomOf="@id/imageView_cover"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
 		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/imageView_cover"
-		app:layout_constraintTop_toBottomOf="@id/textView_title"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toBottomOf="@+id/textView_title"
 		tools:text="@string/new_chapters" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_manga_list.xml b/app/src/main/res/layout/item_manga_list.xml
index fef7a5c33..5694c2289 100644
--- a/app/src/main/res/layout/item_manga_list.xml
+++ b/app/src/main/res/layout/item_manga_list.xml
@@ -1,55 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<androidx.constraintlayout.widget.ConstraintLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/manga_list_item_height"
-	app:cardCornerRadius="12dp">
+	android:layout_height="wrap_content"
+	android:background="@drawable/list_selector"
+	android:clipChildren="false"
+	android:padding="@dimen/list_spacing">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
+	<com.google.android.material.imageview.ShapeableImageView
+		android:id="@+id/imageView_cover"
+		android:layout_width="42dp"
+		android:layout_height="0dp"
+		android:scaleType="centerCrop"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintDimensionRatio="h,1:1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		tools:src="@tools:sample/backgrounds/scenic" />
 
-		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:orientation="vertical"
-			android:scaleType="centerCrop"
-			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
-			tools:src="@tools:sample/backgrounds/scenic" />
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		app:layout_constraintBottom_toTopOf="@+id/textView_subtitle"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toTopOf="@+id/imageView_cover"
+		tools:text="Title" />
 
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:orientation="vertical"
-			android:paddingStart="20dp"
-			android:paddingEnd="16dp">
+	<TextView
+		android:id="@+id/textView_subtitle"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:ellipsize="end"
+		android:maxLines="1"
+		android:textAppearance="?attr/textAppearanceBodySmall"
+		app:layout_constraintBottom_toBottomOf="@+id/imageView_cover"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/imageView_cover"
+		app:layout_constraintTop_toBottomOf="@+id/textView_title"
+		tools:text="Description" />
 
-			<TextView
-				android:id="@+id/textView_title"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="2"
-				android:textAppearance="?attr/textAppearanceBodyLarge"
-				tools:text="@tools:sample/lorem/random" />
-
-			<TextView
-				android:id="@+id/textView_subtitle"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textAppearance="?attr/textAppearanceBodyMedium"
-				android:textColor="?android:textColorSecondary"
-				tools:text="@tools:sample/lorem/random" />
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</com.google.android.material.card.MaterialCardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 16b6b6c0712bf7ea52ab2de6a06f274189eb7712 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 10:31:10 +0300
Subject: [PATCH 052/104] Add dummy manga parser for development

---
 .idea/inspectionProfiles/Project_Default.xml  |  4 +-
 app/build.gradle                              |  2 +-
 .../kotatsu/core/parser/DummyParser.kt        | 40 +++++++++++++++++++
 .../kotatsu/core/parser/MangaParser.kt        | 14 +++++++
 .../kotatsu/core/parser/MangaRepository.kt    |  2 +-
 .../core/parser/RemoteMangaRepository.kt      | 14 +++----
 .../kotatsu/core/prefs/AppSettings.kt         | 21 +++++++---
 .../settings/ContentSettingsFragment.kt       |  3 +-
 .../settings/onboard/OnboardViewModel.kt      |  8 ++--
 .../sources/SourcesSettingsViewModel.kt       |  5 +--
 .../kotatsu/core/parser/MangaParser.kt        | 10 +++++
 11 files changed, 94 insertions(+), 29 deletions(-)
 create mode 100644 app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
 create mode 100644 app/src/debug/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
 create mode 100644 app/src/release/java/org/koitharu/kotatsu/core/parser/MangaParser.kt

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index fe5866281..a6fb1fbe4 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,8 +1,10 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="BooleanLiteralArgument" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="BooleanLiteralArgument" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="Destructure" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ReplaceCollectionCountWithSize" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="TrailingComma" enabled="true" level="INFORMATION" enabled_by_default="true" />
     <inspection_tool class="ZeroLengthArrayInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>
diff --git a/app/build.gradle b/app/build.gradle
index 9e32665c9..c48ed31fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:dd9ace35d1') {
+	implementation('com.github.nv95:kotatsu-parsers:c1aa8a45dc') {
 		exclude group: 'org.json', module: 'json'
 	}
 
diff --git a/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt b/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
new file mode 100644
index 000000000..4323e3a5f
--- /dev/null
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt
@@ -0,0 +1,40 @@
+package org.koitharu.kotatsu.core.parser
+
+import java.util.*
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.parsers.model.*
+
+/**
+ * This parser is just for parser development, it should not be used in releases
+ */
+class DummyParser(override val context: MangaLoaderContext) : MangaParser(MangaSource.DUMMY) {
+
+	override val configKeyDomain: ConfigKey.Domain
+		get() = ConfigKey.Domain("", null)
+
+	override val sortOrders: Set<SortOrder>
+		get() = EnumSet.allOf(SortOrder::class.java)
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getList(
+		offset: Int,
+		query: String?,
+		tags: Set<MangaTag>?,
+		sortOrder: SortOrder?
+	): List<Manga> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
+		TODO("Not yet implemented")
+	}
+
+	override suspend fun getTags(): Set<MangaTag> {
+		TODO("Not yet implemented")
+	}
+}
\ No newline at end of file
diff --git a/app/src/debug/java/org/koitharu/kotatsu/core/parser/MangaParser.kt b/app/src/debug/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
new file mode 100644
index 000000000..596d4c626
--- /dev/null
+++ b/app/src/debug/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
@@ -0,0 +1,14 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.newParser
+
+fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
+	return if (source == MangaSource.DUMMY) {
+		DummyParser(loaderContext)
+	} else {
+		source.newParser(loaderContext)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index 1857064b3..87c5a3d6b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -32,7 +32,7 @@ interface MangaRepository {
 			return if (source == MangaSource.LOCAL) {
 				get<LocalMangaRepository>()
 			} else {
-				RemoteMangaRepository(source, get())
+				RemoteMangaRepository(MangaParser(source, get()))
 			}
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
index a532f6e6e..14a113e24 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
@@ -1,19 +1,15 @@
 package org.koitharu.kotatsu.core.parser
 
 import org.koitharu.kotatsu.core.prefs.SourceSettings
-import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaParser
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
 import org.koitharu.kotatsu.parsers.config.ConfigKey
 import org.koitharu.kotatsu.parsers.model.*
-import org.koitharu.kotatsu.parsers.newParser
 
-class RemoteMangaRepository(
-	override val source: MangaSource,
-	loaderContext: MangaLoaderContext,
-) : MangaRepository {
+class RemoteMangaRepository(private val parser: MangaParser) : MangaRepository {
 
-	private val parser: MangaParser = source.newParser(loaderContext)
+	override val source: MangaSource
+		get() = parser.source
 
 	override val sortOrders: Set<SortOrder>
 		get() = parser.sortOrders
@@ -28,7 +24,7 @@ class RemoteMangaRepository(
 		offset: Int,
 		query: String?,
 		tags: Set<MangaTag>?,
-		sortOrder: SortOrder?
+		sortOrder: SortOrder?,
 	): List<Manga> = parser.getList(offset, query, tags, sortOrder)
 
 	override suspend fun getDetails(manga: Manga): Manga = parser.getDetails(manga)
@@ -48,4 +44,4 @@ class RemoteMangaRepository(
 	}
 
 	private fun getConfig() = parser.config as SourceSettings
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 89cbc1aaf..e3b17c5dc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -18,6 +18,7 @@ import java.util.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.core.model.ZoomMode
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.getEnumValue
@@ -28,6 +29,16 @@ class AppSettings(context: Context) {
 
 	private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
 
+	private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
+		remove(MangaSource.LOCAL)
+		if (!BuildConfig.DEBUG) {
+			remove(MangaSource.DUMMY)
+		}
+	}
+
+	val remoteMangaSources: Set<MangaSource>
+		get() = Collections.unmodifiableSet(remoteSources)
+
 	var listMode: ListMode
 		get() = prefs.getEnumValue(KEY_LIST_MODE, ListMode.DETAILED_LIST)
 		set(value) = prefs.edit { putEnumValue(KEY_LIST_MODE, value) }
@@ -104,10 +115,9 @@ class AppSettings(context: Context) {
 		get() = prefs.getString(KEY_APP_PASSWORD, null)
 		set(value) = prefs.edit { if (value != null) putString(KEY_APP_PASSWORD, value) else remove(KEY_APP_PASSWORD) }
 
-	var sourcesOrder: List<Int>
+	var sourcesOrder: List<String>
 		get() = prefs.getString(KEY_SOURCES_ORDER, null)
 			?.split('|')
-			?.mapNotNull(String::toIntOrNull)
 			.orEmpty()
 		set(value) = prefs.edit {
 			putString(KEY_SOURCES_ORDER, value.joinToString("|"))
@@ -178,11 +188,10 @@ class AppSettings(context: Context) {
 	}
 
 	fun getMangaSources(includeHidden: Boolean): List<MangaSource> {
-		val list = MangaSource.values().toMutableList()
-		list.remove(MangaSource.LOCAL)
+		val list = remoteSources.toMutableList()
 		val order = sourcesOrder
 		list.sortBy { x ->
-			val e = order.indexOf(x.ordinal)
+			val e = order.indexOf(x.name)
 			if (e == -1) order.size + x.ordinal else e
 		}
 		if (!includeHidden) {
@@ -224,7 +233,7 @@ class AppSettings(context: Context) {
 		const val KEY_DYNAMIC_THEME = "dynamic_theme"
 		const val KEY_THEME_AMOLED = "amoled_theme"
 		const val KEY_DATE_FORMAT = "date_format"
-		const val KEY_SOURCES_ORDER = "sources_order"
+		const val KEY_SOURCES_ORDER = "sources_order_2"
 		const val KEY_SOURCES_HIDDEN = "sources_hidden"
 		const val KEY_TRAFFIC_WARNING = "traffic_warning"
 		const val KEY_PAGES_CACHE_CLEAR = "pages_cache_clear"
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
index 5e4c7555b..496fafcea 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/ContentSettingsFragment.kt
@@ -12,7 +12,6 @@ import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.base.ui.dialog.StorageSelectDialog
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.local.data.LocalStorageManager
-import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.getStorageName
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 
@@ -87,7 +86,7 @@ class ContentSettingsFragment :
 
 	private fun bindRemoteSourcesSummary() {
 		findPreference<Preference>(AppSettings.KEY_REMOTE_SOURCES)?.run {
-			val total = MangaSource.values().size - 1
+			val total = settings.remoteMangaSources.size
 			summary = getString(
 				R.string.enabled_d_of_d, total - settings.hiddenSources.size, total
 			)
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
index b9f97f37d..f2a929017 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.settings.onboard
 import androidx.collection.ArraySet
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.MutableLiveData
+import java.util.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -11,17 +12,14 @@ import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.map
 import org.koitharu.kotatsu.utils.ext.mapToSet
-import java.util.*
 
 class OnboardViewModel(
 	private val settings: AppSettings,
 ) : BaseViewModel() {
 
-	private val allSources = MangaSource.values().filterNot { x -> x == MangaSource.LOCAL }
+	private val allSources = settings.remoteMangaSources
 
-	private val locales = allSources.mapTo(ArraySet()) {
-			it.locale
-		}
+	private val locales = allSources.mapTo(ArraySet()) { it.locale }
 
 	private val selectedLocales = locales.toMutableSet()
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt
index 19388cbcc..01185ba2a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsViewModel.kt
@@ -32,7 +32,7 @@ class SourcesSettingsViewModel(
 		if ((snapshot[newPos] as? SourceConfigItem.SourceItem)?.isEnabled != true) return false
 		snapshot.move(oldPos, newPos)
 		settings.sourcesOrder = snapshot.mapNotNull {
-			(it as? SourceConfigItem.SourceItem)?.source?.ordinal
+			(it as? SourceConfigItem.SourceItem)?.source?.name
 		}
 		buildList()
 		return true
@@ -111,9 +111,6 @@ class SourcesSettingsViewModel(
 		if (enabledSources?.size != sources.size) {
 			result += SourceConfigItem.Header(R.string.available_sources)
 			for ((key, list) in map) {
-				val locale = if (key != null) {
-					Locale(key)
-				} else null
 				list.sortBy { it.ordinal }
 				val isExpanded = key in expandedGroups
 				result += SourceConfigItem.LocaleGroup(
diff --git a/app/src/release/java/org/koitharu/kotatsu/core/parser/MangaParser.kt b/app/src/release/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
new file mode 100644
index 000000000..a8f4377e5
--- /dev/null
+++ b/app/src/release/java/org/koitharu/kotatsu/core/parser/MangaParser.kt
@@ -0,0 +1,10 @@
+package org.koitharu.kotatsu.core.parser
+
+import org.koitharu.kotatsu.parsers.MangaLoaderContext
+import org.koitharu.kotatsu.parsers.MangaParser
+import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.newParser
+
+fun MangaParser(source: MangaSource, loaderContext: MangaLoaderContext): MangaParser {
+	return source.newParser(loaderContext)
+}
\ No newline at end of file

From b6a86a6538378d83960ad2157f913e2bbfa7bf20 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 10:39:33 +0300
Subject: [PATCH 053/104] Cache and reuse RemoteMangaRepository instances

---
 .../kotatsu/core/parser/MangaRepository.kt      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
index 87c5a3d6b..ca4cc495b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/MangaRepository.kt
@@ -1,5 +1,7 @@
 package org.koitharu.kotatsu.core.parser
 
+import java.lang.ref.WeakReference
+import java.util.*
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
@@ -28,11 +30,18 @@ interface MangaRepository {
 
 	companion object : KoinComponent {
 
+		private val cache = EnumMap<MangaSource, WeakReference<RemoteMangaRepository>>(MangaSource::class.java)
+
 		operator fun invoke(source: MangaSource): MangaRepository {
-			return if (source == MangaSource.LOCAL) {
-				get<LocalMangaRepository>()
-			} else {
-				RemoteMangaRepository(MangaParser(source, get()))
+			if (source == MangaSource.LOCAL) {
+				return get<LocalMangaRepository>()
+			}
+			cache[source]?.get()?.let { return it }
+			return synchronized(cache) {
+				cache[source]?.get()?.let { return it }
+				val repository = RemoteMangaRepository(MangaParser(source, get()))
+				cache[source] = WeakReference(repository)
+				repository
 			}
 		}
 	}

From e91d9ee38e041aab0398388c631a9c908999cb38 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 13:54:48 +0300
Subject: [PATCH 054/104] Fix list selection corners

---
 .../list/ui/MangaSelectionDecoration.kt       | 22 +++++++++++--------
 app/src/main/res/drawable/list_selector.xml   |  6 ++---
 app/src/main/res/values/dimens.xml            |  1 +
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
index 5c0623e55..3ef530824 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/MangaSelectionDecoration.kt
@@ -28,6 +28,7 @@ class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecorati
 		ColorUtils.blendARGB(strokeColor, context.getThemeColor(materialR.attr.colorSurface), 0.8f),
 		0x74
 	)
+	private val defaultRadius = context.resources.getDimension(R.dimen.list_selector_corner)
 
 	init {
 		hasBackground = false
@@ -51,21 +52,24 @@ class MangaSelectionDecoration(context: Context) : AbstractSelectionItemDecorati
 		bounds: RectF,
 		state: RecyclerView.State,
 	) {
-		val radius = (child as? CardView)?.radius ?: 32f
+		val isCard = child is CardView
+		val radius = (child as? CardView)?.radius ?: defaultRadius
 		paint.color = fillColor
 		paint.style = Paint.Style.FILL
 		canvas.drawRoundRect(bounds, radius, radius, paint)
 		paint.color = strokeColor
 		paint.style = Paint.Style.STROKE
 		canvas.drawRoundRect(bounds, radius, radius, paint)
-		checkIcon?.run {
-			setBounds(
-				(bounds.left + iconOffset).toInt(),
-				(bounds.top + iconOffset).toInt(),
-				(bounds.left + iconOffset + intrinsicWidth).toInt(),
-				(bounds.top + iconOffset + intrinsicHeight).toInt(),
-			)
-			draw(canvas)
+		if (isCard) {
+			checkIcon?.run {
+				setBounds(
+					(bounds.left + iconOffset).toInt(),
+					(bounds.top + iconOffset).toInt(),
+					(bounds.left + iconOffset + intrinsicWidth).toInt(),
+					(bounds.top + iconOffset + intrinsicHeight).toInt(),
+				)
+				draw(canvas)
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/list_selector.xml b/app/src/main/res/drawable/list_selector.xml
index 69666c05d..b1763b045 100644
--- a/app/src/main/res/drawable/list_selector.xml
+++ b/app/src/main/res/drawable/list_selector.xml
@@ -11,7 +11,7 @@
 				android:bottom="2dp"
 				android:left="2dp">
 				<shape android:shape="rectangle">
-					<corners android:radius="12dp" />
+					<corners android:radius="@dimen/list_selector_corner" />
 					<solid android:color="@color/selector_overlay" />
 				</shape>
 			</item>
@@ -22,7 +22,7 @@
 				android:bottom="2dp"
 				android:left="2dp">
 				<shape android:shape="rectangle">
-					<corners android:radius="12dp" />
+					<corners android:radius="@dimen/list_selector_corner" />
 					<solid android:color="@color/selector_overlay" />
 				</shape>
 			</item>
@@ -32,7 +32,7 @@
 				android:bottom="2dp"
 				android:left="2dp">
 				<shape android:shape="rectangle">
-					<corners android:radius="12dp" />
+					<corners android:radius="@dimen/list_selector_corner" />
 					<solid android:color="?android:attr/windowBackground" />
 				</shape>
 			</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c2d158769..282d15034 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,6 +20,7 @@
 	<dimen name="list_footer_height_outer">48dp</dimen>
 	<dimen name="screen_padding">16dp</dimen>
 	<dimen name="selection_stroke_width">2dp</dimen>
+	<dimen name="list_selector_corner">12dp</dimen>
 
 	<dimen name="search_suggestions_manga_height">124dp</dimen>
 	<dimen name="search_suggestions_manga_spacing">4dp</dimen>

From 7bffb5f22d70ae073a0b170d976aa629aac12f36 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 14:45:45 +0300
Subject: [PATCH 055/104] Select source domains using AutoCompleteTextView

---
 app/build.gradle                              |  2 +-
 .../kotatsu/settings/SourceSettingsExt.kt     | 32 ++++------
 .../utils/AutoCompleteTextViewPreference.kt   | 58 ++++++++++++++++++
 ...preference_dialog_autocompletetextview.xml | 59 +++++++++++++++++++
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/styles.xml            |  4 ++
 6 files changed, 136 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/settings/utils/AutoCompleteTextViewPreference.kt
 create mode 100644 app/src/main/res/layout/preference_dialog_autocompletetextview.xml

diff --git a/app/build.gradle b/app/build.gradle
index c48ed31fd..efa110f85 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:c1aa8a45dc') {
+	implementation('com.github.nv95:kotatsu-parsers:1d171d41fe') {
 		exclude group: 'org.json', module: 'json'
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
index 0392bb9c7..3a7c8843c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SourceSettingsExt.kt
@@ -1,15 +1,15 @@
 package org.koitharu.kotatsu.settings
 
 import android.view.inputmethod.EditorInfo
-import androidx.preference.*
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.parsers.config.ConfigKey
+import org.koitharu.kotatsu.settings.utils.AutoCompleteTextViewPreference
 import org.koitharu.kotatsu.settings.utils.EditTextBindListener
 import org.koitharu.kotatsu.settings.utils.EditTextDefaultSummaryProvider
-import org.koitharu.kotatsu.utils.ext.setDefaultValueCompat
-
-private const val KEY_DOMAIN = "domain"
 
 fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMangaRepository) {
 	val configKeys = repository.getConfigKeys()
@@ -19,23 +19,17 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 			is ConfigKey.Domain -> {
 				val presetValues = key.presetValues
 				if (presetValues.isNullOrEmpty()) {
-					EditTextPreference(requireContext()).apply {
-						summaryProvider = EditTextDefaultSummaryProvider(key.defaultValue)
-						setOnBindEditTextListener(
-							EditTextBindListener(
-								inputType = EditorInfo.TYPE_CLASS_TEXT or EditorInfo.TYPE_TEXT_VARIATION_URI,
-								hint = key.defaultValue,
-							)
-						)
-					}
+					EditTextPreference(requireContext())
 				} else {
-					DropDownPreference(requireContext()).apply {
-						entries = presetValues
-						entryValues = entries
-						summaryProvider = ListPreference.SimpleSummaryProvider.getInstance()
-						setDefaultValueCompat(key.defaultValue)
-					}
+					AutoCompleteTextViewPreference(requireContext()).apply { entries = presetValues }
 				}.apply {
+					summaryProvider = EditTextDefaultSummaryProvider(key.defaultValue)
+					setOnBindEditTextListener(
+						EditTextBindListener(
+							inputType = EditorInfo.TYPE_CLASS_TEXT or EditorInfo.TYPE_TEXT_VARIATION_URI,
+							hint = key.defaultValue,
+						)
+					)
 					setTitle(R.string.domain)
 					setDialogTitle(R.string.domain)
 				}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/utils/AutoCompleteTextViewPreference.kt b/app/src/main/java/org/koitharu/kotatsu/settings/utils/AutoCompleteTextViewPreference.kt
new file mode 100644
index 000000000..fe1d3f15c
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/utils/AutoCompleteTextViewPreference.kt
@@ -0,0 +1,58 @@
+package org.koitharu.kotatsu.settings.utils
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
+import android.widget.EditText
+import androidx.annotation.ArrayRes
+import androidx.annotation.AttrRes
+import androidx.annotation.StyleRes
+import androidx.preference.EditTextPreference
+import org.koitharu.kotatsu.R
+
+class AutoCompleteTextViewPreference @JvmOverloads constructor(
+	context: Context,
+	attrs: AttributeSet? = null,
+	@AttrRes defStyleAttr: Int = R.attr.autoCompleteTextViewPreferenceStyle,
+	@StyleRes defStyleRes: Int = R.style.Preference_AutoCompleteTextView,
+) : EditTextPreference(context, attrs, defStyleAttr, defStyleRes) {
+
+	private val autoCompleteBindListener = AutoCompleteBindListener()
+	var entries: Array<String> = emptyArray()
+
+	init {
+		super.setOnBindEditTextListener(autoCompleteBindListener)
+	}
+
+	fun setEntries(@ArrayRes arrayResId: Int) {
+		this.entries = context.resources.getStringArray(arrayResId)
+	}
+
+	fun setEntries(entries: Collection<String>) {
+		this.entries = entries.toTypedArray()
+	}
+
+	override fun setOnBindEditTextListener(onBindEditTextListener: OnBindEditTextListener?) {
+		autoCompleteBindListener.delegate = onBindEditTextListener
+	}
+
+	private inner class AutoCompleteBindListener : OnBindEditTextListener {
+
+		var delegate: OnBindEditTextListener? = null
+
+		override fun onBindEditText(editText: EditText) {
+			delegate?.onBindEditText(editText)
+			if (editText !is AutoCompleteTextView || entries.isEmpty()) {
+				return
+			}
+			editText.threshold = 0
+			editText.setAdapter(ArrayAdapter(editText.context, android.R.layout.simple_spinner_dropdown_item, entries))
+			(editText.parent as? ViewGroup)?.findViewById<View>(R.id.dropdown)?.setOnClickListener {
+				editText.showDropDown()
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_dialog_autocompletetextview.xml b/app/src/main/res/layout/preference_dialog_autocompletetextview.xml
new file mode 100644
index 000000000..38f92332d
--- /dev/null
+++ b/app/src/main/res/layout/preference_dialog_autocompletetextview.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_marginTop="48dp"
+	android:layout_marginBottom="48dp"
+	android:overScrollMode="ifContentScrolls">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@android:id/message"
+			style="?android:attr/textAppearanceSmall"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="24dp"
+			android:layout_marginLeft="24dp"
+			android:layout_marginEnd="24dp"
+			android:layout_marginRight="24dp"
+			android:layout_marginBottom="48dp"
+			android:labelFor="@android:id/edit"
+			android:textColor="?android:attr/textColorSecondary"
+			tools:ignore="LabelFor" />
+
+		<FrameLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="20dp"
+			android:layout_marginLeft="20dp"
+			android:layout_marginEnd="20dp"
+			android:layout_marginRight="20dp">
+
+			<AutoCompleteTextView
+				android:id="@android:id/edit"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:importantForAutofill="no"
+				android:minHeight="48dp" />
+
+			<ImageView
+				android:id="@+id/dropdown"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:layout_gravity="center_vertical|end"
+				android:background="?selectableItemBackgroundBorderless"
+				android:paddingBottom="2dp"
+				android:scaleType="center"
+				android:src="@drawable/ic_expand_more"
+				tools:ignore="ContentDescription" />
+
+		</FrameLayout>
+
+	</LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 449fc3a29..c14ddff76 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,6 +3,7 @@
 
 	<attr name="sliderPreferenceStyle" />
 	<attr name="multiAutoCompleteTextViewPreferenceStyle" />
+	<attr name="autoCompleteTextViewPreferenceStyle" />
 	<attr name="listItemTextViewStyle" />
 
 	<declare-styleable name="Theme">
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2ad34b167..2333f5d68 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -156,4 +156,8 @@
 		<item name="android:dialogLayout">@layout/preference_dialog_multiautocompletetextview</item>
 	</style>
 
+	<style name="Preference.AutoCompleteTextView" parent="Preference.DialogPreference.EditTextPreference.Material">
+		<item name="android:dialogLayout">@layout/preference_dialog_autocompletetextview</item>
+	</style>
+
 </resources>

From 75fcd317584a02b8f5b9ecc0f92dd960c56b7a65 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 15:31:52 +0300
Subject: [PATCH 056/104] Fix locking app on screen rotation

---
 .../org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt
index 35f7321a5..a92d866d2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/protect/AppProtectHelper.kt
@@ -34,7 +34,7 @@ class AppProtectHelper(private val settings: AppSettings) : Application.Activity
 	override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
 
 	override fun onActivityDestroyed(activity: Activity) {
-		if (activity !is ProtectActivity && activity.isTaskRoot) {
+		if (activity !is ProtectActivity && activity.isFinishing && activity.isTaskRoot) {
 			restoreLock()
 		}
 	}

From acf7102d075ea4d60826c6224346874d45268f52 Mon Sep 17 00:00:00 2001
From: lowak <lowak@pm.me>
Date: Sun, 17 Apr 2022 12:07:28 +0200
Subject: [PATCH 057/104] Translated using Weblate (Swedish)

Currently translated at 100.0% (274 of 274 strings)

Co-authored-by: lowak <lowak@pm.me>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/sv/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-sv/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6a84c9707..f477537f4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -53,7 +53,7 @@
     <string name="share_s">Dela %s</string>
     <string name="search_manga">Sök manga</string>
     <string name="cache">Cache</string>
-    <string name="show_notification_app_update">Visa en notifikation om en nyare version av äpplen finns tillgänglig</string>
+    <string name="show_notification_app_update">Visa en avisering om en nyare version av appen finns tillgänglig</string>
     <string name="newest">Nyaste</string>
     <string name="sort_order">Sorteringsordning</string>
     <string name="dark">Mörkt</string>
@@ -90,25 +90,25 @@
     <string name="search_history_cleared">Rensat</string>
     <string name="clear_thumbs_cache">Rensa cache för miniatyrer</string>
     <string name="open_in_browser">Öppna i webbläsare</string>
-    <string name="notifications">Notifikationer</string>
+    <string name="notifications">Aviseringar</string>
     <string name="clear_search_history">Rensa sökhistorik</string>
     <string name="domain">Domän</string>
     <string name="gestures_only">Endast gester</string>
     <string name="internal_storage">Internlagring</string>
     <string name="external_storage">Externlagring</string>
-    <string name="application_update">Kolla om det finns en nyare version av appen</string>
+    <string name="application_update">Håll appen uppdaterad</string>
     <string name="app_update_available">En ny version av appen finns tillgänglig</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d av %2$d aktiva</string>
     <string name="new_chapters">Nya kapitel</string>
     <string name="large_manga_save_confirm">Den här mangan har %s. Spara hela\?</string>
     <string name="save_manga">Spara</string>
     <string name="download">Ladda ned</string>
-    <string name="notifications_settings">Notifikationsinställningar</string>
+    <string name="notifications_settings">Aviseringsinställningar</string>
     <string name="light_indicator">LED-indikator</string>
-    <string name="show_notification_new_chapters">Notifiera om uppdateringar på manga du läser</string>
+    <string name="show_notification_new_chapters">Avisera om uppdateringar på manga du läser</string>
     <string name="read_from_start">Läs från början</string>
     <string name="restart">Starta om</string>
-    <string name="notification_sound">Notifikationsljud</string>
+    <string name="notification_sound">Aviseringsljud</string>
     <string name="vibration">Vibration</string>
     <string name="favourites_categories">Favoritkategorier</string>
     <string name="no_update_available">Inga tillgängliga uppdateringar</string>

From c73af2d45f2770a3eb27054cc746340cb5e1f3fe Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 15:37:16 +0300
Subject: [PATCH 058/104] Update version

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index efa110f85..6b6350b7d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 402
-		versionName '3.1.1'
+		versionCode 403
+		versionName '3.2'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

From cccc2c4fe47fa8ef8d5d250e5c289a74e419755f Mon Sep 17 00:00:00 2001
From: Xtimms <vp1984tanki@gmail.com>
Date: Sat, 23 Apr 2022 19:16:15 +0300
Subject: [PATCH 059/104] Create issue template

---
 .github/ISSUE_TEMPLATE/config.yml          |  5 ++
 .github/ISSUE_TEMPLATE/report_issue.yml    | 93 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/request_feature.yml | 39 +++++++++
 3 files changed, 137 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/report_issue.yml
 create mode 100644 .github/ISSUE_TEMPLATE/request_feature.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..b6d4254a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+    - name: ⚠️ Source issue
+      url: https://github.com/nv95/kotatsu-parsers/issues/new
+      about: Issues and requests for sources should be opened in the kotatsu-parsers repository instead
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
new file mode 100644
index 000000000..69983d414
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -0,0 +1,93 @@
+name: 🐞 Issue report
+description: Report an issue in Kotatsu
+labels: [bug]
+body:
+
+    - type: textarea
+      id: reproduce-steps
+      attributes:
+          label: Steps to reproduce
+          description: Provide an example of the issue.
+          placeholder: |
+              Example:
+                1. First step
+                2. Second step
+                3. Issue here
+      validations:
+          required: true
+
+    - type: textarea
+      id: expected-behavior
+      attributes:
+          label: Expected behavior
+          description: Explain what you should expect to happen.
+          placeholder: |
+              Example:
+                "This should happen..."
+      validations:
+          required: true
+
+    - type: textarea
+      id: actual-behavior
+      attributes:
+          label: Actual behavior
+          description: Explain what actually happens.
+          placeholder: |
+              Example:
+                "This happened instead..."
+      validations:
+          required: true
+
+    - type: input
+      id: kotatsu-version
+      attributes:
+          label: Kotatsu version
+          description: You can find your Kotatsu version in **Settings → About**.
+          placeholder: |
+              Example: "3.2"
+      validations:
+          required: true
+
+    - type: input
+      id: android-version
+      attributes:
+          label: Android version
+          description: You can find this somewhere in your Android settings.
+          placeholder: |
+              Example: "Android 12"
+      validations:
+          required: true
+
+    - type: input
+      id: device
+      attributes:
+          label: Device
+          description: List your device and model.
+          placeholder: |
+              Example: "LG Nexus 5X"
+      validations:
+          required: true
+
+    - type: textarea
+      id: other-details
+      attributes:
+          label: Other details
+          placeholder: |
+              Additional details and attachments.
+
+    - type: checkboxes
+      id: acknowledgements
+      attributes:
+          label: Acknowledgements
+          description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+          options:
+              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+                required: true
+              - label: I have written a short but informative title.
+                required: true
+              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
+                required: true
+              - label: I have updated the app to version **[3.2](https://github.com/nv95/Kotatsu/releases/latest)**.
+                required: true
+              - label: I will fill out all of the requested information in this form.
+                required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
new file mode 100644
index 000000000..a46a0648f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -0,0 +1,39 @@
+name: ⭐ Feature request
+description: Suggest a feature to improve Kotatsu
+labels: [feature request]
+body:
+
+    - type: textarea
+      id: feature-description
+      attributes:
+          label: Describe your suggested feature
+          description: How can Kotatsu be improved?
+          placeholder: |
+              Example:
+                "It should work like this..."
+      validations:
+          required: true
+
+    - type: textarea
+      id: other-details
+      attributes:
+          label: Other details
+          placeholder: |
+              Additional details and attachments.
+
+    - type: checkboxes
+      id: acknowledgements
+      attributes:
+          label: Acknowledgements
+          description: Read this carefully, we will close and ignore your issue if you skimmed through this.
+          options:
+              - label: I have searched the existing issues and this is a new ticket, **NOT** a duplicate or related to another open issue.
+                required: true
+              - label: I have written a short but informative title.
+                required: true
+              - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
+                required: true
+              - label: I have updated the app to version **[3.2](https://github.com/nv95/Kotatsu/releases/latest)**.
+                required: true
+              - label: I will fill out all of the requested information in this form.
+                required: true
\ No newline at end of file

From 0fb29174c5df57d6fa8fda5fdce7577dade563f2 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 18:38:50 +0300
Subject: [PATCH 060/104] Fix webview useragent

---
 .../org/koitharu/kotatsu/browser/BrowserActivity.kt   |  4 +++-
 .../org/koitharu/kotatsu/browser/BrowserClient.kt     |  4 ----
 .../kotatsu/core/network/UserAgentInterceptor.kt      | 11 ++++++++++-
 .../settings/sources/auth/SourceAuthActivity.kt       |  4 +++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
index fc9bd599c..442808bad 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserActivity.kt
@@ -11,10 +11,11 @@ import android.view.MenuItem
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.network.UserAgentInterceptor
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
-import com.google.android.material.R as materialR
 
 @SuppressLint("SetJavaScriptEnabled")
 class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
@@ -28,6 +29,7 @@ class BrowserActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback
 		}
 		with(binding.webView.settings) {
 			javaScriptEnabled = true
+			userAgentString = UserAgentInterceptor.userAgent
 		}
 		binding.webView.webViewClient = BrowserClient(this)
 		binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar)
diff --git a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt
index f39da5fb5..5e801a93f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/browser/BrowserClient.kt
@@ -2,15 +2,11 @@ package org.koitharu.kotatsu.browser
 
 import android.graphics.Bitmap
 import android.webkit.WebView
-import okhttp3.OkHttpClient
 import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
 import org.koitharu.kotatsu.core.network.WebViewClientCompat
 
 class BrowserClient(private val callback: BrowserCallback) : WebViewClientCompat(), KoinComponent {
 
-	private val okHttp by inject<OkHttpClient>(mode = LazyThreadSafetyMode.SYNCHRONIZED)
-
 	override fun onPageFinished(webView: WebView, url: String) {
 		super.onPageFinished(webView, url)
 		callback.onLoadingStateChanged(isLoading = false)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt
index af589dea3..b6491f154 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/network/UserAgentInterceptor.kt
@@ -1,10 +1,10 @@
 package org.koitharu.kotatsu.core.network
 
 import android.os.Build
+import java.util.*
 import okhttp3.Interceptor
 import okhttp3.Response
 import org.koitharu.kotatsu.BuildConfig
-import java.util.*
 
 class UserAgentInterceptor : Interceptor {
 
@@ -30,5 +30,14 @@ class UserAgentInterceptor : Interceptor {
 				Build.DEVICE,
 				Locale.getDefault().language
 			)
+
+		val userAgentChrome
+			get() = (
+				"Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) " +
+					"Chrome/100.0.4896.127 Mobile Safari/537.36"
+				).format(
+				Build.VERSION.RELEASE,
+				Build.MODEL,
+			)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
index 6ad087b80..41f4afa84 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
@@ -11,18 +11,19 @@ import androidx.activity.result.contract.ActivityResultContract
 import androidx.core.graphics.Insets
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
+import com.google.android.material.R as materialR
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.browser.BrowserCallback
 import org.koitharu.kotatsu.browser.BrowserClient
 import org.koitharu.kotatsu.browser.ProgressChromeClient
+import org.koitharu.kotatsu.core.network.UserAgentInterceptor
 import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
 import org.koitharu.kotatsu.databinding.ActivityBrowserBinding
 import org.koitharu.kotatsu.parsers.MangaParserAuthProvider
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.TaggedActivityResult
-import com.google.android.material.R as materialR
 
 class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallback {
 
@@ -52,6 +53,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
 		}
 		with(binding.webView.settings) {
 			javaScriptEnabled = true
+			userAgentString = UserAgentInterceptor.userAgentChrome
 		}
 		binding.webView.webViewClient = BrowserClient(this)
 		binding.webView.webChromeClient = ProgressChromeClient(binding.progressBar)

From e34acf010e05c7577ae25606eb952c8d183e4ec4 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 23 Apr 2022 19:30:45 +0300
Subject: [PATCH 061/104] Update parsers

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6b6350b7d..749ed677d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 403
+		versionCode 404
 		versionName '3.2'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:1d171d41fe') {
+	implementation('com.github.nv95:kotatsu-parsers:72cd6fbadf') {
 		exclude group: 'org.json', module: 'json'
 	}
 

From c462c19a8ba89a4727663029aa3f548a64b5c00d Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 28 Apr 2022 16:46:55 +0300
Subject: [PATCH 062/104] Option to hide 'All categories' tab from favourites

---
 .../base/ui/widgets/CheckableImageView.kt     |  7 ++
 .../kotatsu/core/prefs/AppSettings.kt         | 13 ++-
 .../kotatsu/favourites/FavouritesModule.kt    |  2 +-
 .../favourites/domain/FavouritesRepository.kt |  2 +-
 .../ui/FavouritesContainerFragment.kt         | 80 +++++++++++--------
 .../favourites/ui/FavouritesPagerAdapter.kt   | 33 +++++---
 .../ui/FavouritesTabLongClickListener.kt      |  4 +-
 .../categories/AllCategoriesToggleListener.kt |  6 ++
 .../ui/categories/CategoriesActivity.kt       | 25 ++++--
 .../ui/categories/CategoriesAdapter.kt        | 32 ++++----
 .../FavouritesCategoriesViewModel.kt          | 50 +++++++++++-
 .../ui/categories/adapter/AllCategoriesAD.kt  | 20 +++++
 .../ui/categories/{ => adapter}/CategoryAD.kt | 10 +--
 .../categories/adapter/CategoryListModel.kt   | 59 ++++++++++++++
 .../sources/SourcesSettingsFragment.kt        |  5 +-
 app/src/main/res/drawable/ic_hidden.xml       | 12 +++
 app/src/main/res/drawable/ic_shown.xml        | 12 +++
 app/src/main/res/drawable/ic_shown_hidden.xml |  5 ++
 .../main/res/layout/item_categories_all.xml   | 33 ++++++++
 ...egory_empty.xml => popup_category_all.xml} |  4 +
 app/src/main/res/values/strings.xml           |  1 +
 21 files changed, 327 insertions(+), 88 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/AllCategoriesAD.kt
 rename app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/{ => adapter}/CategoryAD.kt (68%)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
 create mode 100644 app/src/main/res/drawable/ic_hidden.xml
 create mode 100644 app/src/main/res/drawable/ic_shown.xml
 create mode 100644 app/src/main/res/drawable/ic_shown_hidden.xml
 create mode 100644 app/src/main/res/layout/item_categories_all.xml
 rename app/src/main/res/menu/{popup_category_empty.xml => popup_category_all.xml} (70%)

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt
index 9c8366293..5d601d67c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/CheckableImageView.kt
@@ -5,6 +5,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import android.os.Parcelable.Creator
 import android.util.AttributeSet
+import android.view.View
 import android.widget.Checkable
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatImageView
@@ -61,6 +62,12 @@ class CheckableImageView @JvmOverloads constructor(
 		}
 	}
 
+	class ToggleOnClickListener : OnClickListener {
+		override fun onClick(view: View) {
+			(view as? Checkable)?.toggle()
+		}
+	}
+
 	fun interface OnCheckedChangeListener {
 
 		fun onCheckedChanged(view: CheckableImageView, isChecked: Boolean)
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 5784153d3..2b65c60a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -11,10 +11,6 @@ import androidx.collection.arraySetOf
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.google.android.material.color.DynamicColors
-import java.io.File
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.callbackFlow
@@ -24,6 +20,10 @@ import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.getEnumValue
 import org.koitharu.kotatsu.utils.ext.putEnumValue
 import org.koitharu.kotatsu.utils.ext.toUriOrNull
+import java.io.File
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.*
 
 class AppSettings(context: Context) {
 
@@ -67,6 +67,10 @@ class AppSettings(context: Context) {
 		get() = prefs.getBoolean(KEY_TRAFFIC_WARNING, true)
 		set(value) = prefs.edit { putBoolean(KEY_TRAFFIC_WARNING, value) }
 
+	var isAllFavouritesVisible: Boolean
+		get() = prefs.getBoolean(KEY_ALL_FAVOURITES_VISIBLE, true)
+		set(value) = prefs.edit { putBoolean(KEY_ALL_FAVOURITES_VISIBLE, value) }
+
 	val isUpdateCheckingEnabled: Boolean
 		get() = prefs.getBoolean(KEY_APP_UPDATE_AUTO, true)
 
@@ -278,6 +282,7 @@ class AppSettings(context: Context) {
 		const val KEY_SEARCH_SINGLE_SOURCE = "search_single_source"
 		const val KEY_DOWNLOADS_PARALLELISM = "downloads_parallelism"
 		const val KEY_DOWNLOADS_SLOWDOWN = "downloads_slowdown"
+		const val KEY_ALL_FAVOURITES_VISIBLE = "all_favourites_visible"
 
 		// About
 		const val KEY_APP_UPDATE = "app_update"
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
index 9cd6e751e..8222c0f2b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
@@ -15,7 +15,7 @@ val favouritesModule
 		viewModel { categoryId ->
 			FavouritesListViewModel(categoryId.get(), get(), get(), get())
 		}
-		viewModel { FavouritesCategoriesViewModel(get()) }
+		viewModel { FavouritesCategoriesViewModel(get(), get()) }
 		viewModel { manga ->
 			MangaCategoriesViewModel(manga.get(), get())
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 5cb19fda5..731d7ff5e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -64,7 +64,7 @@ class FavouritesRepository(private val db: MangaDatabase) {
 			createdAt = System.currentTimeMillis(),
 			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
 			categoryId = 0,
-			order = SortOrder.UPDATED.name,
+			order = SortOrder.NEWEST.name,
 		)
 		val id = db.favouriteCategoriesDao.insert(entity)
 		return entity.toFavouriteCategory(id)
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index 72b0566b8..4433f978d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -21,12 +21,11 @@ import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.main.ui.AppBarOwner
-import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
 import org.koitharu.kotatsu.utils.ext.resolveDp
-import java.util.*
 
 class FavouritesContainerFragment :
 	BaseFragment<FragmentFavouritesBinding>(),
@@ -53,15 +52,15 @@ class FavouritesContainerFragment :
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
 		val adapter = FavouritesPagerAdapter(this, this)
-		viewModel.categories.value?.let {
-			adapter.replaceData(wrapCategories(it))
+		viewModel.visibleCategories.value?.let {
+			adapter.replaceData(it)
 		}
 		binding.pager.adapter = adapter
 		pagerAdapter = adapter
 		TabLayoutMediator(binding.tabs, binding.pager, adapter).attach()
 		actionModeDelegate.addListener(this, viewLifecycleOwner)
 
-		viewModel.categories.observe(viewLifecycleOwner, ::onCategoriesChanged)
+		viewModel.visibleCategories.observe(viewLifecycleOwner, ::onCategoriesChanged)
 		viewModel.onError.observe(viewLifecycleOwner, ::onError)
 	}
 
@@ -86,7 +85,8 @@ class FavouritesContainerFragment :
 			top = headerHeight - insets.top
 		)
 		binding.pager.updatePadding(
-			top = -headerHeight + resources.resolveDp(8) // 8 dp is needed so that the top of the list is not attached to tabs (visible when ActionMode is active)
+			// 8 dp is needed so that the top of the list is not attached to tabs (visible when ActionMode is active)
+			top = -headerHeight + resources.resolveDp(8)
 		)
 		binding.tabs.apply {
 			updatePadding(
@@ -99,8 +99,8 @@ class FavouritesContainerFragment :
 		}
 	}
 
-	private fun onCategoriesChanged(categories: List<FavouriteCategory>) {
-		pagerAdapter?.replaceData(wrapCategories(categories))
+	private fun onCategoriesChanged(categories: List<CategoryListModel>) {
+		pagerAdapter?.replaceData(categories)
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -122,26 +122,11 @@ class FavouritesContainerFragment :
 		Snackbar.make(binding.pager, e.getDisplayMessage(resources), Snackbar.LENGTH_LONG).show()
 	}
 
-	override fun onTabLongClick(tabView: View, category: FavouriteCategory): Boolean {
-		val menuRes = if (category.id == 0L) R.menu.popup_category_empty else R.menu.popup_category
-		val menu = PopupMenu(tabView.context, tabView)
-		menu.inflate(menuRes)
-		createOrderSubmenu(menu.menu, category)
-		menu.setOnMenuItemClickListener {
-			when (it.itemId) {
-				R.id.action_remove -> editDelegate.deleteCategory(category)
-				R.id.action_rename -> editDelegate.renameCategory(category)
-				R.id.action_create -> editDelegate.createCategory()
-				R.id.action_order -> return@setOnMenuItemClickListener false
-				else -> {
-					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)
-						?: return@setOnMenuItemClickListener false
-					viewModel.setCategoryOrder(category.id, order)
-				}
-			}
-			true
+	override fun onTabLongClick(tabView: View, item: CategoryListModel): Boolean {
+		when (item) {
+			is CategoryListModel.All -> showAllCategoriesMenu(tabView)
+			is CategoryListModel.CategoryItem -> showCategoryMenu(tabView, item.category)
 		}
-		menu.show()
 		return true
 	}
 
@@ -157,13 +142,6 @@ class FavouritesContainerFragment :
 		viewModel.createCategory(name)
 	}
 
-	private fun wrapCategories(categories: List<FavouriteCategory>): List<FavouriteCategory> {
-		val data = ArrayList<FavouriteCategory>(categories.size + 1)
-		data += FavouriteCategory(0L, getString(R.string.all_favourites), -1, SortOrder.NEWEST, Date())
-		data += categories
-		return data
-	}
-
 	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
 		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
 		for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
@@ -181,6 +159,40 @@ class FavouritesContainerFragment :
 		}
 	}
 
+	private fun showCategoryMenu(tabView: View, category: FavouriteCategory) {
+		val menu = PopupMenu(tabView.context, tabView)
+		menu.inflate(R.menu.popup_category)
+		createOrderSubmenu(menu.menu, category)
+		menu.setOnMenuItemClickListener {
+			when (it.itemId) {
+				R.id.action_remove -> editDelegate.deleteCategory(category)
+				R.id.action_rename -> editDelegate.renameCategory(category)
+				R.id.action_create -> editDelegate.createCategory()
+				R.id.action_order -> return@setOnMenuItemClickListener false
+				else -> {
+					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)
+						?: return@setOnMenuItemClickListener false
+					viewModel.setCategoryOrder(category.id, order)
+				}
+			}
+			true
+		}
+		menu.show()
+	}
+
+	private fun showAllCategoriesMenu(tabView: View) {
+		val menu = PopupMenu(tabView.context, tabView)
+		menu.inflate(R.menu.popup_category_all)
+		menu.setOnMenuItemClickListener {
+			when (it.itemId) {
+				R.id.action_create -> editDelegate.createCategory()
+				R.id.action_hide -> viewModel.setAllCategoriesVisible(false)
+			}
+			true
+		}
+		menu.show()
+	}
+
 	companion object {
 
 		fun newInstance() = FavouritesContainerFragment()
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
index 29de80809..329e06751 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesPagerAdapter.kt
@@ -7,14 +7,16 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
-import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
 
 class FavouritesPagerAdapter(
 	fragment: Fragment,
 	private val longClickListener: FavouritesTabLongClickListener
 ) : FragmentStateAdapter(fragment.childFragmentManager, fragment.viewLifecycleOwner.lifecycle),
-	TabLayoutMediator.TabConfigurationStrategy, View.OnLongClickListener {
+	TabLayoutMediator.TabConfigurationStrategy,
+	View.OnLongClickListener {
 
 	private val differ = AsyncListDiffer(this, DiffCallback())
 
@@ -35,12 +37,15 @@ class FavouritesPagerAdapter(
 
 	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
 		val item = differ.currentList[position]
-		tab.text = item.title
+		tab.text = when (item) {
+			is CategoryListModel.All -> tab.view.context.getString(R.string.all_favourites)
+			is CategoryListModel.CategoryItem -> item.category.title
+		}
 		tab.view.tag = item.id
 		tab.view.setOnLongClickListener(this)
 	}
 
-	fun replaceData(data: List<FavouriteCategory>) {
+	fun replaceData(data: List<CategoryListModel>) {
 		differ.submitList(data)
 	}
 
@@ -50,16 +55,22 @@ class FavouritesPagerAdapter(
 		return longClickListener.onTabLongClick(v, item)
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<FavouriteCategory>() {
+	private class DiffCallback : DiffUtil.ItemCallback<CategoryListModel>() {
 
 		override fun areItemsTheSame(
-			oldItem: FavouriteCategory,
-			newItem: FavouriteCategory
-		): Boolean = oldItem.id == newItem.id
+			oldItem: CategoryListModel,
+			newItem: CategoryListModel
+		): Boolean = when {
+			oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> true
+			oldItem is CategoryListModel.CategoryItem && newItem is CategoryListModel.CategoryItem -> {
+				oldItem.category.id == newItem.category.id
+			}
+			else -> false
+		}
 
 		override fun areContentsTheSame(
-			oldItem: FavouriteCategory,
-			newItem: FavouriteCategory
-		): Boolean = oldItem.id == newItem.id && oldItem.title == newItem.title
+			oldItem: CategoryListModel,
+			newItem: CategoryListModel
+		): Boolean = oldItem == newItem
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt
index acc4f89c0..13fca87c9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesTabLongClickListener.kt
@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.favourites.ui
 
 import android.view.View
-import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 
 fun interface FavouritesTabLongClickListener {
 
-	fun onTabLongClick(tabView: View, category: FavouriteCategory): Boolean
+	fun onTabLongClick(tabView: View, item: CategoryListModel): Boolean
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt
new file mode 100644
index 000000000..380722b84
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/AllCategoriesToggleListener.kt
@@ -0,0 +1,6 @@
+package org.koitharu.kotatsu.favourites.ui.categories
+
+interface AllCategoriesToggleListener {
+
+	fun onAllCategoriesToggle(isVisible: Boolean)
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index 9caeb87c8..5a2eaf8df 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -21,6 +21,7 @@ import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
@@ -29,7 +30,7 @@ class CategoriesActivity :
 	BaseActivity<ActivityCategoriesBinding>(),
 	OnListItemClickListener<FavouriteCategory>,
 	View.OnClickListener,
-	CategoriesEditDelegate.CategoriesEditCallback {
+	CategoriesEditDelegate.CategoriesEditCallback, AllCategoriesToggleListener {
 
 	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
 
@@ -41,7 +42,7 @@ class CategoriesActivity :
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityCategoriesBinding.inflate(layoutInflater))
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
-		adapter = CategoriesAdapter(this)
+		adapter = CategoriesAdapter(this, this)
 		editDelegate = CategoriesEditDelegate(this, this)
 		binding.recyclerView.setHasFixedSize(true)
 		binding.recyclerView.adapter = adapter
@@ -49,7 +50,7 @@ class CategoriesActivity :
 		reorderHelper = ItemTouchHelper(ReorderHelperCallback())
 		reorderHelper.attachToRecyclerView(binding.recyclerView)
 
-		viewModel.categories.observe(this, ::onCategoriesChanged)
+		viewModel.allCategories.observe(this, ::onCategoriesChanged)
 		viewModel.onError.observe(this, ::onError)
 	}
 
@@ -84,6 +85,10 @@ class CategoriesActivity :
 		return true
 	}
 
+	override fun onAllCategoriesToggle(isVisible: Boolean) {
+		viewModel.setAllCategoriesVisible(isVisible)
+	}
+
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.fabAdd.updateLayoutParams<ViewGroup.MarginLayoutParams> {
 			rightMargin = topMargin + insets.right
@@ -97,7 +102,7 @@ class CategoriesActivity :
 		)
 	}
 
-	private fun onCategoriesChanged(categories: List<FavouriteCategory>) {
+	private fun onCategoriesChanged(categories: List<CategoryListModel>) {
 		adapter.items = categories
 		binding.textViewHolder.isVisible = categories.isEmpty()
 	}
@@ -138,13 +143,19 @@ class CategoriesActivity :
 		ItemTouchHelper.DOWN or ItemTouchHelper.UP, 0
 	) {
 
+		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
+
 		override fun onMove(
 			recyclerView: RecyclerView,
 			viewHolder: RecyclerView.ViewHolder,
 			target: RecyclerView.ViewHolder,
-		): Boolean = true
+		): Boolean = viewHolder.itemViewType == target.itemViewType
 
-		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
+		override fun canDropOver(
+			recyclerView: RecyclerView,
+			current: RecyclerView.ViewHolder,
+			target: RecyclerView.ViewHolder,
+		): Boolean = current.itemViewType == target.itemViewType
 
 		override fun onMoved(
 			recyclerView: RecyclerView,
@@ -158,6 +169,8 @@ class CategoriesActivity :
 			super.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y)
 			viewModel.reorderCategories(fromPos, toPos)
 		}
+
+		override fun isLongPressDragEnabled(): Boolean = false
 	}
 
 	companion object {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
index adf19ca9c..e13b31e00 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
@@ -4,13 +4,18 @@ import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.allCategoriesAD
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.categoryAD
 
 class CategoriesAdapter(
 	onItemClickListener: OnListItemClickListener<FavouriteCategory>,
-) : AsyncListDifferDelegationAdapter<FavouriteCategory>(DiffCallback()) {
+	allCategoriesToggleListener: AllCategoriesToggleListener,
+) : AsyncListDifferDelegationAdapter<CategoryListModel>(DiffCallback()) {
 
 	init {
 		delegatesManager.addDelegate(categoryAD(onItemClickListener))
+			.addDelegate(allCategoriesAD(allCategoriesToggleListener))
 		setHasStableIds(true)
 	}
 
@@ -18,28 +23,23 @@ class CategoriesAdapter(
 		return items[position].id
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<FavouriteCategory>() {
+	private class DiffCallback : DiffUtil.ItemCallback<CategoryListModel>() {
 
 		override fun areItemsTheSame(
-			oldItem: FavouriteCategory,
-			newItem: FavouriteCategory,
-		): Boolean {
-			return oldItem.id == newItem.id
-		}
+			oldItem: CategoryListModel,
+			newItem: CategoryListModel,
+		): Boolean = oldItem.id == newItem.id
 
 		override fun areContentsTheSame(
-			oldItem: FavouriteCategory,
-			newItem: FavouriteCategory,
-		): Boolean {
-			return oldItem.id == newItem.id && oldItem.title == newItem.title
-					&& oldItem.order == newItem.order
-		}
+			oldItem: CategoryListModel,
+			newItem: CategoryListModel,
+		): Boolean = oldItem == newItem
 
 		override fun getChangePayload(
-			oldItem: FavouriteCategory,
-			newItem: FavouriteCategory,
+			oldItem: CategoryListModel,
+			newItem: CategoryListModel,
 		): Any? = when {
-			oldItem.title == newItem.title && oldItem.order != newItem.order -> newItem.order
+			oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> Unit
 			else -> super.getChangePayload(oldItem, newItem)
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index c87e44c76..7aac74e62 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -3,20 +3,36 @@ package org.koitharu.kotatsu.favourites.ui.categories
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
 import java.util.*
 
 class FavouritesCategoriesViewModel(
-	private val repository: FavouritesRepository
+	private val repository: FavouritesRepository,
+	private val settings: AppSettings,
 ) : BaseViewModel() {
 
 	private var reorderJob: Job? = null
 
-	val categories = repository.observeCategories()
-		.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+	val allCategories = combine(
+		repository.observeCategories(),
+		observeAllCategoriesVisible(),
+	) { list, showAll ->
+		mapCategories(list, showAll, true)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+	
+	val visibleCategories = combine(
+		repository.observeCategories(),
+		observeAllCategoriesVisible(),
+	) { list, showAll ->
+		mapCategories(list, showAll, showAll)
+	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
 	fun createCategory(name: String) {
 		launchJob {
@@ -42,14 +58,40 @@ class FavouritesCategoriesViewModel(
 		}
 	}
 
+	fun setAllCategoriesVisible(isVisible: Boolean) {
+		settings.isAllFavouritesVisible = isVisible
+	}
+
 	fun reorderCategories(oldPos: Int, newPos: Int) {
 		val prevJob = reorderJob
 		reorderJob = launchJob(Dispatchers.Default) {
 			prevJob?.join()
-			val items = categories.value ?: error("This should not happen")
+			val items = allCategories.value ?: error("This should not happen")
 			val ids = items.mapTo(ArrayList(items.size)) { it.id }
 			Collections.swap(ids, oldPos, newPos)
+			ids.remove(0L)
 			repository.reorderCategories(ids)
 		}
 	}
+
+	private fun mapCategories(
+		categories: List<FavouriteCategory>,
+		isAllCategoriesVisible: Boolean,
+		withAllCategoriesItem: Boolean,
+	): List<CategoryListModel> {
+		val result = ArrayList<CategoryListModel>(categories.size + 1)
+		if (withAllCategoriesItem) {
+			result.add(CategoryListModel.All(isAllCategoriesVisible))
+		}
+		categories.mapTo(result) {
+			CategoryListModel.CategoryItem(it)
+		}
+		return result
+	}
+
+	private fun observeAllCategoriesVisible() = settings.observe()
+		.filter { it == AppSettings.KEY_ALL_FAVOURITES_VISIBLE }
+		.map { settings.isAllFavouritesVisible }
+		.onStart { emit(settings.isAllFavouritesVisible) }
+		.distinctUntilChanged()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/AllCategoriesAD.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/AllCategoriesAD.kt
new file mode 100644
index 000000000..113198bfa
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/AllCategoriesAD.kt
@@ -0,0 +1,20 @@
+package org.koitharu.kotatsu.favourites.ui.categories.adapter
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.databinding.ItemCategoriesAllBinding
+import org.koitharu.kotatsu.favourites.ui.categories.AllCategoriesToggleListener
+
+fun allCategoriesAD(
+	allCategoriesToggleListener: AllCategoriesToggleListener,
+) = adapterDelegateViewBinding<CategoryListModel.All, CategoryListModel, ItemCategoriesAllBinding>(
+	{ inflater, parent -> ItemCategoriesAllBinding.inflate(inflater, parent, false) }
+) {
+
+	binding.imageViewToggle.setOnClickListener {
+		allCategoriesToggleListener.onAllCategoriesToggle(!item.isVisible)
+	}
+
+	bind {
+		binding.imageViewToggle.isChecked = item.isVisible
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoryAD.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
similarity index 68%
rename from app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoryAD.kt
rename to app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
index 97b38d926..d840b783f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoryAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.favourites.ui.categories
+package org.koitharu.kotatsu.favourites.ui.categories.adapter
 
 import android.view.MotionEvent
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -8,23 +8,23 @@ import org.koitharu.kotatsu.databinding.ItemCategoryBinding
 
 fun categoryAD(
 	clickListener: OnListItemClickListener<FavouriteCategory>
-) = adapterDelegateViewBinding<FavouriteCategory, FavouriteCategory, ItemCategoryBinding>(
+) = adapterDelegateViewBinding<CategoryListModel.CategoryItem, CategoryListModel, ItemCategoryBinding>(
 	{ inflater, parent -> ItemCategoryBinding.inflate(inflater, parent, false) }
 ) {
 
 	binding.imageViewMore.setOnClickListener {
-		clickListener.onItemClick(item, it)
+		clickListener.onItemClick(item.category, it)
 	}
 	@Suppress("ClickableViewAccessibility")
 	binding.imageViewHandle.setOnTouchListener { v, event ->
 		if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-			clickListener.onItemLongClick(item, itemView)
+			clickListener.onItemLongClick(item.category, itemView)
 		} else {
 			false
 		}
 	}
 
 	bind {
-		binding.textViewTitle.text = item.title
+		binding.textViewTitle.text = item.category.title
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
new file mode 100644
index 000000000..8326f8617
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
@@ -0,0 +1,59 @@
+package org.koitharu.kotatsu.favourites.ui.categories.adapter
+
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.list.ui.model.ListModel
+
+sealed interface CategoryListModel : ListModel {
+
+	val id: Long
+
+	class All(
+		val isVisible: Boolean,
+	) : CategoryListModel {
+
+		override val id: Long = 0L
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as All
+
+			if (isVisible != other.isVisible) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			return isVisible.hashCode()
+		}
+	}
+
+	class CategoryItem(
+		val category: FavouriteCategory,
+	) : CategoryListModel {
+
+		override val id: Long
+			get() = category.id
+
+		override fun equals(other: Any?): Boolean {
+			if (this === other) return true
+			if (javaClass != other?.javaClass) return false
+
+			other as CategoryItem
+
+			if (category.id != other.category.id) return false
+			if (category.title != other.category.title) return false
+			if (category.order != other.category.order) return false
+
+			return true
+		}
+
+		override fun hashCode(): Int {
+			var result = category.id.hashCode()
+			result = 31 * result + category.title.hashCode()
+			result = 31 * result + category.order.hashCode()
+			return result
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
index 60a5b6ff9..ad27cec65 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
@@ -141,10 +141,7 @@ class SourcesSettingsFragment : BaseFragment<FragmentSettingsSourcesBinding>(),
 			recyclerView: RecyclerView,
 			current: RecyclerView.ViewHolder,
 			target: RecyclerView.ViewHolder,
-		): Boolean = current.itemViewType == target.itemViewType && viewModel.canReorder(
-			current.bindingAdapterPosition,
-			target.bindingAdapterPosition,
-		)
+		): Boolean = current.itemViewType == target.itemViewType
 
 		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
 
diff --git a/app/src/main/res/drawable/ic_hidden.xml b/app/src/main/res/drawable/ic_hidden.xml
new file mode 100644
index 000000000..82816e502
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hidden.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L15.65,18.92C14.5,19.3 13.28,19.5 12,19.5C7,19.5 2.73,16.39 1,12C1.69,10.24 2.79,8.69 4.19,7.46L2,5.27M12,9A3,3 0 0,1 15,12C15,12.35 14.94,12.69 14.83,13L11,9.17C11.31,9.06 11.65,9 12,9M12,4.5C17,4.5 21.27,7.61 23,12C22.18,14.08 20.79,15.88 19,17.19L17.58,15.76C18.94,14.82 20.06,13.54 20.82,12C19.17,8.64 15.76,6.5 12,6.5C10.91,6.5 9.84,6.68 8.84,7L7.3,5.47C8.74,4.85 10.33,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C12.69,17.5 13.37,17.43 14,17.29L11.72,15C10.29,14.85 9.15,13.71 9,12.28L5.6,8.87C4.61,9.72 3.78,10.78 3.18,12Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shown.xml b/app/src/main/res/drawable/ic_shown.xml
new file mode 100644
index 000000000..ee4887a82
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shown.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000"
+		android:pathData="M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9M12,4.5C17,4.5 21.27,7.61 23,12C21.27,16.39 17,19.5 12,19.5C7,19.5 2.73,16.39 1,12C2.73,7.61 7,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C15.76,17.5 19.17,15.36 20.82,12C19.17,8.64 15.76,6.5 12,6.5C8.24,6.5 4.83,8.64 3.18,12Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shown_hidden.xml b/app/src/main/res/drawable/ic_shown_hidden.xml
new file mode 100644
index 000000000..5405a4747
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shown_hidden.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_shown" android:state_checked="true" />
+	<item android:drawable="@drawable/ic_hidden" android:state_checked="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_categories_all.xml b/app/src/main/res/layout/item_categories_all.xml
new file mode 100644
index 000000000..8f965adf0
--- /dev/null
+++ b/app/src/main/res/layout/item_categories_all.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="?android:listPreferredItemHeightSmall"
+	android:gravity="center_vertical"
+	android:orientation="horizontal"
+	android:paddingStart="?listPreferredItemPaddingStart"
+	tools:ignore="Overdraw">
+
+	<TextView
+		android:id="@+id/textView_title"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:ellipsize="marquee"
+		android:fadingEdge="horizontal"
+		android:singleLine="true"
+		android:text="@string/all_favourites"
+		android:textAppearance="?attr/textAppearanceBodyLarge" />
+
+	<org.koitharu.kotatsu.base.ui.widgets.CheckableImageView
+		android:id="@+id/imageView_toggle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:background="?selectableItemBackgroundBorderless"
+		android:padding="?listPreferredItemPaddingEnd"
+		android:scaleType="center"
+		app:srcCompat="@drawable/ic_shown_hidden" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/popup_category_empty.xml b/app/src/main/res/menu/popup_category_all.xml
similarity index 70%
rename from app/src/main/res/menu/popup_category_empty.xml
rename to app/src/main/res/menu/popup_category_all.xml
index 740312ef1..60b3bc3bd 100644
--- a/app/src/main/res/menu/popup_category_empty.xml
+++ b/app/src/main/res/menu/popup_category_all.xml
@@ -2,6 +2,10 @@
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
+	<item
+		android:id="@+id/action_hide"
+		android:title="@string/hide" />
+
 	<item
 		android:id="@+id/action_create"
 		android:title="@string/create_category" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 828ad9fe6..cca5b5410 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -279,4 +279,5 @@
 	<string name="download_slowdown_summary">Helps avoid blocking your IP address</string>
 	<string name="local_manga_processing">Saved manga processing</string>
 	<string name="chapters_will_removed_background">Chapters will be removed in the background. It can take some time</string>
+	<string name="hide">Hide</string>
 </resources>
\ No newline at end of file

From 714b708fa9c5429fe4c370ddecbe4695fe396887 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 29 Apr 2022 09:03:39 +0300
Subject: [PATCH 063/104] Fix npe on getExternalFilesDirs #158

---
 .../koitharu/kotatsu/local/data/LocalStorageManager.kt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/LocalStorageManager.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/LocalStorageManager.kt
index 2cbddf856..6e9c1e399 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/LocalStorageManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/LocalStorageManager.kt
@@ -4,6 +4,7 @@ import android.content.ContentResolver
 import android.content.Context
 import android.os.StatFs
 import androidx.annotation.WorkerThread
+import java.io.File
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.withContext
@@ -11,7 +12,6 @@ import okhttp3.Cache
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.utils.ext.computeSize
 import org.koitharu.kotatsu.utils.ext.getStorageName
-import java.io.File
 
 private const val DIR_NAME = "manga"
 private const val CACHE_DISK_PERCENTAGE = 0.02
@@ -71,7 +71,7 @@ class LocalStorageManager(
 	private fun getAvailableStorageDirs(): MutableSet<File> {
 		val result = LinkedHashSet<File>()
 		result += File(context.filesDir, DIR_NAME)
-		result += context.getExternalFilesDirs(DIR_NAME)
+		context.getExternalFilesDirs(DIR_NAME).filterNotNullTo(result)
 		result.retainAll { it.exists() || it.mkdirs() }
 		return result
 	}
@@ -87,8 +87,8 @@ class LocalStorageManager(
 	private fun getCacheDirs(subDir: String): MutableSet<File> {
 		val result = LinkedHashSet<File>()
 		result += File(context.cacheDir, subDir)
-		context.externalCacheDirs.mapTo(result) {
-			File(it, subDir)
+		context.externalCacheDirs.mapNotNullTo(result) {
+			File(it ?: return@mapNotNullTo null, subDir)
 		}
 		return result
 	}
@@ -110,4 +110,4 @@ class LocalStorageManager(
 	private fun File.isWriteable() = runCatching {
 		canWrite()
 	}.getOrDefault(false)
-}
+}
\ No newline at end of file

From 684b494edbd5d56c0a8a1aa02f93cd79dd99814e Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 29 Apr 2022 10:07:04 +0300
Subject: [PATCH 064/104] Fix concurrent manga downloading #154

---
 .../download/domain/DownloadManager.kt        | 27 ++++----
 .../local/domain/LocalMangaRepository.kt      | 27 ++++++--
 .../koitharu/kotatsu/utils/CompositeMutex.kt  | 66 +++++++++++++++++++
 .../utils/progress/TimeLeftEstimator.kt       |  5 +-
 4 files changed, 107 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/CompositeMutex.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
index b8183a96b..58335ed31 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadManager.kt
@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.download.domain
 
 import android.content.Context
-import android.graphics.drawable.Drawable
 import android.net.ConnectivityManager
 import android.webkit.MimeTypeMap
 import coil.ImageLoader
@@ -75,10 +74,12 @@ class DownloadManager(
 	): Job = coroutineScope.launch(Dispatchers.Default + errorStateHandler(outState)) {
 		@Suppress("NAME_SHADOWING") var manga = manga
 		val chaptersIdsSet = chaptersIds?.toMutableSet()
+		val cover = loadCover(manga)
+		outState.value = DownloadState.Queued(startId, manga, cover)
+		localMangaRepository.lockManga(manga.id)
 		semaphore.acquire()
 		coroutineContext[WakeLockNode]?.acquire()
 		outState.value = DownloadState.Preparing(startId, manga, null)
-		var cover: Drawable? = null
 		val destination = localMangaRepository.getOutputDir()
 		checkNotNull(destination) { context.getString(R.string.cannot_find_available_storage) }
 		val tempFileName = "${manga.id}_$startId.tmp"
@@ -88,16 +89,6 @@ class DownloadManager(
 				manga = localMangaRepository.getRemoteManga(manga) ?: error("Cannot obtain remote manga instance")
 			}
 			val repo = MangaRepository(manga.source)
-			cover = runCatching {
-				imageLoader.execute(
-					ImageRequest.Builder(context)
-						.data(manga.coverUrl)
-						.referer(manga.publicUrl)
-						.size(coverWidth, coverHeight)
-						.scale(Scale.FILL)
-						.build()
-				).drawable
-			}.getOrNull()
 			outState.value = DownloadState.Preparing(startId, manga, cover)
 			val data = if (manga.chapters.isNullOrEmpty()) repo.getDetails(manga) else manga
 			output = CbzMangaOutput.get(destination, data)
@@ -176,6 +167,7 @@ class DownloadManager(
 			}
 			coroutineContext[WakeLockNode]?.release()
 			semaphore.release()
+			localMangaRepository.unlockManga(manga.id)
 		}
 	}
 
@@ -208,6 +200,17 @@ class DownloadManager(
 			)
 		}
 
+	private suspend fun loadCover(manga: Manga) = runCatching {
+		imageLoader.execute(
+			ImageRequest.Builder(context)
+				.data(manga.coverUrl)
+				.referer(manga.publicUrl)
+				.size(coverWidth, coverHeight)
+				.scale(Scale.FILL)
+				.build()
+		).drawable
+	}.getOrNull()
+
 	class Factory(
 		private val context: Context,
 		private val imageLoader: ImageLoader,
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
index 43860e451..e034d0672 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/domain/LocalMangaRepository.kt
@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.util.longHashCode
 import org.koitharu.kotatsu.parsers.util.toCamelCase
 import org.koitharu.kotatsu.utils.AlphanumComparator
+import org.koitharu.kotatsu.utils.CompositeMutex
 import org.koitharu.kotatsu.utils.ext.deleteAwait
 import org.koitharu.kotatsu.utils.ext.readText
 import org.koitharu.kotatsu.utils.ext.resolveName
@@ -34,6 +35,7 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 
 	override val source = MangaSource.LOCAL
 	private val filenameFilter = CbzFilter()
+	private val locks = CompositeMutex<Long>()
 
 	override suspend fun getList(
 		offset: Int,
@@ -112,11 +114,18 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		return file.deleteAwait()
 	}
 
-	suspend fun deleteChapters(manga: Manga, ids: Set<Long>) = runInterruptible(Dispatchers.IO) {
-		val uri = Uri.parse(manga.url)
-		val file = uri.toFile()
-		val cbz = CbzMangaOutput(file, manga)
-		CbzMangaOutput.filterChapters(cbz, ids)
+	suspend fun deleteChapters(manga: Manga, ids: Set<Long>) {
+		lockManga(manga.id)
+		try {
+			runInterruptible(Dispatchers.IO) {
+				val uri = Uri.parse(manga.url)
+				val file = uri.toFile()
+				val cbz = CbzMangaOutput(file, manga)
+				CbzMangaOutput.filterChapters(cbz, ids)
+			}
+		} finally {
+			unlockManga(manga.id)
+		}
 	}
 
 	@WorkerThread
@@ -278,6 +287,14 @@ class LocalMangaRepository(private val storageManager: LocalStorageManager) : Ma
 		}
 	}
 
+	suspend fun lockManga(id: Long) {
+		locks.lock(id)
+	}
+
+	suspend fun unlockManga(id: Long) {
+		locks.unlock(id)
+	}
+
 	private suspend fun getAllFiles() = storageManager.getReadableDirs().flatMap { dir ->
 		dir.listFiles(filenameFilter)?.toList().orEmpty()
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/CompositeMutex.kt b/app/src/main/java/org/koitharu/kotatsu/utils/CompositeMutex.kt
new file mode 100644
index 000000000..e66355588
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/CompositeMutex.kt
@@ -0,0 +1,66 @@
+package org.koitharu.kotatsu.utils
+
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import java.util.*
+import kotlin.coroutines.resume
+
+class CompositeMutex<T : Any> : Set<T> {
+
+	private val data = HashMap<T, MutableList<CancellableContinuation<Unit>>>()
+	private val mutex = Mutex()
+
+	override val size: Int
+		get() = data.size
+
+	override fun contains(element: T): Boolean {
+		return data.containsKey(element)
+	}
+
+	override fun containsAll(elements: Collection<T>): Boolean {
+		return elements.all { x -> data.containsKey(x) }
+	}
+
+	override fun isEmpty(): Boolean {
+		return data.isEmpty()
+	}
+
+	override fun iterator(): Iterator<T> {
+		return data.keys.iterator()
+	}
+
+	suspend fun lock(element: T) {
+		waitForRemoval(element)
+		mutex.withLock {
+			val lastValue = data.put(element, LinkedList<CancellableContinuation<Unit>>())
+			check(lastValue == null) {
+				"CompositeMutex is double-locked for $element"
+			}
+		}
+	}
+
+	suspend fun unlock(element: T) {
+		val continuations = mutex.withLock {
+			checkNotNull(data.remove(element)) {
+				"CompositeMutex is not locked for $element"
+			}
+		}
+		continuations.forEach { c ->
+			if (c.isActive) {
+				c.resume(Unit)
+			}
+		}
+	}
+
+	private suspend fun waitForRemoval(element: T) {
+		val list = data[element] ?: return
+		suspendCancellableCoroutine<Unit> { continuation ->
+			list.add(continuation)
+			continuation.invokeOnCancellation {
+				list.remove(continuation)
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt b/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt
index 5cb7aafc5..f998a5119 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/progress/TimeLeftEstimator.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.utils.progress
 
 import android.os.SystemClock
+import java.util.concurrent.TimeUnit
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
 
@@ -11,6 +12,7 @@ class TimeLeftEstimator {
 
 	private var times = ArrayList<Int>()
 	private var lastTick: Tick? = null
+	private val tooLargeTime = TimeUnit.DAYS.toMillis(1)
 
 	fun tick(value: Int, total: Int) {
 		if (total < 0) {
@@ -36,7 +38,8 @@ class TimeLeftEstimator {
 		}
 		val timePerTick = times.average()
 		val ticksLeft = progress.total - progress.value
-		return (ticksLeft * timePerTick).roundToLong()
+		val eta = (ticksLeft * timePerTick).roundToLong()
+		return if (eta < tooLargeTime) eta else NO_TIME
 	}
 
 	private class Tick(

From 4987d43042c4f4c29b4a146bb882a9886e7a4471 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 29 Apr 2022 11:41:14 +0300
Subject: [PATCH 065/104] Fix pages saving #151

---
 .../org/koitharu/kotatsu/local/LocalModule.kt |  3 -
 .../koitharu/kotatsu/reader/ReaderModule.kt   |  6 +-
 .../kotatsu/reader/domain/PageLoader.kt       |  6 +-
 .../kotatsu/reader/ui/PageSaveHelper.kt       | 60 +++++++++++++++++++
 .../kotatsu/reader/ui/ReaderActivity.kt       | 10 +---
 .../kotatsu/reader/ui/ReaderViewModel.kt      | 28 ++++++---
 .../kotatsu/utils/ExternalStorageHelper.kt    | 26 --------
 7 files changed, 93 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
 delete mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/ExternalStorageHelper.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
index 928fe706b..3366248a4 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
@@ -7,7 +7,6 @@ import org.koitharu.kotatsu.download.domain.DownloadManager
 import org.koitharu.kotatsu.local.data.LocalStorageManager
 import org.koitharu.kotatsu.local.domain.LocalMangaRepository
 import org.koitharu.kotatsu.local.ui.LocalListViewModel
-import org.koitharu.kotatsu.utils.ExternalStorageHelper
 
 val localModule
 	get() = module {
@@ -15,8 +14,6 @@ val localModule
 		single { LocalStorageManager(androidContext(), get()) }
 		single { LocalMangaRepository(get()) }
 
-		factory { ExternalStorageHelper(androidContext()) }
-
 		factory { DownloadManager.Factory(androidContext(), get(), get(), get(), get(), get()) }
 
 		viewModel { LocalListViewModel(get(), get(), get(), get()) }
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
index 0d0aec467..f27f061c6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
@@ -1,9 +1,11 @@
 package org.koitharu.kotatsu.reader
 
+import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.reader.ui.PageSaveHelper
 import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 
 val readerModule
@@ -12,6 +14,8 @@ val readerModule
 		single { MangaDataRepository(get()) }
 		single { PagesCache(get()) }
 
+		factory { PageSaveHelper(get(), androidContext()) }
+
 		viewModel { params ->
 			ReaderViewModel(
 				intent = params[0],
@@ -21,7 +25,7 @@ val readerModule
 				historyRepository = get(),
 				shortcutsRepository = get(),
 				settings = get(),
-				externalStorageHelper = get(),
+				pageSaveHelper = get(),
 			)
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
index 523a18881..696f48cc3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt
@@ -113,6 +113,10 @@ class PageLoader : KoinComponent, Closeable {
 		}
 	}
 
+	suspend fun getPageUrl(page: MangaPage): String {
+		return getRepository(page.source).getPageUrl(page)
+	}
+
 	private fun onIdle() {
 		synchronized(prefetchQueue) {
 			while (prefetchQueue.isNotEmpty()) {
@@ -151,7 +155,7 @@ class PageLoader : KoinComponent, Closeable {
 	}
 
 	private suspend fun loadPageImpl(page: MangaPage, progress: MutableStateFlow<Float>): File {
-		val pageUrl = getRepository(page.source).getPageUrl(page)
+		val pageUrl = getPageUrl(page)
 		check(pageUrl.isNotBlank()) { "Cannot obtain full image url" }
 		val uri = Uri.parse(pageUrl)
 		return if (uri.scheme == "cbz") {
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
new file mode 100644
index 000000000..a2d8f7ac5
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
@@ -0,0 +1,60 @@
+package org.koitharu.kotatsu.reader.ui
+
+import android.content.Context
+import android.net.Uri
+import androidx.activity.result.ActivityResultLauncher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.suspendCancellableCoroutine
+import okhttp3.HttpUrl.Companion.toHttpUrl
+import okio.IOException
+import org.koitharu.kotatsu.local.data.PagesCache
+import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.reader.domain.PageLoader
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.coroutineContext
+import kotlin.coroutines.resume
+
+class PageSaveHelper(
+	private val cache: PagesCache,
+	context: Context,
+) {
+
+	private var continuation: Continuation<Uri>? = null
+	private val contentResolver = context.contentResolver
+
+	suspend fun savePage(
+		pageLoader: PageLoader,
+		page: MangaPage,
+		saveLauncher: ActivityResultLauncher<String>,
+	): Uri {
+		var pageFile = cache[page.url]
+		var fileName = pageFile?.name
+		if (fileName == null) {
+			fileName = pageLoader.getPageUrl(page).toHttpUrl().pathSegments.last()
+		}
+		val cc = coroutineContext
+		val destination = suspendCancellableCoroutine<Uri> { cont ->
+			continuation = cont
+			Dispatchers.Main.dispatch(cc) {
+				saveLauncher.launch(fileName)
+			}
+		}
+		continuation = null
+		if (pageFile == null) {
+			pageFile = pageLoader.loadPage(page, force = false)
+		}
+		runInterruptible(Dispatchers.IO) {
+			contentResolver.openOutputStream(destination)?.use { output ->
+				pageFile.inputStream().use { input ->
+					input.copyTo(output)
+				}
+			} ?: throw IOException("Output stream is null")
+		}
+		return destination
+	}
+
+	fun onActivityResult(uri: Uri): Boolean = continuation?.apply {
+		resume(uri)
+	} != null
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
index 914b96ae3..ca9228207 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
@@ -9,7 +9,6 @@ import android.view.*
 import android.widget.Toast
 import androidx.activity.result.ActivityResultCallback
 import androidx.core.graphics.Insets
-import androidx.core.net.toUri
 import androidx.core.view.*
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
@@ -187,10 +186,7 @@ class ReaderActivity :
 			R.id.action_save_page -> {
 				viewModel.getCurrentPage()?.also { page ->
 					viewModel.saveCurrentState(reader?.getCurrentState())
-					val name = page.url.toUri().run {
-						fragment ?: lastPathSegment ?: ""
-					}
-					savePageRequest.launch(name)
+					viewModel.saveCurrentPage(page, savePageRequest)
 				} ?: showWaitWhileLoading()
 			}
 			else -> return super.onOptionsItemSelected(item)
@@ -199,9 +195,7 @@ class ReaderActivity :
 	}
 
 	override fun onActivityResult(uri: Uri?) {
-		if (uri != null) {
-			viewModel.saveCurrentPage(uri)
-		}
+		viewModel.onActivityResult(uri)
 	}
 
 	private fun onLoadingStateChanged(isLoading: Boolean) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
index 688cca84f..5a746c1a3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
@@ -2,6 +2,7 @@ package org.koitharu.kotatsu.reader.ui
 
 import android.net.Uri
 import android.util.LongSparseArray
+import androidx.activity.result.ActivityResultLauncher
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.*
@@ -26,7 +27,6 @@ import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
-import org.koitharu.kotatsu.utils.ExternalStorageHelper
 import org.koitharu.kotatsu.utils.SingleLiveEvent
 import org.koitharu.kotatsu.utils.ext.IgnoreErrors
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
@@ -40,10 +40,11 @@ class ReaderViewModel(
 	private val historyRepository: HistoryRepository,
 	private val shortcutsRepository: ShortcutsRepository,
 	private val settings: AppSettings,
-	private val externalStorageHelper: ExternalStorageHelper,
+	private val pageSaveHelper: PageSaveHelper,
 ) : BaseViewModel() {
 
 	private var loadingJob: Job? = null
+	private var pageSaveJob: Job? = null
 	private val currentState = MutableStateFlow(initialState)
 	private val mangaData = MutableStateFlow(intent.manga)
 	private val chapters = LongSparseArray<MangaChapter>()
@@ -137,12 +138,16 @@ class ReaderViewModel(
 		return pages.filter { it.chapterId == chapterId }.map { it.toMangaPage() }
 	}
 
-	fun saveCurrentPage(destination: Uri) {
-		launchJob(Dispatchers.Default) {
+	fun saveCurrentPage(
+		page: MangaPage,
+		saveLauncher: ActivityResultLauncher<String>,
+	) {
+		val prevJob = pageSaveJob
+		pageSaveJob = launchLoadingJob(Dispatchers.Default) {
+			prevJob?.cancelAndJoin()
 			try {
-				val page = getCurrentPage() ?: error("Page not found")
-				externalStorageHelper.savePage(page, destination)
-				onPageSaved.postCall(destination)
+				val dest = pageSaveHelper.savePage(pageLoader, page, saveLauncher)
+				onPageSaved.postCall(dest)
 			} catch (e: CancellationException) {
 				throw e
 			} catch (e: Exception) {
@@ -154,6 +159,15 @@ class ReaderViewModel(
 		}
 	}
 
+	fun onActivityResult(uri: Uri?) {
+		if (uri != null) {
+			pageSaveHelper.onActivityResult(uri)
+		} else {
+			pageSaveJob?.cancel()
+			pageSaveJob = null
+		}
+	}
+
 	fun getCurrentPage(): MangaPage? {
 		val state = currentState.value ?: return null
 		return content.value?.pages?.find {
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ExternalStorageHelper.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ExternalStorageHelper.kt
deleted file mode 100644
index b769645b8..000000000
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ExternalStorageHelper.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.koitharu.kotatsu.utils
-
-import android.content.Context
-import android.net.Uri
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runInterruptible
-import okio.IOException
-import org.koitharu.kotatsu.parsers.model.MangaPage
-import org.koitharu.kotatsu.reader.domain.PageLoader
-
-class ExternalStorageHelper(context: Context) {
-
-	private val contentResolver = context.contentResolver
-
-	suspend fun savePage(page: MangaPage, destination: Uri) {
-		val pageLoader = PageLoader()
-		val pageFile = pageLoader.loadPage(page, force = false)
-		runInterruptible(Dispatchers.IO) {
-			contentResolver.openOutputStream(destination)?.use { output ->
-				pageFile.inputStream().use { input ->
-					input.copyTo(output)
-				}
-			} ?: throw IOException("Output stream is null")
-		}
-	}
-}
\ No newline at end of file

From 3d68d7c8181f568d8ae41e11932055138ab76ef8 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 29 Apr 2022 12:45:28 +0300
Subject: [PATCH 066/104] Reuse PageLoader in PagesThumbnailsSheet

---
 .../org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt  |  2 +-
 .../reader/ui/thumbnails/PagesThumbnailsSheet.kt       | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
index 5a746c1a3..bfe5ac663 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderViewModel.kt
@@ -55,7 +55,7 @@ class ReaderViewModel(
 	val onPageSaved = SingleLiveEvent<Uri?>()
 	val uiState = combine(
 		mangaData,
-		currentState
+		currentState,
 	) { manga, state ->
 		val chapter = state?.chapterId?.let(chapters::get)
 		ReaderUiState(
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
index f9c6ea3d6..55d59adea 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt
@@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import org.koin.android.ext.android.get
+import org.koin.androidx.viewmodel.ext.android.getViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseBottomSheet
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -20,6 +21,8 @@ import org.koitharu.kotatsu.databinding.SheetPagesBinding
 import org.koitharu.kotatsu.list.ui.MangaListSpanResolver
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
+import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
 import org.koitharu.kotatsu.utils.BottomSheetToolbarController
 import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
@@ -81,7 +84,7 @@ class PagesThumbnailsSheet :
 				dataSet = thumbnails,
 				coil = get(),
 				scope = viewLifecycleScope,
-				loader = PageLoader().also { pageLoader = it },
+				loader = getPageLoader(),
 				clickListener = this@PagesThumbnailsSheet
 			)
 			addOnLayoutChangeListener(spanResolver)
@@ -109,6 +112,11 @@ class PagesThumbnailsSheet :
 		}
 	}
 
+	private fun getPageLoader(): PageLoader {
+		val viewModel = (activity as? ReaderActivity)?.getViewModel<ReaderViewModel>()
+		return viewModel?.pageLoader ?: PageLoader().also { pageLoader = it }
+	}
+
 	private inner class ToolbarController(toolbar: Toolbar) : BottomSheetToolbarController(toolbar) {
 		override fun onStateChanged(bottomSheet: View, newState: Int) {
 			super.onStateChanged(bottomSheet, newState)

From 2dce65a44877f1cd0f774d438bd704b80057f800 Mon Sep 17 00:00:00 2001
From: mondstern <mondstern@snopyta.org>
Date: Sun, 1 May 2022 02:12:03 +0200
Subject: [PATCH 067/104] Translated using Weblate (German)

Currently translated at 98.9% (276 of 279 strings)

Co-authored-by: mondstern <mondstern@snopyta.org>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/de/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-de/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a26fd04e6..8933fe241 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -272,4 +272,6 @@
     <string name="text_delete_local_manga_batch">Ausgewählte Elemente dauerhaft vom Gerät löschen\?</string>
     <string name="batch_manga_save_confirm">Sind Sie sicher, dass Sie alle ausgewählten Mangas mit allen Kapiteln herunterladen möchten\? Diese Aktion kann eine Menge Datenverkehr und Speicherplatz verbrauchen</string>
     <string name="removal_completed">Entfernung abgeschlossen</string>
+    <string name="download_slowdown">Download-Verzögerung</string>
+    <string name="parallel_downloads">Parallele Downloads</string>
 </resources>
\ No newline at end of file

From a2b16990478b90cb098d76b5b4ae3b80d994e8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Sun, 1 May 2022 02:12:03 +0200
Subject: [PATCH 068/104] Translated using Weblate (Turkish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (280 of 280 strings)

Translated using Weblate (Turkish)

Currently translated at 100.0% (279 of 279 strings)

Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-tr/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index fcd97d286..ff48edbc1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -272,4 +272,10 @@
     <string name="text_delete_local_manga_batch">Seçilen ögeler aygıttan kalıcı olarak silinsin mi\?</string>
     <string name="batch_manga_save_confirm">Seçilen tüm mangaları tüm bölümleriyle birlikte indirmek istediğinizden emin misiniz\? Bu işlem çok fazla trafik ve depolama alanı tüketebilir</string>
     <string name="removal_completed">Kaldırma tamamlandı</string>
+    <string name="chapters_will_removed_background">Bölümler arka planda kaldırılacaktır. Bu biraz zaman alabilir</string>
+    <string name="parallel_downloads">Paralel indirmeler</string>
+    <string name="download_slowdown">İndirmeyi yavaşlat</string>
+    <string name="download_slowdown_summary">IP adresinizin engellenmesinden kaçınmanıza yardımcı olur</string>
+    <string name="local_manga_processing">Kaydedilen manga işleme</string>
+    <string name="hide">Gizle</string>
 </resources>
\ No newline at end of file

From 9aa28f6fd23bc5367cabb6a3691023449708eb8c Mon Sep 17 00:00:00 2001
From: kuragehime <kuragehime641@gmail.com>
Date: Sun, 1 May 2022 02:12:03 +0200
Subject: [PATCH 069/104] Translated using Weblate (Japanese)

Currently translated at 100.0% (280 of 280 strings)

Translated using Weblate (Japanese)

Currently translated at 100.0% (279 of 279 strings)

Co-authored-by: kuragehime <kuragehime641@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-ja/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7aa767327..d6db95de8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -272,4 +272,10 @@
     <string name="text_delete_local_manga_batch">選択した項目をデバイスから完全に削除しますか？</string>
     <string name="removal_completed">削除が完了しました</string>
     <string name="batch_manga_save_confirm">本当に選択したマンガを全編ダウンロードしますか？この動作は多くのトラフィックとストレージを消費する可能性があります</string>
+    <string name="download_slowdown_summary">IPアドレスのブロックを回避することができます</string>
+    <string name="local_manga_processing">保存されたマンガの処理</string>
+    <string name="download_slowdown">ダウンロードの速度低下</string>
+    <string name="parallel_downloads">並列ダウンロード</string>
+    <string name="chapters_will_removed_background">チャプターはバックグラウンドで削除されます。時間がかかる場合があります</string>
+    <string name="hide">隠す</string>
 </resources>
\ No newline at end of file

From de8739f1439c2dbda3c7caac2b8fde35688d1763 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Sun, 1 May 2022 02:12:04 +0200
Subject: [PATCH 070/104] Translated using Weblate (Finnish)

Currently translated at 99.6% (279 of 280 strings)

Translated using Weblate (French)

Currently translated at 100.0% (280 of 280 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (280 of 280 strings)

Translated using Weblate (German)

Currently translated at 100.0% (280 of 280 strings)

Translated using Weblate (Finnish)

Currently translated at 99.6% (278 of 279 strings)

Translated using Weblate (French)

Currently translated at 100.0% (279 of 279 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (279 of 279 strings)

Translated using Weblate (German)

Currently translated at 100.0% (279 of 279 strings)

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/de/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/it/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-de/strings.xml | 4 ++++
 app/src/main/res/values-fi/strings.xml | 7 +++++++
 app/src/main/res/values-fr/strings.xml | 6 ++++++
 app/src/main/res/values-it/strings.xml | 6 ++++++
 4 files changed, 23 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8933fe241..42fb3a9ee 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -274,4 +274,8 @@
     <string name="removal_completed">Entfernung abgeschlossen</string>
     <string name="download_slowdown">Download-Verzögerung</string>
     <string name="parallel_downloads">Parallele Downloads</string>
+    <string name="local_manga_processing">Gespeicherte Manga-Verarbeitung</string>
+    <string name="download_slowdown_summary">Hilft, das Blockieren Ihrer IP-Adresse zu vermeiden</string>
+    <string name="chapters_will_removed_background">Die Kapitel werden im Hintergrund entfernt. Das kann einige Zeit dauern</string>
+    <string name="hide">Ausblenden</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index c6cc64414..69f9c193e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -271,4 +271,11 @@
     <string name="suggestions_excluded_genres">Sulje pois genrejä</string>
     <string name="text_delete_local_manga_batch">Poista valitut kohteet laitteesta pysyvästi\?</string>
     <string name="removal_completed">Poisto valmis</string>
+    <string name="parallel_downloads">Rinnakkaislataukset</string>
+    <string name="download_slowdown">Latauksen hidastuminen</string>
+    <string name="download_slowdown_summary">Auttaa välttämään IP-osoitteesi estämisen</string>
+    <string name="chapters_will_removed_background">Luvut poistetaan taustalla. Se voi kestää jonkin aikaa</string>
+    <string name="batch_manga_save_confirm">Oletko varma, että haluat ladata kaikki valitut mangat kaikkine lukuineen\? Tämä toiminto voi kuluttaa paljon liikennettä ja tallennustilaa</string>
+    <string name="local_manga_processing">Tallennettujen mangojen käsittely</string>
+    <string name="hide">Piilota</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 08206fec0..958794036 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -272,4 +272,10 @@
     <string name="text_delete_local_manga_batch">Supprimer définitivement les éléments sélectionnés de l\'appareil \?</string>
     <string name="removal_completed">Suppression terminée</string>
     <string name="batch_manga_save_confirm">Voulez-vous vraiment télécharger tous les mangas sélectionnés avec tous leurs chapitres \? Cette action peut consommer beaucoup de trafic et de stockage</string>
+    <string name="parallel_downloads">Téléchargements parallèles</string>
+    <string name="download_slowdown">Ralentissement du téléchargement</string>
+    <string name="download_slowdown_summary">Permet d\'éviter le blocage de votre adresse IP</string>
+    <string name="chapters_will_removed_background">Les chapitres seront supprimés en arrière-plan. Cela peut prendre un certain temps</string>
+    <string name="local_manga_processing">Traitement des mangas sauvegardés</string>
+    <string name="hide">Masquer</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7c508afc2..e6196111b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -272,4 +272,10 @@
     <string name="removal_completed">Rimozione completata</string>
     <string name="text_delete_local_manga_batch">Eliminare gli elementi selezionati dal dispositivo in modo permanente\?</string>
     <string name="batch_manga_save_confirm">Vuoi davvero scaricare tutti i manga selezionati con tutti i loro capitoli\? Questa azione può consumare molto traffico e memoria</string>
+    <string name="parallel_downloads">Scaricamenti paralleli</string>
+    <string name="download_slowdown">Rallentamento dello scaricamento</string>
+    <string name="local_manga_processing">Elaborazione dei manga salvati</string>
+    <string name="chapters_will_removed_background">I capitoli saranno rimossi in sfondo. Può richiedere un po\' di tempo</string>
+    <string name="download_slowdown_summary">Aiuta ad evitare il blocco del tuo indirizzo IP</string>
+    <string name="hide">Nascondi</string>
 </resources>
\ No newline at end of file

From fa1f2cbf511da79c7b4800b0c731e81e1f9c69d5 Mon Sep 17 00:00:00 2001
From: Luna Jernberg <droidbittin@gmail.com>
Date: Sun, 1 May 2022 02:12:04 +0200
Subject: [PATCH 071/104] Translated using Weblate (Swedish)

Currently translated at 98.5% (275 of 279 strings)

Co-authored-by: Luna Jernberg <droidbittin@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/sv/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f477537f4..76cfa061a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -272,4 +272,5 @@
     <string name="text_delete_local_manga_batch">Vill du ta bort markerade objekt från enheten permanent\?</string>
     <string name="percent_string_pattern">%1$s%%</string>
     <string name="batch_manga_save_confirm">Är du säker på att du vill ladda ner alla utvalda manga med alla kapitel\? Den här åtgärden kan kräva mycket nätverkstrafik och lagringsutrymme</string>
+    <string name="parallel_downloads">Parallella nedladdningar</string>
 </resources>
\ No newline at end of file

From 59c2d20311bbc4fda87128acfd52cdd5dda642ab Mon Sep 17 00:00:00 2001
From: Luiz-bro <luiznneto1@gmail.com>
Date: Sun, 1 May 2022 02:12:05 +0200
Subject: [PATCH 072/104] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (280 of 280 strings)

Co-authored-by: Luiz-bro <luiznneto1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-pt-rBR/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5097c09fe..32910e0a3 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -272,4 +272,10 @@
     <string name="removal_completed">Remoção concluída</string>
     <string name="text_delete_local_manga_batch">Excluir itens selecionados do dispositivo permanentemente\?</string>
     <string name="batch_manga_save_confirm">Tem certeza de que deseja baixar todos os mangás selecionados com todos os seus capítulos\? Essa ação pode consumir muito tráfego e armazenamento</string>
+    <string name="hide">Esconder</string>
+    <string name="download_slowdown">Baixar lentidão</string>
+    <string name="download_slowdown_summary">Ajuda a evitar o bloqueio do seu endereço IP</string>
+    <string name="local_manga_processing">Processamento de mangá salvo</string>
+    <string name="chapters_will_removed_background">Os capítulos serão removidos em segundo plano. Pode levar algum tempo</string>
+    <string name="parallel_downloads">Downloads paralelos</string>
 </resources>
\ No newline at end of file

From 558c19e5265f2129f28ac3ee44f3c30dcfc811c6 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 1 May 2022 09:24:45 +0300
Subject: [PATCH 073/104] Update parsers and version

---
 app/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 749ed677d..30058f76f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 404
-		versionName '3.2'
+		versionCode 405
+		versionName '3.2.1'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:72cd6fbadf') {
+	implementation('com.github.nv95:kotatsu-parsers:d704815acf') {
 		exclude group: 'org.json', module: 'json'
 	}
 

From 28b556121b856896eb595f94a1a7f1f4b98a873c Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 2 May 2022 09:35:21 +0300
Subject: [PATCH 074/104] Show new sources on app startup

---
 .../kotatsu/core/prefs/AppSettings.kt         | 14 ++++
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |  9 ++-
 .../kotatsu/settings/SettingsModule.kt        |  2 +
 .../newsources/NewSourcesDialogFragment.kt    | 68 +++++++++++++++++++
 .../newsources/NewSourcesViewModel.kt         | 42 ++++++++++++
 .../settings/onboard/OnboardDialogFragment.kt |  1 +
 .../sources/SourcesSettingsFragment.kt        |  5 +-
 .../adapter/SourceConfigAdapterDelegates.kt   |  4 +-
 app/src/main/res/layout/dialog_onboard.xml    |  5 +-
 app/src/main/res/values-ru/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 11 files changed, 147 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index 2b65c60a3..d9178713c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -134,6 +134,20 @@ class AppSettings(context: Context) {
 	val isSourcesSelected: Boolean
 		get() = KEY_SOURCES_HIDDEN in prefs
 
+	val newSources: Set<MangaSource>
+		get() {
+			val known = sourcesOrder.toSet()
+			val hidden = hiddenSources
+			return remoteMangaSources
+				.filterNotTo(EnumSet.noneOf(MangaSource::class.java)) { x ->
+					x.name in known || x.name in hidden
+				}
+		}
+
+	fun markKnownSources(sources: Collection<MangaSource>) {
+		sourcesOrder = sourcesOrder + sources.map { it.name }
+	}
+
 	val isPagesNumbersEnabled: Boolean
 		get() = prefs.getBoolean(KEY_PAGES_NUMBERS, false)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index d1e033cb7..24805aa84 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -49,6 +49,7 @@ import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 import org.koitharu.kotatsu.settings.AppUpdateChecker
 import org.koitharu.kotatsu.settings.SettingsActivity
+import org.koitharu.kotatsu.settings.newsources.NewSourcesDialogFragment
 import org.koitharu.kotatsu.settings.onboard.OnboardDialogFragment
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsFragment
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsWorker
@@ -390,10 +391,14 @@ class MainActivity :
 			if (AppUpdateChecker.isUpdateSupported(this@MainActivity)) {
 				AppUpdateChecker(this@MainActivity).checkIfNeeded()
 			}
-			if (!get<AppSettings>().isSourcesSelected) {
-				withContext(Dispatchers.Main) {
+			val settings = get<AppSettings>()
+			when {
+				!settings.isSourcesSelected -> withContext(Dispatchers.Main) {
 					OnboardDialogFragment.showWelcome(supportFragmentManager)
 				}
+				settings.newSources.isNotEmpty() -> withContext(Dispatchers.Main) {
+					NewSourcesDialogFragment.show(supportFragmentManager)
+				}
 			}
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
index e8e7f97ae..b1fd14c50 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
@@ -9,6 +9,7 @@ import org.koitharu.kotatsu.core.backup.RestoreRepository
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.backup.BackupViewModel
 import org.koitharu.kotatsu.settings.backup.RestoreViewModel
+import org.koitharu.kotatsu.settings.newsources.NewSourcesViewModel
 import org.koitharu.kotatsu.settings.onboard.OnboardViewModel
 import org.koitharu.kotatsu.settings.protect.ProtectSetupViewModel
 import org.koitharu.kotatsu.settings.sources.SourcesSettingsViewModel
@@ -27,4 +28,5 @@ val settingsModule
 		viewModel { ProtectSetupViewModel(get()) }
 		viewModel { OnboardViewModel(get()) }
 		viewModel { SourcesSettingsViewModel(get()) }
+		viewModel { NewSourcesViewModel(get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt
new file mode 100644
index 000000000..9718e5306
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesDialogFragment.kt
@@ -0,0 +1,68 @@
+package org.koitharu.kotatsu.settings.newsources
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.FragmentManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.koin.android.ext.android.get
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.AlertDialogFragment
+import org.koitharu.kotatsu.databinding.DialogOnboardBinding
+import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigAdapter
+import org.koitharu.kotatsu.settings.sources.adapter.SourceConfigListener
+import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
+
+class NewSourcesDialogFragment :
+	AlertDialogFragment<DialogOnboardBinding>(),
+	SourceConfigListener,
+	DialogInterface.OnClickListener {
+
+	private val viewModel by viewModel<NewSourcesViewModel>()
+
+	override fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): DialogOnboardBinding {
+		return DialogOnboardBinding.inflate(inflater, container, false)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		val adapter = SourceConfigAdapter(this, get(), viewLifecycleOwner)
+		binding.recyclerView.adapter = adapter
+		binding.textViewTitle.setText(R.string.new_sources_text)
+
+		viewModel.sources.observe(viewLifecycleOwner) { adapter.items = it }
+	}
+
+	override fun onBuildDialog(builder: MaterialAlertDialogBuilder) {
+		builder
+			.setPositiveButton(R.string.done, this)
+			.setCancelable(true)
+			.setTitle(R.string.remote_sources)
+	}
+
+	override fun onClick(dialog: DialogInterface, which: Int) {
+		viewModel.apply()
+		dialog.dismiss()
+	}
+
+	override fun onItemSettingsClick(item: SourceConfigItem.SourceItem) = Unit
+
+	override fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
+		viewModel.onItemEnabledChanged(item, isEnabled)
+	}
+
+	override fun onDragHandleTouch(holder: RecyclerView.ViewHolder) = Unit
+
+	override fun onHeaderClick(header: SourceConfigItem.LocaleGroup) = Unit
+
+	companion object {
+
+		private const val TAG = "NewSources"
+
+		fun show(fm: FragmentManager) = NewSourcesDialogFragment().show(fm, TAG)
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt
new file mode 100644
index 000000000..530851d46
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt
@@ -0,0 +1,42 @@
+package org.koitharu.kotatsu.settings.newsources
+
+import androidx.lifecycle.MutableLiveData
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem
+
+class NewSourcesViewModel(
+	private val settings: AppSettings,
+) : BaseViewModel() {
+
+	val sources = MutableLiveData<List<SourceConfigItem>>()
+	private val initialList = settings.newSources
+
+	init {
+		buildList()
+	}
+
+	fun onItemEnabledChanged(item: SourceConfigItem.SourceItem, isEnabled: Boolean) {
+		if (isEnabled) {
+			settings.hiddenSources -= item.source.name
+		} else {
+			settings.hiddenSources += item.source.name
+		}
+	}
+
+	fun apply() {
+		settings.markKnownSources(initialList)
+	}
+
+	private fun buildList() {
+		val hidden = settings.hiddenSources
+		sources.value = initialList.map {
+			SourceConfigItem.SourceItem(
+				source = it,
+				summary = null,
+				isEnabled = it.name !in hidden,
+				isDraggable = false,
+			)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
index 005469b96..92fee1db9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
@@ -53,6 +53,7 @@ class OnboardDialogFragment : AlertDialogFragment<DialogOnboardBinding>(),
 		super.onViewCreated(view, savedInstanceState)
 		val adapter = SourceLocalesAdapter(this)
 		binding.recyclerView.adapter = adapter
+		binding.textViewTitle.setText(R.string.onboard_text)
 		viewModel.list.observeNotNull(viewLifecycleOwner) {
 			adapter.items = it
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
index ad27cec65..60a5b6ff9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/SourcesSettingsFragment.kt
@@ -141,7 +141,10 @@ class SourcesSettingsFragment : BaseFragment<FragmentSettingsSourcesBinding>(),
 			recyclerView: RecyclerView,
 			current: RecyclerView.ViewHolder,
 			target: RecyclerView.ViewHolder,
-		): Boolean = current.itemViewType == target.itemViewType
+		): Boolean = current.itemViewType == target.itemViewType && viewModel.canReorder(
+			current.bindingAdapterPosition,
+			target.bindingAdapterPosition,
+		)
 
 		override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt
index 48f0e74c5..752e3d33e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/adapter/SourceConfigAdapterDelegates.kt
@@ -83,7 +83,9 @@ fun sourceConfigDraggableItemDelegate(
 	on = { item, _, _ -> item is SourceConfigItem.SourceItem && item.isDraggable }
 ) {
 
-	val eventListener = object : View.OnClickListener, View.OnTouchListener,
+	val eventListener = object :
+		View.OnClickListener,
+		View.OnTouchListener,
 		CompoundButton.OnCheckedChangeListener {
 		override fun onClick(v: View?) = listener.onItemSettingsClick(item)
 
diff --git a/app/src/main/res/layout/dialog_onboard.xml b/app/src/main/res/layout/dialog_onboard.xml
index 03346c04d..e9757cc61 100644
--- a/app/src/main/res/layout/dialog_onboard.xml
+++ b/app/src/main/res/layout/dialog_onboard.xml
@@ -8,14 +8,15 @@
 	android:orientation="vertical">
 
 	<TextView
+		android:id="@+id/textView_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:paddingStart="?listPreferredItemPaddingStart"
 		android:paddingTop="6dp"
 		android:paddingEnd="?listPreferredItemPaddingEnd"
 		android:paddingBottom="6dp"
-		android:text="@string/onboard_text"
-		android:textAppearance="?attr/textAppearanceBodyMedium" />
+		android:textAppearance="?attr/textAppearanceBodyMedium"
+		tools:text="@string/onboard_text" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recycler_view"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3b28783b5..41dad2021 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -276,4 +276,6 @@
 	<string name="download_slowdown_summary">Помогает избежать блокировки IP-адреса</string>
 	<string name="local_manga_processing">Обработка сохранённой манги</string>
 	<string name="chapters_will_removed_background">Главы будут удалены в фоновом режиме. Это может занять какое-то время</string>
+	<string name="hide">Скрыть</string>
+	<string name="new_sources_text">Доступны новые источники манги</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cca5b5410..692597cee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -280,4 +280,5 @@
 	<string name="local_manga_processing">Saved manga processing</string>
 	<string name="chapters_will_removed_background">Chapters will be removed in the background. It can take some time</string>
 	<string name="hide">Hide</string>
+	<string name="new_sources_text">New manga sources are available</string>
 </resources>
\ No newline at end of file

From 96be49aa83cabc7f91311e968184f6e45a255c56 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 2 May 2022 09:38:48 +0300
Subject: [PATCH 075/104] Update monochrome launcher icon

---
 .../res/drawable/ic_launcher_monochrome.xml   | 22 +++++++++++++++++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |  2 +-
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_launcher_monochrome.xml

diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml
new file mode 100644
index 000000000..1048bdfff
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="108dp"
+	android:height="108dp"
+	android:viewportWidth="108"
+	android:viewportHeight="108">
+	<group
+		android:scaleX="0.12950581"
+		android:scaleY="0.12950581"
+		android:translateX="20.846512"
+		android:translateY="20.846512">
+		<path
+			android:fillColor="#ffffff"
+			android:pathData="m256,206c-50.54,0 -91.67,44.86 -91.67,100 0,55.14 41.13,100 91.67,100 50.54,0 91.67,-44.86 91.67,-100 0,-55.14 -41.13,-100 -91.67,-100zM221.79,284.73c-1.46,2.91 -4.41,4.61 -7.45,4.61 -1.25,0 -2.52,-0.28 -3.73,-0.88l-12.94,-6.48 -12.94,6.48c-4.13,2.07 -9.11,0.37 -11.18,-3.73 -2.05,-4.12 -0.39,-9.11 3.73,-11.18l16.67,-8.33c2.34,-1.17 5.11,-1.17 7.45,0l16.67,8.33c4.12,2.07 5.78,7.06 3.73,11.18zM280.12,259.73c-1.46,2.91 -4.41,4.61 -7.45,4.61 -1.25,0 -2.52,-0.28 -3.73,-0.88l-12.94,-6.48 -12.94,6.48c-4.13,2.07 -9.11,0.37 -11.18,-3.73 -2.05,-4.12 -0.39,-9.11 3.73,-11.18l16.67,-8.33c2.34,-1.17 5.11,-1.17 7.45,0l16.67,8.33c4.12,2.07 5.78,7.06 3.73,11.18zM334.73,273.54c4.12,2.07 5.78,7.06 3.73,11.18 -1.46,2.91 -4.41,4.61 -7.45,4.61 -1.25,0 -2.52,-0.28 -3.73,-0.88l-12.94,-6.48 -12.94,6.48c-4.12,2.07 -9.11,0.37 -11.18,-3.73 -2.05,-4.12 -0.39,-9.11 3.73,-11.18l16.67,-8.33c2.34,-1.17 5.11,-1.17 7.45,0z"
+			android:strokeWidth="0.781247" />
+		<path
+			android:fillColor="#ffffff"
+			android:pathData="m364.24,169.25c-3.48,-6.91 -6.92,-13.42 -10.21,-19.37l-8.27,-14.48c-6.8,-11.52 -12.26,-19.9 -14.78,-23.67 -0.72,-43.33 -19.12,-53.79 -21.26,-54.87 -3.21,-1.58 -7.1,-0.98 -9.62,1.56 -12.26,12.26 -20.23,24.46 -24.01,30.89h-40.2c-3.78,-6.43 -11.75,-18.64 -24.01,-30.89 -2.52,-2.54 -6.4,-3.14 -9.62,-1.56 -2.13,1.07 -20.54,11.54 -21.26,54.87 -2.53,3.76 -7.99,12.15 -14.78,23.66l-8.27,14.49c-3.29,5.96 -6.73,12.47 -10.21,19.38l-7.44,15.33c-17.73,38.05 -34.3,85.43 -34.3,129.73 0,69.32 58.27,128.42 60.76,130.89 0.91,0.91 2.03,1.61 3.26,2.02 1.07,0.36 26.79,8.76 69.32,8.76 2.21,0 4.33,-0.88 5.89,-2.44l5.89,-5.89h9.77l5.89,5.89c1.56,1.56 3.68,2.44 5.89,2.44 42.53,0 68.25,-8.4 69.32,-8.76 1.22,-0.41 2.34,-1.11 3.26,-2.02 2.49,-2.47 60.76,-61.57 60.76,-130.89 0,-44.3 -16.57,-91.67 -34.3,-129.73zM297.67,122.67c4.61,0 4.41,7.35 4.41,11.96 4.61,0 12.25,0.1 12.25,4.71 0,9.2 -7.47,16.67 -16.67,16.67 -9.2,0 -16.67,-7.47 -16.67,-16.67 0,-9.2 7.47,-16.67 16.67,-16.67zM239.97,152.81c1.29,-3.11 4.33,-5.14 7.7,-5.14h16.67c3.37,0 6.41,2.03 7.7,5.14 1.29,3.11 0.57,6.71 -1.81,9.08l-8.33,8.33c-1.63,1.63 -3.76,2.44 -5.89,2.44 -2.13,0 -4.26,-0.81 -5.89,-2.44l-8.33,-8.33c-2.37,-2.38 -3.09,-5.97 -1.8,-9.08zM214.33,122.67c4.61,0 4.41,7.35 4.41,11.96 4.61,0 12.25,0.1 12.25,4.71 0,9.2 -7.47,16.67 -16.67,16.67 -9.2,0 -16.67,-7.47 -16.67,-16.67 -0,-9.2 7.47,-16.67 16.67,-16.67zM256,422.67c-59.73,0 -108.33,-52.34 -108.33,-116.67 0,-64.32 48.6,-116.67 108.33,-116.67 59.73,0 108.33,52.34 108.33,116.67 0,64.32 -48.6,116.67 -108.33,116.67z"
+			android:strokeWidth="0.781247" />
+	</group>
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index df1ae1085..4c1843bb3 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -3,5 +3,5 @@
 	xmlns:android="http://schemas.android.com/apk/res/android">
 	<background android:drawable="@color/blue_primary" />
 	<foreground android:drawable="@mipmap/ic_launcher_foreground" />
-	<monochrome android:drawable="@drawable/ic_totoro" />
+	<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 811595fcf..0ed32d5be 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
 	<background android:drawable="@color/blue_primary"/>
 	<foreground android:drawable="@mipmap/ic_launcher_foreground" />
-	<monochrome android:drawable="@drawable/ic_totoro" />
+	<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file

From 4c5314fe59865359693083c09158b783b9ad71a4 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 2 May 2022 14:53:31 +0300
Subject: [PATCH 076/104] Update parsers

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 30058f76f..ff599eb34 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:d704815acf') {
+	implementation('com.github.nv95:kotatsu-parsers:090ad4b256') {
 		exclude group: 'org.json', module: 'json'
 	}
 

From ffad6a4ae656bef008e1e8c8aa2fdc79c9c29a37 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 4 May 2022 13:17:02 +0300
Subject: [PATCH 077/104] Upgrade coil to v2

---
 app/build.gradle                              |  7 +--
 .../kotatsu/core/os/ShortcutsRepository.kt    | 10 ++--
 .../kotatsu/core/parser/FaviconMapper.kt      | 10 ++--
 .../org/koitharu/kotatsu/core/ui/uiModule.kt  | 20 ++++++--
 .../kotatsu/details/ui/DetailsFragment.kt     |  2 +-
 .../kotatsu/image/ui/ImageActivity.kt         |  9 +---
 .../list/ui/adapter/MangaGridItemAD.kt        |  2 +-
 .../ui/adapter/MangaListDetailedItemAD.kt     |  2 +-
 .../list/ui/adapter/MangaListItemAD.kt        |  2 +-
 .../koitharu/kotatsu/local/data/CbzFetcher.kt | 51 +++++++++++--------
 .../ui/thumbnails/adapter/PageThumbnailAD.kt  |  4 +-
 .../progress/ImageRequestIndicatorListener.kt |  7 +--
 12 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ff599eb34..b2d55cf7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,6 +52,7 @@ android {
 				'-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
 				'-opt-in=kotlinx.coroutines.FlowPreview',
 				'-opt-in=kotlin.contracts.ExperimentalContracts',
+				'-opt-in=coil.annotation.ExperimentalCoilApi',
 		]
 	}
 	lint {
@@ -86,7 +87,7 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'com.google.android.material:material:1.6.0-rc01'
+	implementation 'com.google.android.material:material:1.7.0-alpha01'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
 
@@ -101,11 +102,11 @@ dependencies {
 	implementation 'com.hannesdorfmann:adapterdelegates4-kotlin-dsl-viewbinding:4.3.2'
 
 	implementation 'io.insert-koin:koin-android:3.1.6'
-	implementation 'io.coil-kt:coil-base:1.4.0'
+	implementation 'io.coil-kt:coil-base:2.0.0-rc03'
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
index 98ebe3a6a..9e8b18a52 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/os/ShortcutsRepository.kt
@@ -5,12 +5,12 @@ import android.content.Context
 import android.content.pm.ShortcutManager
 import android.media.ThumbnailUtils
 import android.os.Build
+import android.util.Size
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.size.PixelSize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koitharu.kotatsu.R
@@ -54,7 +54,7 @@ class ShortcutsRepository(
 				val bmp = coil.execute(
 					ImageRequest.Builder(context)
 						.data(manga.coverUrl)
-						.size(iconSize)
+						.size(iconSize.width, iconSize.height)
 						.build()
 				).requireBitmap()
 				ThumbnailUtils.extractThumbnail(bmp, iconSize.width, iconSize.height, 0)
@@ -74,14 +74,14 @@ class ShortcutsRepository(
 			)
 	}
 
-	private fun getIconSize(context: Context): PixelSize {
+	private fun getIconSize(context: Context): Size {
 		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
 			(context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager).let {
-				PixelSize(it.iconMaxWidth, it.iconMaxHeight)
+				Size(it.iconMaxWidth, it.iconMaxHeight)
 			}
 		} else {
 			(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager).launcherLargeIconSize.let {
-				PixelSize(it, it)
+				Size(it, it)
 			}
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
index 4a386d3f8..ba5412a50 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/FaviconMapper.kt
@@ -2,17 +2,19 @@ package org.koitharu.kotatsu.core.parser
 
 import android.net.Uri
 import coil.map.Mapper
+import coil.request.Options
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.koitharu.kotatsu.parsers.model.MangaSource
 
-class FaviconMapper() : Mapper<Uri, HttpUrl> {
+class FaviconMapper : Mapper<Uri, HttpUrl> {
 
-	override fun map(data: Uri): HttpUrl {
+	override fun map(data: Uri, options: Options): HttpUrl? {
+		if (data.scheme != "favicon") {
+			return null
+		}
 		val mangaSource = MangaSource.valueOf(data.schemeSpecificPart)
 		val repo = MangaRepository(mangaSource) as RemoteMangaRepository
 		return repo.getFaviconUrl().toHttpUrl()
 	}
-
-	override fun handles(data: Uri) = data.scheme == "favicon"
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
index 26ccbf44a..54529b37c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/ui/uiModule.kt
@@ -2,11 +2,13 @@ package org.koitharu.kotatsu.core.ui
 
 import coil.ComponentRegistry
 import coil.ImageLoader
-import coil.util.CoilUtils
+import coil.disk.DiskCache
+import kotlinx.coroutines.Dispatchers
 import okhttp3.OkHttpClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 import org.koitharu.kotatsu.core.parser.FaviconMapper
+import org.koitharu.kotatsu.local.data.CacheDir
 import org.koitharu.kotatsu.local.data.CbzFetcher
 
 val uiModule
@@ -14,15 +16,23 @@ val uiModule
 		single {
 			val httpClientFactory = {
 				get<OkHttpClient>().newBuilder()
-					.cache(CoilUtils.createDefaultCache(androidContext()))
+					.cache(null)
+					.build()
+			}
+			val diskCacheFactory = {
+				val context = androidContext()
+				val rootDir = context.externalCacheDir ?: context.cacheDir
+				DiskCache.Builder()
+					.directory(rootDir.resolve(CacheDir.THUMBS.dir))
 					.build()
 			}
 			ImageLoader.Builder(androidContext())
 				.okHttpClient(httpClientFactory)
-				.launchInterceptorChainOnMainThread(false)
-				.componentRegistry(
+				.interceptorDispatcher(Dispatchers.Default)
+				.diskCache(diskCacheFactory)
+				.components(
 					ComponentRegistry.Builder()
-						.add(CbzFetcher())
+						.add(CbzFetcher.Factory())
 						.add(FaviconMapper())
 						.build()
 				).build()
diff --git a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
index df4fc2de9..99c7319e3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt
@@ -283,7 +283,7 @@ class DetailsFragment :
 			.target(binding.imageViewCover)
 		if (currentCover != null) {
 			request.data(manga.largeCoverUrl ?: return)
-				.placeholderMemoryCacheKey(CoilUtils.metadata(binding.imageViewCover)?.memoryCacheKey)
+				.placeholderMemoryCacheKey(CoilUtils.result(binding.imageViewCover)?.request?.memoryCacheKey)
 				.fallback(currentCover)
 		} else {
 			request.crossfade(true)
diff --git a/app/src/main/java/org/koitharu/kotatsu/image/ui/ImageActivity.kt b/app/src/main/java/org/koitharu/kotatsu/image/ui/ImageActivity.kt
index 8e674701a..28f58887b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/image/ui/ImageActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/image/ui/ImageActivity.kt
@@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
 import android.view.ViewGroup
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.graphics.Insets
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.updateLayoutParams
@@ -14,7 +13,7 @@ import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.request.CachePolicy
 import coil.request.ImageRequest
-import coil.target.PoolableViewTarget
+import coil.target.ViewTarget
 import com.davemorrissey.labs.subscaleview.ImageSource
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import org.koin.android.ext.android.inject
@@ -61,16 +60,12 @@ class ImageActivity : BaseActivity<ActivityImageBinding>() {
 
 	private class SsivTarget(
 		override val view: SubsamplingScaleImageView,
-	) : PoolableViewTarget<SubsamplingScaleImageView> {
-
-		override fun onStart(placeholder: Drawable?) = setDrawable(placeholder)
+	) : ViewTarget<SubsamplingScaleImageView> {
 
 		override fun onError(error: Drawable?) = setDrawable(error)
 
 		override fun onSuccess(result: Drawable) = setDrawable(result)
 
-		override fun onClear() = setDrawable(null)
-
 		override fun equals(other: Any?): Boolean {
 			return (this === other) || (other is SsivTarget && view == other.view)
 		}
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
index ced1697b0..bc716c935 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
@@ -53,7 +53,7 @@ fun mangaGridItemAD(
 		badge = null
 		imageRequest?.dispose()
 		imageRequest = null
-		CoilUtils.clear(binding.imageViewCover)
+		CoilUtils.dispose(binding.imageViewCover)
 		binding.imageViewCover.setImageDrawable(null)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
index 10e9a473d..60420df4d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
@@ -57,7 +57,7 @@ fun mangaListDetailedItemAD(
 		badge = null
 		imageRequest?.dispose()
 		imageRequest = null
-		CoilUtils.clear(binding.imageViewCover)
+		CoilUtils.dispose(binding.imageViewCover)
 		binding.imageViewCover.setImageDrawable(null)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
index 18696de6b..d709d954d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
@@ -55,7 +55,7 @@ fun mangaListItemAD(
 		badge = null
 		imageRequest?.dispose()
 		imageRequest = null
-		CoilUtils.clear(binding.imageViewCover)
+		CoilUtils.dispose(binding.imageViewCover)
 		binding.imageViewCover.setImageDrawable(null)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
index ff04a2eff..c773a05d3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/data/CbzFetcher.kt
@@ -2,41 +2,52 @@ package org.koitharu.kotatsu.local.data
 
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import coil.bitmap.BitmapPool
+import coil.ImageLoader
 import coil.decode.DataSource
-import coil.decode.Options
-import coil.fetch.FetchResult
+import coil.decode.ImageSource
 import coil.fetch.Fetcher
 import coil.fetch.SourceResult
-import coil.size.Size
-import java.util.zip.ZipFile
+import coil.request.Options
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import okio.buffer
 import okio.source
+import java.util.zip.ZipFile
 
-class CbzFetcher : Fetcher<Uri> {
+class CbzFetcher(
+	private val uri: Uri,
+	private val options: Options
+) : Fetcher {
 
-	override suspend fun fetch(
-		pool: BitmapPool,
-		data: Uri,
-		size: Size,
-		options: Options,
-	): FetchResult = runInterruptible(Dispatchers.IO) {
-		val zip = ZipFile(data.schemeSpecificPart)
-		val entry = zip.getEntry(data.fragment)
+	override suspend fun fetch() = runInterruptible(Dispatchers.IO) {
+		val zip = ZipFile(uri.schemeSpecificPart)
+		val entry = zip.getEntry(uri.fragment)
 		val ext = MimeTypeMap.getFileExtensionFromUrl(entry.name)
+		val bufferedSource = ExtraCloseableBufferedSource(
+			zip.getInputStream(entry).source().buffer(),
+			zip,
+		)
 		SourceResult(
-			source = ExtraCloseableBufferedSource(
-				zip.getInputStream(entry).source().buffer(),
-				zip,
+			source = ImageSource(
+				source = bufferedSource,
+				context = options.context,
+				metadata = CbzMetadata(uri),
 			),
 			mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext),
-			dataSource = DataSource.DISK
+			dataSource = DataSource.DISK,
 		)
 	}
 
-	override fun key(data: Uri) = data.toString()
+	class Factory : Fetcher.Factory<Uri> {
 
-	override fun handles(data: Uri) = data.scheme == "cbz"
+		override fun create(data: Uri, options: Options, imageLoader: ImageLoader): Fetcher? {
+			return if (data.scheme == "cbz") {
+				CbzFetcher(data, options)
+			} else {
+				null
+			}
+		}
+	}
+
+	class CbzMetadata(val uri: Uri) : ImageSource.Metadata()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
index 201a4f4ae..8cddae963 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/thumbnails/adapter/PageThumbnailAD.kt
@@ -3,7 +3,7 @@ package org.koitharu.kotatsu.reader.ui.thumbnails.adapter
 import android.graphics.drawable.Drawable
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.size.PixelSize
+import coil.size.Size
 import com.google.android.material.R as materialR
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import kotlinx.coroutines.*
@@ -27,7 +27,7 @@ fun pageThumbnailAD(
 
 	var job: Job? = null
 	val gridWidth = itemView.context.resources.getDimensionPixelSize(R.dimen.preferred_grid_width)
-	val thumbSize = PixelSize(
+	val thumbSize = Size(
 		width = gridWidth,
 		height = (gridWidth * 13f / 18f).toInt()
 	)
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/progress/ImageRequestIndicatorListener.kt b/app/src/main/java/org/koitharu/kotatsu/utils/progress/ImageRequestIndicatorListener.kt
index eb38e1d32..317c77c5f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/progress/ImageRequestIndicatorListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/progress/ImageRequestIndicatorListener.kt
@@ -1,7 +1,8 @@
 package org.koitharu.kotatsu.utils.progress
 
+import coil.request.ErrorResult
 import coil.request.ImageRequest
-import coil.request.ImageResult
+import coil.request.SuccessResult
 import com.google.android.material.progressindicator.BaseProgressIndicator
 
 class ImageRequestIndicatorListener(
@@ -10,9 +11,9 @@ class ImageRequestIndicatorListener(
 
 	override fun onCancel(request: ImageRequest) = indicator.hide()
 
-	override fun onError(request: ImageRequest, throwable: Throwable) = indicator.hide()
+	override fun onError(request: ImageRequest, result: ErrorResult) = indicator.hide()
 
 	override fun onStart(request: ImageRequest) = indicator.show()
 
-	override fun onSuccess(request: ImageRequest, metadata: ImageResult.Metadata) = indicator.hide()
+	override fun onSuccess(request: ImageRequest, result: SuccessResult) = indicator.hide()
 }
\ No newline at end of file

From 1d1931f721baa8c2b1eb072ee7cd21622948e714 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Wed, 4 May 2022 19:01:32 +0300
Subject: [PATCH 078/104] [Issue template] Update version

---
 .github/ISSUE_TEMPLATE/report_issue.yml    | 4 ++--
 .github/ISSUE_TEMPLATE/request_feature.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
index 69983d414..c6c05a681 100644
--- a/.github/ISSUE_TEMPLATE/report_issue.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -44,7 +44,7 @@ body:
           label: Kotatsu version
           description: You can find your Kotatsu version in **Settings → About**.
           placeholder: |
-              Example: "3.2"
+              Example: "3.2.1"
       validations:
           required: true
 
@@ -87,7 +87,7 @@ body:
                 required: true
               - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
                 required: true
-              - label: I have updated the app to version **[3.2](https://github.com/nv95/Kotatsu/releases/latest)**.
+              - label: I have updated the app to version **[3.2.1](https://github.com/nv95/Kotatsu/releases/latest)**.
                 required: true
               - label: I will fill out all of the requested information in this form.
                 required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
index a46a0648f..262c63ebb 100644
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -33,7 +33,7 @@ body:
                 required: true
               - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
                 required: true
-              - label: I have updated the app to version **[3.2](https://github.com/nv95/Kotatsu/releases/latest)**.
+              - label: I have updated the app to version **[3.2.1](https://github.com/nv95/Kotatsu/releases/latest)**.
                 required: true
               - label: I will fill out all of the requested information in this form.
                 required: true
\ No newline at end of file

From 4e4024c1827834ad1fc5a3486cdbb42f370f5c40 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Wed, 4 May 2022 23:00:44 +0300
Subject: [PATCH 079/104] Fix `FavouriteCategoriesDialog` toolbar in album
 orientation

---
 app/src/main/res/layout/dialog_favorite_categories.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/dialog_favorite_categories.xml
index 2085c72f7..0acdd440e 100644
--- a/app/src/main/res/layout/dialog_favorite_categories.xml
+++ b/app/src/main/res/layout/dialog_favorite_categories.xml
@@ -10,7 +10,7 @@
 	<com.google.android.material.appbar.MaterialToolbar
 		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="?attr/actionBarSize"
 		app:menu="@menu/opt_favourites_bs"
 		app:title="@string/add_to_favourites" />
 

From 11fc8b66422588f702ecadfb28039c921e66ff1c Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 5 May 2022 13:44:26 +0300
Subject: [PATCH 080/104] Configure manga tracker for each favourite category

---
 .../kotatsu/core/backup/BackupRepository.kt   |   1 +
 .../kotatsu/core/backup/RestoreRepository.kt  |   1 +
 .../kotatsu/core/db/DatabaseModule.kt         |   2 +-
 .../koitharu/kotatsu/core/db/MangaDatabase.kt |  40 +++--
 .../koitharu/kotatsu/core/db/dao/TracksDao.kt |   3 +
 .../core/db/migrations/Migration9To10.kt      |  11 ++
 .../kotatsu/core/github/GithubModule.kt       |   2 +-
 .../kotatsu/core/model/FavouriteCategory.kt   |   3 +-
 .../kotatsu/core/prefs/AppSettings.kt         |   9 +-
 .../kotatsu/favourites/FavouritesModule.kt    |   2 +-
 .../kotatsu/favourites/data/EntityMapping.kt  |   1 +
 .../favourites/data/FavouriteCategoriesDao.kt |   3 +
 .../data/FavouriteCategoryEntity.kt           |   1 +
 .../kotatsu/favourites/data/FavouritesDao.kt  |   3 +
 .../favourites/domain/FavouritesRepository.kt |  17 ++-
 .../ui/categories/CategoriesActivity.kt       |  12 +-
 .../FavouritesCategoriesViewModel.kt          |  11 +-
 .../koitharu/kotatsu/history/HistoryModule.kt |   2 +-
 .../org/koitharu/kotatsu/local/LocalModule.kt |   2 +-
 .../org/koitharu/kotatsu/main/MainModule.kt   |   2 +-
 .../koitharu/kotatsu/reader/ReaderModule.kt   |   2 +-
 .../koitharu/kotatsu/search/SearchModule.kt   |   3 +-
 .../NotificationSettingsLegacyFragment.kt     |  33 +++-
 .../kotatsu/settings/SettingsModule.kt        |   4 +-
 .../settings/TrackerSettingsFragment.kt       |  86 ++++++++++-
 .../kotatsu/settings/backup/AppBackupAgent.kt |   4 +-
 .../koitharu/kotatsu/tracker/TrackerModule.kt |   5 +-
 .../tracker/domain/TrackingRepository.kt      |  41 +++--
 .../kotatsu/tracker/work/TrackWorker.kt       | 105 ++++++++-----
 .../work/TrackerNotificationChannels.kt       | 143 ++++++++++++++++++
 .../kotatsu/tracker/work/TrackingItem.kt      |  31 ++++
 .../res/layout/preference_toggle_header.xml   |  64 ++++++++
 app/src/main/res/menu/popup_category.xml      |   5 +
 app/src/main/res/values-be/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-fi/strings.xml        |   1 -
 app/src/main/res/values-fr/strings.xml        |   1 -
 app/src/main/res/values-it/strings.xml        |   1 -
 app/src/main/res/values-ja/strings.xml        |   1 -
 app/src/main/res/values-nb-rNO/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-ru/strings.xml        |   5 +-
 app/src/main/res/values-sv/strings.xml        |   1 -
 app/src/main/res/values-tr/strings.xml        |   1 -
 app/src/main/res/values/strings.xml           |   5 +-
 app/src/main/res/xml/pref_notifications.xml   |  21 ++-
 app/src/main/res/xml/pref_suggestions.xml     |   2 +-
 app/src/main/res/xml/pref_tracker.xml         |  17 ++-
 50 files changed, 584 insertions(+), 132 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration9To10.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackingItem.kt
 create mode 100644 app/src/main/res/layout/preference_toggle_header.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
index 3d2f668a6..4b42b4c60 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/BackupRepository.kt
@@ -121,6 +121,7 @@ class BackupRepository(private val db: MangaDatabase) {
 		jo.put("sort_key", sortKey)
 		jo.put("title", title)
 		jo.put("order", order)
+		jo.put("track", track)
 		return jo
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
index ba4a8b6a3..57fd4d6ee 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/backup/RestoreRepository.kt
@@ -104,6 +104,7 @@ class RestoreRepository(private val db: MangaDatabase) {
 		sortKey = json.getInt("sort_key"),
 		title = json.getString("title"),
 		order = json.getStringOrNull("order") ?: SortOrder.NEWEST.name,
+		track = json.getBooleanOrDefault("track", true),
 	)
 
 	private fun parseFavourite(json: JSONObject) = FavouriteEntity(
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
index dadbb05eb..215d02259 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabaseModule.kt
@@ -5,5 +5,5 @@ import org.koin.dsl.module
 
 val databaseModule
 	get() = module {
-		single { MangaDatabase.create(androidContext()) }
+		single { MangaDatabase(androidContext()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
index 010a2653f..436455014 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/MangaDatabase.kt
@@ -22,7 +22,7 @@ import org.koitharu.kotatsu.suggestions.data.SuggestionEntity
 		FavouriteCategoryEntity::class, FavouriteEntity::class, MangaPrefsEntity::class,
 		TrackEntity::class, TrackLogEntity::class, SuggestionEntity::class
 	],
-	version = 9
+	version = 10
 )
 abstract class MangaDatabase : RoomDatabase() {
 
@@ -43,24 +43,22 @@ abstract class MangaDatabase : RoomDatabase() {
 	abstract val trackLogsDao: TrackLogsDao
 
 	abstract val suggestionDao: SuggestionDao
+}
 
-	companion object {
-
-		fun create(context: Context): MangaDatabase = Room.databaseBuilder(
-			context,
-			MangaDatabase::class.java,
-			"kotatsu-db"
-		).addMigrations(
-			Migration1To2(),
-			Migration2To3(),
-			Migration3To4(),
-			Migration4To5(),
-			Migration5To6(),
-			Migration6To7(),
-			Migration7To8(),
-			Migration8To9(),
-		).addCallback(
-			DatabasePrePopulateCallback(context.resources)
-		).build()
-	}
-}
\ No newline at end of file
+fun MangaDatabase(context: Context): MangaDatabase = Room.databaseBuilder(
+	context,
+	MangaDatabase::class.java,
+	"kotatsu-db"
+).addMigrations(
+	Migration1To2(),
+	Migration2To3(),
+	Migration3To4(),
+	Migration4To5(),
+	Migration5To6(),
+	Migration6To7(),
+	Migration7To8(),
+	Migration8To9(),
+	Migration9To10(),
+).addCallback(
+	DatabasePrePopulateCallback(context.resources)
+).build()
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TracksDao.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TracksDao.kt
index 4bd188966..f8352524b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TracksDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/dao/TracksDao.kt
@@ -10,6 +10,9 @@ abstract class TracksDao {
 	@Query("SELECT * FROM tracks")
 	abstract suspend fun findAll(): List<TrackEntity>
 
+	@Query("SELECT * FROM tracks WHERE manga_id IN (:ids)")
+	abstract suspend fun findAll(ids: Collection<Long>): List<TrackEntity>
+
 	@Query("SELECT * FROM tracks WHERE manga_id = :mangaId")
 	abstract suspend fun find(mangaId: Long): TrackEntity?
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration9To10.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration9To10.kt
new file mode 100644
index 000000000..59cba96ef
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/migrations/Migration9To10.kt
@@ -0,0 +1,11 @@
+package org.koitharu.kotatsu.core.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration9To10 : Migration(9, 10) {
+
+	override fun migrate(database: SupportSQLiteDatabase) {
+		database.execSQL("ALTER TABLE favourite_categories ADD COLUMN `track` INTEGER NOT NULL DEFAULT 1")
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt
index de5256337..7da9e309f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/github/GithubModule.kt
@@ -4,7 +4,7 @@ import org.koin.dsl.module
 
 val githubModule
 	get() = module {
-		single {
+		factory {
 			GithubRepository(get())
 		}
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
index 655a0eb08..798ec2fbd 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/model/FavouriteCategory.kt
@@ -1,9 +1,9 @@
 package org.koitharu.kotatsu.core.model
 
 import android.os.Parcelable
+import java.util.*
 import kotlinx.parcelize.Parcelize
 import org.koitharu.kotatsu.parsers.model.SortOrder
-import java.util.*
 
 @Parcelize
 data class FavouriteCategory(
@@ -12,4 +12,5 @@ data class FavouriteCategory(
 	val sortKey: Int,
 	val order: SortOrder,
 	val createdAt: Date,
+	val isTrackingEnabled: Boolean,
 ) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
index d9178713c..185336542 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.core.prefs
 
+import android.annotation.TargetApi
 import android.content.Context
 import android.content.SharedPreferences
 import android.net.ConnectivityManager
@@ -78,7 +79,10 @@ class AppSettings(context: Context) {
 		get() = prefs.getLong(KEY_APP_UPDATE, 0L)
 		set(value) = prefs.edit { putLong(KEY_APP_UPDATE, value) }
 
-	val trackerNotifications: Boolean
+	val isTrackerEnabled: Boolean
+		get() = prefs.getBoolean(KEY_TRACKER_ENABLED, true)
+
+	val isTrackerNotificationsEnabled: Boolean
 		get() = prefs.getBoolean(KEY_TRACKER_NOTIFICATIONS, true)
 
 	var notificationSound: Uri
@@ -269,13 +273,16 @@ class AppSettings(context: Context) {
 		const val KEY_REMOTE_SOURCES = "remote_sources"
 		const val KEY_LOCAL_STORAGE = "local_storage"
 		const val KEY_READER_SWITCHERS = "reader_switchers"
+		const val KEY_TRACKER_ENABLED = "tracker_enabled"
 		const val KEY_TRACK_SOURCES = "track_sources"
+		const val KEY_TRACK_CATEGORIES = "track_categories"
 		const val KEY_TRACK_WARNING = "track_warning"
 		const val KEY_TRACKER_NOTIFICATIONS = "tracker_notifications"
 		const val KEY_NOTIFICATIONS_SETTINGS = "notifications_settings"
 		const val KEY_NOTIFICATIONS_SOUND = "notifications_sound"
 		const val KEY_NOTIFICATIONS_VIBRATE = "notifications_vibrate"
 		const val KEY_NOTIFICATIONS_LIGHT = "notifications_light"
+		const val KEY_NOTIFICATIONS_INFO = "tracker_notifications_info"
 		const val KEY_READER_ANIMATION = "reader_animation"
 		const val KEY_READER_PREFER_RTL = "reader_prefer_rtl"
 		const val KEY_APP_PASSWORD = "app_password"
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
index 8222c0f2b..0f10b81ac 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
@@ -10,7 +10,7 @@ import org.koitharu.kotatsu.favourites.ui.list.FavouritesListViewModel
 val favouritesModule
 	get() = module {
 
-		single { FavouritesRepository(get()) }
+		factory { FavouritesRepository(get(), get()) }
 
 		viewModel { categoryId ->
 			FavouritesListViewModel(categoryId.get(), get(), get(), get())
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
index 801f2566a..c6a65c78e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/EntityMapping.kt
@@ -11,4 +11,5 @@ fun FavouriteCategoryEntity.toFavouriteCategory(id: Long = categoryId.toLong())
 	sortKey = sortKey,
 	order = SortOrder(order, SortOrder.NEWEST),
 	createdAt = Date(createdAt),
+	isTrackingEnabled = track,
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
index 436dc12ea..65d429706 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
@@ -30,6 +30,9 @@ abstract class FavouriteCategoriesDao {
 	@Query("UPDATE favourite_categories SET `order` = :order WHERE category_id = :id")
 	abstract suspend fun updateOrder(id: Long, order: String)
 
+	@Query("UPDATE favourite_categories SET `track` = :isEnabled WHERE category_id = :id")
+	abstract suspend fun updateTracking(id: Long, isEnabled: Boolean)
+
 	@Query("UPDATE favourite_categories SET sort_key = :sortKey WHERE category_id = :id")
 	abstract suspend fun updateSortKey(id: Long, sortKey: Int)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
index d2b0bc7ed..5fe02f019 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoryEntity.kt
@@ -12,4 +12,5 @@ class FavouriteCategoryEntity(
 	@ColumnInfo(name = "sort_key") val sortKey: Int,
 	@ColumnInfo(name = "title") val title: String,
 	@ColumnInfo(name = "order") val order: String,
+	@ColumnInfo(name = "track") val track: Boolean,
 )
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
index 9e5da45f7..89fcc92fb 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouritesDao.kt
@@ -43,6 +43,9 @@ abstract class FavouritesDao {
 	@Query("SELECT * FROM favourites WHERE category_id = :categoryId GROUP BY manga_id ORDER BY created_at DESC LIMIT :limit OFFSET :offset")
 	abstract suspend fun findAll(categoryId: Long, offset: Int, limit: Int): List<FavouriteManga>
 
+	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites WHERE category_id = :categoryId)")
+	abstract suspend fun findAllManga(categoryId: Int): List<MangaEntity>
+
 	@Query("SELECT * FROM manga WHERE manga_id IN (SELECT manga_id FROM favourites)")
 	abstract suspend fun findAllManga(): List<MangaEntity>
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 731d7ff5e..35a362e95 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -13,9 +13,13 @@ import org.koitharu.kotatsu.favourites.data.FavouriteEntity
 import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
 import org.koitharu.kotatsu.utils.ext.mapItems
 
-class FavouritesRepository(private val db: MangaDatabase) {
+class FavouritesRepository(
+	private val db: MangaDatabase,
+	private val channels: TrackerNotificationChannels,
+) {
 
 	suspend fun getAllManga(): List<Manga> {
 		val entities = db.favouritesDao.findAll()
@@ -65,23 +69,32 @@ class FavouritesRepository(private val db: MangaDatabase) {
 			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
 			categoryId = 0,
 			order = SortOrder.NEWEST.name,
+			track = true,
 		)
 		val id = db.favouriteCategoriesDao.insert(entity)
-		return entity.toFavouriteCategory(id)
+		val category = entity.toFavouriteCategory(id)
+		channels.createChannel(category)
+		return category
 	}
 
 	suspend fun renameCategory(id: Long, title: String) {
 		db.favouriteCategoriesDao.updateTitle(id, title)
+		channels.renameChannel(id, title)
 	}
 
 	suspend fun removeCategory(id: Long) {
 		db.favouriteCategoriesDao.delete(id)
+		channels.deleteChannel(id)
 	}
 
 	suspend fun setCategoryOrder(id: Long, order: SortOrder) {
 		db.favouriteCategoriesDao.updateOrder(id, order.name)
 	}
 
+	suspend fun setCategoryTracking(id: Long, isEnabled: Boolean) {
+		db.favouriteCategoriesDao.updateTracking(id, isEnabled)
+	}
+
 	suspend fun reorderCategories(orderedIds: List<Long>) {
 		val dao = db.favouriteCategoriesDao
 		db.withTransaction {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index 5a2eaf8df..d2615c826 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -30,7 +30,8 @@ class CategoriesActivity :
 	BaseActivity<ActivityCategoriesBinding>(),
 	OnListItemClickListener<FavouriteCategory>,
 	View.OnClickListener,
-	CategoriesEditDelegate.CategoriesEditCallback, AllCategoriesToggleListener {
+	CategoriesEditDelegate.CategoriesEditCallback,
+	AllCategoriesToggleListener {
 
 	private val viewModel by viewModel<FavouritesCategoriesViewModel>()
 
@@ -63,11 +64,12 @@ class CategoriesActivity :
 	override fun onItemClick(item: FavouriteCategory, view: View) {
 		val menu = PopupMenu(view.context, view)
 		menu.inflate(R.menu.popup_category)
-		createOrderSubmenu(menu.menu, item)
+		prepareCategoryMenu(menu.menu, item)
 		menu.setOnMenuItemClickListener { menuItem ->
 			when (menuItem.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(item)
 				R.id.action_rename -> editDelegate.renameCategory(item)
+				R.id.action_tracking -> viewModel.setCategoryTracking(item.id, !item.isTrackingEnabled)
 				R.id.action_order -> return@setOnMenuItemClickListener false
 				else -> {
 					val order = SORT_ORDERS.getOrNull(menuItem.order) ?: return@setOnMenuItemClickListener false
@@ -124,7 +126,7 @@ class CategoriesActivity :
 		viewModel.createCategory(name)
 	}
 
-	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
+	private fun prepareCategoryMenu(menu: Menu, category: FavouriteCategory) {
 		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
 		for ((i, item) in SORT_ORDERS.withIndex()) {
 			val menuItem = submenu.add(
@@ -137,6 +139,10 @@ class CategoriesActivity :
 			menuItem.isChecked = item == category.order
 		}
 		submenu.setGroupCheckable(R.id.group_order, true, true)
+		menu.findItem(R.id.action_tracking)?.run {
+			isVisible = viewModel.isFavouritesTrackerEnabled
+			isChecked = category.isTrackingEnabled
+		}
 	}
 
 	private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index 7aac74e62..9e84a9d89 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.favourites.ui.categories
 
 import androidx.lifecycle.viewModelScope
+import java.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
@@ -11,7 +12,6 @@ import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
-import java.util.*
 
 class FavouritesCategoriesViewModel(
 	private val repository: FavouritesRepository,
@@ -34,6 +34,9 @@ class FavouritesCategoriesViewModel(
 		mapCategories(list, showAll, showAll)
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
+	val isFavouritesTrackerEnabled: Boolean
+		get() = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources
+
 	fun createCategory(name: String) {
 		launchJob {
 			repository.addCategory(name)
@@ -58,6 +61,12 @@ class FavouritesCategoriesViewModel(
 		}
 	}
 
+	fun setCategoryTracking(id: Long, isEnabled: Boolean) {
+		launchJob {
+			repository.setCategoryTracking(id, isEnabled)
+		}
+	}
+
 	fun setAllCategoriesVisible(isVisible: Boolean) {
 		settings.isAllFavouritesVisible = isVisible
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/history/HistoryModule.kt b/app/src/main/java/org/koitharu/kotatsu/history/HistoryModule.kt
index 74fb0ef40..246cb3a5f 100644
--- a/app/src/main/java/org/koitharu/kotatsu/history/HistoryModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/history/HistoryModule.kt
@@ -8,6 +8,6 @@ import org.koitharu.kotatsu.history.ui.HistoryListViewModel
 val historyModule
 	get() = module {
 
-		single { HistoryRepository(get(), get(), get()) }
+		factory { HistoryRepository(get(), get(), get()) }
 		viewModel { HistoryListViewModel(get(), get(), get(), get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
index 3366248a4..f8cb28657 100644
--- a/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/local/LocalModule.kt
@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.local.ui.LocalListViewModel
 val localModule
 	get() = module {
 
-		single { LocalStorageManager(androidContext(), get()) }
+		factory { LocalStorageManager(androidContext(), get()) }
 		single { LocalMangaRepository(get()) }
 
 		factory { DownloadManager.Factory(androidContext(), get(), get(), get(), get(), get()) }
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/MainModule.kt b/app/src/main/java/org/koitharu/kotatsu/main/MainModule.kt
index e8c69d824..c6e11107b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/MainModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/MainModule.kt
@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.main.ui.protect.ProtectViewModel
 val mainModule
 	get() = module {
 		single { AppProtectHelper(get()) }
-		single { ShortcutsRepository(androidContext(), get(), get(), get()) }
+		factory { ShortcutsRepository(androidContext(), get(), get(), get()) }
 		viewModel { MainViewModel(get(), get()) }
 		viewModel { ProtectViewModel(get(), get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
index f27f061c6..c83ad608b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ReaderModule.kt
@@ -11,7 +11,7 @@ import org.koitharu.kotatsu.reader.ui.ReaderViewModel
 val readerModule
 	get() = module {
 
-		single { MangaDataRepository(get()) }
+		factory { MangaDataRepository(get()) }
 		single { PagesCache(get()) }
 
 		factory { PageSaveHelper(get(), androidContext()) }
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
index 1f14c6ee3..1d1fb43fc 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/SearchModule.kt
@@ -13,8 +13,7 @@ import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionViewModel
 val searchModule
 	get() = module {
 
-		single { MangaSearchRepository(get(), get(), androidContext(), get()) }
-
+		factory { MangaSearchRepository(get(), get(), androidContext(), get()) }
 		factory { MangaSuggestionsProvider.createSuggestions(androidContext()) }
 
 		viewModel { params ->
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/NotificationSettingsLegacyFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/NotificationSettingsLegacyFragment.kt
index b8852f47e..ee15c796a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/NotificationSettingsLegacyFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/NotificationSettingsLegacyFragment.kt
@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.settings
 
 import android.content.Context
+import android.content.SharedPreferences
 import android.media.RingtoneManager
 import android.os.Bundle
 import android.view.View
@@ -11,7 +12,9 @@ import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.settings.utils.RingtonePickContract
 
-class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notifications) {
+class NotificationSettingsLegacyFragment :
+	BasePreferenceFragment(R.string.notifications),
+	SharedPreferences.OnSharedPreferenceChangeListener {
 
 	private val ringtonePickContract = registerForActivityResult(
 		RingtonePickContract(get<Context>().getString(R.string.notification_sound))
@@ -25,15 +28,28 @@ class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notif
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_notifications)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
 		findPreference<Preference>(AppSettings.KEY_NOTIFICATIONS_SOUND)?.run {
 			val uri = settings.notificationSound
 			summary = RingtoneManager.getRingtone(context, uri)?.getTitle(context)
 				?: getString(R.string.silent)
 		}
+		updateInfo()
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		settings.subscribe(this)
+	}
+
+	override fun onDestroyView() {
+		settings.unsubscribe(this)
+		super.onDestroyView()
+	}
+
+	override fun onSharedPreferenceChanged(prefs: SharedPreferences?, key: String?) {
+		when (key) {
+			AppSettings.KEY_TRACKER_NOTIFICATIONS -> updateInfo()
+		}
 	}
 
 	override fun onPreferenceTreeClick(preference: Preference): Boolean {
@@ -45,4 +61,9 @@ class NotificationSettingsLegacyFragment : BasePreferenceFragment(R.string.notif
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
-}
+
+	private fun updateInfo() {
+		findPreference<Preference>(AppSettings.KEY_NOTIFICATIONS_INFO)
+			?.isVisible = !settings.isTrackerNotificationsEnabled
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
index b1fd14c50..230ab0d32 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/SettingsModule.kt
@@ -17,8 +17,8 @@ import org.koitharu.kotatsu.settings.sources.SourcesSettingsViewModel
 val settingsModule
 	get() = module {
 
-		single { BackupRepository(get()) }
-		single { RestoreRepository(get()) }
+		factory { BackupRepository(get()) }
+		factory { RestoreRepository(get()) }
 		single(createdAtStart = true) { AppSettings(androidContext()) }
 
 		viewModel { BackupViewModel(get(), androidContext()) }
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt
index 1e993f845..f1637def6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/TrackerSettingsFragment.kt
@@ -1,21 +1,34 @@
 package org.koitharu.kotatsu.settings
 
 import android.content.Intent
+import android.content.SharedPreferences
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.text.style.URLSpan
+import android.view.View
 import androidx.core.text.buildSpannedString
 import androidx.core.text.inSpans
 import androidx.preference.MultiSelectListPreference
 import androidx.preference.Preference
+import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BasePreferenceFragment
 import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.settings.utils.MultiSummaryProvider
-import org.koitharu.kotatsu.tracker.work.TrackWorker
+import org.koitharu.kotatsu.tracker.domain.TrackingRepository
+import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 
-class TrackerSettingsFragment : BasePreferenceFragment(R.string.check_for_new_chapters) {
+class TrackerSettingsFragment :
+	BasePreferenceFragment(R.string.check_for_new_chapters),
+	SharedPreferences.OnSharedPreferenceChangeListener {
+
+	private val repository by inject<TrackingRepository>()
+	private val channels by inject<TrackerNotificationChannels>()
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_tracker)
@@ -32,22 +45,81 @@ class TrackerSettingsFragment : BasePreferenceFragment(R.string.check_for_new_ch
 				}
 			}
 		}
+		updateCategoriesEnabled()
+	}
+
+	override fun onResume() {
+		super.onResume()
+		updateCategoriesSummary()
+		updateNotificationsSummary()
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		settings.subscribe(this)
+	}
+
+	override fun onDestroyView() {
+		settings.unsubscribe(this)
+		super.onDestroyView()
+	}
+
+	override fun onSharedPreferenceChanged(prefs: SharedPreferences, key: String?) {
+		when (key) {
+			AppSettings.KEY_TRACKER_NOTIFICATIONS -> updateNotificationsSummary()
+			AppSettings.KEY_TRACK_SOURCES,
+			AppSettings.KEY_TRACKER_ENABLED -> updateCategoriesEnabled()
+		}
 	}
 
 	override fun onPreferenceTreeClick(preference: Preference): Boolean {
 		return when (preference.key) {
-			AppSettings.KEY_NOTIFICATIONS_SETTINGS -> {
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+			AppSettings.KEY_NOTIFICATIONS_SETTINGS -> when {
+				Build.VERSION.SDK_INT >= Build.VERSION_CODES.O -> {
+					val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
 						.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
-						.putExtra(Settings.EXTRA_CHANNEL_ID, TrackWorker.CHANNEL_ID)
 					startActivity(intent)
 					true
-				} else {
+				}
+				channels.areNotificationsDisabled -> {
+					val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+						.setData(Uri.fromParts("package", requireContext().packageName, null))
+					startActivity(intent)
+					true
+				}
+				else -> {
 					super.onPreferenceTreeClick(preference)
 				}
 			}
+			AppSettings.KEY_TRACK_CATEGORIES -> {
+				startActivity(CategoriesActivity.newIntent(preference.context))
+				true
+			}
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
+
+	private fun updateNotificationsSummary() {
+		val pref = findPreference<Preference>(AppSettings.KEY_NOTIFICATIONS_SETTINGS) ?: return
+		pref.setSummary(
+			when {
+				channels.areNotificationsDisabled -> R.string.disabled
+				channels.isNotificationGroupEnabled() -> R.string.show_notification_new_chapters_on
+				else -> R.string.show_notification_new_chapters_off
+			}
+		)
+	}
+
+	private fun updateCategoriesEnabled() {
+		val pref = findPreference<Preference>(AppSettings.KEY_TRACK_CATEGORIES) ?: return
+		pref.isEnabled = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources
+	}
+
+	private fun updateCategoriesSummary() {
+		val pref = findPreference<Preference>(AppSettings.KEY_TRACK_CATEGORIES) ?: return
+		viewLifecycleScope.launch {
+			val count = repository.getCategoriesCount()
+			pref.summary = getString(R.string.enabled_d_of_d, count[0], count[1])
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt b/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
index 278995dab..baa2a5217 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/backup/AppBackupAgent.kt
@@ -51,7 +51,7 @@ class AppBackupAgent : BackupAgent() {
 	}
 
 	private fun createBackupFile() = runBlocking {
-		val repository = BackupRepository(MangaDatabase.create(applicationContext))
+		val repository = BackupRepository(MangaDatabase(applicationContext))
 		BackupZipOutput(this@AppBackupAgent).use { backup ->
 			backup.put(repository.createIndex())
 			backup.put(repository.dumpHistory())
@@ -63,7 +63,7 @@ class AppBackupAgent : BackupAgent() {
 	}
 
 	private fun restoreBackupFile(fd: FileDescriptor, size: Long) {
-		val repository = RestoreRepository(MangaDatabase.create(applicationContext))
+		val repository = RestoreRepository(MangaDatabase(applicationContext))
 		val tempFile = File.createTempFile("backup_", ".tmp")
 		FileInputStream(fd).use { input ->
 			tempFile.outputStream().use { output ->
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/TrackerModule.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/TrackerModule.kt
index a08495f54..975e96d66 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/TrackerModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/TrackerModule.kt
@@ -1,14 +1,17 @@
 package org.koitharu.kotatsu.tracker
 
+import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.tracker.domain.TrackingRepository
 import org.koitharu.kotatsu.tracker.ui.FeedViewModel
+import org.koitharu.kotatsu.tracker.work.TrackerNotificationChannels
 
 val trackerModule
 	get() = module {
 
-		single { TrackingRepository(get()) }
+		factory { TrackingRepository(get()) }
+		factory { TrackerNotificationChannels(androidContext(), get()) }
 
 		viewModel { FeedViewModel(get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
index 661f68bba..aefa9a69a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/domain/TrackingRepository.kt
@@ -2,15 +2,15 @@ package org.koitharu.kotatsu.tracker.domain
 
 import androidx.room.withTransaction
 import org.koitharu.kotatsu.core.db.MangaDatabase
-import org.koitharu.kotatsu.core.db.entity.TrackEntity
-import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
-import org.koitharu.kotatsu.core.db.entity.toManga
-import org.koitharu.kotatsu.core.db.entity.toTrackingLogItem
+import org.koitharu.kotatsu.core.db.entity.*
+import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.MangaTracking
 import org.koitharu.kotatsu.core.model.TrackingLogItem
+import org.koitharu.kotatsu.favourites.data.toFavouriteCategory
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.util.mapToSet
 import java.util.*
 
 class TrackingRepository(
@@ -21,16 +21,29 @@ class TrackingRepository(
 		return db.tracksDao.findNewChapters(mangaId) ?: 0
 	}
 
-	suspend fun getAllTracks(useFavourites: Boolean, useHistory: Boolean): List<MangaTracking> {
-		val mangaList = ArrayList<Manga>()
-		if (useFavourites) {
-			db.favouritesDao.findAllManga().mapTo(mangaList) { it.toManga(emptySet()) }
+	suspend fun getHistoryManga(): List<Manga> {
+		return db.historyDao.findAllManga().toMangaList()
+	}
+
+	suspend fun getFavouritesManga(): Map<FavouriteCategory, List<Manga>> {
+		val categories = db.favouriteCategoriesDao.findAll()
+		return categories.associateTo(LinkedHashMap(categories.size)) { categoryEntity ->
+			categoryEntity.toFavouriteCategory() to db.favouritesDao.findAllManga(categoryEntity.categoryId).toMangaList()
 		}
-		if (useHistory) {
-			db.historyDao.findAllManga().mapTo(mangaList) { it.toManga(emptySet()) }
-		}
-		val tracks = db.tracksDao.findAll().groupBy { it.mangaId }
-		return mangaList
+	}
+
+	suspend fun getCategoriesCount(): IntArray {
+		val categories = db.favouriteCategoriesDao.findAll()
+		return intArrayOf(
+			categories.count { it.track },
+			categories.size,
+		)
+	}
+
+	suspend fun getTracks(mangaList: Collection<Manga>): List<MangaTracking> {
+		val ids = mangaList.mapToSet { it.id }
+		val tracks = db.tracksDao.findAll(ids).groupBy { it.mangaId }
+		return mangaList // TODO optimize
 			.filterNot { it.source == MangaSource.LOCAL }
 			.distinctBy { it.id }
 			.map { manga ->
@@ -103,4 +116,6 @@ class TrackingRepository(
 		)
 		db.tracksDao.upsert(entity)
 	}
+
+	private fun Collection<MangaEntity>.toMangaList() = map { it.toManga(emptySet()) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
index a61b25c47..943572f24 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackWorker.kt
@@ -5,7 +5,6 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LiveData
@@ -41,26 +40,22 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 	private val coil by inject<ImageLoader>()
 	private val repository by inject<TrackingRepository>()
 	private val settings by inject<AppSettings>()
+	private val channels by inject<TrackerNotificationChannels>()
 
 	override suspend fun doWork(): Result {
-		val trackSources = settings.trackSources
-		if (trackSources.isEmpty()) {
-			return Result.success()
-		}
-		val tracks = repository.getAllTracks(
-			useFavourites = AppSettings.TRACK_FAVOURITES in trackSources,
-			useHistory = AppSettings.TRACK_HISTORY in trackSources
-		)
-		if (tracks.isEmpty()) {
+		if (!settings.isTrackerEnabled) {
 			return Result.success()
 		}
 		if (TAG in tags) { // not expedited
 			trySetForeground()
 		}
+		val tracks = getAllTracks()
+
 		var success = 0
 		val workData = Data.Builder()
 			.putInt(DATA_TOTAL, tracks.size)
-		for ((index, track) in tracks.withIndex()) {
+		for ((index, item) in tracks.withIndex()) {
+			val (track, channelId) = item
 			val details = runCatching {
 				MangaRepository(track.manga.source).getDetails(track.manga)
 			}.getOrNull()
@@ -80,12 +75,12 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 				track.knownChaptersCount == 0 && track.lastChapterId == 0L -> { // manga was empty on last check
 					repository.storeTrackResult(
 						mangaId = track.manga.id,
-						knownChaptersCount = track.knownChaptersCount,
+						knownChaptersCount = 0,
 						lastChapterId = 0L,
 						previousTrackChapterId = track.lastNotifiedChapterId,
 						newChapters = chapters
 					)
-					showNotification(details, chapters)
+					showNotification(details, channelId, chapters)
 				}
 				chapters.size == track.knownChaptersCount -> {
 					if (chapters.lastOrNull()?.id == track.lastChapterId) {
@@ -114,7 +109,8 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 							)
 							showNotification(
 								details,
-								newChapters.takeLastWhile { x -> x.id != track.lastNotifiedChapterId }
+								channelId,
+								newChapters.takeLastWhile { x -> x.id != track.lastNotifiedChapterId },
 							)
 						}
 					}
@@ -126,11 +122,12 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 						knownChaptersCount = track.knownChaptersCount,
 						lastChapterId = track.lastChapterId,
 						previousTrackChapterId = track.lastNotifiedChapterId,
-						newChapters = newChapters
+						newChapters = newChapters,
 					)
 					showNotification(
-						track.manga,
-						newChapters.takeLastWhile { x -> x.id != track.lastNotifiedChapterId }
+						manga = track.manga,
+						channelId = channelId,
+						newChapters = newChapters.takeLastWhile { x -> x.id != track.lastNotifiedChapterId },
 					)
 				}
 			}
@@ -144,13 +141,60 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 		}
 	}
 
-	private suspend fun showNotification(manga: Manga, newChapters: List<MangaChapter>) {
-		if (newChapters.isEmpty() || !settings.trackerNotifications) {
+	private suspend fun getAllTracks(): List<TrackingItem> {
+		val sources = settings.trackSources
+		if (sources.isEmpty()) {
+			return emptyList()
+		}
+		val knownIds = HashSet<Manga>()
+		val result = ArrayList<TrackingItem>()
+		// Favourites
+		if (AppSettings.TRACK_FAVOURITES in sources) {
+			val favourites = repository.getFavouritesManga()
+			channels.updateChannels(favourites.keys)
+			for ((category, mangaList) in favourites) {
+				if (!category.isTrackingEnabled || mangaList.isEmpty()) {
+					continue
+				}
+				val categoryTracks = repository.getTracks(mangaList)
+				val channelId = if (channels.isFavouriteNotificationsEnabled(category)) {
+					channels.getFavouritesChannelId(category.id)
+				} else {
+					null
+				}
+				for (track in categoryTracks) {
+					if (knownIds.add(track.manga)) {
+						result.add(TrackingItem(track, channelId))
+					}
+				}
+			}
+		}
+		// History
+		if (AppSettings.TRACK_HISTORY in sources) {
+			val history = repository.getHistoryManga()
+			val historyTracks = repository.getTracks(history)
+			val channelId = if (channels.isHistoryNotificationsEnabled()) {
+				channels.getHistoryChannelId()
+			} else {
+				null
+			}
+			for (track in historyTracks) {
+				if (knownIds.add(track.manga)) {
+					result.add(TrackingItem(track, channelId))
+				}
+			}
+		}
+		result.trimToSize()
+		return result
+	}
+
+	private suspend fun showNotification(manga: Manga, channelId: String?, newChapters: List<MangaChapter>) {
+		if (newChapters.isEmpty() || channelId == null) {
 			return
 		}
 		val id = manga.url.hashCode()
 		val colorPrimary = ContextCompat.getColor(applicationContext, R.color.blue_primary)
-		val builder = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
+		val builder = NotificationCompat.Builder(applicationContext, channelId)
 		val summary = applicationContext.resources.getQuantityString(
 			R.plurals.new_chapters,
 			newChapters.size, newChapters.size
@@ -236,7 +280,6 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 
 	companion object {
 
-		const val CHANNEL_ID = "tracking"
 		private const val WORKER_CHANNEL_ID = "track_worker"
 		private const val WORKER_NOTIFICATION_ID = 35
 		private const val DATA_PROGRESS = "progress"
@@ -244,27 +287,7 @@ class TrackWorker(context: Context, workerParams: WorkerParameters) :
 		private const val TAG = "tracking"
 		private const val TAG_ONESHOT = "tracking_oneshot"
 
-		@RequiresApi(Build.VERSION_CODES.O)
-		private fun createNotificationChannel(context: Context) {
-			val manager =
-				context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-			if (manager.getNotificationChannel(CHANNEL_ID) == null) {
-				val channel = NotificationChannel(
-					CHANNEL_ID,
-					context.getString(R.string.new_chapters),
-					NotificationManager.IMPORTANCE_DEFAULT
-				)
-				channel.setShowBadge(true)
-				channel.lightColor = ContextCompat.getColor(context, R.color.blue_primary_dark)
-				channel.enableLights(true)
-				manager.createNotificationChannel(channel)
-			}
-		}
-
 		fun setup(context: Context) {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				createNotificationChannel(context)
-			}
 			val constraints = Constraints.Builder()
 				.setRequiredNetworkType(NetworkType.CONNECTED)
 				.build()
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt
new file mode 100644
index 000000000..81fcb73d5
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackerNotificationChannels.kt
@@ -0,0 +1,143 @@
+package org.koitharu.kotatsu.tracker.work
+
+import android.app.NotificationChannel
+import android.app.NotificationChannelGroup
+import android.app.NotificationManager
+import android.content.Context
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationManagerCompat
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.prefs.AppSettings
+
+class TrackerNotificationChannels(
+	private val context: Context,
+	private val settings: AppSettings,
+) {
+
+	private val manager = NotificationManagerCompat.from(context)
+
+	val areNotificationsDisabled: Boolean
+		get() = !manager.areNotificationsEnabled()
+
+	fun updateChannels(categories: Collection<FavouriteCategory>) {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			return
+		}
+		manager.deleteNotificationChannel(OLD_CHANNEL_ID)
+		val group = createGroup()
+		val existingChannels = group.channels.associateByTo(HashMap()) { it.id }
+		for (category in categories) {
+			val id = getFavouritesChannelId(category.id)
+			if (existingChannels.remove(id)?.name == category.title) {
+				continue
+			}
+			val channel = NotificationChannel(id, category.title, NotificationManager.IMPORTANCE_DEFAULT)
+			channel.group = GROUP_ID
+			manager.createNotificationChannel(channel)
+		}
+		existingChannels.remove(CHANNEL_ID_HISTORY)
+		createHistoryChannel()
+		for (id in existingChannels.keys) {
+			manager.deleteNotificationChannel(id)
+		}
+	}
+
+	fun createChannel(category: FavouriteCategory) {
+		renameChannel(category.id, category.title)
+	}
+
+	fun renameChannel(categoryId: Long, name: String) {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			return
+		}
+		val id = getFavouritesChannelId(categoryId)
+		val channel = NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT)
+		channel.group = createGroup().id
+		manager.createNotificationChannel(channel)
+	}
+
+	fun deleteChannel(categoryId: Long) {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			return
+		}
+		manager.deleteNotificationChannel(getFavouritesChannelId(categoryId))
+	}
+
+	fun isFavouriteNotificationsEnabled(category: FavouriteCategory): Boolean {
+		if (!manager.areNotificationsEnabled()) {
+			return false
+		}
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val channel = manager.getNotificationChannel(getFavouritesChannelId(category.id))
+			channel != null && channel.importance != NotificationManager.IMPORTANCE_NONE
+		} else {
+			// fallback
+			settings.isTrackerNotificationsEnabled
+		}
+	}
+
+	fun isHistoryNotificationsEnabled(): Boolean {
+		if (!manager.areNotificationsEnabled()) {
+			return false
+		}
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			val channel = manager.getNotificationChannel(getHistoryChannelId())
+			channel != null && channel.importance != NotificationManager.IMPORTANCE_NONE
+		} else {
+			// fallback
+			settings.isTrackerNotificationsEnabled
+		}
+	}
+
+	fun isNotificationGroupEnabled(): Boolean {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			return settings.isTrackerNotificationsEnabled
+		}
+		val group = manager.getNotificationChannelGroup(GROUP_ID) ?: return true
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && group.isBlocked) {
+			return false
+		}
+		return group.channels.any { it.importance != NotificationManagerCompat.IMPORTANCE_NONE }
+	}
+
+	fun getFavouritesChannelId(categoryId: Long): String {
+		return CHANNEL_ID_PREFIX + categoryId
+	}
+
+	fun getHistoryChannelId(): String {
+		return CHANNEL_ID_HISTORY
+	}
+
+	@RequiresApi(Build.VERSION_CODES.O)
+	private fun createGroup(): NotificationChannelGroup {
+		manager.getNotificationChannelGroup(GROUP_ID)?.let {
+			return it
+		}
+		val group = NotificationChannelGroup(GROUP_ID, context.getString(R.string.new_chapters))
+		manager.createNotificationChannelGroup(group)
+		return group
+	}
+
+	private fun createHistoryChannel() {
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			return
+		}
+		val channel = NotificationChannel(
+			CHANNEL_ID_HISTORY,
+			context.getString(R.string.history),
+			NotificationManager.IMPORTANCE_DEFAULT,
+		)
+		channel.group = GROUP_ID
+		manager.createNotificationChannel(channel)
+	}
+
+	companion object {
+
+		const val GROUP_ID = "trackers"
+		private const val CHANNEL_ID_PREFIX = "track_fav_"
+		private const val CHANNEL_ID_HISTORY = "track_history"
+		private const val OLD_CHANNEL_ID = "tracking"
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackingItem.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackingItem.kt
new file mode 100644
index 000000000..933918009
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/work/TrackingItem.kt
@@ -0,0 +1,31 @@
+package org.koitharu.kotatsu.tracker.work
+
+import org.koitharu.kotatsu.core.model.MangaTracking
+
+class TrackingItem(
+	val tracking: MangaTracking,
+	val channelId: String?,
+) {
+
+	operator fun component1() = tracking
+
+	operator fun component2() = channelId
+
+	override fun equals(other: Any?): Boolean {
+		if (this === other) return true
+		if (javaClass != other?.javaClass) return false
+
+		other as TrackingItem
+
+		if (tracking != other.tracking) return false
+		if (channelId != other.channelId) return false
+
+		return true
+	}
+
+	override fun hashCode(): Int {
+		var result = tracking.hashCode()
+		result = 31 * result + channelId.hashCode()
+		return result
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_toggle_header.xml b/app/src/main/res/layout/preference_toggle_header.xml
new file mode 100644
index 000000000..f21e8604e
--- /dev/null
+++ b/app/src/main/res/layout/preference_toggle_header.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?android:windowBackground"
+	android:clipToPadding="false"
+	android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+	android:paddingTop="8dp"
+	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+	android:paddingBottom="8dp">
+
+	<com.google.android.material.card.MaterialCardView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:baselineAligned="false"
+			android:clipChildren="false"
+			android:clipToPadding="false"
+			android:gravity="center_vertical"
+			android:minHeight="?android:attr/listPreferredItemHeightSmall"
+			android:padding="8dp">
+
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@android:id/title"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:textAppearance="?android:attr/textAppearanceListItem" />
+
+				<TextView
+					android:id="@android:id/summary"
+					style="@style/PreferenceSummaryTextStyle"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="start"
+					android:maxLines="10"
+					android:textAlignment="viewStart"
+					android:textColor="?android:attr/textColorSecondary" />
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:id="@android:id/widget_frame"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:gravity="end|center_vertical"
+				android:orientation="vertical"
+				android:paddingStart="16dp"
+				android:paddingEnd="0dp" />
+
+		</LinearLayout>
+
+	</com.google.android.material.card.MaterialCardView>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/popup_category.xml b/app/src/main/res/menu/popup_category.xml
index 1c4fc96d2..ee78b4b80 100644
--- a/app/src/main/res/menu/popup_category.xml
+++ b/app/src/main/res/menu/popup_category.xml
@@ -23,4 +23,9 @@
 
 	</item>
 
+	<item
+		android:id="@+id/action_tracking"
+		android:title="@string/check_for_new_chapters"
+		android:checkable="true" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index cbd9de9a7..bada7be01 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -101,7 +101,6 @@
     <string name="notifications">Паведамленні</string>
     <string name="enabled_d_of_d">Уключана %1$d з %2$d</string>
     <string name="new_chapters">Новыя главы</string>
-    <string name="show_notification_new_chapters">Апавяшчаць пра абнаўленні мангі, якую вы чытаеце</string>
     <string name="download">Спампаваць</string>
     <string name="read_from_start">Чытаць з пачатку</string>
     <string name="restart">Перазапусціць</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 42fb3a9ee..9bab88eb0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -46,7 +46,6 @@
     <string name="updates_feed_cleared">Aktualisierungsfeed gelöscht</string>
     <string name="clear_updates_feed">Aktualisierungsfeed löschen</string>
     <string name="updates">Aktualisierungen</string>
-    <string name="show_notification_new_chapters">Über Aktualisierungen von Manga benachrichtigen, die du liest</string>
     <string name="show_notification_app_update">Benachrichtigung anzeigen, wenn eine Aktualisierung verfügbar ist</string>
     <string name="app_update_available">Anwendungsaktualisierung ist verfügbar</string>
     <string name="application_update">Automatisch nach Aktualisierungen suchen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9cde0edc3..ef974cffd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -101,7 +101,6 @@
     <string name="notifications">Notificaciones</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Activado %1$d de %2$d</string>
     <string name="new_chapters">Nuevos capítulos</string>
-    <string name="show_notification_new_chapters">Notificar sobre las actualizaciones del manga que estás leyendo</string>
     <string name="download">Descargar</string>
     <string name="read_from_start">Leer desde el principio</string>
     <string name="restart">Reiniciar</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 69f9c193e..40ee9d1b7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -118,7 +118,6 @@
     <string name="restart">Käynnistä uudelleen</string>
     <string name="read_from_start">Lue alusta</string>
     <string name="download">Lataa</string>
-    <string name="show_notification_new_chapters">Ilmoita lukemastasi mangan päivityksistä</string>
     <string name="new_chapters">Uusia lukuja</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Käytössä %1$d / %2$d</string>
     <string name="notifications">Ilmoitukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 958794036..720c59b4a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -112,7 +112,6 @@
     <string name="notifications_settings">Paramètres des notifications</string>
     <string name="read_from_start">Lire depuis le début</string>
     <string name="download">Télécharger</string>
-    <string name="show_notification_new_chapters">Avertir des mises à jour des mangas que vous lisez</string>
     <string name="new_chapters">Nouveaux chapitres</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d de %2$d activé(s)</string>
     <string name="notifications">Notifications</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e6196111b..683112a44 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -154,7 +154,6 @@
     <string name="restart">Riavvia</string>
     <string name="read_from_start">Leggi dall\'inizio</string>
     <string name="download">Scarica</string>
-    <string name="show_notification_new_chapters">Notifica gli aggiornamenti dei manga che stai leggendo</string>
     <string name="new_chapters">Nuovi capitoli</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Abilitato %1$d di %2$d</string>
     <string name="notifications">Notifiche</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d6db95de8..8f9ab14f1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -143,7 +143,6 @@
     <string name="clear_search_history">検索履歴をクリア</string>
     <string name="external_storage">外部ストレージ</string>
     <string name="app_update_available">Kotatsuの新しい更新が利用可能です</string>
-    <string name="show_notification_new_chapters">あなたが読んでいる漫画の更新について通知</string>
     <string name="text_empty_holder_primary">ここは空っぽです…</string>
     <string name="text_categories_holder">カテゴリーを使用してお気に入りを整理できます。 «+»を押してカテゴリーを作成出来ます</string>
     <string name="favourites_category_empty">空のカテゴリー</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 74c07b980..41444062e 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -54,7 +54,6 @@
     <string name="category_delete_confirm">Fjern «%s»-kategorien fra favorittene\?
 \nAlle mangaer i den vil bli tapt.</string>
     <string name="restart">Programomstart</string>
-    <string name="show_notification_new_chapters">Gi merknad om oppdateringer av det du leser</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d av %2$d påskrudd</string>
     <string name="large_manga_save_confirm">Denne mangaen har %s. Lagre hele\?</string>
     <string name="open_in_browser">Åpne i nettleser</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 32910e0a3..9e654146f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -232,7 +232,6 @@
     <string name="clear_thumbs_cache">Limpar cache de miniaturas</string>
     <string name="application_update">Verifique se há novas versões do aplicativo</string>
     <string name="favourites_categories">Categorias favoritas</string>
-    <string name="show_notification_new_chapters">Notificar sobre atualizações de mangá que você está lendo</string>
     <string name="category_delete_confirm">Remover a categoria “%s” dos seus favoritos\?
 \nTodos os mangás nela serão perdidos.</string>
     <string name="no_update_available">Nenhuma atualização disponível</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b23edc825..d3794d77a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -83,7 +83,6 @@
     <string name="save_manga">Salve</string>
     <string name="notifications">Notificações</string>
     <string name="new_chapters">Novos capítulos</string>
-    <string name="show_notification_new_chapters">Notifique sobre atualizações do mangá que está lendo</string>
     <string name="download">Download</string>
     <string name="read_from_start">Ler desde o início</string>
     <string name="restart">Reiniciar</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 41dad2021..87da7d5d0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -101,7 +101,6 @@
     <string name="notifications">Уведомления</string>
     <string name="enabled_d_of_d">Включено %1$d из %2$d</string>
     <string name="new_chapters">Новые главы</string>
-    <string name="show_notification_new_chapters">Уведомлять об обновлении манги, которую Вы читаете</string>
     <string name="download">Загрузить</string>
     <string name="read_from_start">Читать с начала</string>
     <string name="restart">Перезапустить</string>
@@ -278,4 +277,8 @@
 	<string name="chapters_will_removed_background">Главы будут удалены в фоновом режиме. Это может занять какое-то время</string>
 	<string name="hide">Скрыть</string>
 	<string name="new_sources_text">Доступны новые источники манги</string>
+	<string name="check_new_chapters_title">Проверять новые главы и уведомлять о них</string>
+	<string name="show_notification_new_chapters_on">Вы будете получать уведомления об обновлении манги, которую Вы читаете</string>
+	<string name="show_notification_new_chapters_off">Вы не будете получать уведомления, но новые главы будут отображаться в списке</string>
+	<string name="notifications_enable">Включить уведомления</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 76cfa061a..264ad6c1c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -105,7 +105,6 @@
     <string name="download">Ladda ned</string>
     <string name="notifications_settings">Aviseringsinställningar</string>
     <string name="light_indicator">LED-indikator</string>
-    <string name="show_notification_new_chapters">Avisera om uppdateringar på manga du läser</string>
     <string name="read_from_start">Läs från början</string>
     <string name="restart">Starta om</string>
     <string name="notification_sound">Aviseringsljud</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ff48edbc1..74d931aab 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -234,7 +234,6 @@
     <string name="system_default">Öntanımlı</string>
     <string name="error_empty_name">Bir ad girmelisiniz</string>
     <string name="auth_not_supported_by">%s üzerinde oturum açma desteklenmiyor</string>
-    <string name="show_notification_new_chapters">Okunan manga güncellemeleri hakkında bildirimde bulun</string>
     <string name="read_more">Daha fazla oku</string>
     <string name="tracker_warning">Bazı aygıtların arka plan görevlerini bozabilecek farklı sistem davranışları vardır.</string>
     <string name="screenshots_policy">Ekran görüntüsü politikası</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 692597cee..083717035 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -103,7 +103,6 @@
     <string name="notifications">Notifications</string>
     <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">%1$d of %2$d on</string>
     <string name="new_chapters">New chapters</string>
-    <string name="show_notification_new_chapters">Notify about updates of manga you are reading</string>
     <string name="download">Download</string>
     <string name="read_from_start">Read from start</string>
     <string name="restart">Restart</string>
@@ -281,4 +280,8 @@
 	<string name="chapters_will_removed_background">Chapters will be removed in the background. It can take some time</string>
 	<string name="hide">Hide</string>
 	<string name="new_sources_text">New manga sources are available</string>
+	<string name="check_new_chapters_title">Check for new chapters and notify about it</string>
+	<string name="show_notification_new_chapters_on">You will receive notifications about updates of manga you are reading</string>
+	<string name="show_notification_new_chapters_off">You will not receive notifications but new chapters will be highlighted in the lists</string>
+	<string name="notifications_enable">Enable notifications</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_notifications.xml b/app/src/main/res/xml/pref_notifications.xml
index b3c349d72..c3be1d40d 100644
--- a/app/src/main/res/xml/pref_notifications.xml
+++ b/app/src/main/res/xml/pref_notifications.xml
@@ -1,19 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<SwitchPreferenceCompat
+		android:defaultValue="true"
+		android:key="tracker_notifications"
+		android:layout="@layout/preference_toggle_header"
+		android:title="@string/notifications_enable" />
 
 	<Preference
+		android:dependency="tracker_notifications"
 		android:key="notifications_sound"
 		android:title="@string/notification_sound" />
 
 	<CheckBoxPreference
 		android:defaultValue="false"
+		android:dependency="tracker_notifications"
 		android:key="notifications_vibrate"
 		android:title="@string/vibration" />
 
 	<CheckBoxPreference
 		android:defaultValue="true"
+		android:dependency="tracker_notifications"
 		android:key="notifications_light"
 		android:title="@string/light_indicator" />
 
+	<org.koitharu.kotatsu.settings.utils.LinksPreference
+		android:icon="@drawable/ic_info_outline"
+		android:key="tracker_notifications_info"
+		android:persistent="false"
+		android:selectable="false"
+		android:summary="@string/show_notification_new_chapters_off"
+		app:allowDividerAbove="true"
+		app:isPreferenceVisible="false" />
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_suggestions.xml b/app/src/main/res/xml/pref_suggestions.xml
index 224185a67..b9712a556 100644
--- a/app/src/main/res/xml/pref_suggestions.xml
+++ b/app/src/main/res/xml/pref_suggestions.xml
@@ -6,7 +6,7 @@
 	<SwitchPreferenceCompat
 		android:defaultValue="false"
 		android:key="suggestions"
-		android:summary="@string/suggestions_summary"
+		android:layout="@layout/preference_toggle_header"
 		android:title="@string/suggestions_enable" />
 
 	<org.koitharu.kotatsu.settings.utils.MultiAutoCompleteTextViewPreference
diff --git a/app/src/main/res/xml/pref_tracker.xml b/app/src/main/res/xml/pref_tracker.xml
index ad9aae15c..4087b503e 100644
--- a/app/src/main/res/xml/pref_tracker.xml
+++ b/app/src/main/res/xml/pref_tracker.xml
@@ -3,23 +3,28 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
+	<SwitchPreferenceCompat
+		android:defaultValue="true"
+		android:key="tracker_enabled"
+		android:layout="@layout/preference_toggle_header"
+		android:title="@string/check_new_chapters_title" />
+
 	<MultiSelectListPreference
 		android:defaultValue="@array/values_track_sources_default"
+		android:dependency="tracker_enabled"
 		android:entries="@array/track_sources"
 		android:entryValues="@array/values_track_sources"
 		android:key="track_sources"
 		android:title="@string/track_sources" />
 
-	<SwitchPreferenceCompat
-		android:defaultValue="true"
-		android:key="tracker_notifications"
-		android:summary="@string/show_notification_new_chapters"
-		android:title="@string/notifications" />
+	<Preference
+		android:key="track_categories"
+		android:title="@string/favourites_categories" />
 
 	<Preference
-		android:dependency="tracker_notifications"
 		android:fragment="org.koitharu.kotatsu.settings.NotificationSettingsLegacyFragment"
 		android:key="notifications_settings"
+		android:dependency="tracker_enabled"
 		android:title="@string/notifications_settings" />
 
 	<org.koitharu.kotatsu.settings.utils.LinksPreference

From 3407e74e99616cb6e6efed64d6c8009b7e57a30d Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Wed, 4 May 2022 23:00:44 +0300
Subject: [PATCH 081/104] Fix `FavouriteCategoriesDialog` toolbar in album
 orientation

---
 app/src/main/res/layout/dialog_favorite_categories.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/dialog_favorite_categories.xml
index 2085c72f7..0acdd440e 100644
--- a/app/src/main/res/layout/dialog_favorite_categories.xml
+++ b/app/src/main/res/layout/dialog_favorite_categories.xml
@@ -10,7 +10,7 @@
 	<com.google.android.material.appbar.MaterialToolbar
 		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_height="?attr/actionBarSize"
 		app:menu="@menu/opt_favourites_bs"
 		app:title="@string/add_to_favourites" />
 

From 9166716f2a693d60ebd1bf921732fbaf48268de8 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 5 May 2022 15:21:10 +0300
Subject: [PATCH 082/104] Update version

---
 app/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ff599eb34..b04edbd11 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 32
-		versionCode 405
-		versionName '3.2.1'
+		versionCode 406
+		versionName '3.2.2'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -86,7 +86,7 @@ dependencies {
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.work:work-runtime-ktx:2.7.1'
-	implementation 'com.google.android.material:material:1.6.0-rc01'
+	implementation 'com.google.android.material:material:1.6.0'
 	//noinspection LifecycleAnnotationProcessorWithJava8
 	kapt 'androidx.lifecycle:lifecycle-compiler:2.4.1'
 
@@ -105,7 +105,7 @@ dependencies {
 	implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 	implementation 'com.github.solkin:disk-lru-cache:1.4'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'

From c695468aeca80029b0147902bd926613e313fccd Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 5 May 2022 15:43:07 +0300
Subject: [PATCH 083/104] Fix cold launch

---
 .../koitharu/kotatsu/main/ui/MainActivity.kt  | 20 ++++-----
 .../kotatsu/settings/AppUpdateChecker.kt      | 43 +++++++++----------
 .../settings/onboard/OnboardDialogFragment.kt |  6 ++-
 .../settings/onboard/OnboardViewModel.kt      |  3 +-
 4 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 24805aa84..0e8c85fb9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -22,7 +22,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -385,20 +384,19 @@ class MainActivity :
 	}
 
 	private fun onFirstStart() {
-		lifecycleScope.launch(Dispatchers.Default) {
-			TrackWorker.setup(applicationContext)
-			SuggestionsWorker.setup(applicationContext)
-			if (AppUpdateChecker.isUpdateSupported(this@MainActivity)) {
+		lifecycleScope.launchWhenResumed {
+			val isUpdateSupported = withContext(Dispatchers.Default) {
+				TrackWorker.setup(applicationContext)
+				SuggestionsWorker.setup(applicationContext)
+				AppUpdateChecker.isUpdateSupported(this@MainActivity)
+			}
+			if (isUpdateSupported) {
 				AppUpdateChecker(this@MainActivity).checkIfNeeded()
 			}
 			val settings = get<AppSettings>()
 			when {
-				!settings.isSourcesSelected -> withContext(Dispatchers.Main) {
-					OnboardDialogFragment.showWelcome(supportFragmentManager)
-				}
-				settings.newSources.isNotEmpty() -> withContext(Dispatchers.Main) {
-					NewSourcesDialogFragment.show(supportFragmentManager)
-				}
+				!settings.isSourcesSelected -> OnboardDialogFragment.showWelcome(supportFragmentManager)
+				settings.newSources.isNotEmpty() -> NewSourcesDialogFragment.show(supportFragmentManager)
 			}
 		}
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt b/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt
index 12d7f21ce..5b7bc661e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/AppUpdateChecker.kt
@@ -8,6 +8,15 @@ import android.net.Uri
 import androidx.activity.ComponentActivity
 import androidx.annotation.MainThread
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import java.io.ByteArrayInputStream
+import java.io.InputStream
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateEncodingException
+import java.security.cert.CertificateException
+import java.security.cert.CertificateFactory
+import java.security.cert.X509Certificate
+import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
@@ -19,15 +28,6 @@ import org.koitharu.kotatsu.core.github.VersionId
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.util.byte2HexFormatted
 import org.koitharu.kotatsu.utils.FileSize
-import java.io.ByteArrayInputStream
-import java.io.InputStream
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.security.cert.CertificateEncodingException
-import java.security.cert.CertificateException
-import java.security.cert.CertificateFactory
-import java.security.cert.X509Certificate
-import java.util.concurrent.TimeUnit
 
 class AppUpdateChecker(private val activity: ComponentActivity) {
 
@@ -61,25 +61,22 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 
 	@MainThread
 	private fun showUpdateDialog(version: AppVersion) {
+		val message = buildString {
+			append(activity.getString(R.string.new_version_s, version.name))
+			appendLine()
+			append(activity.getString(R.string.size_s, FileSize.BYTES.format(activity, version.apkSize)))
+			appendLine()
+			appendLine()
+			append(version.description)
+		}
 		MaterialAlertDialogBuilder(activity)
 			.setTitle(R.string.app_update_available)
-			.setMessage(buildString {
-				append(activity.getString(R.string.new_version_s, version.name))
-				appendLine()
-				append(
-					activity.getString(
-						R.string.size_s,
-						FileSize.BYTES.format(activity, version.apkSize),
-					)
-				)
-				appendLine()
-				appendLine()
-				append(version.description)
-			})
+			.setMessage(message)
 			.setPositiveButton(R.string.download) { _, _ ->
 				activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(version.apkUrl)))
 			}
 			.setNegativeButton(R.string.close, null)
+			.setCancelable(false)
 			.create()
 			.show()
 	}
@@ -128,4 +125,4 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
index 92fee1db9..4f695b154 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardDialogFragment.kt
@@ -18,8 +18,10 @@ import org.koitharu.kotatsu.utils.ext.observeNotNull
 import org.koitharu.kotatsu.utils.ext.showAllowStateLoss
 import org.koitharu.kotatsu.utils.ext.withArgs
 
-class OnboardDialogFragment : AlertDialogFragment<DialogOnboardBinding>(),
-	OnListItemClickListener<SourceLocale>, DialogInterface.OnClickListener {
+class OnboardDialogFragment :
+	AlertDialogFragment<DialogOnboardBinding>(),
+	OnListItemClickListener<SourceLocale>,
+	DialogInterface.OnClickListener {
 
 	private val viewModel by viewModel<OnboardViewModel>()
 	private var isWelcome: Boolean = false
diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
index f2a929017..2f1495243 100644
--- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt
@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.settings.onboard
 import androidx.collection.ArraySet
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.MutableLiveData
-import java.util.*
 import org.koitharu.kotatsu.base.ui.BaseViewModel
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.parsers.model.MangaSource
@@ -12,6 +11,7 @@ import org.koitharu.kotatsu.parsers.util.toTitleCase
 import org.koitharu.kotatsu.settings.onboard.model.SourceLocale
 import org.koitharu.kotatsu.utils.ext.map
 import org.koitharu.kotatsu.utils.ext.mapToSet
+import java.util.*
 
 class OnboardViewModel(
 	private val settings: AppSettings,
@@ -55,6 +55,7 @@ class OnboardViewModel(
 		settings.hiddenSources = allSources.filterNot { x ->
 			x.locale in selectedLocales
 		}.mapToSet { x -> x.name }
+		settings.markKnownSources(settings.newSources)
 	}
 
 	private fun rebuildList() {

From fdd4f5abcaee4d2a420550d4bc18b71ead5f5105 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 5 May 2022 15:51:30 +0300
Subject: [PATCH 084/104] Fix bottom sheet navbar color

---
 app/src/main/res/values-v27/styles.xml | 7 +++++++
 app/src/main/res/values/styles.xml     | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-v27/styles.xml

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..0f361cb7f
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
+		<item name="android:navigationBarColor">?colorSurfaceVariant</item>
+		<item name="android:windowLightNavigationBar">true</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2333f5d68..772a54b02 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,7 +23,6 @@
 	<!-- Bottom sheet -->
 
 	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
-		<item name="android:navigationBarColor">?colorSurfaceVariant</item>
 	</style>
 
 	<!-- Widget styles -->

From 23e7aa2aaa80ac848837a4fb0b7d4f3a5d9929e6 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 5 May 2022 15:57:05 +0300
Subject: [PATCH 085/104] Fix images scale type

---
 .../org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt     | 2 ++
 .../koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt | 2 ++
 .../org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt     | 2 ++
 .../java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt  | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
index ced1697b0..c7196e37c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaGridItemAD.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.list.ui.adapter
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import coil.request.Disposable
+import coil.size.Scale
 import coil.util.CoilUtils
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -43,6 +44,7 @@ fun mangaGridItemAD(
 			.fallback(R.drawable.ic_placeholder)
 			.error(R.drawable.ic_placeholder)
 			.allowRgb565(true)
+			.scale(Scale.FILL)
 			.lifecycle(lifecycleOwner)
 			.enqueueWith(coil)
 		badge = itemView.bindBadge(badge, item.counter)
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
index 10e9a473d..b265c0442 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListDetailedItemAD.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.list.ui.adapter
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import coil.request.Disposable
+import coil.size.Scale
 import coil.util.CoilUtils
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -44,6 +45,7 @@ fun mangaListDetailedItemAD(
 			.placeholder(R.drawable.ic_placeholder)
 			.fallback(R.drawable.ic_placeholder)
 			.error(R.drawable.ic_placeholder)
+			.scale(Scale.FILL)
 			.allowRgb565(true)
 			.lifecycle(lifecycleOwner)
 			.enqueueWith(coil)
diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
index 18696de6b..19dc24779 100644
--- a/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/adapter/MangaListItemAD.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.list.ui.adapter
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import coil.request.Disposable
+import coil.size.Scale
 import coil.util.CoilUtils
 import com.google.android.material.badge.BadgeDrawable
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
@@ -44,6 +45,7 @@ fun mangaListItemAD(
 			.placeholder(R.drawable.ic_placeholder)
 			.fallback(R.drawable.ic_placeholder)
 			.error(R.drawable.ic_placeholder)
+			.scale(Scale.FILL)
 			.allowRgb565(true)
 			.lifecycle(lifecycleOwner)
 			.enqueueWith(coil)
diff --git a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
index 74e5468b9..000ff5399 100644
--- a/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/tracker/ui/adapter/FeedItemAD.kt
@@ -3,6 +3,7 @@ package org.koitharu.kotatsu.tracker.ui.adapter
 import androidx.lifecycle.LifecycleOwner
 import coil.ImageLoader
 import coil.request.Disposable
+import coil.size.Scale
 import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
@@ -34,6 +35,7 @@ fun feedItemAD(
 			.fallback(R.drawable.ic_placeholder)
 			.error(R.drawable.ic_placeholder)
 			.allowRgb565(true)
+			.scale(Scale.FILL)
 			.lifecycle(lifecycleOwner)
 			.enqueueWith(coil)
 		binding.textViewTitle.text = item.title

From b759f8d0a0ac02e75c65d9acda031c6c4e3616a1 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Thu, 5 May 2022 16:46:44 +0300
Subject: [PATCH 086/104] Fix pages filename #151

---
 .../kotatsu/base/domain/MangaUtils.kt         |  9 ++++
 .../kotatsu/reader/ui/PageSaveHelper.kt       | 47 +++++++++++++------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
index 09a970eee..03b0dd53b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/domain/MangaUtils.kt
@@ -15,6 +15,7 @@ import org.koitharu.kotatsu.core.parser.MangaRepository
 import org.koitharu.kotatsu.parsers.model.MangaPage
 import org.koitharu.kotatsu.parsers.util.await
 import org.koitharu.kotatsu.parsers.util.medianOrNull
+import java.io.File
 import java.io.InputStream
 import java.util.zip.ZipFile
 
@@ -59,6 +60,14 @@ object MangaUtils : KoinComponent {
 		}
 	}
 
+	suspend fun getImageMimeType(file: File): String? = runInterruptible(Dispatchers.IO) {
+		val options = BitmapFactory.Options().apply {
+			inJustDecodeBounds = true
+		}
+		BitmapFactory.decodeFile(file.path, options)?.recycle()
+		options.outMimeType
+	}
+
 	private fun getBitmapSize(input: InputStream?): Size {
 		val options = BitmapFactory.Options().apply {
 			inJustDecodeBounds = true
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
index a2d8f7ac5..3e19c7036 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/PageSaveHelper.kt
@@ -2,19 +2,26 @@ package org.koitharu.kotatsu.reader.ui
 
 import android.content.Context
 import android.net.Uri
+import android.webkit.MimeTypeMap
 import androidx.activity.result.ActivityResultLauncher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runInterruptible
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okio.IOException
+import org.koitharu.kotatsu.base.domain.MangaUtils
 import org.koitharu.kotatsu.local.data.PagesCache
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.parsers.util.toFileNameSafe
 import org.koitharu.kotatsu.reader.domain.PageLoader
+import java.io.File
 import kotlin.coroutines.Continuation
-import kotlin.coroutines.coroutineContext
 import kotlin.coroutines.resume
 
+private const val MAX_FILENAME_LENGTH = 10
+private const val EXTENSION_FALLBACK = "png"
+
 class PageSaveHelper(
 	private val cache: PagesCache,
 	context: Context,
@@ -28,22 +35,17 @@ class PageSaveHelper(
 		page: MangaPage,
 		saveLauncher: ActivityResultLauncher<String>,
 	): Uri {
-		var pageFile = cache[page.url]
-		var fileName = pageFile?.name
-		if (fileName == null) {
-			fileName = pageLoader.getPageUrl(page).toHttpUrl().pathSegments.last()
-		}
-		val cc = coroutineContext
-		val destination = suspendCancellableCoroutine<Uri> { cont ->
-			continuation = cont
-			Dispatchers.Main.dispatch(cc) {
-				saveLauncher.launch(fileName)
+		val pageUrl = pageLoader.getPageUrl(page)
+		val pageFile = pageLoader.loadPage(page, force = false)
+		val proposedName = getProposedFileName(pageUrl, pageFile)
+		val destination = withContext(Dispatchers.Main) {
+			suspendCancellableCoroutine<Uri> { cont ->
+				continuation = cont
+				saveLauncher.launch(proposedName)
+			}.also {
+				continuation = null
 			}
 		}
-		continuation = null
-		if (pageFile == null) {
-			pageFile = pageLoader.loadPage(page, force = false)
-		}
 		runInterruptible(Dispatchers.IO) {
 			contentResolver.openOutputStream(destination)?.use { output ->
 				pageFile.inputStream().use { input ->
@@ -57,4 +59,19 @@ class PageSaveHelper(
 	fun onActivityResult(uri: Uri): Boolean = continuation?.apply {
 		resume(uri)
 	} != null
+
+	private suspend fun getProposedFileName(url: String, file: File): String {
+		var name = url.toHttpUrl().pathSegments.last()
+		var extension = name.substringAfterLast('.', "")
+		name = name.substringBeforeLast('.')
+		if (extension.length !in 2..4) {
+			val mimeType = MangaUtils.getImageMimeType(file)
+			extension = if (mimeType != null) {
+				MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType) ?: EXTENSION_FALLBACK
+			} else {
+				EXTENSION_FALLBACK
+			}
+		}
+		return name.toFileNameSafe().take(MAX_FILENAME_LENGTH) + "." + extension
+	}
 }
\ No newline at end of file

From 878df24a642a8e9ff2aacdcad482b2c6814b26ff Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 6 May 2022 10:52:51 +0300
Subject: [PATCH 087/104] Add voice search

---
 .../koitharu/kotatsu/main/ui/MainActivity.kt  | 44 +++++++++++++-
 .../ui/suggestion/SearchSuggestionListener.kt |  2 +
 .../search/ui/widget/SearchEditText.kt        | 57 +++++++++++++++----
 .../kotatsu/utils/VoiceInputContract.kt       | 26 +++++++++
 .../koitharu/kotatsu/utils/ext/AndroidExt.kt  | 19 ++++++-
 app/src/main/res/drawable/ic_voice_input.xml  |  9 +++
 .../res/layout-w720dp-land/activity_main.xml  |  3 +-
 app/src/main/res/layout/activity_main.xml     |  2 +-
 app/src/main/res/values/styles.xml            |  1 +
 9 files changed, 148 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/utils/VoiceInputContract.kt
 create mode 100644 app/src/main/res/drawable/ic_voice_input.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
index 24805aa84..1d635173d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt
@@ -7,8 +7,10 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
+import androidx.activity.result.ActivityResultCallback
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.view.ActionMode
+import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.*
@@ -17,7 +19,10 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
 import androidx.lifecycle.lifecycleScope
+import androidx.transition.TransitionManager
+import com.google.android.material.R as materialR
 import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.AppBarLayout.LayoutParams.*
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
@@ -55,8 +60,8 @@ import org.koitharu.kotatsu.suggestions.ui.SuggestionsFragment
 import org.koitharu.kotatsu.suggestions.ui.SuggestionsWorker
 import org.koitharu.kotatsu.tracker.ui.FeedFragment
 import org.koitharu.kotatsu.tracker.work.TrackWorker
+import org.koitharu.kotatsu.utils.VoiceInputContract
 import org.koitharu.kotatsu.utils.ext.*
-import com.google.android.material.R as materialR
 
 private const val TAG_PRIMARY = "primary"
 private const val TAG_SEARCH = "search"
@@ -75,6 +80,7 @@ class MainActivity :
 	private lateinit var navHeaderBinding: NavigationHeaderBinding
 	private var drawerToggle: ActionBarDrawerToggle? = null
 	private var drawer: DrawerLayout? = null
+	private val voiceInputLauncher = registerForActivityResult(VoiceInputContract(), VoiceInputCallback())
 
 	override val appBar: AppBarLayout
 		get() = binding.appbar
@@ -119,6 +125,7 @@ class MainActivity :
 		}
 
 		binding.fab.setOnClickListener(this@MainActivity)
+		binding.searchView.isVoiceSearchEnabled = voiceInputLauncher.resolve(this, null) != null
 
 		supportFragmentManager.findFragmentByTag(TAG_PRIMARY)?.let {
 			if (it is HistoryListFragment) binding.fab.show() else binding.fab.hide()
@@ -277,6 +284,19 @@ class MainActivity :
 		searchSuggestionViewModel.onQueryChanged(query)
 	}
 
+	override fun onVoiceSearchClick() {
+		val options = binding.searchView.drawableEnd?.bounds?.let { bounds ->
+			ActivityOptionsCompat.makeScaleUpAnimation(
+				binding.searchView,
+				bounds.centerX(),
+				bounds.centerY(),
+				bounds.width(),
+				bounds.height(),
+			)
+		}
+		voiceInputLauncher.tryLaunch(binding.searchView.hint?.toString(), options)
+	}
+
 	override fun onClearSearchHistory() {
 		MaterialAlertDialogBuilder(this)
 			.setTitle(R.string.clear_search_history)
@@ -373,13 +393,26 @@ class MainActivity :
 	}
 
 	private fun onSearchOpened() {
+		TransitionManager.beginDelayedTransition(binding.appbar)
 		drawerToggle?.isDrawerIndicatorEnabled = false
+		binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> {
+			scrollFlags = SCROLL_FLAG_NO_SCROLL
+		}
+		binding.appbar.setBackgroundColor(getThemeColor(materialR.attr.colorSurfaceVariant))
+		binding.appbar.updatePadding(left = 0, right = 0)
 		adjustDrawerLock()
 		adjustFabVisibility(isSearchOpened = true)
 	}
 
 	private fun onSearchClosed() {
+		TransitionManager.beginDelayedTransition(binding.appbar)
 		drawerToggle?.isDrawerIndicatorEnabled = true
+		binding.toolbarCard.updateLayoutParams<AppBarLayout.LayoutParams> {
+			scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS
+		}
+		binding.appbar.background = null
+		val padding = resources.getDimensionPixelOffset(R.dimen.margin_normal)
+		binding.appbar.updatePadding(left = padding, right = padding)
 		adjustDrawerLock()
 		adjustFabVisibility(isSearchOpened = false)
 	}
@@ -427,4 +460,13 @@ class MainActivity :
 			if (isLocked) DrawerLayout.LOCK_MODE_LOCKED_CLOSED else DrawerLayout.LOCK_MODE_UNLOCKED
 		)
 	}
+
+	private inner class VoiceInputCallback : ActivityResultCallback<String?> {
+
+		override fun onActivityResult(result: String?) {
+			if (result != null) {
+				binding.searchView.query = result
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
index 9a942009b..ea9dfd6f2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionListener.kt
@@ -14,4 +14,6 @@ interface SearchSuggestionListener {
 	fun onClearSearchHistory()
 
 	fun onTagClick(tag: MangaTag)
+
+	fun onVoiceSearchClick()
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
index 07e24ca16..261648fce 100644
--- a/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
@@ -2,15 +2,20 @@ package org.koitharu.kotatsu.search.ui.widget
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.os.Parcelable
 import android.util.AttributeSet
 import android.view.KeyEvent
 import android.view.MotionEvent
+import android.view.SoundEffectConstants
+import android.view.accessibility.AccessibilityEvent
 import android.view.inputmethod.EditorInfo
 import androidx.annotation.AttrRes
 import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.content.ContextCompat
-import com.google.android.material.R
+import com.google.android.material.R as materialR
+import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
+import org.koitharu.kotatsu.utils.ext.drawableEnd
 import org.koitharu.kotatsu.utils.ext.drawableStart
 
 private const val DRAWABLE_END = 2
@@ -18,11 +23,19 @@ private const val DRAWABLE_END = 2
 class SearchEditText @JvmOverloads constructor(
 	context: Context,
 	attrs: AttributeSet? = null,
-	@AttrRes defStyleAttr: Int = R.attr.editTextStyle,
+	@AttrRes defStyleAttr: Int = materialR.attr.editTextStyle,
 ) : AppCompatEditText(context, attrs, defStyleAttr) {
 
 	var searchSuggestionListener: SearchSuggestionListener? = null
-	private val clearIcon = ContextCompat.getDrawable(context, R.drawable.abc_ic_clear_material)
+	private val clearIcon = ContextCompat.getDrawable(context, materialR.drawable.abc_ic_clear_material)
+	private val voiceIcon = ContextCompat.getDrawable(context, R.drawable.ic_voice_input)
+	private var isEmpty = text.isNullOrEmpty()
+
+	var isVoiceSearchEnabled: Boolean = false
+		set(value) {
+			field = value
+			updateActionIcon()
+		}
 
 	var query: String
 		get() = text?.trim()?.toString().orEmpty()
@@ -57,15 +70,19 @@ class SearchEditText @JvmOverloads constructor(
 		lengthAfter: Int,
 	) {
 		super.onTextChanged(text, start, lengthBefore, lengthAfter)
-		setCompoundDrawablesRelativeWithIntrinsicBounds(
-			drawableStart,
-			null,
-			if (text.isNullOrEmpty()) null else clearIcon,
-			null,
-		)
+		val empty = text.isNullOrEmpty()
+		if (isEmpty != empty) {
+			isEmpty = empty
+			updateActionIcon()
+		}
 		searchSuggestionListener?.onQueryChanged(query)
 	}
 
+	override fun onRestoreInstanceState(state: Parcelable?) {
+		super.onRestoreInstanceState(state)
+		updateActionIcon()
+	}
+
 	@SuppressLint("ClickableViewAccessibility")
 	override fun onTouchEvent(event: MotionEvent): Boolean {
 		if (event.action == MotionEvent.ACTION_UP) {
@@ -76,7 +93,9 @@ class SearchEditText @JvmOverloads constructor(
 				event.x.toInt() in (width - drawable.bounds.width() - paddingRight)..(width - paddingRight)
 			}
 			if (isOnDrawable) {
-				text?.clear()
+				sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED)
+				playSoundEffect(SoundEffectConstants.CLICK)
+				onActionIconClick()
 				return true
 			}
 		}
@@ -87,4 +106,22 @@ class SearchEditText @JvmOverloads constructor(
 		super.clearFocus()
 		text?.clear()
 	}
+
+	private fun onActionIconClick() {
+		when {
+			!text.isNullOrEmpty() -> text?.clear()
+			isVoiceSearchEnabled -> searchSuggestionListener?.onVoiceSearchClick()
+		}
+	}
+
+	private fun updateActionIcon() {
+		val icon = when {
+			!text.isNullOrEmpty() -> clearIcon
+			isVoiceSearchEnabled -> voiceIcon
+			else -> null
+		}
+		if (icon !== drawableEnd) {
+			setCompoundDrawablesRelativeWithIntrinsicBounds(drawableStart, null, icon, null)
+		}
+	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/VoiceInputContract.kt b/app/src/main/java/org/koitharu/kotatsu/utils/VoiceInputContract.kt
new file mode 100644
index 000000000..e95e0fb96
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/VoiceInputContract.kt
@@ -0,0 +1,26 @@
+package org.koitharu.kotatsu.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.speech.RecognizerIntent
+import androidx.activity.result.contract.ActivityResultContract
+
+class VoiceInputContract : ActivityResultContract<String?, String?>() {
+
+	override fun createIntent(context: Context, input: String?): Intent {
+		val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
+		intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+		intent.putExtra(RecognizerIntent.EXTRA_PROMPT, input)
+		return intent
+	}
+
+	override fun parseResult(resultCode: Int, intent: Intent?): String? {
+		return if (resultCode == Activity.RESULT_OK && intent != null) {
+			val matches = intent.getStringArrayExtra(RecognizerIntent.EXTRA_RESULTS)
+			matches?.firstOrNull()
+		} else {
+			null
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
index 733bf17d4..6f15f7cd3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/ext/AndroidExt.kt
@@ -1,14 +1,17 @@
 package org.koitharu.kotatsu.utils.ext
 
 import android.content.Context
+import android.content.pm.ResolveInfo
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkRequest
 import android.net.Uri
 import android.os.Build
+import androidx.activity.result.ActivityResultLauncher
+import androidx.core.app.ActivityOptionsCompat
 import androidx.work.CoroutineWorker
-import kotlin.coroutines.resume
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
 
 val Context.connectivityManager: ConnectivityManager
 	get() = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
@@ -40,4 +43,16 @@ fun String.toUriOrNull() = if (isEmpty()) null else Uri.parse(this)
 suspend fun CoroutineWorker.trySetForeground(): Boolean = runCatching {
 	val info = getForegroundInfo()
 	setForeground(info)
-}.isSuccess
\ No newline at end of file
+}.isSuccess
+
+fun <I> ActivityResultLauncher<I>.resolve(context: Context, input: I): ResolveInfo? {
+	val pm = context.packageManager
+	val intent = contract.createIntent(context, input)
+	return pm.resolveActivity(intent, 0)
+}
+
+fun <I> ActivityResultLauncher<I>.tryLaunch(input: I, options: ActivityOptionsCompat? = null): Boolean {
+	return runCatching {
+		launch(input, options)
+	}.isSuccess
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_voice_input.xml b/app/src/main/res/drawable/ic_voice_input.xml
new file mode 100644
index 000000000..ab46188aa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_voice_input.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:height="24dp"
+	android:width="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path android:fillColor="#000" android:pathData="M17.3,11C17.3,14 14.76,16.1 12,16.1C9.24,16.1 6.7,14 6.7,11H5C5,14.41 7.72,17.23 11,17.72V21H13V17.72C16.28,17.23 19,14.41 19,11M10.8,4.9C10.8,4.24 11.34,3.7 12,3.7C12.66,3.7 13.2,4.24 13.2,4.9L13.19,11.1C13.19,11.76 12.66,12.3 12,12.3C11.34,12.3 10.8,11.76 10.8,11.1M12,14A3,3 0 0,0 15,11V5A3,3 0 0,0 12,2A3,3 0 0,0 9,5V11A3,3 0 0,0 12,14Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml
index 80a34cfb5..ee362d397 100644
--- a/app/src/main/res/layout-w720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w720dp-land/activity_main.xml
@@ -31,8 +31,9 @@
 			android:id="@+id/appbar"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingLeft="16dp"
 			android:background="@null"
+			android:clipToPadding="false"
+			android:paddingLeft="16dp"
 			android:paddingRight="16dp"
 			app:elevation="0dp"
 			app:liftOnScroll="false">
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1366af2c4..43361b15b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,6 +23,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:background="@null"
+			android:clipToPadding="false"
 			android:paddingLeft="16dp"
 			android:paddingRight="16dp"
 			android:stateListAnimator="@null">
@@ -56,7 +57,6 @@
 						android:hint="@string/search_manga"
 						android:imeOptions="actionSearch"
 						android:importantForAutofill="no"
-						android:paddingBottom="1dp"
 						android:singleLine="true"
 						tools:drawableEnd="@drawable/abc_ic_clear_material" />
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2333f5d68..a1efd039d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,6 +39,7 @@
 	<style name="Widget.Kotatsu.SearchView" parent="@style/Widget.AppCompat.SearchView">
 		<item name="iconifiedByDefault">false</item>
 		<item name="searchIcon">@null</item>
+		<item name="hintTextAppearance">?textAppearanceBodyMedium</item>
 		<item name="queryBackground">@null</item>
 		<item name="android:textColorHint">?attr/colorControlNormal</item>
 		<item name="android:textSize">18sp</item>

From 45b42ad5bdd369e78bf35b1ff1f3c5c930983142 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 6 May 2022 12:57:37 +0300
Subject: [PATCH 088/104] Revert "Fix bottom sheet navbar color"

This reverts commit fdd4f5abcaee4d2a420550d4bc18b71ead5f5105.
---
 app/src/main/res/values-v27/styles.xml | 7 -------
 app/src/main/res/values/styles.xml     | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 app/src/main/res/values-v27/styles.xml

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
deleted file mode 100644
index 0f361cb7f..000000000
--- a/app/src/main/res/values-v27/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
-		<item name="android:navigationBarColor">?colorSurfaceVariant</item>
-		<item name="android:windowLightNavigationBar">true</item>
-	</style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 772a54b02..2333f5d68 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,7 @@
 	<!-- Bottom sheet -->
 
 	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
+		<item name="android:navigationBarColor">?colorSurfaceVariant</item>
 	</style>
 
 	<!-- Widget styles -->

From 2709d40fc0a7ce4ff4624529a354e5f54a0e79a1 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 6 May 2022 13:51:55 +0300
Subject: [PATCH 089/104] Fix BottomSheet edge-to-edge mode

---
 .idea/deploymentTargetDropDown.xml            | 21 ++++++++++++++
 .../kotatsu/base/ui/BaseBottomSheet.kt        |  7 +++--
 .../base/ui/dialog/AppBottomSheetDialog.kt    | 29 +++++++++++++++++++
 .../utils/BottomSheetToolbarController.kt     |  5 ++--
 app/src/main/res/values-v27/styles.xml        |  7 +++++
 app/src/main/res/values/styles.xml            |  4 +--
 6 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
 create mode 100644 app/src/main/res/values-v27/styles.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 27370aa28..4b6850667 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -13,5 +13,26 @@
       </Target>
     </targetSelectedWithDropDown>
     <timeTargetWasSelectedWithDropDown value="2021-02-19T19:02:37.198775Z" />
+    <multipleDevicesSelectedInDropDown value="true" />
+    <runningDeviceTargetsSelectedWithDialog>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="QV7209UC8G" />
+          </Key>
+        </deviceKey>
+      </Target>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="EP73080091" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetsSelectedWithDialog>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
index 0672b880f..75503afc5 100644
--- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt
@@ -9,11 +9,12 @@ import android.view.ViewGroup.LayoutParams
 import androidx.appcompat.app.AppCompatDialog
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
-import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog
+import com.google.android.material.R as materialR
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 
@@ -43,7 +44,9 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
 		return if (resources.getBoolean(R.bool.is_tablet)) {
 			AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
-		} else super.onCreateDialog(savedInstanceState)
+		} else {
+			AppBottomSheetDialog(requireContext(), theme)
+		}
 	}
 
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
new file mode 100644
index 000000000..d3b911ace
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.base.ui.dialog
+
+import android.content.Context
+import android.graphics.Color
+import android.view.View
+import com.google.android.material.bottomsheet.BottomSheetDialog
+
+class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(context, theme) {
+
+	/**
+	 * https://github.com/material-components/material-components-android/issues/2582
+	 */
+	@Suppress("DEPRECATION")
+	override fun onAttachedToWindow() {
+		val window = window
+		val initialSystemUiVisibility = window?.decorView?.systemUiVisibility ?: 0
+		super.onAttachedToWindow()
+		if (window != null) {
+			// If the navigation bar is translucent at all, the BottomSheet should be edge to edge
+			val drawEdgeToEdge = edgeToEdgeEnabled && Color.alpha(window.navigationBarColor) < 0xFF
+			if (drawEdgeToEdge) {
+				// Copied from super.onAttachedToWindow:
+				val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+				// Fix super-class's window flag bug by respecting the intial system UI visibility:
+				window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt b/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt
index 17d62d3a3..ae40b41f6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/utils/BottomSheetToolbarController.kt
@@ -2,15 +2,16 @@ package org.koitharu.kotatsu.utils
 
 import android.view.View
 import androidx.appcompat.widget.Toolbar
-import com.google.android.material.R as materialR
 import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.R as materialR
 
 open class BottomSheetToolbarController(
 	protected val toolbar: Toolbar,
 ) : BottomSheetBehavior.BottomSheetCallback() {
 
 	override fun onStateChanged(bottomSheet: View, newState: Int) {
-		if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+		val isExpanded = newState == BottomSheetBehavior.STATE_EXPANDED && bottomSheet.top <= 0
+		if (isExpanded) {
 			toolbar.setNavigationIcon(materialR.drawable.abc_ic_clear_material)
 		} else {
 			toolbar.navigationIcon = null
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..88dc7707b
--- /dev/null
+++ b/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.DayNight.BottomSheetDialog">
+		<item name="android:navigationBarColor">@color/navigation_bar_scrim</item>
+		<item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2333f5d68..d424cf260 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,8 +22,8 @@
 
 	<!-- Bottom sheet -->
 
-	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
-		<item name="android:navigationBarColor">?colorSurfaceVariant</item>
+	<style name="ThemeOverlay.Kotatsu.BottomSheetDialog" parent="ThemeOverlay.Material3.DayNight.BottomSheetDialog">
+		<item name="android:statusBarColor">@color/dim</item>
 	</style>
 
 	<!-- Widget styles -->

From de9c1017b3f7a7522c74fa84796dfd2f9e384f4c Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Fri, 6 May 2022 15:45:20 +0300
Subject: [PATCH 090/104] Update parsers

---
 .gitignore                         |  1 +
 .idea/deploymentTargetDropDown.xml | 38 ------------------------------
 app/build.gradle                   |  2 +-
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.gitignore b/.gitignore
index d4fcf16ce..3ba4daee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/kotlinScripting.xml
+/.idea/deploymentTargetDropDown.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 4b6850667..000000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_API_S.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-02-19T19:02:37.198775Z" />
-    <multipleDevicesSelectedInDropDown value="true" />
-    <runningDeviceTargetsSelectedWithDialog>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="QV7209UC8G" />
-          </Key>
-        </deviceKey>
-      </Target>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="EP73080091" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetsSelectedWithDialog>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index b04edbd11..e899f7b87 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,7 @@ android {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation('com.github.nv95:kotatsu-parsers:090ad4b256') {
+	implementation('com.github.nv95:kotatsu-parsers:b495e5e457') {
 		exclude group: 'org.json', module: 'json'
 	}
 

From a40322b2e7f86068a7a34d6bbea042f6449ed2c2 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 6 May 2022 16:53:55 +0300
Subject: [PATCH 091/104] Fix crash on first database initialization

---
 .../koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
index 35c52192c..6257a8456 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/db/DatabasePrePopulateCallback.kt
@@ -10,8 +10,8 @@ class DatabasePrePopulateCallback(private val resources: Resources) : RoomDataba
 
 	override fun onCreate(db: SupportSQLiteDatabase) {
 		db.execSQL(
-			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`) VALUES (?,?,?,?)",
-			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name)
+			"INSERT INTO favourite_categories (created_at, sort_key, title, `order`, track) VALUES (?,?,?,?,?)",
+			arrayOf(System.currentTimeMillis(), 1, resources.getString(R.string.read_later), SortOrder.NEWEST.name, 1)
 		)
 	}
 }
\ No newline at end of file

From 400a2b14f7b375186d357238f195b53c81a91c47 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 6 May 2022 16:54:41 +0300
Subject: [PATCH 092/104] Change a bit `preference_toggle_header` view

---
 .../res/layout/preference_toggle_header.xml   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/preference_toggle_header.xml b/app/src/main/res/layout/preference_toggle_header.xml
index f21e8604e..b1f816337 100644
--- a/app/src/main/res/layout/preference_toggle_header.xml
+++ b/app/src/main/res/layout/preference_toggle_header.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<androidx.constraintlayout.widget.ConstraintLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?android:windowBackground"
-	android:clipToPadding="false"
-	android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-	android:paddingTop="8dp"
-	android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:paddingBottom="8dp">
 
 	<com.google.android.material.card.MaterialCardView
+		style="@style/Widget.Material3.CardView.Filled"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="16dp"
+		android:layout_marginVertical="8dp"
+		app:cardCornerRadius="24dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -22,7 +26,7 @@
 			android:clipToPadding="false"
 			android:gravity="center_vertical"
 			android:minHeight="?android:attr/listPreferredItemHeightSmall"
-			android:padding="8dp">
+			android:padding="16dp">
 
 			<LinearLayout
 				android:layout_width="0dp"
@@ -34,7 +38,9 @@
 					android:id="@android:id/title"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:textAppearance="?android:attr/textAppearanceListItem" />
+					android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+					android:textSize="20sp"
+					tools:text="Title"/>
 
 				<TextView
 					android:id="@android:id/summary"
@@ -43,8 +49,8 @@
 					android:layout_height="wrap_content"
 					android:layout_gravity="start"
 					android:maxLines="10"
-					android:textAlignment="viewStart"
-					android:textColor="?android:attr/textColorSecondary" />
+					android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+					tools:text="Subtitle"/>
 
 			</LinearLayout>
 
@@ -61,4 +67,4 @@
 
 	</com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

From fa150e45ff65b2f935cb04685b7e5391fc92bd59 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 6 May 2022 20:15:29 +0300
Subject: [PATCH 093/104] [Issue template] Update version

---
 .github/ISSUE_TEMPLATE/report_issue.yml    | 4 ++--
 .github/ISSUE_TEMPLATE/request_feature.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
index 69983d414..97aa936c3 100644
--- a/.github/ISSUE_TEMPLATE/report_issue.yml
+++ b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -44,7 +44,7 @@ body:
           label: Kotatsu version
           description: You can find your Kotatsu version in **Settings → About**.
           placeholder: |
-              Example: "3.2"
+              Example: "3.2.2"
       validations:
           required: true
 
@@ -87,7 +87,7 @@ body:
                 required: true
               - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
                 required: true
-              - label: I have updated the app to version **[3.2](https://github.com/nv95/Kotatsu/releases/latest)**.
+              - label: I have updated the app to version **[3.2.2](https://github.com/nv95/Kotatsu/releases/latest)**.
                 required: true
               - label: I will fill out all of the requested information in this form.
                 required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
index a46a0648f..2077efe27 100644
--- a/.github/ISSUE_TEMPLATE/request_feature.yml
+++ b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -33,7 +33,7 @@ body:
                 required: true
               - label: If this is an issue with a source, I should be opening an issue in the [parsers repository](https://github.com/nv95/kotatsu-parsers/issues/new).
                 required: true
-              - label: I have updated the app to version **[3.2](https://github.com/nv95/Kotatsu/releases/latest)**.
+              - label: I have updated the app to version **[3.2.2](https://github.com/nv95/Kotatsu/releases/latest)**.
                 required: true
               - label: I will fill out all of the requested information in this form.
                 required: true
\ No newline at end of file

From 930819ffa2084eed7288f4ca29f4bfcc481787a4 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Fri, 6 May 2022 20:59:43 +0300
Subject: [PATCH 094/104] Fix setting tracker on favourites screen

---
 .../kotatsu/favourites/ui/FavouritesContainerFragment.kt     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index 4433f978d..45cbba17a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -150,6 +150,10 @@ class FavouritesContainerFragment :
 			menuItem.isChecked = item == category.order
 		}
 		submenu.setGroupCheckable(R.id.group_order, true, true)
+		menu.findItem(R.id.action_tracking)?.run {
+			isVisible = viewModel.isFavouritesTrackerEnabled
+			isChecked = category.isTrackingEnabled
+		}
 	}
 
 	private fun TabLayout.setTabsEnabled(enabled: Boolean) {
@@ -168,6 +172,7 @@ class FavouritesContainerFragment :
 				R.id.action_remove -> editDelegate.deleteCategory(category)
 				R.id.action_rename -> editDelegate.renameCategory(category)
 				R.id.action_create -> editDelegate.createCategory()
+				R.id.action_tracking -> viewModel.setCategoryTracking(category.id, !category.isTrackingEnabled)
 				R.id.action_order -> return@setOnMenuItemClickListener false
 				else -> {
 					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)

From 6405523232e25ecb2ea1cfb5c92b13b943d0ac67 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 7 May 2022 08:50:33 +0300
Subject: [PATCH 095/104] Fix CategoryListModel equals/hashcode

---
 .../kotatsu/favourites/ui/categories/CategoriesAdapter.kt    | 5 ++++-
 .../favourites/ui/categories/adapter/CategoryListModel.kt    | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
index e13b31e00..7a5620158 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesAdapter.kt
@@ -40,7 +40,10 @@ class CategoriesAdapter(
 			newItem: CategoryListModel,
 		): Any? = when {
 			oldItem is CategoryListModel.All && newItem is CategoryListModel.All -> Unit
-			else -> super.getChangePayload(oldItem, newItem)
+			oldItem is CategoryListModel.CategoryItem &&
+				newItem is CategoryListModel.CategoryItem &&
+				oldItem.category.title != newItem.category.title -> null
+			else -> Unit
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
index 8326f8617..899b73e1c 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryListModel.kt
@@ -45,6 +45,7 @@ sealed interface CategoryListModel : ListModel {
 			if (category.id != other.category.id) return false
 			if (category.title != other.category.title) return false
 			if (category.order != other.category.order) return false
+			if (category.isTrackingEnabled != other.category.isTrackingEnabled) return false
 
 			return true
 		}
@@ -53,6 +54,7 @@ sealed interface CategoryListModel : ListModel {
 			var result = category.id.hashCode()
 			result = 31 * result + category.title.hashCode()
 			result = 31 * result + category.order.hashCode()
+			result = 31 * result + category.isTrackingEnabled.hashCode()
 			return result
 		}
 	}

From 46fe2bb8ac1085ad2566588560abd1a2547b83f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Thu, 5 May 2022 16:12:41 +0200
Subject: [PATCH 096/104] Translated using Weblate (Turkish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (281 of 281 strings)

Co-authored-by: Oğuz Ersen <oguz@ersen.moe>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/tr/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-tr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ff48edbc1..2f2946ebf 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -278,4 +278,5 @@
     <string name="download_slowdown_summary">IP adresinizin engellenmesinden kaçınmanıza yardımcı olur</string>
     <string name="local_manga_processing">Kaydedilen manga işleme</string>
     <string name="hide">Gizle</string>
+    <string name="new_sources_text">Yeni manga kaynakları var</string>
 </resources>
\ No newline at end of file

From 9e706ea0961d2a8bea3caa93b911055ea0061e48 Mon Sep 17 00:00:00 2001
From: kuragehime <kuragehime641@gmail.com>
Date: Thu, 5 May 2022 16:12:41 +0200
Subject: [PATCH 097/104] Translated using Weblate (Japanese)

Currently translated at 100.0% (281 of 281 strings)

Co-authored-by: kuragehime <kuragehime641@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/ja/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-ja/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d6db95de8..99fb80a84 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -278,4 +278,5 @@
     <string name="parallel_downloads">並列ダウンロード</string>
     <string name="chapters_will_removed_background">チャプターはバックグラウンドで削除されます。時間がかかる場合があります</string>
     <string name="hide">隠す</string>
+    <string name="new_sources_text">新しいマンガソースが利用可能になりました</string>
 </resources>
\ No newline at end of file

From 4d5d25834ecc77fa2e8154951d26eba657e2df71 Mon Sep 17 00:00:00 2001
From: Dpper <ruslan20020401@gmail.com>
Date: Thu, 5 May 2022 16:12:42 +0200
Subject: [PATCH 098/104] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (281 of 281 strings)

Translated using Weblate (Ukrainian)

Currently translated at 100.0% (8 of 8 strings)

Added translation using Weblate (Ukrainian)

Added translation using Weblate (Ukrainian)

Co-authored-by: Dpper <ruslan20020401@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/plurals/uk/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/uk/
Translation: Kotatsu/Strings
Translation: Kotatsu/plurals
---
 app/src/main/res/values-uk/plurals.xml |  51 +++++
 app/src/main/res/values-uk/strings.xml | 282 +++++++++++++++++++++++++
 2 files changed, 333 insertions(+)
 create mode 100644 app/src/main/res/values-uk/plurals.xml
 create mode 100644 app/src/main/res/values-uk/strings.xml

diff --git a/app/src/main/res/values-uk/plurals.xml b/app/src/main/res/values-uk/plurals.xml
new file mode 100644
index 000000000..0ced943b7
--- /dev/null
+++ b/app/src/main/res/values-uk/plurals.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <plurals name="new_chapters">
+        <item quantity="one">%1$d новий розділ</item>
+        <item quantity="few">%1$d нових розділи</item>
+        <item quantity="many">%1$d нових розділів</item>
+        <item quantity="other">%1$d нових розділів</item>
+    </plurals>
+    <plurals name="minutes_ago">
+        <item quantity="one">%1$d хвилину тому</item>
+        <item quantity="few">%1$d хвилини тому</item>
+        <item quantity="many">%1$d хвилин тому</item>
+        <item quantity="other">%1$d хвилин тому</item>
+    </plurals>
+    <plurals name="pages">
+        <item quantity="one">Всього %1$d сторінка</item>
+        <item quantity="few">Всього %1$d сторінки</item>
+        <item quantity="many">Всього %1$d сторінок</item>
+        <item quantity="other">Всього %1$d сторінок</item>
+    </plurals>
+    <plurals name="hours_ago">
+        <item quantity="one">%1$d годину тому</item>
+        <item quantity="few">%1$d години тому</item>
+        <item quantity="many">%1$d годин тому</item>
+        <item quantity="other">%1$d годин тому</item>
+    </plurals>
+    <plurals name="days_ago">
+        <item quantity="one">%1$d день тому</item>
+        <item quantity="few">%1$d дні тому</item>
+        <item quantity="many">%1$d днів тому</item>
+        <item quantity="other">%1$d днів тому</item>
+    </plurals>
+    <plurals name="items">
+        <item quantity="one">%1$d елемент</item>
+        <item quantity="few">%1$d елементи</item>
+        <item quantity="many">%1$d елементів</item>
+        <item quantity="other">%1$d елементів</item>
+    </plurals>
+    <plurals name="chapters_from_x">
+        <item quantity="one">%1$d розділ із %2$d</item>
+        <item quantity="few">%1$d розділи з %2$d</item>
+        <item quantity="many">%1$d розділів із %2$d</item>
+        <item quantity="other">%1$d розділів із %2$d</item>
+    </plurals>
+    <plurals name="chapters">
+        <item quantity="one">%1$d розділ</item>
+        <item quantity="few">%1$d розділи</item>
+        <item quantity="many">%1$d розділів</item>
+        <item quantity="other">%1$d розділів</item>
+    </plurals>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 000000000..e476c3a7b
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="wait_for_loading_finish">Дочекайтеся завершення завантаження…</string>
+    <string name="delete">Видалити</string>
+    <string name="nothing_found">Нічого не знайдено</string>
+    <string name="add_to_favourites">Додати це до улюблених</string>
+    <string name="clear_history">Очистити історію</string>
+    <string name="history_is_empty">Історії ще немає</string>
+    <string name="add">Додати</string>
+    <string name="save">Зберегти</string>
+    <string name="local_storage">Локальне сховище</string>
+    <string name="network_error">Не вдалося підключитися до Інтернету</string>
+    <string name="details">Деталі</string>
+    <string name="try_again">Спробуйте ще раз</string>
+    <string name="open_menu">Відкрити меню</string>
+    <string name="you_have_not_favourites_yet">Улюблених ще немає</string>
+    <string name="add_new_category">Нова категорія</string>
+    <string name="enter_category_name">Введіть назву категорії</string>
+    <string name="download_complete">Завантажено</string>
+    <string name="favourites">Уподобання</string>
+    <string name="history">Історія</string>
+    <string name="error_occurred">Сталася помилка</string>
+    <string name="chapters">Розділи</string>
+    <string name="list">Список</string>
+    <string name="detailed_list">Детальний список</string>
+    <string name="list_mode">Режим списку</string>
+    <string name="settings">Налаштування</string>
+    <string name="remote_sources">Віддалені джерела</string>
+    <string name="loading_">Завантаження…</string>
+    <string name="computing_">Обчислення…</string>
+    <string name="chapter_d_of_d">Розділ %1$d із %2$d</string>
+    <string name="close">Закрити</string>
+    <string name="read">Читати</string>
+    <string name="grid">Таблиця</string>
+    <string name="share">Поділитися</string>
+    <string name="create_shortcut">Створити ярлик…</string>
+    <string name="share_s">Поділитися %s</string>
+    <string name="search">Пошук</string>
+    <string name="search_manga">Пошук манґи</string>
+    <string name="processing_">Обробка…</string>
+    <string name="by_name">Ім\'я</string>
+    <string name="popular">Популярна</string>
+    <string name="updated">Оновлена</string>
+    <string name="newest">Нова</string>
+    <string name="by_rating">Рейтинг</string>
+    <string name="sort_order">Порядок сортування</string>
+    <string name="filter">Фільтр</string>
+    <string name="theme">Тема</string>
+    <string name="light">Світла</string>
+    <string name="dark">Темна</string>
+    <string name="pages">Сторінки</string>
+    <string name="text_clear_history_prompt">Очистити всю історію читання перманентно\?</string>
+    <string name="remove">Видалити</string>
+    <string name="_s_removed_from_history">\"%s\" видалено з історії</string>
+    <string name="_s_deleted_from_local_storage">\"%s\" видалено з локального сховища</string>
+    <string name="save_page">Зберегти сторінку</string>
+    <string name="page_saved">Збережено</string>
+    <string name="share_image">Поділитись зображенням</string>
+    <string name="operation_not_supported">Ця операція не підтримується</string>
+    <string name="text_file_not_supported">Виберіть файл ZIP або CBZ.</string>
+    <string name="no_description">Немає опису</string>
+    <string name="history_and_cache">Історія та кеш</string>
+    <string name="clear_pages_cache">Очистити кеш сторінок</string>
+    <string name="cache">Кеш</string>
+    <string name="text_file_sizes">Б|кБ|МБ|ГБ|ТБ</string>
+    <string name="standard">Стандартний</string>
+    <string name="webtoon">Манхва</string>
+    <string name="read_mode">Режим читання</string>
+    <string name="grid_size">Розмір сітки</string>
+    <string name="search_on_s">Пошук по %s</string>
+    <string name="delete_manga">Видалити манґу</string>
+    <string name="text_delete_local_manga">Видалити \"%s\" з пристрою перманентно\?</string>
+    <string name="reader_settings">Налаштування читача</string>
+    <string name="switch_pages">Перегортання сторінок</string>
+    <string name="volume_buttons">Кнопки гучності</string>
+    <string name="cancelling_">Скасування…</string>
+    <string name="error">Помилка</string>
+    <string name="clear_thumbs_cache">Очистити кеш мініатюр</string>
+    <string name="clear_search_history">Очистити історію пошуку</string>
+    <string name="search_history_cleared">Очищено</string>
+    <string name="gestures_only">Тільки жести</string>
+    <string name="internal_storage">Внутрішнє сховище</string>
+    <string name="external_storage">Зовнішнє сховище</string>
+    <string name="domain">Домен</string>
+    <string name="application_update">Перевірити наявність нових версій додатка</string>
+    <string name="app_update_available">Доступна нова версія додатка</string>
+    <string name="large_manga_save_confirm">Ця манґа має %s. Зберегти все це\?</string>
+    <string name="save_manga">Зберегти</string>
+    <string name="notifications">Сповіщення</string>
+    <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Увімкнено %1$d з %2$d</string>
+    <string name="new_chapters">Нові розділи</string>
+    <string name="show_notification_new_chapters">Повідомляти про оновлення манґи, яку Ви читаєте</string>
+    <string name="download">Завантажити</string>
+    <string name="read_from_start">Читати з початку</string>
+    <string name="restart">Перезавантажити</string>
+    <string name="vibration">Вібрація</string>
+    <string name="favourites_categories">Улюблені категорії</string>
+    <string name="category_delete_confirm">Вилучити категорію \"%s\" зі своїх уподобань\?
+\nВся манґа в ній буде втрачена.</string>
+    <string name="remove_category">Видалити</string>
+    <string name="text_empty_holder_primary">Тут якось пусто…</string>
+    <string name="text_search_holder_secondary">Спробуйте переформулювати запит.</string>
+    <string name="text_history_holder_primary">Те, що ви читаєте, буде показано тут</string>
+    <string name="text_history_holder_secondary">Знайдіть, що читати, у бічному меню.</string>
+    <string name="text_local_holder_primary">Спочатку збережіть щось</string>
+    <string name="text_local_holder_secondary">Збережіть його з онлайн-джерела або імпортуйте файли.</string>
+    <string name="manga_shelf">Полиця</string>
+    <string name="recent_manga">Недавні</string>
+    <string name="pages_animation">Анімація перегортання</string>
+    <string name="manga_save_location">Папка для завантажень</string>
+    <string name="other_storage">Інше сховище</string>
+    <string name="done">Готово</string>
+    <string name="all_favourites">Усі улюблені</string>
+    <string name="favourites_category_empty">Порожня категорія</string>
+    <string name="read_later">Прочитати пізніше</string>
+    <string name="updates">Оновлення</string>
+    <string name="related">Схожі</string>
+    <string name="new_version_s">Нова версія: %s</string>
+    <string name="size_s">Розмір: %s</string>
+    <string name="waiting_for_network">Очікування мережі…</string>
+    <string name="clear_updates_feed">Очистити стрічку оновлень</string>
+    <string name="updates_feed_cleared">Очищено</string>
+    <string name="rotate_screen">Повернути екран</string>
+    <string name="update">Оновити</string>
+    <string name="feed_will_update_soon">Оновлення скоро почнеться</string>
+    <string name="track_sources">Стежити за оновленнями</string>
+    <string name="dont_check">Не перевіряти</string>
+    <string name="wrong_password">Неправильний пароль</string>
+    <string name="protect_application">Захистити додаток</string>
+    <string name="protect_application_summary">Запитувати пароль під час запуску Kotatsu</string>
+    <string name="repeat_password">Повторіть пароль</string>
+    <string name="passwords_mismatch">Паролі не співпадають</string>
+    <string name="about">Про програму</string>
+    <string name="app_version">Версія %s</string>
+    <string name="check_for_updates">Перевірити наявність оновлень</string>
+    <string name="checking_for_updates">Перевірка наявності оновлень…</string>
+    <string name="update_check_failed">Не вдалося перевірити оновлення</string>
+    <string name="no_update_available">Немає доступних оновлень</string>
+    <string name="prefer_rtl_reader">Віддавати перевагу читанню справа наліво (←)</string>
+    <string name="create_category">Нова категорія</string>
+    <string name="scale_mode">Режим масштабування</string>
+    <string name="zoom_mode_fit_center">Вмістити в екран</string>
+    <string name="zoom_mode_fit_height">Підігнати по висоті</string>
+    <string name="zoom_mode_fit_width">підігнати по ширині</string>
+    <string name="zoom_mode_keep_start">Вихідний розмір</string>
+    <string name="black_dark_theme">Чорна</string>
+    <string name="black_dark_theme_summary">Споживає менше енергії на екранах AMOLED</string>
+    <string name="restart_required">Потрібен перезапуск</string>
+    <string name="backup_restore">Резервне копіювання та відновлення</string>
+    <string name="data_restored">Відновлено</string>
+    <string name="preparing_">Підготовка…</string>
+    <string name="report_github">Створити проблему на GitHub</string>
+    <string name="file_not_found">Файл не знайдено</string>
+    <string name="data_restored_with_errors">Дані відновлено, але є деякі помилки</string>
+    <string name="backup_information">Ви можете створити резервну копію своєї історії та уподобань і відновити їх</string>
+    <string name="just_now">Тільки що</string>
+    <string name="tap_to_try_again">Торкніться, щоб спробувати ще раз</string>
+    <string name="reader_mode_hint">Обраний режим буде запам\'ятован для цієї манги</string>
+    <string name="captcha_required">Потрібна CAPTCHA</string>
+    <string name="captcha_solve">Пройти</string>
+    <string name="clear_cookies">Очистити кукі</string>
+    <string name="cookies_cleared">Всі кукі були видалені</string>
+    <string name="clear_feed">Очистити стрічку</string>
+    <string name="check_for_new_chapters">Перевірити нові розділи</string>
+    <string name="reverse">В зворотньому порядку</string>
+    <string name="sign_in">Увійти</string>
+    <string name="auth_required">Увійдіть, щоб переглянути цей вміст</string>
+    <string name="default_s">За замовчуванням: %s</string>
+    <string name="_and_x_more">...і ще %1$d</string>
+    <string name="next">Далі</string>
+    <string name="protect_application_subtitle">Введіть пароль для запуску програми</string>
+    <string name="confirm">Підтвердити</string>
+    <string name="password_length_hint">Пароль має містити 4 символи або більше</string>
+    <string name="search_only_on_s">Пошук лише на %s</string>
+    <string name="welcome">Ласкаво просимо</string>
+    <string name="backup_saved">Резервна копія збережена</string>
+    <string name="read_more">Докладніше</string>
+    <string name="queued">У черзі</string>
+    <string name="text_downloads_holder">Немає активних завантажень</string>
+    <string name="about_app_translation_summary">Допомогти з перекладом програми</string>
+    <string name="about_app_translation">Переклад</string>
+    <string name="about_feedback_4pda">Тема на 4PDA</string>
+    <string name="auth_complete">Авторизація виконана</string>
+    <string name="auth_not_supported_by">Вхід на %s не підтримується</string>
+    <string name="text_clear_cookies_prompt">Ви вийдете з усіх джерел</string>
+    <string name="state_finished">Завершена</string>
+    <string name="state_ongoing">Триває</string>
+    <string name="date_format">Формат дати</string>
+    <string name="exclude_nsfw_from_history">Виключити NSFW манґу з історії</string>
+    <string name="error_empty_name">Ви повинні ввести ім’я</string>
+    <string name="show_pages_numbers">Показувати номери сторінок</string>
+    <string name="enabled_sources">Включені джерела</string>
+    <string name="dynamic_theme_summary">Застосовує тему програми, засновану на палітрі кольорів шпалер на пристрої</string>
+    <string name="importing_progress">Імпорт манґи: %1$d з %2$d</string>
+    <string name="screenshots_policy">Політика щодо знімків екрана</string>
+    <string name="screenshots_allow">Дозволити</string>
+    <string name="suggestions_summary">Пропонувати манґу на основі ваших уподобань</string>
+    <string name="suggestions_info">Усі дані аналізуються локально на цьому пристрої. Передача ваших персональних даних у будь-які сервіси не здійснюється</string>
+    <string name="text_suggestion_holder">Почніть читати манґу, і ви отримаєте персоналізовані пропозиції</string>
+    <string name="enabled">Увімкнено</string>
+    <string name="disabled">Вимкнено</string>
+    <string name="reset_filter">Скинути фільтр</string>
+    <string name="find_genre">Знайти жанр</string>
+    <string name="onboard_text">Виберіть мови, якими ви хочете читати манґу. Це можливо змінити пізніше в налаштуваннях.</string>
+    <string name="only_using_wifi">Тільки по Wi-Fi</string>
+    <string name="preload_pages">Попереднє завантаження сторінок</string>
+    <string name="logged_in_as">Ви увійшли як %s</string>
+    <string name="nsfw">18+</string>
+    <string name="various_languages">Різні мови</string>
+    <string name="search_chapters">Знайти розділ</string>
+    <string name="chapters_empty">Немає розділів у цій манзі</string>
+    <string name="percent_string_pattern">%1$s%%</string>
+    <string name="content">Зміст</string>
+    <string name="suggestions_updating">Оновлення пропозицій</string>
+    <string name="text_delete_local_manga_batch">Видалити вибрані елементи з пристрою назавжди\?</string>
+    <string name="removal_completed">Видалення завершено</string>
+    <string name="batch_manga_save_confirm">Ви впевнені, що хочете завантажити всю вибрану манґу з усіма її розділами\? Це може споживати багато трафіку та пам’яті</string>
+    <string name="parallel_downloads">Завантажувати паралельно</string>
+    <string name="download_slowdown">Сповільнення завантаження</string>
+    <string name="local_manga_processing">Обробка збереженої манґи</string>
+    <string name="hide">Приховати</string>
+    <string name="new_sources_text">Доступні нові джерела манґи</string>
+    <string name="close_menu">Закрити меню</string>
+    <string name="manga_downloading_">Завантаження…</string>
+    <string name="clear">Очистити</string>
+    <string name="downloads">Завантаження</string>
+    <string name="automatic">Як в системі</string>
+    <string name="chapter_is_missing_text">Завантажте або прочитайте цей відсутній розділ онлайн.</string>
+    <string name="chapter_is_missing">Розділ відсутній</string>
+    <string name="about_feedback">Зворотній зв\'язок</string>
+    <string name="genres">Жанри</string>
+    <string name="system_default">За замовчуванням</string>
+    <string name="always">Завжди</string>
+    <string name="_continue">Продовжити</string>
+    <string name="_import">Імпорт</string>
+    <string name="taps_on_edges">Натискання по краях</string>
+    <string name="warning">Попередження</string>
+    <string name="network_consumption_warning">Це може призвести до витрати великої кількості трафіку</string>
+    <string name="dont_ask_again">Більше не питати</string>
+    <string name="notifications_settings">Налаштування сповіщень</string>
+    <string name="rename">Перейменувати</string>
+    <string name="show_notification_app_update">Показувати сповіщення, якщо доступна нова версія</string>
+    <string name="open_in_browser">Відкрити у веб-браузері</string>
+    <string name="not_available">Недоступно</string>
+    <string name="cannot_find_available_storage">Немає доступного сховища</string>
+    <string name="text_feed_holder">Нові розділи того, що ви читаєте, показано тут</string>
+    <string name="search_results">Результати пошуку</string>
+    <string name="enter_password">Введіть пароль</string>
+    <string name="notification_sound">Звук сповіщень</string>
+    <string name="light_indicator">Світлодіодний індикатор</string>
+    <string name="categories_">Категорії…</string>
+    <string name="text_categories_holder">Ви можете використовувати категорії для впорядкування своїх уподобань. Натисніть «+», щоб створити категорію</string>
+    <string name="yesterday">Учора</string>
+    <string name="right_to_left">Справа наліво (←)</string>
+    <string name="prefer_rtl_reader_summary">Режим читання можна налаштувати окремо для кожної серії</string>
+    <string name="create_backup">Створити резервну копію</string>
+    <string name="restore_backup">Відновити з резервної копії</string>
+    <string name="data_restored_success">Всі дані були відновлені</string>
+    <string name="group">Групувати</string>
+    <string name="today">Сьогодні</string>
+    <string name="silent">Без звуку</string>
+    <string name="long_ago">Давно</string>
+    <string name="chapters_checking_progress">Перевірка наявності нових розділів: %1$d з %2$d</string>
+    <string name="text_clear_updates_feed_prompt">Очистити всю історію оновлень назавжди\?</string>
+    <string name="tracker_warning">Деякі пристрої мають різну поведінку системи, що може порушити фонові завдання.</string>
+    <string name="text_clear_search_history_prompt">Видалити всі останні пошукові запити назавжди\?</string>
+    <string name="other">Інше</string>
+    <string name="available_sources">Доступні джерела</string>
+    <string name="dynamic_theme">Динамічна тема</string>
+    <string name="screenshots_block_nsfw">Блок на NSFW</string>
+    <string name="screenshots_block_all">Завжди блокувати</string>
+    <string name="suggestions">Пропозиції</string>
+    <string name="suggestions_enable">Увімкнути пропозиції</string>
+    <string name="exclude_nsfw_from_suggestions">Не пропонувати NSFW манґу</string>
+    <string name="filter_load_error">Не вдалося завантажити список жанрів</string>
+    <string name="never">Ніколи</string>
+    <string name="appearance">Зовнішній вигляд</string>
+    <string name="suggestions_excluded_genres">Виключити жанри</string>
+    <string name="suggestions_excluded_genres_summary">Укажіть жанри, які ви не хочете бачити в пропозиціях</string>
+    <string name="download_slowdown_summary">Допомагає уникнути блокування вашої IP-адреси</string>
+    <string name="chapters_will_removed_background">Розділи будуть видалені у фоновому режимі. Це може зайняти деякий час</string>
+</resources>
\ No newline at end of file

From f9281850ad46981a4a6a87ad6d87919af3516bf5 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Thu, 5 May 2022 16:12:42 +0200
Subject: [PATCH 099/104] Translated using Weblate (Finnish)

Currently translated at 99.6% (280 of 281 strings)

Translated using Weblate (French)

Currently translated at 100.0% (281 of 281 strings)

Translated using Weblate (Italian)

Currently translated at 100.0% (281 of 281 strings)

Translated using Weblate (German)

Currently translated at 100.0% (281 of 281 strings)

Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/de/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/it/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-de/strings.xml | 1 +
 app/src/main/res/values-fi/strings.xml | 1 +
 app/src/main/res/values-fr/strings.xml | 1 +
 app/src/main/res/values-it/strings.xml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 42fb3a9ee..49d08ac30 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -278,4 +278,5 @@
     <string name="download_slowdown_summary">Hilft, das Blockieren Ihrer IP-Adresse zu vermeiden</string>
     <string name="chapters_will_removed_background">Die Kapitel werden im Hintergrund entfernt. Das kann einige Zeit dauern</string>
     <string name="hide">Ausblenden</string>
+    <string name="new_sources_text">Neue Manga-Quellen sind verfügbar</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 69f9c193e..486e04471 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -278,4 +278,5 @@
     <string name="batch_manga_save_confirm">Oletko varma, että haluat ladata kaikki valitut mangat kaikkine lukuineen\? Tämä toiminto voi kuluttaa paljon liikennettä ja tallennustilaa</string>
     <string name="local_manga_processing">Tallennettujen mangojen käsittely</string>
     <string name="hide">Piilota</string>
+    <string name="new_sources_text">Uusia mangalähteitä on saatavilla</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 958794036..aeb8252f2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -278,4 +278,5 @@
     <string name="chapters_will_removed_background">Les chapitres seront supprimés en arrière-plan. Cela peut prendre un certain temps</string>
     <string name="local_manga_processing">Traitement des mangas sauvegardés</string>
     <string name="hide">Masquer</string>
+    <string name="new_sources_text">De nouvelles sources de mangas sont disponibles</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e6196111b..04f7b3d93 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -278,4 +278,5 @@
     <string name="chapters_will_removed_background">I capitoli saranno rimossi in sfondo. Può richiedere un po\' di tempo</string>
     <string name="download_slowdown_summary">Aiuta ad evitare il blocco del tuo indirizzo IP</string>
     <string name="hide">Nascondi</string>
+    <string name="new_sources_text">Sono disponibili nuove fonti di manga</string>
 </resources>
\ No newline at end of file

From b439e0c2c238f82710b7307a360293f95d343b03 Mon Sep 17 00:00:00 2001
From: Luiz-bro <luiznneto1@gmail.com>
Date: Thu, 5 May 2022 16:12:43 +0200
Subject: [PATCH 100/104] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (281 of 281 strings)

Co-authored-by: Luiz-bro <luiznneto1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/kotatsu/strings/pt_BR/
Translation: Kotatsu/Strings
---
 app/src/main/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 32910e0a3..d4a14e50f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -278,4 +278,5 @@
     <string name="local_manga_processing">Processamento de mangá salvo</string>
     <string name="chapters_will_removed_background">Os capítulos serão removidos em segundo plano. Pode levar algum tempo</string>
     <string name="parallel_downloads">Downloads paralelos</string>
+    <string name="new_sources_text">Novas fontes de mangá estão disponíveis</string>
 </resources>
\ No newline at end of file

From 03cbd8410fe693a7350f4a21f40a63c30f3533b4 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 7 May 2022 09:21:32 +0300
Subject: [PATCH 101/104] Remove travis.ci integration

---
 .travis.yml | 11 -----------
 README.md   |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 9cec1af6c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: android
-dist: trusty
-android:
-  components:
-    - android-30
-    - build-tools-30.0.3
-    - platform-tools-30.0.5
-    - tools
-before_install:
-  - yes | sdkmanager "platforms;android-30"
-script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug
\ No newline at end of file
diff --git a/README.md b/README.md
index b079e87af..cea436ae3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Kotatsu is a free and open source manga reader for Android.
 
-![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) [![Build Status](https://travis-ci.org/nv95/Kotatsu.svg?branch=master)](https://travis-ci.org/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
+![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) ![Kotlin](https://img.shields.io/github/languages/top/nv95/Kotatsu) ![License](https://img.shields.io/github/license/nv95/Kotatsu) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![4pda](https://img.shields.io/badge/discuss-4pda-2982CC)](http://4pda.ru/forum/index.php?showtopic=697669) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5)
 
 ### Download
 

From 2a97cb34d7121f2e4ab4ea1bb4b6dc92a0ea3700 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Sat, 7 May 2022 14:01:07 +0300
Subject: [PATCH 102/104] Change root view of `preference_toggle_header`

---
 .../res/layout/preference_toggle_header.xml   | 100 ++++++++----------
 1 file changed, 47 insertions(+), 53 deletions(-)

diff --git a/app/src/main/res/layout/preference_toggle_header.xml b/app/src/main/res/layout/preference_toggle_header.xml
index b1f816337..4b0ed9431 100644
--- a/app/src/main/res/layout/preference_toggle_header.xml
+++ b/app/src/main/res/layout/preference_toggle_header.xml
@@ -1,70 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:paddingBottom="8dp">
+	style="@style/Widget.Material3.CardView.Filled"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginHorizontal="16dp"
+	android:layout_marginVertical="8dp"
+	android:paddingBottom="8dp"
+	app:cardCornerRadius="24dp"
+	app:layout_constraintEnd_toEndOf="parent"
+	app:layout_constraintStart_toStartOf="parent"
+	app:layout_constraintTop_toTopOf="parent">
 
-	<com.google.android.material.card.MaterialCardView
-		style="@style/Widget.Material3.CardView.Filled"
+	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_marginHorizontal="16dp"
-		android:layout_marginVertical="8dp"
-		app:cardCornerRadius="24dp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent">
+		android:baselineAligned="false"
+		android:clipChildren="false"
+		android:clipToPadding="false"
+		android:gravity="center_vertical"
+		android:minHeight="?android:attr/listPreferredItemHeightSmall"
+		android:padding="16dp">
 
 		<LinearLayout
-			android:layout_width="match_parent"
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:baselineAligned="false"
-			android:clipChildren="false"
-			android:clipToPadding="false"
-			android:gravity="center_vertical"
-			android:minHeight="?android:attr/listPreferredItemHeightSmall"
-			android:padding="16dp">
+			android:layout_weight="1"
+			android:orientation="vertical">
 
-			<LinearLayout
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_weight="1"
-				android:orientation="vertical">
-
-				<TextView
-					android:id="@android:id/title"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
-					android:textSize="20sp"
-					tools:text="Title"/>
-
-				<TextView
-					android:id="@android:id/summary"
-					style="@style/PreferenceSummaryTextStyle"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:layout_gravity="start"
-					android:maxLines="10"
-					android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-					tools:text="Subtitle"/>
-
-			</LinearLayout>
-
-			<LinearLayout
-				android:id="@android:id/widget_frame"
+			<TextView
+				android:id="@android:id/title"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:gravity="end|center_vertical"
-				android:orientation="vertical"
-				android:paddingStart="16dp"
-				android:paddingEnd="0dp" />
+				android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+				android:textSize="20sp"
+				tools:text="Title" />
+
+			<TextView
+				android:id="@android:id/summary"
+				style="@style/PreferenceSummaryTextStyle"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="start"
+				android:maxLines="10"
+				android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+				tools:text="Subtitle" />
 
 		</LinearLayout>
 
-	</com.google.android.material.card.MaterialCardView>
+		<LinearLayout
+			android:id="@android:id/widget_frame"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="end|center_vertical"
+			android:orientation="vertical"
+			android:paddingStart="16dp"
+			android:paddingEnd="0dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+	</LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file

From 33ab7f4d9565d35247d6beb5858556bf14ea8d85 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 7 May 2022 15:06:17 +0300
Subject: [PATCH 103/104] Cleanup preference_toggle_header

---
 app/src/main/res/layout/preference_toggle_header.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/preference_toggle_header.xml b/app/src/main/res/layout/preference_toggle_header.xml
index 4b0ed9431..a95b5e211 100644
--- a/app/src/main/res/layout/preference_toggle_header.xml
+++ b/app/src/main/res/layout/preference_toggle_header.xml
@@ -9,10 +9,7 @@
 	android:layout_marginHorizontal="16dp"
 	android:layout_marginVertical="8dp"
 	android:paddingBottom="8dp"
-	app:cardCornerRadius="24dp"
-	app:layout_constraintEnd_toEndOf="parent"
-	app:layout_constraintStart_toStartOf="parent"
-	app:layout_constraintTop_toTopOf="parent">
+	app:cardCornerRadius="24dp">
 
 	<LinearLayout
 		android:layout_width="match_parent"

From 4771882f50687730aee83a3d6137d119add2748e Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Mon, 9 May 2022 09:02:58 +0300
Subject: [PATCH 104/104] Edit favourite category activity

---
 app/src/main/AndroidManifest.xml              |  14 +-
 .../kotatsu/favourites/FavouritesModule.kt    |   2 +
 .../favourites/data/FavouriteCategoriesDao.kt |   6 +
 .../favourites/domain/FavouritesRepository.kt |  28 ++++
 .../ui/FavouritesContainerFragment.kt         |  38 +----
 .../ui/categories/CategoriesActivity.kt       |  41 +----
 .../ui/categories/CategoriesEditDelegate.kt   |  46 ------
 .../FavouritesCategoriesViewModel.kt          |  30 +---
 .../edit/FavouritesCategoryEditActivity.kt    | 147 ++++++++++++++++++
 .../edit/FavouritesCategoryEditViewModel.kt   |  53 +++++++
 .../select/FavouriteCategoriesDialog.kt       |  12 +-
 .../select/MangaCategoriesViewModel.kt        |   6 -
 .../ui/list/FavouritesListFragment.kt         |  51 +++++-
 .../ui/list/FavouritesListViewModel.kt        |  27 +++-
 .../res/layout-w720dp-land/activity_main.xml  |   1 +
 .../res/layout/activity_category_edit.xml     |  81 ++++++++++
 app/src/main/res/layout/activity_main.xml     |   2 +-
 app/src/main/res/menu/opt_favourites_list.xml |  19 +++
 app/src/main/res/menu/popup_category.xml      |  22 +--
 app/src/main/res/values-large/themes.xml      |  34 ++++
 app/src/main/res/values-ru/strings.xml        |   3 +
 app/src/main/res/values/strings.xml           |   3 +
 app/src/main/res/values/styles.xml            |   2 +
 app/src/main/res/values/themes.xml            |   5 +-
 24 files changed, 480 insertions(+), 193 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditViewModel.kt
 create mode 100644 app/src/main/res/layout/activity_category_edit.xml
 create mode 100644 app/src/main/res/menu/opt_favourites_list.xml
 create mode 100644 app/src/main/res/values-large/themes.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bba1d89b0..13f5cecbf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,8 @@
 		<activity
 			android:name="org.koitharu.kotatsu.search.ui.SearchActivity"
 			android:label="@string/search" />
-		<activity android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
+		<activity
+			android:name="org.koitharu.kotatsu.search.ui.MangaListActivity"
 			android:label="@string/search_manga" />
 		<activity
 			android:name="org.koitharu.kotatsu.settings.SettingsActivity"
@@ -78,7 +79,8 @@
 		<activity
 			android:name="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 			android:exported="true"
-			android:label="@string/manga_shelf">
+			android:label="@string/manga_shelf"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
@@ -95,9 +97,13 @@
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="org.koitharu.kotatsu.download.ui.DownloadsActivity"
+			android:label="@string/downloads"
 			android:launchMode="singleTop"
-			android:label="@string/downloads" />
-		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity"/>
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
+		<activity android:name="org.koitharu.kotatsu.image.ui.ImageActivity" />
+		<activity
+			android:name="org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity"
+			android:theme="@style/Theme.Kotatsu.DialogWhenLarge" />
 
 		<service
 			android:name="org.koitharu.kotatsu.download.ui.service.DownloadService"
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
index 0f10b81ac..6d880abb9 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/FavouritesModule.kt
@@ -4,6 +4,7 @@ import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditViewModel
 import org.koitharu.kotatsu.favourites.ui.categories.select.MangaCategoriesViewModel
 import org.koitharu.kotatsu.favourites.ui.list.FavouritesListViewModel
 
@@ -19,4 +20,5 @@ val favouritesModule
 		viewModel { manga ->
 			MangaCategoriesViewModel(manga.get(), get())
 		}
+		viewModel { params -> FavouritesCategoryEditViewModel(params[0], get(), get()) }
 	}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
index 65d429706..d0ada21da 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/data/FavouriteCategoriesDao.kt
@@ -6,6 +6,9 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 abstract class FavouriteCategoriesDao {
 
+	@Query("SELECT * FROM favourite_categories WHERE category_id = :id")
+	abstract suspend fun find(id: Int): FavouriteCategoryEntity
+
 	@Query("SELECT * FROM favourite_categories ORDER BY sort_key")
 	abstract suspend fun findAll(): List<FavouriteCategoryEntity>
 
@@ -27,6 +30,9 @@ abstract class FavouriteCategoriesDao {
 	@Query("UPDATE favourite_categories SET title = :title WHERE category_id = :id")
 	abstract suspend fun updateTitle(id: Long, title: String)
 
+	@Query("UPDATE favourite_categories SET title = :title, `order` = :order, `track` = :tracker  WHERE category_id = :id")
+	abstract suspend fun update(id: Long, title: String, order: String, tracker: Boolean)
+
 	@Query("UPDATE favourite_categories SET `order` = :order WHERE category_id = :id")
 	abstract suspend fun updateOrder(id: Long, order: String)
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
index 35a362e95..6e995696b 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/domain/FavouritesRepository.kt
@@ -52,6 +52,11 @@ class FavouritesRepository(
 		}.distinctUntilChanged()
 	}
 
+	fun observeCategory(id: Long): Flow<FavouriteCategory> {
+		return db.favouriteCategoriesDao.observe(id)
+			.map { it.toFavouriteCategory() }
+	}
+
 	fun observeCategories(mangaId: Long): Flow<List<FavouriteCategory>> {
 		return db.favouritesDao.observe(mangaId).map { entity ->
 			entity?.categories?.map { it.toFavouriteCategory() }.orEmpty()
@@ -62,6 +67,29 @@ class FavouritesRepository(
 		return db.favouritesDao.observeIds(mangaId).map { it.toSet() }
 	}
 
+	suspend fun getCategory(id: Long): FavouriteCategory {
+		return db.favouriteCategoriesDao.find(id.toInt()).toFavouriteCategory()
+	}
+
+	suspend fun createCategory(title: String, sortOrder: SortOrder, isTrackerEnabled: Boolean): FavouriteCategory {
+		val entity = FavouriteCategoryEntity(
+			title = title,
+			createdAt = System.currentTimeMillis(),
+			sortKey = db.favouriteCategoriesDao.getNextSortKey(),
+			categoryId = 0,
+			order = sortOrder.name,
+			track = isTrackerEnabled,
+		)
+		val id = db.favouriteCategoriesDao.insert(entity)
+		val category = entity.toFavouriteCategory(id)
+		channels.createChannel(category)
+		return category
+	}
+
+	suspend fun updateCategory(id: Long, title: String, sortOrder: SortOrder, isTrackerEnabled: Boolean) {
+		db.favouriteCategoriesDao.update(id, title, sortOrder.name, isTrackerEnabled)
+	}
+
 	suspend fun addCategory(title: String): FavouriteCategory {
 		val entity = FavouriteCategoryEntity(
 			title = title,
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
index 45cbba17a..61fae0369 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/FavouritesContainerFragment.kt
@@ -16,12 +16,12 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.util.ActionModeListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.FragmentFavouritesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
 import org.koitharu.kotatsu.favourites.ui.categories.FavouritesCategoriesViewModel
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import org.koitharu.kotatsu.main.ui.AppBarOwner
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
@@ -134,28 +134,6 @@ class FavouritesContainerFragment :
 		viewModel.deleteCategory(category.id)
 	}
 
-	override fun onRenameCategory(category: FavouriteCategory, newName: String) {
-		viewModel.renameCategory(category.id, newName)
-	}
-
-	override fun onCreateCategory(name: String) {
-		viewModel.createCategory(name)
-	}
-
-	private fun createOrderSubmenu(menu: Menu, category: FavouriteCategory) {
-		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
-		for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
-			val menuItem = submenu.add(R.id.group_order, Menu.NONE, i, item.titleRes)
-			menuItem.isCheckable = true
-			menuItem.isChecked = item == category.order
-		}
-		submenu.setGroupCheckable(R.id.group_order, true, true)
-		menu.findItem(R.id.action_tracking)?.run {
-			isVisible = viewModel.isFavouritesTrackerEnabled
-			isChecked = category.isTrackingEnabled
-		}
-	}
-
 	private fun TabLayout.setTabsEnabled(enabled: Boolean) {
 		val tabStrip = getChildAt(0) as? ViewGroup ?: return
 		for (tab in tabStrip.children) {
@@ -166,19 +144,11 @@ class FavouritesContainerFragment :
 	private fun showCategoryMenu(tabView: View, category: FavouriteCategory) {
 		val menu = PopupMenu(tabView.context, tabView)
 		menu.inflate(R.menu.popup_category)
-		createOrderSubmenu(menu.menu, category)
 		menu.setOnMenuItemClickListener {
 			when (it.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(category)
-				R.id.action_rename -> editDelegate.renameCategory(category)
-				R.id.action_create -> editDelegate.createCategory()
-				R.id.action_tracking -> viewModel.setCategoryTracking(category.id, !category.isTrackingEnabled)
-				R.id.action_order -> return@setOnMenuItemClickListener false
-				else -> {
-					val order = CategoriesActivity.SORT_ORDERS.getOrNull(it.order)
-						?: return@setOnMenuItemClickListener false
-					viewModel.setCategoryOrder(category.id, order)
-				}
+				R.id.action_edit -> FavouritesCategoryEditActivity.newIntent(tabView.context, category.id)
+				else -> return@setOnMenuItemClickListener false
 			}
 			true
 		}
@@ -190,7 +160,7 @@ class FavouritesContainerFragment :
 		menu.inflate(R.menu.popup_category_all)
 		menu.setOnMenuItemClickListener {
 			when (it.itemId) {
-				R.id.action_create -> editDelegate.createCategory()
+				R.id.action_create -> FavouritesCategoryEditActivity.newIntent(requireContext())
 				R.id.action_hide -> viewModel.setAllCategoriesVisible(false)
 			}
 			true
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
index d2615c826..80fd2a137 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesActivity.kt
@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.favourites.ui.categories
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
@@ -19,9 +18,9 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseActivity
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.model.FavouriteCategory
-import org.koitharu.kotatsu.core.ui.titleRes
 import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.measureHeight
@@ -57,24 +56,17 @@ class CategoriesActivity :
 
 	override fun onClick(v: View) {
 		when (v.id) {
-			R.id.fab_add -> editDelegate.createCategory()
+			R.id.fab_add -> startActivity(FavouritesCategoryEditActivity.newIntent(this))
 		}
 	}
 
 	override fun onItemClick(item: FavouriteCategory, view: View) {
 		val menu = PopupMenu(view.context, view)
 		menu.inflate(R.menu.popup_category)
-		prepareCategoryMenu(menu.menu, item)
 		menu.setOnMenuItemClickListener { menuItem ->
 			when (menuItem.itemId) {
 				R.id.action_remove -> editDelegate.deleteCategory(item)
-				R.id.action_rename -> editDelegate.renameCategory(item)
-				R.id.action_tracking -> viewModel.setCategoryTracking(item.id, !item.isTrackingEnabled)
-				R.id.action_order -> return@setOnMenuItemClickListener false
-				else -> {
-					val order = SORT_ORDERS.getOrNull(menuItem.order) ?: return@setOnMenuItemClickListener false
-					viewModel.setCategoryOrder(item.id, order)
-				}
+				R.id.action_edit -> startActivity(FavouritesCategoryEditActivity.newIntent(this, item.id))
 			}
 			true
 		}
@@ -118,33 +110,6 @@ class CategoriesActivity :
 		viewModel.deleteCategory(category.id)
 	}
 
-	override fun onRenameCategory(category: FavouriteCategory, newName: String) {
-		viewModel.renameCategory(category.id, newName)
-	}
-
-	override fun onCreateCategory(name: String) {
-		viewModel.createCategory(name)
-	}
-
-	private fun prepareCategoryMenu(menu: Menu, category: FavouriteCategory) {
-		val submenu = menu.findItem(R.id.action_order)?.subMenu ?: return
-		for ((i, item) in SORT_ORDERS.withIndex()) {
-			val menuItem = submenu.add(
-				R.id.group_order,
-				Menu.NONE,
-				i,
-				item.titleRes
-			)
-			menuItem.isCheckable = true
-			menuItem.isChecked = item == category.order
-		}
-		submenu.setGroupCheckable(R.id.group_order, true, true)
-		menu.findItem(R.id.action_tracking)?.run {
-			isVisible = viewModel.isFavouritesTrackerEnabled
-			isChecked = category.isTrackingEnabled
-		}
-	}
-
 	private inner class ReorderHelperCallback : ItemTouchHelper.SimpleCallback(
 		ItemTouchHelper.DOWN or ItemTouchHelper.UP, 0
 	) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt
index 603a70ee3..f7a98c078 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/CategoriesEditDelegate.kt
@@ -1,15 +1,10 @@
 package org.koitharu.kotatsu.favourites.ui.categories
 
 import android.content.Context
-import android.text.InputType
-import android.widget.Toast
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.koitharu.kotatsu.R
-import org.koitharu.kotatsu.base.ui.dialog.TextInputDialog
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 
-private const val MAX_TITLE_LENGTH = 24
-
 class CategoriesEditDelegate(
 	private val context: Context,
 	private val callback: CategoriesEditCallback
@@ -26,49 +21,8 @@ class CategoriesEditDelegate(
 			.show()
 	}
 
-	fun renameCategory(category: FavouriteCategory) {
-		TextInputDialog.Builder(context)
-			.setTitle(R.string.rename)
-			.setText(category.title)
-			.setHint(R.string.enter_category_name)
-			.setInputType(InputType.TYPE_TEXT_VARIATION_PERSON_NAME or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)
-			.setNegativeButton(android.R.string.cancel)
-			.setMaxLength(MAX_TITLE_LENGTH, false)
-			.setPositiveButton(R.string.rename) { _, name ->
-				val trimmed = name.trim()
-				if (trimmed.isEmpty()) {
-					Toast.makeText(context, R.string.error_empty_name, Toast.LENGTH_SHORT).show()
-				} else {
-					callback.onRenameCategory(category, name)
-				}
-			}.create()
-			.show()
-	}
-
-	fun createCategory() {
-		TextInputDialog.Builder(context)
-			.setTitle(R.string.add_new_category)
-			.setHint(R.string.enter_category_name)
-			.setInputType(InputType.TYPE_TEXT_VARIATION_PERSON_NAME or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES)
-			.setNegativeButton(android.R.string.cancel)
-			.setMaxLength(MAX_TITLE_LENGTH, false)
-			.setPositiveButton(R.string.add) { _, name ->
-				val trimmed = name.trim()
-				if (trimmed.isEmpty()) {
-					Toast.makeText(context, R.string.error_empty_name, Toast.LENGTH_SHORT).show()
-				} else {
-					callback.onCreateCategory(trimmed)
-				}
-			}.create()
-			.show()
-	}
-
 	interface CategoriesEditCallback {
 
 		fun onDeleteCategory(category: FavouriteCategory)
-
-		fun onRenameCategory(category: FavouriteCategory, newName: String)
-
-		fun onCreateCategory(name: String)
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index 9e84a9d89..31c1e11de 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.favourites.ui.categories
 
 import androidx.lifecycle.viewModelScope
-import java.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.*
@@ -10,8 +9,8 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoryListModel
-import org.koitharu.kotatsu.parsers.model.SortOrder
 import org.koitharu.kotatsu.utils.ext.asLiveDataDistinct
+import java.util.*
 
 class FavouritesCategoriesViewModel(
 	private val repository: FavouritesRepository,
@@ -34,39 +33,12 @@ class FavouritesCategoriesViewModel(
 		mapCategories(list, showAll, showAll)
 	}.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
 
-	val isFavouritesTrackerEnabled: Boolean
-		get() = settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources
-
-	fun createCategory(name: String) {
-		launchJob {
-			repository.addCategory(name)
-		}
-	}
-
-	fun renameCategory(id: Long, name: String) {
-		launchJob {
-			repository.renameCategory(id, name)
-		}
-	}
-
 	fun deleteCategory(id: Long) {
 		launchJob {
 			repository.removeCategory(id)
 		}
 	}
 
-	fun setCategoryOrder(id: Long, order: SortOrder) {
-		launchJob {
-			repository.setCategoryOrder(id, order)
-		}
-	}
-
-	fun setCategoryTracking(id: Long, isEnabled: Boolean) {
-		launchJob {
-			repository.setCategoryTracking(id, isEnabled)
-		}
-	}
-
 	fun setAllCategoriesVisible(isVisible: Boolean) {
 		settings.isAllFavouritesVisible = isVisible
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
new file mode 100644
index 000000000..27239c0dc
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditActivity.kt
@@ -0,0 +1,147 @@
+package org.koitharu.kotatsu.favourites.ui.categories.edit
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.base.ui.BaseActivity
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.ui.titleRes
+import org.koitharu.kotatsu.databinding.ActivityCategoryEditBinding
+import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+
+class FavouritesCategoryEditActivity : BaseActivity<ActivityCategoryEditBinding>(), AdapterView.OnItemClickListener {
+
+	private val viewModel by viewModel<FavouritesCategoryEditViewModel> {
+		parametersOf(intent.getLongExtra(EXTRA_ID, NO_ID))
+	}
+	private var selectedSortOrder: SortOrder? = null
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(ActivityCategoryEditBinding.inflate(layoutInflater))
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setHomeAsUpIndicator(com.google.android.material.R.drawable.abc_ic_clear_material)
+		}
+		initSortSpinner()
+
+		viewModel.onSaved.observe(this) { finishAfterTransition() }
+		viewModel.category.observe(this, ::onCategoryChanged)
+		viewModel.isLoading.observe(this, ::onLoadingStateChanged)
+		viewModel.onError.observe(this, ::onError)
+		viewModel.isTrackerEnabled.observe(this) {
+			binding.switchTracker.isVisible = it
+		}
+	}
+
+	override fun onSaveInstanceState(outState: Bundle) {
+		super.onSaveInstanceState(outState)
+		outState.putSerializable(KEY_SORT_ORDER, selectedSortOrder)
+	}
+
+	override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+		super.onRestoreInstanceState(savedInstanceState)
+		val order = savedInstanceState.getSerializable(KEY_SORT_ORDER)
+		if (order != null && order is SortOrder) {
+			selectedSortOrder = order
+		}
+	}
+
+	override fun onCreateOptionsMenu(menu: Menu): Boolean {
+		menuInflater.inflate(R.menu.opt_config, menu)
+		menu.findItem(R.id.action_done)?.setTitle(R.string.save)
+		return super.onCreateOptionsMenu(menu)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+		R.id.action_done -> {
+			viewModel.save(
+				title = binding.editName.text?.toString().orEmpty(),
+				sortOrder = getSelectedSortOrder(),
+				isTrackerEnabled = binding.switchTracker.isChecked,
+			)
+			true
+		}
+		else -> super.onOptionsItemSelected(item)
+	}
+
+	override fun onWindowInsetsChanged(insets: Insets) {
+		binding.scrollView.updatePadding(
+			left = insets.left,
+			right = insets.right,
+			bottom = insets.bottom,
+		)
+		binding.toolbar.updatePadding(
+			top = insets.top,
+		)
+	}
+
+	override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+		selectedSortOrder = CategoriesActivity.SORT_ORDERS.getOrNull(position)
+	}
+
+	private fun onCategoryChanged(category: FavouriteCategory?) {
+		setTitle(if (category == null) R.string.create_category else R.string.edit_category)
+		if (selectedSortOrder != null) {
+			return
+		}
+		binding.editName.setText(category?.title)
+		selectedSortOrder = category?.order
+		val sortText = getString((category?.order ?: SortOrder.NEWEST).titleRes)
+		binding.editSort.setText(sortText, false)
+		binding.switchTracker.isChecked = category?.isTrackingEnabled ?: true
+	}
+
+	private fun onError(e: Throwable) {
+		binding.textViewError.text = e.getDisplayMessage(resources)
+		binding.textViewError.isVisible = true
+	}
+
+	private fun onLoadingStateChanged(isLoading: Boolean) {
+		binding.editSort.isEnabled = !isLoading
+		binding.editName.isEnabled = !isLoading
+		binding.switchTracker.isEnabled = !isLoading
+		if (isLoading) {
+			binding.textViewError.isVisible = false
+		}
+	}
+
+	private fun initSortSpinner() {
+		val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
+		val adapter = ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, entries)
+		binding.editSort.setAdapter(adapter)
+		binding.editSort.onItemClickListener = this
+	}
+
+	private fun getSelectedSortOrder(): SortOrder {
+		selectedSortOrder?.let { return it }
+		val entries = CategoriesActivity.SORT_ORDERS.map { getString(it.titleRes) }
+		val index = entries.indexOf(binding.editSort.text.toString())
+		return CategoriesActivity.SORT_ORDERS.getOrNull(index) ?: SortOrder.NEWEST
+	}
+
+	companion object {
+
+		private const val EXTRA_ID = "id"
+		private const val KEY_SORT_ORDER = "sort"
+		private const val NO_ID = -1L
+
+		fun newIntent(context: Context, id: Long = NO_ID): Intent {
+			return Intent(context, FavouritesCategoryEditActivity::class.java)
+				.putExtra(EXTRA_ID, id)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditViewModel.kt
new file mode 100644
index 000000000..78446dd14
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/edit/FavouritesCategoryEditViewModel.kt
@@ -0,0 +1,53 @@
+package org.koitharu.kotatsu.favourites.ui.categories.edit
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.liveData
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Dispatchers
+import org.koitharu.kotatsu.base.ui.BaseViewModel
+import org.koitharu.kotatsu.core.model.FavouriteCategory
+import org.koitharu.kotatsu.core.prefs.AppSettings
+import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.parsers.model.SortOrder
+import org.koitharu.kotatsu.utils.SingleLiveEvent
+
+private const val NO_ID = -1L
+
+class FavouritesCategoryEditViewModel(
+	private val categoryId: Long,
+	private val repository: FavouritesRepository,
+	private val settings: AppSettings,
+) : BaseViewModel() {
+
+	val onSaved = SingleLiveEvent<Unit>()
+	val category = MutableLiveData<FavouriteCategory?>()
+
+	val isTrackerEnabled = liveData(viewModelScope.coroutineContext + Dispatchers.Default) {
+		emit(settings.isTrackerEnabled && AppSettings.TRACK_FAVOURITES in settings.trackSources)
+	}
+
+	init {
+		launchLoadingJob {
+			category.value = if (categoryId != NO_ID) {
+				repository.getCategory(categoryId)
+			} else {
+				null
+			}
+		}
+	}
+
+	fun save(
+		title: String,
+		sortOrder: SortOrder,
+		isTrackerEnabled: Boolean,
+	) {
+		launchLoadingJob {
+			if (categoryId == NO_ID) {
+				repository.createCategory(title, sortOrder, isTrackerEnabled)
+			} else {
+				repository.updateCategory(categoryId, title, sortOrder, isTrackerEnabled)
+			}
+			onSaved.call(Unit)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
index 43eec185e..95f733006 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesDialog.kt
@@ -17,6 +17,7 @@ import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.databinding.DialogFavoriteCategoriesBinding
 import org.koitharu.kotatsu.favourites.ui.categories.CategoriesEditDelegate
+import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
 import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
 import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
 import org.koitharu.kotatsu.parsers.model.Manga
@@ -34,9 +35,6 @@ class FavouriteCategoriesDialog :
 	}
 
 	private var adapter: MangaCategoriesAdapter? = null
-	private val editDelegate by lazy(LazyThreadSafetyMode.NONE) {
-		CategoriesEditDelegate(requireContext(), this@FavouriteCategoriesDialog)
-	}
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
@@ -61,7 +59,7 @@ class FavouriteCategoriesDialog :
 	override fun onMenuItemClick(item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.action_create -> {
-				editDelegate.createCategory()
+				FavouritesCategoryEditActivity.newIntent(requireContext())
 				true
 			}
 			else -> false
@@ -74,12 +72,6 @@ class FavouriteCategoriesDialog :
 
 	override fun onDeleteCategory(category: FavouriteCategory) = Unit
 
-	override fun onRenameCategory(category: FavouriteCategory, newName: String) = Unit
-
-	override fun onCreateCategory(name: String) {
-		viewModel.createCategory(name)
-	}
-
 	private fun onContentChanged(categories: List<MangaCategoryItem>) {
 		adapter?.items = categories
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
index 84f9cf8f9..b9f906549 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/MangaCategoriesViewModel.kt
@@ -38,12 +38,6 @@ class MangaCategoriesViewModel(
 		}
 	}
 
-	fun createCategory(name: String) {
-		launchJob(Dispatchers.Default) {
-			favouritesRepository.addCategory(name)
-		}
-	}
-
 	private fun observeCategoriesIds() = if (manga.size == 1) {
 		// Fast path
 		favouritesRepository.observeCategoriesIds(manga[0].id)
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
index f2748622c..8d4b9e419 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListFragment.kt
@@ -1,11 +1,17 @@
 package org.koitharu.kotatsu.favourites.ui.list
 
+import android.os.Bundle
 import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.view.ActionMode
+import androidx.core.view.iterator
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.titleRes
+import org.koitharu.kotatsu.favourites.ui.categories.CategoriesActivity
 import org.koitharu.kotatsu.list.ui.MangaListFragment
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.utils.ext.withArgs
@@ -17,12 +23,54 @@ class FavouritesListFragment : MangaListFragment() {
 	}
 
 	private val categoryId: Long
-		get() = arguments?.getLong(ARG_CATEGORY_ID) ?: 0L
+		get() = arguments?.getLong(ARG_CATEGORY_ID) ?: NO_ID
 
 	override val isSwipeRefreshEnabled = false
 
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		viewModel.sortOrder.observe(viewLifecycleOwner) { activity?.invalidateOptionsMenu() }
+	}
+
 	override fun onScrolledToEnd() = Unit
 
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+		super.onCreateOptionsMenu(menu, inflater)
+		if (categoryId != NO_ID) {
+			inflater.inflate(R.menu.opt_favourites_list, menu)
+			menu.findItem(R.id.action_order)?.subMenu?.let { submenu ->
+				for ((i, item) in CategoriesActivity.SORT_ORDERS.withIndex()) {
+					val menuItem = submenu.add(R.id.group_order, Menu.NONE, i, item.titleRes)
+					menuItem.isCheckable = true
+				}
+				submenu.setGroupCheckable(R.id.group_order, true, true)
+			}
+		}
+	}
+
+	override fun onPrepareOptionsMenu(menu: Menu) {
+		super.onPrepareOptionsMenu(menu)
+		menu.findItem(R.id.action_order)?.subMenu?.let { submenu ->
+			val selectedOrder = viewModel.sortOrder.value
+			for (item in submenu) {
+				val order = CategoriesActivity.SORT_ORDERS.getOrNull(item.order)
+				item.isChecked = order == selectedOrder
+			}
+		}
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		return when {
+			item.itemId == R.id.action_order -> false
+			item.groupId == R.id.group_order -> {
+				val order = CategoriesActivity.SORT_ORDERS.getOrNull(item.order) ?: return false
+				viewModel.setSortOrder(order)
+				true
+			}
+			else -> super.onOptionsItemSelected(item)
+		}
+	}
+
 	override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
 		mode.menuInflater.inflate(R.menu.mode_favourites, menu)
 		return super.onCreateActionMode(mode, menu)
@@ -48,6 +96,7 @@ class FavouritesListFragment : MangaListFragment() {
 
 	companion object {
 
+		const val NO_ID = 0L
 		private const val ARG_CATEGORY_ID = "category_id"
 
 		fun newInstance(categoryId: Long) = FavouritesListFragment().withArgs(1) {
diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
index 476fa6fb1..06d5bee3d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/list/FavouritesListViewModel.kt
@@ -1,12 +1,16 @@
 package org.koitharu.kotatsu.favourites.ui.list
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
+import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
 import org.koitharu.kotatsu.list.domain.CountersProvider
 import org.koitharu.kotatsu.list.ui.MangaListViewModel
 import org.koitharu.kotatsu.list.ui.model.EmptyState
@@ -24,8 +28,16 @@ class FavouritesListViewModel(
 	settings: AppSettings,
 ) : MangaListViewModel(settings), CountersProvider {
 
+	var sortOrder: LiveData<SortOrder> = if (categoryId == NO_ID) {
+		MutableLiveData(null)
+	} else {
+		repository.observeCategory(categoryId)
+			.map { it.order }
+			.asLiveDataDistinct(viewModelScope.coroutineContext + Dispatchers.Default)
+	}
+
 	override val content = combine(
-		if (categoryId == 0L) {
+		if (categoryId == NO_ID) {
 			repository.observeAll(SortOrder.NEWEST)
 		} else {
 			repository.observeAll(categoryId)
@@ -37,7 +49,7 @@ class FavouritesListViewModel(
 				EmptyState(
 					icon = R.drawable.ic_heart_outline,
 					textPrimary = R.string.text_empty_holder_primary,
-					textSecondary = if (categoryId == 0L) {
+					textSecondary = if (categoryId == NO_ID) {
 						R.string.you_have_not_favourites_yet
 					} else {
 						R.string.favourites_category_empty
@@ -60,7 +72,7 @@ class FavouritesListViewModel(
 			return
 		}
 		launchJob {
-			if (categoryId == 0L) {
+			if (categoryId == NO_ID) {
 				repository.removeFromFavourites(ids)
 			} else {
 				repository.removeFromCategory(categoryId, ids)
@@ -68,6 +80,15 @@ class FavouritesListViewModel(
 		}
 	}
 
+	fun setSortOrder(order: SortOrder) {
+		if (categoryId == NO_ID) {
+			return
+		}
+		launchJob {
+			repository.setCategoryOrder(categoryId, order)
+		}
+	}
+
 	override suspend fun getCounter(mangaId: Long): Int {
 		return trackingRepository.getNewChaptersCount(mangaId)
 	}
diff --git a/app/src/main/res/layout-w720dp-land/activity_main.xml b/app/src/main/res/layout-w720dp-land/activity_main.xml
index ee362d397..a442269b3 100644
--- a/app/src/main/res/layout-w720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-w720dp-land/activity_main.xml
@@ -62,6 +62,7 @@
 						android:layout_height="match_parent"
 						android:background="@null"
 						android:drawablePadding="16dp"
+						android:layout_marginEnd="4dp"
 						android:gravity="center_vertical"
 						android:hint="@string/search_manga"
 						android:imeOptions="actionSearch"
diff --git a/app/src/main/res/layout/activity_category_edit.xml b/app/src/main/res/layout/activity_category_edit.xml
new file mode 100644
index 000000000..e453df674
--- /dev/null
+++ b/app/src/main/res/layout/activity_category_edit.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.MaterialToolbar
+		android:id="@+id/toolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content" />
+
+	<ScrollView
+		android:id="@+id/scrollView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:clipToPadding="false"
+		android:overScrollMode="ifContentScrolls">
+
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:padding="16dp">
+
+			<com.google.android.material.textfield.TextInputLayout
+				android:id="@+id/layout_name"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<com.google.android.material.textfield.TextInputEditText
+					android:id="@+id/edit_name"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:hint="@string/name" />
+
+			</com.google.android.material.textfield.TextInputLayout>
+
+			<com.google.android.material.textfield.TextInputLayout
+				android:id="@+id/layout_sort"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				app:endIconMode="dropdown_menu">
+
+				<AutoCompleteTextView
+					android:id="@+id/edit_sort"
+					style="?editTextStyle"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:hint="@string/sort_order"
+					android:inputType="none" />
+
+			</com.google.android.material.textfield.TextInputLayout>
+
+			<com.google.android.material.switchmaterial.SwitchMaterial
+				android:id="@+id/switch_tracker"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:text="@string/check_for_new_chapters"
+				android:visibility="gone"
+				tools:visibility="visible" />
+
+			<TextView
+				android:id="@+id/textView_error"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="16dp"
+				android:textColor="?colorError"
+				android:visibility="gone"
+				tools:text="@tools:sample/lorem[4]"
+				tools:visibility="visible" />
+
+		</LinearLayout>
+
+	</ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 43361b15b..6314cf7ef 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -51,7 +51,7 @@
 						style="@style/Widget.Kotatsu.SearchView"
 						android:layout_width="match_parent"
 						android:layout_height="match_parent"
-						android:layout_marginEnd="2dp"
+						android:layout_marginEnd="4dp"
 						android:background="@null"
 						android:gravity="center_vertical"
 						android:hint="@string/search_manga"
diff --git a/app/src/main/res/menu/opt_favourites_list.xml b/app/src/main/res/menu/opt_favourites_list.xml
new file mode 100644
index 000000000..269569df7
--- /dev/null
+++ b/app/src/main/res/menu/opt_favourites_list.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+	xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@+id/action_order"
+		android:orderInCategory="30"
+		android:title="@string/sort_order">
+
+		<menu>
+
+			<group
+				android:id="@+id/group_order"
+				android:checkableBehavior="single" />
+		</menu>
+
+	</item>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/popup_category.xml b/app/src/main/res/menu/popup_category.xml
index ee78b4b80..50c1313be 100644
--- a/app/src/main/res/menu/popup_category.xml
+++ b/app/src/main/res/menu/popup_category.xml
@@ -7,25 +7,7 @@
 		android:title="@string/remove" />
 
 	<item
-		android:id="@+id/action_rename"
-		android:title="@string/rename" />
-
-	<item
-		android:id="@+id/action_order"
-		android:title="@string/sort_order">
-
-		<menu>
-
-			<group
-				android:id="@+id/group_order"
-				android:checkableBehavior="single" />
-		</menu>
-
-	</item>
-
-	<item
-		android:id="@+id/action_tracking"
-		android:title="@string/check_for_new_chapters"
-		android:checkable="true" />
+		android:id="@+id/action_edit"
+		android:title="@string/edit" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-large/themes.xml b/app/src/main/res/values-large/themes.xml
new file mode 100644
index 000000000..56e1ed965
--- /dev/null
+++ b/app/src/main/res/values-large/themes.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="Theme.Kotatsu.DialogWhenLarge">
+		<item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
+		<item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
+		<item name="windowFixedHeightMajor">@dimen/abc_dialog_fixed_height_major</item>
+		<item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
+		<item name="android:windowElevation">@dimen/abc_floating_window_z</item>
+		<item name="android:colorBackground">?attr/colorBackgroundFloating</item>
+		<item name="android:colorBackgroundCacheHint">@null</item>
+
+		<item name="android:windowFrame">@null</item>
+		<item name="android:windowTitleStyle">@style/RtlOverlay.DialogWindowTitle.AppCompat</item>
+		<item name="android:windowTitleBackgroundStyle">@style/Base.DialogWindowTitleBackground.AppCompat</item>
+		<item name="android:windowBackground">@drawable/abc_dialog_material_background</item>
+		<item name="android:windowIsFloating">true</item>
+		<item name="android:backgroundDimEnabled">true</item>
+		<item name="android:windowContentOverlay">@null</item>
+		<item name="android:windowAnimationStyle">@style/Animation.AppCompat.Dialog</item>
+		<item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+
+		<item name="windowActionBar">false</item>
+		<item name="windowActionModeOverlay">true</item>
+
+		<item name="listPreferredItemPaddingLeft">24dip</item>
+		<item name="listPreferredItemPaddingRight">24dip</item>
+
+		<item name="android:listDivider">@null</item>
+
+		<item name="android:buttonBarStyle">@style/Widget.AppCompat.ButtonBar.AlertDialog</item>
+		<item name="android:borderlessButtonStyle">@style/Widget.AppCompat.Button.Borderless</item>
+		<item name="android:windowCloseOnTouchOutside">true</item>
+	</style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 87da7d5d0..012bf4aee 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -281,4 +281,7 @@
 	<string name="show_notification_new_chapters_on">Вы будете получать уведомления об обновлении манги, которую Вы читаете</string>
 	<string name="show_notification_new_chapters_off">Вы не будете получать уведомления, но новые главы будут отображаться в списке</string>
 	<string name="notifications_enable">Включить уведомления</string>
+	<string name="name">Название</string>
+	<string name="edit">Изменить</string>
+	<string name="edit_category">Изменить категорию</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 083717035..2bc68e061 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -284,4 +284,7 @@
 	<string name="show_notification_new_chapters_on">You will receive notifications about updates of manga you are reading</string>
 	<string name="show_notification_new_chapters_off">You will not receive notifications but new chapters will be highlighted in the lists</string>
 	<string name="notifications_enable">Enable notifications</string>
+	<string name="name">Name</string>
+	<string name="edit">Edit</string>
+	<string name="edit_category">Edit category</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b63927f74..b16f50044 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -119,6 +119,8 @@
 
 	<style name="TextAppearance.Kotatsu.Preference.Secondary" parent="TextAppearance.Material3.BodySmall" />
 
+	<style name="TextAppearance.Kotatsu.Menu" parent="TextAppearance.Material3.BodyLarge" />
+
 	<style name="TextAppearance.Kotatsu.SectionHeader" parent="TextAppearance.Material3.LabelLarge">
 		<item name="android:textColor">?android:attr/textColorSecondary</item>
 	</style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 12ccac10f..f6addbe8f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -71,7 +71,8 @@
 		<item name="recyclerViewStyle">@style/Widget.Kotatsu.RecyclerView</item>
 		<item name="listItemTextViewStyle">@style/Widget.Kotatsu.ListItemTextView</item>
 
-		<!-- Preference text appearance -->
+		<!-- Text appearance -->
+		<item name="actionMenuTextAppearance">@style/TextAppearance.Kotatsu.Menu</item>
 		<item name="android:textAppearanceListItem">?attr/textAppearanceBodyLarge</item>
 		<item name="android:textAppearanceListItemSecondary">@style/TextAppearance.Kotatsu.Preference.Secondary</item>
 
@@ -80,6 +81,8 @@
 	<!--== Default Theme ==-->
 	<style name="Theme.Kotatsu" parent="Base.Theme.Kotatsu" />
 
+	<style name="Theme.Kotatsu.DialogWhenLarge" />
+
 	<!-- Monet theme only support S+ -->
 	<style name="Theme.Kotatsu.Monet" />