From c115bcc163f29df5716eb6c343e3d6ad4c9752f6 Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Sun, 13 Mar 2022 17:10:34 +0200
Subject: [PATCH] Improve details activity layout

---
 .../core/parser/site/ComickFunRepository.kt   |   2 +-
 .../kotatsu/details/ui/ChaptersFragment.kt    |  40 ++--
 .../kotatsu/details/ui/DetailsActivity.kt     |  36 +++-
 .../koitharu/kotatsu/main/ui/MainActivity.kt  |   1 +
 .../main/res/layout-land/activity_details.xml |  49 -----
 .../main/res/layout-land/dialog_list_mode.xml |  81 +++++++
 .../layout-w600dp-port/fragment_details.xml   | 198 ------------------
 .../fragment_details.xml                      |  44 ++--
 .../layout-w720dp-land/activity_details.xml   |  55 -----
 .../res/layout-w720dp/activity_details.xml    |  79 +++++++
 .../res/layout-w720dp/fragment_chapters.xml   |  28 +++
 app/src/main/res/layout/activity_details.xml  |  27 +--
 app/src/main/res/values-w980dp/dimens.xml     |   6 -
 app/src/main/res/values/dimens.xml            |   7 -
 14 files changed, 281 insertions(+), 372 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/activity_details.xml
 create mode 100644 app/src/main/res/layout-land/dialog_list_mode.xml
 delete mode 100644 app/src/main/res/layout-w600dp-port/fragment_details.xml
 rename app/src/main/res/{layout-w600dp-land => layout-w600dp}/fragment_details.xml (92%)
 delete mode 100644 app/src/main/res/layout-w720dp-land/activity_details.xml
 create mode 100644 app/src/main/res/layout-w720dp/activity_details.xml
 create mode 100644 app/src/main/res/layout-w720dp/fragment_chapters.xml
 delete mode 100644 app/src/main/res/values-w980dp/dimens.xml

diff --git a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
index bd0b858f1..3d19907c8 100644
--- a/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/core/parser/site/ComickFunRepository.kt
@@ -77,7 +77,7 @@ class ComickFunRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposi
 				altTitle = null,
 				url = slug,
 				publicUrl = "https://$domain/comic/$slug",
-				rating = jo.getDouble("rating").toFloat() / 10f,
+				rating = jo.optDouble("rating", -10.0).toFloat() / 10f,
 				isNsfw = false,
 				coverUrl = jo.getString("cover_url"),
 				largeCoverUrl = null,
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 4e66273a4..0048e8fe5 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
@@ -4,13 +4,12 @@ import android.app.ActivityOptions
 import android.os.Bundle
 import android.view.*
 import android.widget.AdapterView
+import android.widget.Spinner
 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.core.view.updatePaddingRelative
-import androidx.fragment.app.FragmentContainerView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.divider.MaterialDividerItemDecoration
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -26,7 +25,6 @@ import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
-import org.koitharu.kotatsu.utils.ext.getEnd
 
 class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	OnListItemClickListener<ChapterListItem>,
@@ -59,21 +57,9 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 			setHasFixedSize(true)
 			adapter = chaptersAdapter
 		}
-		val branchesAdapter = BranchesAdapter()
-		binding.spinnerBranches.adapter = branchesAdapter
-		binding.spinnerBranches.onItemSelectedListener = this
-
+		binding.spinnerBranches?.let(::initSpinner)
 		viewModel.isLoading.observe(viewLifecycleOwner, this::onLoadingStateChanged)
 		viewModel.chapters.observe(viewLifecycleOwner, this::onChaptersChanged)
-		viewModel.branches.observe(viewLifecycleOwner) {
-			branchesAdapter.setItems(it)
-			binding.spinnerBranches.isVisible = it.size > 1
-		}
-		viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
-			if (it != -1 && it != binding.spinnerBranches.selectedItemPosition) {
-				binding.spinnerBranches.setSelection(it)
-			}
-		}
 		viewModel.isChaptersReversed.observe(viewLifecycleOwner) {
 			activity?.invalidateOptionsMenu()
 		}
@@ -82,7 +68,7 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	override fun onDestroyView() {
 		chaptersAdapter = null
 		selectionDecoration = null
-		binding.spinnerBranches.adapter = null
+		binding.spinnerBranches?.adapter = null
 		super.onDestroyView()
 	}
 
@@ -169,7 +155,8 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 	}
 
 	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-		viewModel.setSelectedBranch(binding.spinnerBranches.selectedItem as String?)
