highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-06-27 21:10:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Faster animations

Browse Source
This commit is contained in:
Vitor Pamplona 2023-02-03 11:26:28 -05:00
parent bb3e38d079
commit a45a8789e7
9 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/vitorpamplona/amethyst/ui/components/UrlPreview.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.components package com.vitorpamplona.amethyst.ui.components
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -32,7 +33,7 @@ fun UrlPreview(url: String, urlText: String, showUrlIfError: Boolean = true) {
}) })
} }
Crossfade(targetState = urlPreviewState) { state -> Crossfade(targetState = urlPreviewState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is UrlPreviewState.Loaded -> { is UrlPreviewState.Loaded -> {
UrlPreviewCard(url, state.previewInfo) UrlPreviewCard(url, state.previewInfo)

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
@ -13,7 +14,7 @@ fun AccountScreen(accountStateViewModel: AccountStateViewModel, startingPage: St
val accountState by accountStateViewModel.accountContent.collectAsState() val accountState by accountStateViewModel.accountContent.collectAsState()
Column() { Column() {
Crossfade(targetState = accountState) { state -> Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is AccountState.LoggedOff -> { is AccountState.LoggedOff -> {
LoginPage(accountStateViewModel) LoginPage(accountStateViewModel)

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedView.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@ -45,7 +46,7 @@ fun CardFeedView(viewModel: CardFeedViewModel, accountViewModel: AccountViewMode
}, },
) { ) {
Column() { Column() {
Crossfade(targetState = feedState) { state -> Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is CardFeedState.Empty -> { is CardFeedState.Empty -> {
FeedEmpty { FeedEmpty {

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@ -36,7 +37,7 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode
} }
Column() { Column() {
Crossfade(targetState = feedState) { state -> Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is FeedState.Empty -> { is FeedState.Empty -> {
FeedEmpty { FeedEmpty {

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomListFeedView.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@ -48,7 +49,7 @@ fun ChatroomListFeedView(viewModel: FeedViewModel, accountViewModel: AccountView
}, },
) { ) {
Column() { Column() {
Crossfade(targetState = feedState) { state -> Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is FeedState.Empty -> { is FeedState.Empty -> {
FeedEmpty { FeedEmpty {

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
@ -56,7 +57,7 @@ fun FeedView(viewModel: FeedViewModel, accountViewModel: AccountViewModel, navCo
) { ) {
Column() { Column() {
Crossfade(targetState = feedState) { state -> Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is FeedState.Empty -> { is FeedState.Empty -> {
FeedEmpty { FeedEmpty {

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@ -73,7 +74,7 @@ fun ThreadFeedView(noteId: String, viewModel: FeedViewModel, accountViewModel: A
}, },
) { ) {
Column() { Column() {
Crossfade(targetState = feedState) { state -> Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is FeedState.Empty -> { is FeedState.Empty -> {
FeedEmpty { FeedEmpty {

3
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedView.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@ -43,7 +44,7 @@ fun UserFeedView(viewModel: UserFeedViewModel, accountViewModel: AccountViewMode
}, },
) { ) {
Column() { Column() {
Crossfade(targetState = feedState) { state -> Crossfade(targetState = feedState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is UserFeedState.Empty -> { is UserFeedState.Empty -> {
FeedEmpty { FeedEmpty {

5
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt
View File

@ -1,6 +1,7 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.Crossfade import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -61,7 +62,7 @@ fun FloatingButton(navController: NavHostController, accountViewModel: AccountSt
val accountState by accountViewModel.accountContent.collectAsState() val accountState by accountViewModel.accountContent.collectAsState()
if (currentRoute(navController) == Route.Home.route) { if (currentRoute(navController) == Route.Home.route) {
Crossfade(targetState = accountState) { state -> Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is AccountState.LoggedInViewOnly -> { is AccountState.LoggedInViewOnly -> {
// Does nothing. // Does nothing.
@ -77,7 +78,7 @@ fun FloatingButton(navController: NavHostController, accountViewModel: AccountSt
} }
if (currentRoute(navController) == Route.Message.route) { if (currentRoute(navController) == Route.Message.route) {
Crossfade(targetState = accountState) { state -> Crossfade(targetState = accountState, animationSpec = tween(durationMillis = 100)) { state ->
when (state) { when (state) {
is AccountState.LoggedInViewOnly -> { is AccountState.LoggedInViewOnly -> {
// Does nothing. // Does nothing.