-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Implement MediaSelectorSummary * better animation * remove unused param from EstimatedProgressIndicatorState * max 1 row * set min height to 144dp * document `rememberEstimatedProgressIndicatorState`
- Loading branch information
Showing
5 changed files
with
730 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
* Copyright (C) 2024-2025 OpenAni and contributors. | ||
* | ||
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. | ||
* Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link. | ||
* | ||
* https://github.com/open-ani/ani/blob/main/LICENSE | ||
*/ | ||
|
||
plugins { | ||
kotlin("multiplatform") | ||
id("com.android.library") | ||
kotlin("plugin.compose") | ||
id("org.jetbrains.compose") | ||
|
||
`ani-mpp-lib-targets` | ||
kotlin("plugin.serialization") | ||
} | ||
|
||
kotlin { | ||
sourceSets.commonMain.dependencies { | ||
api(projects.app.shared.uiFoundation) | ||
api(projects.app.shared.uiAdaptive) | ||
api(projects.app.shared.uiSettings) | ||
implementation(projects.utils.ktorClient) | ||
implementation(compose.components.resources) | ||
implementation(projects.utils.logging) | ||
} | ||
sourceSets.commonTest.dependencies { | ||
} | ||
sourceSets.androidMain.dependencies { | ||
} | ||
sourceSets.desktopMain.dependencies { | ||
} | ||
} | ||
|
||
android { | ||
namespace = "me.him188.ani.app.ui.mediaselect" | ||
} |
10 changes: 10 additions & 0 deletions
10
app/shared/ui-mediaselect/src/commonMain/kotlin/package.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* | ||
* Copyright (C) 2024-2025 OpenAni and contributors. | ||
* | ||
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. | ||
* Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link. | ||
* | ||
* https://github.com/open-ani/ani/blob/main/LICENSE | ||
*/ | ||
|
||
package me.him188.ani.app |
154 changes: 154 additions & 0 deletions
154
...ui-mediaselect/src/commonMain/kotlin/ui/mediaselect/summary/EstimatedProgressIndicator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
/* | ||
* Copyright (C) 2024-2025 OpenAni and contributors. | ||
* | ||
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. | ||
* Use of this source code is governed by the GNU AGPLv3 license, which can be found at the following link. | ||
* | ||
* https://github.com/open-ani/ani/blob/main/LICENSE | ||
*/ | ||
|
||
package me.him188.ani.app.ui.mediaselect.summary | ||
|
||
import androidx.compose.animation.core.LinearEasing | ||
import androidx.compose.animation.core.animate | ||
import androidx.compose.animation.core.spring | ||
import androidx.compose.animation.core.tween | ||
import androidx.compose.foundation.layout.Box | ||
import androidx.compose.foundation.layout.height | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.Stable | ||
import androidx.compose.runtime.getValue | ||
import androidx.compose.runtime.mutableFloatStateOf | ||
import androidx.compose.runtime.saveable.Saver | ||
import androidx.compose.runtime.saveable.rememberSaveable | ||
import androidx.compose.runtime.setValue | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.graphics.graphicsLayer | ||
import androidx.compose.ui.unit.dp | ||
import kotlinx.coroutines.coroutineScope | ||
import kotlinx.coroutines.launch | ||
import me.him188.ani.utils.coroutines.SingleTaskExecutor | ||
|
||
/** | ||
* @param initialProgress 初始进度. 此值的变更不会反应到 [EstimatedProgressIndicatorState] 中, 也就是说只有第一个值会被使用. | ||
* @param initialVisible 初始是否可见. 此值的变更不会反应到 [EstimatedProgressIndicatorState] 中, 也就是说只有第一个值会被使用. | ||
*/ | ||
@Composable | ||
fun rememberEstimatedProgressIndicatorState( | ||
initialProgress: Float = 0f, | ||
initialVisible: Boolean = false, | ||
) = rememberSaveable(saver = EstimatedProgressIndicatorState.Saver) { | ||
EstimatedProgressIndicatorState(initialProgress, initialVisible) | ||
} | ||
|
||
@Stable | ||
class EstimatedProgressIndicatorState private constructor( | ||
initialProgress: Float = 0f, | ||
initialHeightScale: Float = 0f, | ||
) { | ||
constructor( | ||
initialProgress: Float = 0f, | ||
initialVisible: Boolean = false, | ||
) : this(initialProgress, initialHeightScale = if (initialVisible) 1f else 0f) | ||
|
||
var progress by mutableFloatStateOf(initialProgress) | ||
private set | ||
var heightScale by mutableFloatStateOf(initialHeightScale) | ||
private set | ||
|
||
private var velocity by mutableFloatStateOf(0f) | ||
private val singleTaskExecutor = SingleTaskExecutor() | ||
|
||
private val isVisible: Boolean | ||
get() = progress > 0f | ||
|
||
/** | ||
* Animate the progress from 0 to 0.99f | ||
*/ | ||
suspend fun animateWithoutFinish( | ||
durationMillis: Int, | ||
) { | ||
coroutineScope { | ||
if (!isVisible) { | ||
launch { | ||
// animate height expand | ||
animate( | ||
initialValue = heightScale, | ||
targetValue = 1f, | ||
animationSpec = spring(), | ||
) { value, _ -> | ||
this@EstimatedProgressIndicatorState.heightScale = value | ||
} | ||
} | ||
} | ||
|
||
// animate progress | ||
animate( | ||
initialValue = 0f, | ||
targetValue = 0.99f, | ||
initialVelocity = velocity, | ||
animationSpec = tween(durationMillis, easing = LinearEasing), | ||
) { p, v -> | ||
progress = p | ||
velocity = v | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Animate the progress to 1.0f | ||
*/ | ||
suspend fun finish() { | ||
if (progress >= 1f) { | ||
return | ||
} | ||
// no animate progress | ||
|
||
// animate height collapse | ||
animate( | ||
initialValue = this.heightScale, | ||
targetValue = 0f, | ||
animationSpec = spring(), | ||
) { value, _ -> | ||
this.heightScale = value | ||
} | ||
|
||
this.progress = 1f | ||
} | ||
|
||
companion object { | ||
val Saver = Saver<EstimatedProgressIndicatorState, Any>( | ||
save = { listOf(it.heightScale, it.progress) }, | ||
restore = { | ||
it as List<*> | ||
EstimatedProgressIndicatorState( | ||
initialProgress = it[2] as Float, | ||
initialHeightScale = it[1] as Float, | ||
) | ||
}, | ||
) | ||
} | ||
} | ||
|
||
@Composable | ||
fun EstimatedLinearProgressIndictorBox( | ||
state: EstimatedProgressIndicatorState, | ||
modifier: Modifier = Modifier, | ||
contentAlignment: Alignment = Alignment.TopStart, | ||
content: @Composable () -> Unit, | ||
) { | ||
Box( | ||
modifier.height(4.dp), | ||
contentAlignment, | ||
) { | ||
Box( | ||
Modifier.graphicsLayer { | ||
scaleY = state.heightScale | ||
}, | ||
contentAlignment = Alignment.Center, | ||
) { | ||
content() | ||
} | ||
} | ||
} |
Oops, something went wrong.