avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 11:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: Disable collapsable TopBar

Browse Source
This commit is contained in:
machiav3lli 2022-07-07 00:37:37 +02:00
parent cfa6a7471a
commit 5f3a174b14
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt
View File

@ -23,7 +23,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import com.machiav3lli.fdroid.R import com.machiav3lli.fdroid.R
@ -87,11 +86,11 @@ class ExploreFragment : MainNavFragmentX() {
) { ) {
Scaffold( Scaffold(
// TODO add the topBar to the activity instead of the fragments // TODO add the topBar to the activity instead of the fragments
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), //modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = { topBar = {
TopBar( TopBar(
title = stringResource(id = R.string.application_name), title = stringResource(id = R.string.application_name),
scrollBehavior = scrollBehavior //scrollBehavior = scrollBehavior
) { ) {
ExpandableSearchAction( ExpandableSearchAction(
query = searchQuery.orEmpty(), query = searchQuery.orEmpty(),

5
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt
View File

@ -38,7 +38,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
@ -105,11 +104,11 @@ class InstalledFragment : MainNavFragmentX() {
) { ) {
Scaffold( Scaffold(
// TODO add the topBar to the activity instead of the fragments // TODO add the topBar to the activity instead of the fragments
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), //modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = { topBar = {
TopBar( TopBar(
title = stringResource(id = R.string.application_name), title = stringResource(id = R.string.application_name),
scrollBehavior = scrollBehavior //scrollBehavior = scrollBehavior
) { ) {
ExpandableSearchAction( ExpandableSearchAction(
query = searchQuery.orEmpty(), query = searchQuery.orEmpty(),

5
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt
View File

@ -26,7 +26,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -90,11 +89,11 @@ class LatestFragment : MainNavFragmentX() {
) { ) {
Scaffold( Scaffold(
// TODO add the topBar to the activity instead of the fragments // TODO add the topBar to the activity instead of the fragments
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), //modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = { topBar = {
TopBar( TopBar(
title = stringResource(id = R.string.application_name), title = stringResource(id = R.string.application_name),
scrollBehavior = scrollBehavior //scrollBehavior = scrollBehavior
) { ) {
ExpandableSearchAction( ExpandableSearchAction(
query = searchQuery.orEmpty(), query = searchQuery.orEmpty(),