+		val spinner = binding.spinnerBranches ?: return
+		viewModel.setSelectedBranch(spinner.selectedItem as String?)
 	}
 
 	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
@@ -204,10 +191,25 @@ class ChaptersFragment : BaseFragment<FragmentChaptersBinding>(),
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.recyclerViewChapters.updatePadding(
-			bottom = insets.bottom + binding.spinnerBranches.height,
+			bottom = insets.bottom + (binding.spinnerBranches?.height ?: 0),
 		)
 	}
 
+	private fun initSpinner(spinner: Spinner) {
+		val branchesAdapter = BranchesAdapter()
+		spinner.adapter = branchesAdapter
+		spinner.onItemSelectedListener = this
+		viewModel.branches.observe(viewLifecycleOwner) {
+			branchesAdapter.setItems(it)
+			spinner.isVisible = it.size > 1
+		}
+		viewModel.selectedBranchIndex.observe(viewLifecycleOwner) {
+			if (it != -1 && it != spinner.selectedItemPosition) {
+				spinner.setSelection(it)
+			}
+		}
+	}
+
 	private fun onChaptersChanged(list: List<ChapterListItem>) {
 		chaptersAdapter?.items = list
 	}
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 10c22b67a..24bf3130b 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
@@ -6,12 +6,16 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.Spinner
 import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.Insets
 import androidx.core.net.toFile
+import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
@@ -32,6 +36,7 @@ import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.os.ShortcutsRepository
 import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
+import org.koitharu.kotatsu.details.ui.adapter.BranchesAdapter
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
@@ -40,7 +45,8 @@ import org.koitharu.kotatsu.utils.ShareHelper
 import org.koitharu.kotatsu.utils.ext.buildAlertDialog
 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> {
 		parametersOf(MangaIntent(intent))
@@ -49,12 +55,16 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		setContentView(ActivityDetailsBinding.inflate(layoutInflater))
-		supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		supportActionBar?.run {
+			setDisplayHomeAsUpEnabled(true)
+			setDisplayShowTitleEnabled(false)
+		}
 		val pager = binding.pager
 		if (pager != null) {
 			pager.adapter = MangaDetailsAdapter(this)
 			TabLayoutMediator(checkNotNull(binding.tabs), pager, this).attach()
 		}
+		binding.spinnerBranches?.let(::initSpinner)
 
 		viewModel.manga.observe(this, ::onMangaUpdated)
 		viewModel.newChaptersCount.observe(this, ::onNewChaptersChanged)
@@ -226,6 +236,13 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 		binding.pager?.isUserInputEnabled = true
 	}
 
+	override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+		val spinner = binding.spinnerBranches ?: return
+		viewModel.setSelectedBranch(spinner.selectedItem as String?)
+	}
+
+	override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+
 	fun showChapterMissingDialog(chapterId: Long) {
 		val remoteManga = viewModel.getRemoteManga()
 		if (remoteManga == null) {
@@ -252,6 +269,21 @@ class DetailsActivity : BaseActivity<ActivityDetailsBinding>(), TabLayoutMediato
 		}.show()
 	}
 
+	private fun initSpinner(spinner: Spinner) {
+		val branchesAdapter = BranchesAdapter()
+		spinner.adapter = branchesAdapter
+		spinner.onItemSelectedListener = this
+		viewModel.branches.observe(this) {
+			branchesAdapter.setItems(it)
+			spinner.isVisible = it.size > 1
+		}
+		viewModel.selectedBranchIndex.observe(this) {
+			if (it != -1 && it != spinner.selectedItemPosition) {
+				spinner.setSelection(it)
+			}
+		}
+	}
+
 	companion object {
 
 		fun newIntent(context: Context, manga: Manga): Intent {
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 be471f458..b8d8cb999 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
@@ -209,6 +209,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 			}
 		}
 		drawer?.closeDrawers()
+		appBar.setExpanded(true)
 		return true
 	}
 
