From 8b2e388a818bff885f33d93017c696db6350ac72 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Tue, 21 Dec 2021 19:05:15 +0900
Subject: [PATCH] [Manatoki] Bug fix

---
 .idea/deploymentTargetDropDown.xml                        | 2 +-
 .../quaver/pupil/sources/composable/OverscrollPager.kt    | 4 ++--
 .../java/xyz/quaver/pupil/sources/manatoki/Manatoki.kt    | 4 ++++
 .../manatoki/composable/MangaListingBottomSheet.kt        | 8 --------
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 140d9cd6..57e09285 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-12-21T07:51:21.968371Z" />
+    <timeTargetWasSelectedWithDropDown value="2021-12-21T09:29:02.245596Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/xyz/quaver/pupil/sources/composable/OverscrollPager.kt b/app/src/main/java/xyz/quaver/pupil/sources/composable/OverscrollPager.kt
index 3d7dda72..23f5c499 100644
--- a/app/src/main/java/xyz/quaver/pupil/sources/composable/OverscrollPager.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/composable/OverscrollPager.kt
@@ -77,12 +77,12 @@ fun OverscrollPager(
     if (topCircleRadius != 0f || bottomCircleRadius != 0f)
         Canvas(modifier = Modifier.fillMaxSize()) {
             drawCircle(
-                LightBlue300.copy(alpha = 0.6f),
+                LightBlue300,
                 center = Offset(this.center.x, prevPageTurnIndicatorOffsetPx),
                 radius = topCircleRadius
             )
             drawCircle(
-                LightBlue300.copy(alpha = 0.6f),
+                LightBlue300,
                 center = Offset(this.center.x, this.size.height-pageTurnIndicatorHeight-nextPageTurnIndicatorOffsetPx),
                 radius = bottomCircleRadius
             )
diff --git a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/Manatoki.kt b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/Manatoki.kt
index b8a7b421..526859f0 100644
--- a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/Manatoki.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/Manatoki.kt
@@ -18,6 +18,7 @@
 package xyz.quaver.pupil.sources.manatoki
 
 import android.app.Application
+import android.util.Half
 import android.util.LruCache
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.AnimatedVisibility
@@ -812,6 +813,9 @@ class Manatoki(app: Application) : Source(), DIAware {
                             currentPage = model.page,
                             prevPageAvailable = model.page > 1,
                             nextPageAvailable = model.page < model.maxPage,
+                            nextPageTurnIndicatorOffset = rememberInsetsPaddingValues(
+                                LocalWindowInsets.current.navigationBars
+                            ).calculateBottomPadding(),
                             onPageTurn = {
                                 model.page = it
                                 coroutineScope.launch {
diff --git a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt
index 3e9c6d5a..9f8c55ee 100644
--- a/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/manatoki/composable/MangaListingBottomSheet.kt
@@ -110,14 +110,6 @@ fun MangaListingBottomSheet(
 ) {
     val coroutineScope = rememberCoroutineScope()
 
-    rippleInteractionSource.forEach {
-        coroutineScope.launch {
-            it.interactions.collect {
-                Log.d("PUPILD", it.toString())
-            }
-        }
-    }
-
     Box(
         modifier = Modifier.fillMaxWidth()
     ) {