Merge remote-tracking branch 'origin/development' into file-tree-browse-feature

This commit is contained in:
acclorite 2024-08-04 19:11:50 +03:00
commit 7743c9cc95

View file

@ -4,10 +4,8 @@ import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.Spring import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.spring import androidx.compose.animation.core.spring
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.PagerState
@ -58,7 +56,6 @@ fun LibraryTopBar(
) { ) {
val focusRequester = remember { FocusRequester() } val focusRequester = remember { FocusRequester() }
Column(Modifier.fillMaxWidth()) {
AnimatedTopAppBar( AnimatedTopAppBar(
scrollBehavior = null, scrollBehavior = null,
isTopBarScrolled = state.value.hasSelectedItems, isTopBarScrolled = state.value.hasSelectedItems,
@ -187,4 +184,3 @@ fun LibraryTopBar(
} }
) )
} }
}