diff --git a/app/src/main/res/layout-land/activity_details.xml b/app/src/main/res/layout-land/activity_details.xml
deleted file mode 100644
index 6bf664eea..000000000
--- a/app/src/main/res/layout-land/activity_details.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	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:id="@+id/coordinator"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	tools:context=".details.ui.DetailsActivity">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
-
-		<com.google.android.material.appbar.MaterialToolbar
-			android:id="@id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			app:layout_scrollFlags="scroll|enterAlways">
-
-			<com.google.android.material.tabs.TabLayout
-				android:id="@+id/tabs"
-				style="@style/Widget.Kotatsu.Tabs"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_gravity="end"
-				android:background="@android:color/transparent"
-				app:tabGravity="center"
-				app:tabMode="fixed" />
-
-		</com.google.android.material.appbar.MaterialToolbar>
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<androidx.viewpager2.widget.ViewPager2
-		android:id="@+id/pager"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-	<org.koitharu.kotatsu.base.ui.widgets.FadingSnackbar
-		android:id="@+id/snackbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:visibility="gone" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/dialog_list_mode.xml b/app/src/main/res/layout-land/dialog_list_mode.xml
new file mode 100644
index 000000000..f103a0ac3
--- /dev/null
+++ b/app/src/main/res/layout-land/dialog_list_mode.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="wrap_content"
+	android:animateLayoutChanges="true"
+	android:orientation="vertical">
+
+	<org.koitharu.kotatsu.base.ui.widgets.CheckableButtonGroup
+		android:id="@+id/checkableGroup"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="16dp"
+		android:orientation="horizontal"
+		android:weightSum="3">
+
+		<com.google.android.material.button.MaterialButton
+			android:id="@+id/button_list"
+			style="@style/Widget.Kotatsu.ToggleButton"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:text="@string/list"
+			app:icon="@drawable/ic_list" />
+
+		<com.google.android.material.button.MaterialButton
+			android:id="@+id/button_list_detailed"
+			style="@style/Widget.Kotatsu.ToggleButton"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="12dp"
+			android:layout_weight="1"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:text="@string/detailed_list"
+			app:icon="@drawable/ic_list_detailed" />
+
+		<com.google.android.material.button.MaterialButton
+			android:id="@+id/button_grid"
+			style="@style/Widget.Kotatsu.ToggleButton"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:singleLine="true"
+			android:ellipsize="end"
+			android:text="@string/grid"
+			app:icon="@drawable/ic_grid" />
+
+	</org.koitharu.kotatsu.base.ui.widgets.CheckableButtonGroup>
+
+	<TextView
+		android:id="@+id/textView_grid_title"
+		style="?materialAlertDialogTitleTextStyle"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingLeft="?attr/dialogPreferredPadding"
+		android:paddingRight="?attr/dialogPreferredPadding"
+		android:singleLine="true"
+		android:text="@string/grid_size"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+	<com.google.android.material.slider.Slider
+		android:id="@+id/slider_grid"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginHorizontal="16dp"
+		android:stepSize="5"
+		android:valueFrom="50"
+		android:valueTo="150"
+		android:visibility="gone"
+		app:labelBehavior="floating"
+		app:tickVisible="false"
+		tools:value="100"
+		tools:visibility="visible" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp-port/fragment_details.xml b/app/src/main/res/layout-w600dp-port/fragment_details.xml
deleted file mode 100644
index c42301de6..000000000
--- a/app/src/main/res/layout-w600dp-port/fragment_details.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-	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:clipToPadding="false"
-	android:scrollbars="vertical"
-	app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent">
-
-		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
-			android:id="@+id/imageView_cover"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:foreground="?selectableItemBackground"
-			android:scaleType="centerCrop"
-			android:transitionName="cover"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:layout_constraintWidth_percent="0.3"
-			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
-			tools:background="@tools:sample/backgrounds/scenic"
-			tools:ignore="ContentDescription,UnusedAttribute" />
-
-		<TextView
-			android:id="@+id/textView_title"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginEnd="16dp"
-			android:ellipsize="end"
-			android:maxLines="4"
-			android:textAppearance="?attr/textAppearanceHeadlineSmall"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toTopOf="parent"
-			tools:text="@tools:sample/lorem[15]" />
-
-		<TextView
-			android:id="@+id/textView_subtitle"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="6dp"
-			android:layout_marginEnd="16dp"
-			android:ellipsize="end"
-			android:maxLines="4"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/textView_title"
-			tools:text="@tools:sample/lorem[12]" />
-
-		<TextView
-			android:id="@+id/textView_author"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="12dp"
-			android:layout_marginTop="2dp"
-			android:layout_marginEnd="12dp"
-			android:background="@drawable/list_selector"
-			android:padding="4dp"
-			android:singleLine="true"
-			android:textColor="?attr/colorTertiary"
-			android:textStyle="bold"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintHorizontal_bias="0"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/textView_subtitle"
-			app:layout_constraintWidth_default="wrap"
-			tools:text="@tools:sample/full_names" />
-
-		<TextView
-			android:id="@+id/textView_state"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="4dp"
-			android:layout_marginEnd="16dp"
-			android:drawablePadding="4dp"
-			android:singleLine="true"
-			android:textAppearance="?attr/textAppearanceBodySmall"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/textView_author"
-			tools:drawableStart="@drawable/ic_state_finished"
-			tools:text="Finished" />
-
-		<include
-			android:id="@+id/info_layout"
-			layout="@layout/layout_details_info"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="6dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toBottomOf="@id/textView_state" />
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_favorite"
-			style="@style/Widget.Material3.Button.OutlinedButton"
-			android:layout_width="0dp"
-			android:layout_height="0dp"
-			android:layout_marginStart="16dp"
-			android:paddingStart="0dp"
-			android:paddingEnd="0dp"
-			app:icon="@drawable/ic_heart_outline"
-			app:iconGravity="textTop"
-			app:iconPadding="0dp"
-			app:layout_constraintBottom_toBottomOf="@id/button_read"
-			app:layout_constraintDimensionRatio="1:1"
-			app:layout_constraintStart_toEndOf="@id/imageView_cover"
-			app:layout_constraintTop_toTopOf="@id/button_read" />
-
-		<com.google.android.material.button.MaterialButton
-			android:id="@+id/button_read"
-			style="@style/Widget.Material3.Button.TonalButton"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginEnd="16dp"
-			android:enabled="false"
-			android:text="@string/read"
-			android:textAllCaps="false"
-			app:iconGravity="textStart"
-			app:iconPadding="8dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toEndOf="@id/button_favorite"
-			app:layout_constraintTop_toBottomOf="@id/info_layout"
-			tools:text="@string/_continue" />
-
-		<androidx.constraintlayout.widget.Barrier
-			android:id="@+id/barrier_header"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			app:barrierDirection="bottom"
-			app:barrierMargin="8dp"
-			app:constraint_referenced_ids="imageView_cover,button_read" />
-
-		<org.koitharu.kotatsu.base.ui.widgets.ChipsView
-			android:id="@+id/chips_tags"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="8dp"
-			android:paddingStart="16dp"
-			android:paddingEnd="16dp"
-			app:chipSpacingHorizontal="6dp"
-			app:chipSpacingVertical="6dp"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/barrier_header" />
-
-		<TextView
-			android:id="@+id/textView_description"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="8dp"
-			android:layout_marginEnd="16dp"
-			android:layout_marginBottom="16dp"
-			android:lineSpacingMultiplier="1.2"
-			android:textAppearance="?attr/textAppearanceBodyMedium"
-			android:textIsSelectable="true"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@id/chips_tags"
-			tools:ignore="UnusedAttribute"
-			tools:text="@tools:sample/lorem/random[250]" />
-
-		<com.google.android.material.progressindicator.LinearProgressIndicator
-			android:id="@+id/progressBar"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:indeterminate="true"
-			android:visibility="gone"
-			app:hideAnimationBehavior="outward"
-			app:layout_constraintBottom_toTopOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
-			app:showAnimationBehavior="inward"
-			tools:visibility="visible" />
-
-	</androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w600dp-land/fragment_details.xml b/app/src/main/res/layout-w600dp/fragment_details.xml
similarity index 92%
rename from app/src/main/res/layout-w600dp-land/fragment_details.xml
rename to app/src/main/res/layout-w600dp/fragment_details.xml
index 55df1bb95..d751d0c6c 100644
--- a/app/src/main/res/layout-w600dp-land/fragment_details.xml
+++ b/app/src/main/res/layout-w600dp/fragment_details.xml
@@ -17,8 +17,8 @@
 			android:id="@+id/imageView_cover"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
