mirror of https://github.com/tasks/tasks
Update subscription screen to fix rejection
Alex Baker
1 year ago
parent
a289cb80fd
commit
5fa00ea53d
@ -1,201 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2020 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.tasks.compose
|
|
||||||
|
|
||||||
import androidx.compose.animation.core.Animatable
|
|
||||||
import androidx.compose.foundation.gestures.Orientation
|
|
||||||
import androidx.compose.foundation.gestures.draggable
|
|
||||||
import androidx.compose.foundation.gestures.rememberDraggableState
|
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.Immutable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.key
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.rememberCoroutineScope
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.runtime.structuralEqualityPolicy
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.layout.Layout
|
|
||||||
import androidx.compose.ui.layout.Measurable
|
|
||||||
import androidx.compose.ui.layout.ParentDataModifier
|
|
||||||
import androidx.compose.ui.unit.Density
|
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This is a modified version of:
|
|
||||||
* https://gist.github.com/adamp/07d468f4bcfe632670f305ce3734f511
|
|
||||||
*/
|
|
||||||
|
|
||||||
class PagerState(
|
|
||||||
currentPage: Int = 0,
|
|
||||||
minPage: Int = 0,
|
|
||||||
maxPage: Int = 0
|
|
||||||
) {
|
|
||||||
private var _minPage by mutableStateOf(minPage)
|
|
||||||
var minPage: Int
|
|
||||||
get() = _minPage
|
|
||||||
set(value) {
|
|
||||||
_minPage = value.coerceAtMost(_maxPage)
|
|
||||||
_currentPage = _currentPage.coerceIn(_minPage, _maxPage)
|
|
||||||
}
|
|
||||||
|
|
||||||
private var _maxPage by mutableStateOf(maxPage, structuralEqualityPolicy())
|
|
||||||
var maxPage: Int
|
|
||||||
get() = _maxPage
|
|
||||||
set(value) {
|
|
||||||
_maxPage = value.coerceAtLeast(_minPage)
|
|
||||||
_currentPage = _currentPage.coerceIn(_minPage, maxPage)
|
|
||||||
}
|
|
||||||
|
|
||||||
private var _currentPage by mutableStateOf(currentPage.coerceIn(minPage, maxPage))
|
|
||||||
var currentPage: Int
|
|
||||||
get() = _currentPage
|
|
||||||
set(value) {
|
|
||||||
_currentPage = value.coerceIn(minPage, maxPage)
|
|
||||||
}
|
|
||||||
|
|
||||||
enum class SelectionState { Selected, Undecided }
|
|
||||||
|
|
||||||
var selectionState by mutableStateOf(SelectionState.Selected)
|
|
||||||
|
|
||||||
private suspend fun selectPage() {
|
|
||||||
currentPage -= currentPageOffset.roundToInt()
|
|
||||||
snapToOffset(0f)
|
|
||||||
selectionState = SelectionState.Selected
|
|
||||||
}
|
|
||||||
|
|
||||||
private var _currentPageOffset = Animatable(0f).apply {
|
|
||||||
updateBounds(-1f, 1f)
|
|
||||||
}
|
|
||||||
val currentPageOffset: Float
|
|
||||||
get() = _currentPageOffset.value
|
|
||||||
|
|
||||||
suspend fun snapToOffset(offset: Float) {
|
|
||||||
val max = if (currentPage == minPage) 0f else 1f
|
|
||||||
val min = if (currentPage == maxPage) 0f else -1f
|
|
||||||
_currentPageOffset.snapTo(offset.coerceIn(min, max))
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun fling(velocity: Float) {
|
|
||||||
if (velocity < 0 && currentPage == maxPage) return
|
|
||||||
if (velocity > 0 && currentPage == minPage) return
|
|
||||||
|
|
||||||
_currentPageOffset.animateTo(currentPageOffset.roundToInt().toFloat())
|
|
||||||
selectPage()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun toString(): String = "PagerState{minPage=$minPage, maxPage=$maxPage, " +
|
|
||||||
"currentPage=$currentPage, currentPageOffset=$currentPageOffset}"
|
|
||||||
}
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
private data class PageData(val page: Int) : ParentDataModifier {
|
|
||||||
override fun Density.modifyParentData(parentData: Any?): Any = this@PageData
|
|
||||||
}
|
|
||||||
|
|
||||||
private val Measurable.page: Int
|
|
||||||
get() = (parentData as? PageData)?.page ?: error("no PageData for measurable $this")
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Pager(
|
|
||||||
state: PagerState,
|
|
||||||
modifier: Modifier = Modifier,
|
|
||||||
offscreenLimit: Int = 2,
|
|
||||||
pageContent: @Composable PagerScope.() -> Unit
|
|
||||||
) {
|
|
||||||
var pageSize by remember { mutableStateOf(0) }
|
|
||||||
val coroutineScope = rememberCoroutineScope()
|
|
||||||
Layout(
|
|
||||||
content = {
|
|
||||||
val minPage = (state.currentPage - offscreenLimit).coerceAtLeast(state.minPage)
|
|
||||||
val maxPage = (state.currentPage + offscreenLimit).coerceAtMost(state.maxPage)
|
|
||||||
|
|
||||||
for (page in minPage..maxPage) {
|
|
||||||
val pageData = PageData(page)
|
|
||||||
val scope = PagerScope(page)
|
|
||||||
key(pageData) {
|
|
||||||
Box(contentAlignment = Alignment.Center, modifier = pageData) {
|
|
||||||
scope.pageContent()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
modifier = modifier.draggable(
|
|
||||||
orientation = Orientation.Horizontal,
|
|
||||||
onDragStarted = {
|
|
||||||
state.selectionState = PagerState.SelectionState.Undecided
|
|
||||||
},
|
|
||||||
onDragStopped = { velocity ->
|
|
||||||
coroutineScope.launch {
|
|
||||||
// Velocity is in pixels per second, but we deal in percentage offsets, so we
|
|
||||||
// need to scale the velocity to match
|
|
||||||
state.fling(velocity / pageSize)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
state = rememberDraggableState { dy ->
|
|
||||||
coroutineScope.launch {
|
|
||||||
with(state) {
|
|
||||||
val pos = pageSize * currentPageOffset
|
|
||||||
val max = if (currentPage == minPage) 0 else pageSize * offscreenLimit
|
|
||||||
val min = if (currentPage == maxPage) 0 else -pageSize * offscreenLimit
|
|
||||||
val newPos = (pos + dy).coerceIn(min.toFloat(), max.toFloat())
|
|
||||||
snapToOffset(newPos / pageSize)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
)
|
|
||||||
) { measurables, constraints ->
|
|
||||||
layout(constraints.maxWidth, constraints.maxHeight) {
|
|
||||||
val currentPage = state.currentPage
|
|
||||||
val offset = state.currentPageOffset
|
|
||||||
val childConstraints = constraints.copy(minWidth = 0, minHeight = 0)
|
|
||||||
|
|
||||||
measurables
|
|
||||||
.map {
|
|
||||||
it.measure(childConstraints) to it.page
|
|
||||||
}
|
|
||||||
.forEach { (placeable, page) ->
|
|
||||||
// TODO: current this centers each page. We should investigate reading
|
|
||||||
// gravity modifiers on the child, or maybe as a param to Pager.
|
|
||||||
val xCenterOffset = (constraints.maxWidth - placeable.width) / 2
|
|
||||||
val yCenterOffset = (constraints.maxHeight - placeable.height) / 2
|
|
||||||
|
|
||||||
if (currentPage == page) {
|
|
||||||
pageSize = placeable.width
|
|
||||||
}
|
|
||||||
|
|
||||||
val xItemOffset = ((page + offset - currentPage) * placeable.width).roundToInt()
|
|
||||||
|
|
||||||
placeable.place(
|
|
||||||
x = xCenterOffset + xItemOffset,
|
|
||||||
y = yCenterOffset
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Scope for [Pager] content.
|
|
||||||
*/
|
|
||||||
class PagerScope(
|
|
||||||
val page: Int
|
|
||||||
)
|
|
||||||
Loading…
Reference in New Issue