Reverts the New Post button animation due to bugs of not coming back
This commit is contained in:
@@ -3,9 +3,6 @@ package com.vitorpamplona.amethyst.ui.screen.loggedIn
|
|||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import androidx.activity.compose.BackHandler
|
import androidx.activity.compose.BackHandler
|
||||||
import androidx.compose.animation.AnimatedContent
|
import androidx.compose.animation.AnimatedContent
|
||||||
import androidx.compose.animation.AnimatedVisibility
|
|
||||||
import androidx.compose.animation.expandIn
|
|
||||||
import androidx.compose.animation.fadeIn
|
|
||||||
import androidx.compose.animation.slideInVertically
|
import androidx.compose.animation.slideInVertically
|
||||||
import androidx.compose.animation.slideOutVertically
|
import androidx.compose.animation.slideOutVertically
|
||||||
import androidx.compose.animation.togetherWith
|
import androidx.compose.animation.togetherWith
|
||||||
@@ -43,7 +40,6 @@ import androidx.compose.ui.platform.LocalConfiguration
|
|||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.platform.LocalDensity
|
import androidx.compose.ui.platform.LocalDensity
|
||||||
import androidx.compose.ui.platform.LocalLifecycleOwner
|
import androidx.compose.ui.platform.LocalLifecycleOwner
|
||||||
import androidx.compose.ui.unit.IntSize
|
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.lifecycle.Lifecycle
|
import androidx.lifecycle.Lifecycle
|
||||||
import androidx.lifecycle.LifecycleEventObserver
|
import androidx.lifecycle.LifecycleEventObserver
|
||||||
@@ -328,18 +324,13 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
floatingActionButton = {
|
floatingActionButton = {
|
||||||
AnimatedVisibility(
|
FloatingButtons(
|
||||||
visible = shouldShow.value,
|
navState,
|
||||||
enter = fadeIn() + expandIn { IntSize(width = 1, height = 1) }
|
accountViewModel,
|
||||||
) {
|
accountStateViewModel,
|
||||||
FloatingButtons(
|
nav,
|
||||||
navState,
|
navBottomRow
|
||||||
accountViewModel,
|
)
|
||||||
accountStateViewModel,
|
|
||||||
nav,
|
|
||||||
navBottomRow
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
Column(
|
Column(
|
||||||
@@ -467,6 +458,7 @@ private fun WritePermissionButtons(
|
|||||||
nav: (String) -> Unit,
|
nav: (String) -> Unit,
|
||||||
navScrollToTop: (Route, Boolean) -> Unit
|
navScrollToTop: (Route, Boolean) -> Unit
|
||||||
) {
|
) {
|
||||||
|
println("AAAA - WritePermissionButtons")
|
||||||
val currentRoute by remember(navEntryState.value) {
|
val currentRoute by remember(navEntryState.value) {
|
||||||
derivedStateOf {
|
derivedStateOf {
|
||||||
navEntryState.value?.destination?.route?.substringBefore("?")
|
navEntryState.value?.destination?.route?.substringBefore("?")
|
||||||
|
|||||||
Reference in New Issue
Block a user