From bc2ffef17e796483e752a107d5cb9e1d8eab3743 Mon Sep 17 00:00:00 2001
From: Zakhar Timoshenko <vp1984tanki@gmail.com>
Date: Mon, 8 Aug 2022 04:47:43 +0300
Subject: [PATCH] Padding for description

---
 .../org/koitharu/kotatsu/details/ui/DetailsActivity.kt   | 9 ++++++++-
 .../org/koitharu/kotatsu/details/ui/DetailsFragment.kt   | 5 ++++-
 .../kotatsu/main/ui/owners/NoModalBottomSheetOwner.kt    | 8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/org/koitharu/kotatsu/main/ui/owners/NoModalBottomSheetOwner.kt

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 31bbb704b..371287b66 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
@@ -7,11 +7,13 @@ import android.content.IntentFilter
 import android.os.Bundle
 import android.view.Menu
 import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.graphics.Insets
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.badge.BadgeDrawable
@@ -31,6 +33,7 @@ import org.koitharu.kotatsu.databinding.ActivityDetailsBinding
 import org.koitharu.kotatsu.details.ui.model.HistoryInfo
 import org.koitharu.kotatsu.download.ui.service.DownloadService
 import org.koitharu.kotatsu.list.ui.adapter.bindBadge
+import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
@@ -40,7 +43,11 @@ import org.koitharu.kotatsu.utils.ext.*
 class DetailsActivity :
 	BaseActivity<ActivityDetailsBinding>(),
 	View.OnClickListener,
-	BottomSheetHeaderBar.OnExpansionChangeListener {
+	BottomSheetHeaderBar.OnExpansionChangeListener,
+	NoModalBottomSheetOwner {
+
+	override val bsHeader: BottomSheetHeaderBar?
+		get() = binding.headerChapters
 
 	@Inject
 	lateinit var viewModelFactory: DetailsViewModel.Factory
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 a55c0e8b5..cc965d679 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
@@ -33,6 +33,7 @@ import org.koitharu.kotatsu.details.ui.model.ChapterListItem
 import org.koitharu.kotatsu.details.ui.scrobbling.ScrobblingInfoBottomSheet
 import org.koitharu.kotatsu.history.domain.PROGRESS_NONE
 import org.koitharu.kotatsu.image.ui.ImageActivity
+import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
@@ -290,7 +291,9 @@ class DetailsFragment :
 
 	override fun onWindowInsetsChanged(insets: Insets) {
 		binding.root.updatePadding(
-			bottom = insets.bottom,
+			bottom = ((activity as? NoModalBottomSheetOwner)?.bsHeader?.measureHeight()
+				?.plus(insets.bottom)?.plus(resources.resolveDp(16)))
+				?: insets.bottom,
 		)
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/owners/NoModalBottomSheetOwner.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/owners/NoModalBottomSheetOwner.kt
new file mode 100644
index 000000000..78c4f29a2
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/owners/NoModalBottomSheetOwner.kt
@@ -0,0 +1,8 @@
+package org.koitharu.kotatsu.main.ui.owners
+
+import org.koitharu.kotatsu.base.ui.widgets.BottomSheetHeaderBar
+
+interface NoModalBottomSheetOwner {
+
+	val bsHeader: BottomSheetHeaderBar?
+}