Revert "feat(android): use enter always scroll behavior for TopAppBar"

This reverts commit eeef2c347d.
This commit is contained in:
Harsh Shandilya 2023-01-07 00:29:06 +05:30
parent 53524c8ef8
commit e67df253de
No known key found for this signature in database
3 changed files with 3 additions and 14 deletions

View file

@ -14,7 +14,6 @@ import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
@ -23,7 +22,6 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
@ -71,7 +69,6 @@ fun LobstersApp(
modifier: Modifier = Modifier,
viewModel: ClawViewModel = injectedViewModel(),
) {
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior()
val systemUiController = rememberSystemUiController()
val hottestListState = rememberLazyListState()
val newestListState = rememberLazyListState()
@ -156,7 +153,6 @@ fun LobstersApp(
Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
}
},
scrollBehavior = scrollBehavior,
)
},
bottomBar = {
@ -166,10 +162,7 @@ fun LobstersApp(
isVisible = navItems.any { it.route == currentDestination },
)
},
modifier =
modifier
.semantics { testTagsAsResourceId = true }
.nestedScroll(scrollBehavior.nestedScrollConnection),
modifier = modifier.semantics { testTagsAsResourceId = true },
) { paddingValues ->
NavHost(
navController = navController,

View file

@ -4,8 +4,6 @@
* license that can be found in the LICENSE file or at
* https://opensource.org/licenses/MIT.
*/
@file:OptIn(ExperimentalMaterial3Api::class)
package dev.msfjarvis.claw.common.ui.decorations
import androidx.compose.foundation.layout.RowScope
@ -14,7 +12,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow
@ -27,13 +24,13 @@ import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation
@Composable
@OptIn(ExperimentalMaterial3Api::class)
fun ClawAppBar(
backgroundColor: Color,
modifier: Modifier = Modifier,
navigationIcon: @Composable () -> Unit = {},
title: @Composable () -> Unit = {},
actions: @Composable RowScope.() -> Unit = {},
scrollBehavior: TopAppBarScrollBehavior? = null,
) {
TopAppBar(
title = title,
@ -41,7 +38,6 @@ fun ClawAppBar(
colors = TopAppBarDefaults.smallTopAppBarColors(containerColor = backgroundColor),
navigationIcon = navigationIcon,
actions = actions,
scrollBehavior = scrollBehavior,
)
}

View file

@ -125,7 +125,7 @@ complexity:
threshold: 60
LongParameterList:
active: true
functionThreshold: 7
functionThreshold: 6
constructorThreshold: 7
ignoreDefaultParameters: false
ignoreDataClasses: true