+			android:layout_marginStart="8dp"
+			android:layout_marginTop="8dp"
 			android:foreground="?selectableItemBackground"
 			android:scaleType="centerCrop"
 			android:transitionName="cover"
@@ -35,9 +35,9 @@
 			android:id="@+id/textView_title"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
-			android:layout_marginEnd="16dp"
+			android:layout_marginStart="8dp"
+			android:layout_marginTop="8dp"
+			android:layout_marginEnd="8dp"
 			android:ellipsize="end"
 			android:maxLines="3"
 			android:textAppearance="?attr/textAppearanceHeadlineSmall"
@@ -50,9 +50,9 @@
 			android:id="@+id/textView_subtitle"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
-			android:layout_marginTop="6dp"
-			android:layout_marginEnd="16dp"
+			android:layout_marginStart="8dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
 			android:ellipsize="end"
 			android:maxLines="3"
 			android:textAppearance="?attr/textAppearanceBodyMedium"
@@ -65,11 +65,11 @@
 			android:id="@+id/textView_author"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="12dp"
+			android:layout_marginStart="6dp"
 			android:layout_marginTop="2dp"
-			android:layout_marginEnd="12dp"
+			android:layout_marginEnd="6dp"
 			android:background="@drawable/list_selector"
-			android:padding="4dp"
+			android:padding="2dp"
 			android:singleLine="true"
 			android:textColor="?attr/colorTertiary"
 			android:textStyle="bold"
