From 5f3a174b141ef5375a92417a6e2e866b42a799d6 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Thu, 7 Jul 2022 00:37:37 +0200 Subject: [PATCH] Update: Disable collapsable TopBar --- .../com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt | 5 ++--- .../com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt | 5 ++--- .../com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt index 6d398db2..f1b7f2e8 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt @@ -23,7 +23,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Modifier -import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource import com.machiav3lli.fdroid.R @@ -87,11 +86,11 @@ class ExploreFragment : MainNavFragmentX() { ) { Scaffold( // TODO add the topBar to the activity instead of the fragments - modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + //modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { TopBar( title = stringResource(id = R.string.application_name), - scrollBehavior = scrollBehavior + //scrollBehavior = scrollBehavior ) { ExpandableSearchAction( query = searchQuery.orEmpty(), diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt index 12f38417..51966f08 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt @@ -38,7 +38,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -105,11 +104,11 @@ class InstalledFragment : MainNavFragmentX() { ) { Scaffold( // TODO add the topBar to the activity instead of the fragments - modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + //modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { TopBar( title = stringResource(id = R.string.application_name), - scrollBehavior = scrollBehavior + //scrollBehavior = scrollBehavior ) { ExpandableSearchAction( query = searchQuery.orEmpty(), diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt index 65086afd..f3a11cdc 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt @@ -26,7 +26,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp @@ -90,11 +89,11 @@ class LatestFragment : MainNavFragmentX() { ) { Scaffold( // TODO add the topBar to the activity instead of the fragments - modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + //modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = { TopBar( title = stringResource(id = R.string.application_name), - scrollBehavior = scrollBehavior + //scrollBehavior = scrollBehavior ) { ExpandableSearchAction( query = searchQuery.orEmpty(),