[Manatoki] Bug fix

This commit is contained in:
tom5079
2021-12-21 19:05:15 +09:00
parent c34b0f6f0f
commit 8b2e388a81
4 changed files with 7 additions and 11 deletions

View File

@@ -12,6 +12,6 @@
</deviceKey> </deviceKey>
</Target> </Target>
</targetSelectedWithDropDown> </targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2021-12-21T07:51:21.968371Z" /> <timeTargetWasSelectedWithDropDown value="2021-12-21T09:29:02.245596Z" />
</component> </component>
</project> </project>

View File

@@ -77,12 +77,12 @@ fun OverscrollPager(
if (topCircleRadius != 0f || bottomCircleRadius != 0f) if (topCircleRadius != 0f || bottomCircleRadius != 0f)
Canvas(modifier = Modifier.fillMaxSize()) { Canvas(modifier = Modifier.fillMaxSize()) {
drawCircle( drawCircle(
LightBlue300.copy(alpha = 0.6f), LightBlue300,
center = Offset(this.center.x, prevPageTurnIndicatorOffsetPx), center = Offset(this.center.x, prevPageTurnIndicatorOffsetPx),
radius = topCircleRadius radius = topCircleRadius
) )
drawCircle( drawCircle(
LightBlue300.copy(alpha = 0.6f), LightBlue300,
center = Offset(this.center.x, this.size.height-pageTurnIndicatorHeight-nextPageTurnIndicatorOffsetPx), center = Offset(this.center.x, this.size.height-pageTurnIndicatorHeight-nextPageTurnIndicatorOffsetPx),
radius = bottomCircleRadius radius = bottomCircleRadius
) )

View File

@@ -18,6 +18,7 @@
package xyz.quaver.pupil.sources.manatoki package xyz.quaver.pupil.sources.manatoki
import android.app.Application import android.app.Application
import android.util.Half
import android.util.LruCache import android.util.LruCache
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
@@ -812,6 +813,9 @@ class Manatoki(app: Application) : Source(), DIAware {
currentPage = model.page, currentPage = model.page,
prevPageAvailable = model.page > 1, prevPageAvailable = model.page > 1,
nextPageAvailable = model.page < model.maxPage, nextPageAvailable = model.page < model.maxPage,
nextPageTurnIndicatorOffset = rememberInsetsPaddingValues(
LocalWindowInsets.current.navigationBars
).calculateBottomPadding(),
onPageTurn = { onPageTurn = {
model.page = it model.page = it
coroutineScope.launch { coroutineScope.launch {

View File

@@ -110,14 +110,6 @@ fun MangaListingBottomSheet(
) { ) {
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
rippleInteractionSource.forEach {
coroutineScope.launch {
it.interactions.collect {
Log.d("PUPILD", it.toString())
}
}
}
Box( Box(
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { ) {