@@ -84,9 +84,9 @@
 			android:id="@+id/textView_state"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginStart="16dp"
+			android:layout_marginStart="8dp"
 			android:layout_marginTop="4dp"
-			android:layout_marginEnd="16dp"
+			android:layout_marginEnd="8dp"
 			android:drawablePadding="4dp"
 			android:singleLine="true"
 			android:textAppearance="?attr/textAppearanceBodySmall"
@@ -96,12 +96,19 @@
 			tools:drawableStart="@drawable/ic_state_finished"
 			tools:text="Finished" />
 
+		<androidx.constraintlayout.widget.Barrier
+			android:id="@+id/barrier_header"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			app:barrierDirection="bottom"
+			app:barrierMargin="8dp"
+			app:constraint_referenced_ids="imageView_cover,button_read" />
+
 		<include
 			android:id="@+id/info_layout"
 			layout="@layout/layout_details_info"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginTop="6dp"
 			app:layout_constraintEnd_toEndOf="parent"
 			app:layout_constraintStart_toEndOf="@id/imageView_cover"
 			app:layout_constraintTop_toBottomOf="@id/textView_state" />
@@ -128,7 +135,6 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_marginStart="16dp"
-			android:layout_marginTop="16dp"
 			android:layout_marginEnd="16dp"
 			android:enabled="false"
 			android:text="@string/read"
@@ -140,14 +146,6 @@
 			app:layout_constraintTop_toBottomOf="@id/info_layout"
 			tools:text="@string/_continue" />
 
-		<androidx.constraintlayout.widget.Barrier
-			android:id="@+id/barrier_header"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			app:barrierDirection="bottom"
-			app:barrierMargin="8dp"
-			app:constraint_referenced_ids="imageView_cover,button_read" />
-
 		<org.koitharu.kotatsu.base.ui.widgets.ChipsView
 			android:id="@+id/chips_tags"
 			android:layout_width="0dp"
