From aa21dd9721f679187feef7c6c6c2fec6fa28a5ed Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sat, 13 Mar 2021 09:13:16 +0200
Subject: [PATCH] Fixes

---
 .idea/misc.xml                                |  1 +
 app/build.gradle                              |  7 ++--
 .../kotatsu/details/ui/ChaptersFragment.kt    | 11 +++++-
 .../favourites/ui/FavouritesPagerAdapter.kt   |  8 ++++
 .../koitharu/kotatsu/local/data/MangaIndex.kt |  2 +
 .../reader/ui/pager/BaseReaderAdapter.kt      |  1 +
 app/src/main/res/layout/fragment_chapters.xml | 39 +++++++++----------
 build.gradle                                  |  3 +-
 8 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 489f14cd9..69b17eb0d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="../../../../../../layout/custom_preview.xml" value="0.1" />
+        <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/drawable/list_divider_material.xml" value="0.28512820512820514" />
         <entry key="../../../../../../opt/usr/android-sdk/platforms/android-30/data/res/layout/simple_dropdown_item_1line.xml" value="0.24739583333333334" />
         <entry key="app/src/main/res/layout-w600dp/fragment_details.xml" value="0.14583333333333334" />
         <entry key="app/src/main/res/layout/fragment_chapters.xml" value="0.24739583333333334" />
diff --git a/app/build.gradle b/app/build.gradle
index f16fddbc1..8101bbcef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,13 +62,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 }
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
 	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
 
-	implementation 'androidx.core:core-ktx:1.5.0-beta02'
-	implementation 'androidx.activity:activity-ktx:1.2.0'
-	implementation 'androidx.fragment:fragment-ktx:1.3.0'
+	implementation 'androidx.core:core-ktx:1.5.0-beta03'
+	implementation 'androidx.activity:activity-ktx:1.2.1'
+	implementation 'androidx.fragment:fragment-ktx:1.3.1'
 	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0'
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 447a90c72..fdf29d88e 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
@@ -7,6 +7,10 @@ import android.widget.AdapterView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.core.graphics.Insets
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
@@ -46,7 +50,12 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 		chaptersAdapter = ChaptersAdapter(this)
 		selectionDecoration = ChaptersSelectionDecoration(view.context)
 		with(binding.recyclerViewChapters) {
-			addItemDecoration(DividerItemDecoration(view.context, RecyclerView.VERTICAL))
+			addItemDecoration(
+				DividerItemDecoration(
+					view.context,
+					RecyclerView.VERTICAL
+				)
+			)
 			addItemDecoration(selectionDecoration!!)
 			setHasFixedSize(true)
 			adapter = chaptersAdapter
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 5fa02d548..83368d802 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
@@ -25,6 +25,14 @@ class FavouritesPagerAdapter(
 		return FavouritesListFragment.newInstance(item.id)
 	}
 
+	override fun getItemId(position: Int): Long {
+		return differ.currentList[position].id
+	}
+
+	override fun containsItem(itemId: Long): Boolean {
+		return differ.currentList.any { it.id == itemId }
+	}
+
 	override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
 		val item = differ.currentList[position]
 		tab.text = item.title
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 8b0b92033..45df69340 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
@@ -72,6 +72,7 @@ class MangaIndex(source: String?) {
 			jo.put("number", chapter.number)
 			jo.put("url", chapter.url)
 			jo.put("name", chapter.name)
+			jo.put("branch", chapter.branch)
 			jo.put("entries", "%03d\\d{3}".format(chapter.number))
 			chapters.put(chapter.id.toString(), jo)
 		}
@@ -97,6 +98,7 @@ class MangaIndex(source: String?) {
 					name = v.getString("name"),
 					url = v.getString("url"),
 					number = v.getInt("number"),
+					branch = v.getStringOrNull("branch"),
 					source = source
 				)
 			)
diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt
index 495287e9f..c44a5a1c0 100644
--- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/BaseReaderAdapter.kt
@@ -21,6 +21,7 @@ abstract class BaseReaderAdapter<H : BasePageHolder<*>>(
 
 	init {
 		setHasStableIds(true)
+		stateRestorationPolicy = StateRestorationPolicy.PREVENT
 	}
 
 	override fun onBindViewHolder(holder: H, position: Int) {
diff --git a/app/src/main/res/layout/fragment_chapters.xml b/app/src/main/res/layout/fragment_chapters.xml
index 50a4ed6f6..bca60d6f7 100644
--- a/app/src/main/res/layout/fragment_chapters.xml
+++ b/app/src/main/res/layout/fragment_chapters.xml
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<RelativeLayout
 	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">
 
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/app_bar"
-		style="@style/Widget.MaterialComponents.AppBarLayout.Surface"
-		android:layout_width="match_parent"
+	<Spinner
+		android:id="@+id/spinner_branches"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$Behavior">
-
-		<Spinner
-			android:id="@+id/spinner_branches"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			app:layout_scrollFlags="scroll|enterAlways"
-			tools:listitem="@layout/item_branch"
-			tools:visibility="visible" />
-
-	</com.google.android.material.appbar.AppBarLayout>
+		android:layout_alignParentStart="true"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentEnd="true"
+		android:visibility="gone"
+		tools:listitem="@layout/item_branch" />
 
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView_chapters"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_below="@id/spinner_branches"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentEnd="true"
+		android:layout_alignParentBottom="true"
 		android:orientation="vertical"
 		android:scrollbars="vertical"
 		app:fastScrollEnabled="true"
@@ -36,7 +33,6 @@
 		app:fastScrollVerticalThumbDrawable="@drawable/list_thumb"
 		app:fastScrollVerticalTrackDrawable="@drawable/list_track"
 		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
 		tools:listitem="@layout/item_chapter" />
 
 	<ProgressBar
@@ -44,8 +40,9 @@
 		style="@style/Widget.AppCompat.ProgressBar"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_centerInParent="true"
 		android:layout_gravity="center"
 		android:visibility="gone"
 		tools:visibility="visible" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4933dce61..af3eca8ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-	ext.kotlin_version = '1.4.31'
 	repositories {
 		google()
 		jcenter()
 	}
 	dependencies {
 		classpath 'com.android.tools.build:gradle:4.1.2'
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
 
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files