diff --git a/app/src/main/res/layout-w720dp-land/activity_details.xml b/app/src/main/res/layout-w720dp-land/activity_details.xml
deleted file mode 100644
index bcf33f71a..000000000
--- a/app/src/main/res/layout-w720dp-land/activity_details.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-	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:id="@+id/coordinator"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	app:keylines="@array/keylines_details"
-	tools:context=".details.ui.DetailsActivity">
-
-	<com.google.android.material.appbar.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		app:elevation="0dp"
-		app:liftOnScroll="false">
-
-		<com.google.android.material.appbar.MaterialToolbar
-			android:id="@id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			android:theme="?attr/actionBarTheme"
-			app:layout_scrollFlags="scroll|enterAlways" />
-
-	</com.google.android.material.appbar.AppBarLayout>
-
-	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/container_details"
-		android:name="org.koitharu.kotatsu.details.ui.DetailsFragment"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_gravity="start"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-		app:layout_keyline="0"
-		tools:layout="@layout/fragment_details" />
-
-	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/container_chapters"
-		android:name="org.koitharu.kotatsu.details.ui.ChaptersFragment"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:layout_gravity="end"
-		app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-		app:layout_keyline="0"
-		tools:layout="@layout/fragment_chapters" />
-
-	<org.koitharu.kotatsu.base.ui.widgets.FadingSnackbar
-		android:id="@+id/snackbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:visibility="gone" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w720dp/activity_details.xml b/app/src/main/res/layout-w720dp/activity_details.xml
new file mode 100644
index 000000000..337b9ec77
--- /dev/null
+++ b/app/src/main/res/layout-w720dp/activity_details.xml
@@ -0,0 +1,79 @@
+<?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="match_parent"
+	android:orientation="vertical"
+	tools:context=".details.ui.DetailsActivity">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appbar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		app:elevation="0dp"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:liftOnScroll="false">
+
+		<com.google.android.material.appbar.MaterialToolbar
+			android:id="@id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="?attr/actionBarSize"
+			android:theme="?attr/actionBarTheme">
+
+			<Spinner
+				android:id="@+id/spinner_branches"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="end"
+				android:visibility="gone"
+				tools:listitem="@layout/item_branch"
+				tools:visibility="visible" />
+
+		</com.google.android.material.appbar.MaterialToolbar>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@+id/container_details"
+		android:name="org.koitharu.kotatsu.details.ui.DetailsFragment"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@id/guideline"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@id/appbar"
+		tools:layout="@layout/fragment_details" />
+
+	<androidx.fragment.app.FragmentContainerView
+		android:id="@+id/container_chapters"
+		android:name="org.koitharu.kotatsu.details.ui.ChaptersFragment"
+		android:layout_width="0dp"
+		android:layout_height="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@id/guideline"
+		app:layout_constraintTop_toBottomOf="@id/appbar"
+		tools:layout="@layout/fragment_chapters" />
+
+	<org.koitharu.kotatsu.base.ui.widgets.FadingSnackbar
+		android:id="@+id/snackbar"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:visibility="gone"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent" />
+
+	<androidx.constraintlayout.widget.Guideline
+		android:id="@+id/guideline"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		app:layout_constraintGuide_percent="0.6" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w720dp/fragment_chapters.xml b/app/src/main/res/layout-w720dp/fragment_chapters.xml
new file mode 100644
index 000000000..386ce6fb0
--- /dev/null
+++ b/app/src/main/res/layout-w720dp/fragment_chapters.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	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">
+
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/recyclerView_chapters"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:clipToPadding="false"
+		android:orientation="vertical"
+		app:fastScrollEnabled="true"
+		app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		tools:listitem="@layout/item_chapter" />
+
+	<com.google.android.material.progressindicator.CircularProgressIndicator
+		android:id="@+id/progressBar"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:indeterminate="true"
+		android:visibility="gone"
+		tools:visibility="visible" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml
index 5a723948f..8190e9c82 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout/activity_details.xml
@@ -3,7 +3,6 @@
 	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:id="@+id/coordinator"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	tools:context=".details.ui.DetailsActivity">
@@ -12,24 +11,28 @@
 		android:id="@+id/appbar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		app:liftOnScroll="false"
-		app:elevation="0dp">
+		app:elevation="0dp"
+		app:liftOnScroll="false">
 
 		<com.google.android.material.appbar.MaterialToolbar
 			android:id="@id/toolbar"
 			android:layout_width="match_parent"
 			android:layout_height="?attr/actionBarSize"
+			android:background="@drawable/m3_tabs_background"
 			android:theme="?attr/actionBarTheme"
-			app:layout_scrollFlags="scroll|enterAlways"/>
+			app:layout_scrollFlags="scroll|enterAlways"
+			tools:ignore="PrivateResource">
 
-		<com.google.android.material.tabs.TabLayout
-			android:id="@+id/tabs"
-			style="@style/Widget.Kotatsu.Tabs"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			app:tabGravity="fill"
-			app:tabMaxWidth="0dp"
-			app:tabMode="fixed" />
+			<com.google.android.material.tabs.TabLayout
+				android:id="@+id/tabs"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_gravity="center_horizontal"
+				android:background="@null"
+				app:tabGravity="center"
+				app:tabMode="scrollable" />
+
+		</com.google.android.material.appbar.MaterialToolbar>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/values-w980dp/dimens.xml b/app/src/main/res/values-w980dp/dimens.xml
deleted file mode 100644
index 32b68f0c3..000000000
--- a/app/src/main/res/values-w980dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<array name="keylines_details">
-		<item>760</item>
-	</array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e2c130bde..5003ad1fc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,11 +18,4 @@
 	<dimen name="list_footer_height_inner">36dp</dimen>
 	<dimen name="list_footer_height_outer">48dp</dimen>
 	<dimen name="screen_padding">16dp</dimen>
-
-	<!--Text dimens-->
-
-	<!-- Keylines -->
-	<array name="keylines_details">
-		<item>600</item>
-	</array>
 </resources>
\ No newline at end of file