1.14.1/overscroll revert and backdrop (#220)

* feat: revert overscroll effect. * fix: pull out the search box when the list is not at the top.
oxyroid · Jan 1, 2025 · b094cb6 · b094cb6
1 parent 8049c6a
commit b094cb6
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 470 deletions.
diff --git a/androidApp/src/main/java/com/m3u/androidApp/ui/Scaffold.kt b/androidApp/src/main/java/com/m3u/androidApp/ui/Scaffold.kt
@@ -51,9 +51,6 @@ import com.m3u.material.effects.currentBackStackEntry
 import com.m3u.material.ktx.tv
 import com.m3u.material.model.LocalHazeState
 import com.m3u.material.model.LocalSpacing
-import com.m3u.material.overscroll.OverScroll
-import com.m3u.material.overscroll.overScrollAlpha
-import com.m3u.material.overscroll.overScrollParallaxVertical
 import com.m3u.ui.Destination
 import com.m3u.ui.FontFamilies
 import com.m3u.ui.helper.Fob
@@ -139,98 +136,89 @@ internal fun MainContent(
     val tv = tv()
     val spacing = LocalSpacing.current
     val hazeState = LocalHazeState.current
-    val density = LocalDensity.current
 
     val title = Metadata.title
     val subtitle = Metadata.subtitle
     val actions = Metadata.actions
 
     val backStackEntry by currentBackStackEntry()
 
-    OverScroll {
-        Scaffold(
-            topBar = {
-                if (!tv) {
-                    TopAppBar(
-                        colors = TopAppBarDefaults.topAppBarColors(Color.Transparent),
-                        windowInsets = windowInsets,
-                        title = {
-                            Row(
-                                horizontalArrangement = Arrangement.SpaceBetween,
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier.defaultMinSize(minHeight = 56.dp)
+    Scaffold(
+        topBar = {
+            if (!tv) {
+                TopAppBar(
+                    colors = TopAppBarDefaults.topAppBarColors(Color.Transparent),
+                    windowInsets = windowInsets,
+                    title = {
+                        Row(
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier.defaultMinSize(minHeight = 56.dp)
+                        ) {
+                            Column(
+                                modifier = Modifier
+                                    .padding(horizontal = spacing.medium)
+                                    .weight(1f)
                             ) {
-                                Column(
-                                    modifier = Modifier
-                                        .padding(horizontal = spacing.medium)
-                                        .weight(1f)
-                                ) {
+                                Text(
+                                    text = title,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                    fontFamily = FontFamilies.LexendExa
+                                )
+                                AnimatedVisibility(subtitle.text.isNotEmpty()) {
                                     Text(
-                                        text = title,
+                                        text = subtitle,
+                                        style = MaterialTheme.typography.titleMedium,
                                         maxLines = 1,
-                                        overflow = TextOverflow.Ellipsis,
-                                        fontFamily = FontFamilies.LexendExa
+                                        overflow = TextOverflow.Ellipsis
                                     )
-                                    AnimatedVisibility(subtitle.text.isNotEmpty()) {
-                                        Text(
-                                            text = subtitle,
-                                            style = MaterialTheme.typography.titleMedium,
-                                            maxLines = 1,
-                                            overflow = TextOverflow.Ellipsis
-                                        )
-                                    }
-                                }
-
-                                Row {
-                                    actions.forEach { action ->
-                                        IconButton(
-                                            icon = action.icon,
-                                            contentDescription = action.contentDescription,
-                                            onClick = action.onClick,
-                                            enabled = action.enabled
-                                        )
-                                    }
                                 }
-
-                                Spacer(modifier = Modifier.width(spacing.medium))
                             }
-                        },
-                        navigationIcon = {
-                            AnimatedContent(
-                                targetState = onBackPressed,
-                                label = "app-scaffold-icon"
-                            ) { onBackPressed ->
-                                if (onBackPressed != null) {
+
+                            Row {
+                                actions.forEach { action ->
                                     IconButton(
-                                        icon = backStackEntry?.navigationIcon
-                                            ?: Icons.AutoMirrored.Rounded.ArrowBack,
-                                        contentDescription = null,
-                                        onClick = onBackPressed,
-                                        modifier = Modifier.wrapContentSize()
+                                        icon = action.icon,
+                                        contentDescription = action.contentDescription,
+                                        onClick = action.onClick,
+                                        enabled = action.enabled
                                     )
                                 }
                             }
-                        },
-                        modifier = Modifier
-                            .hazeChild(hazeState, style = HazeStyle(blurRadius = 6.dp))
-                            .fillMaxWidth()
-                            .overScrollParallaxVertical(maxParallaxOffset = -40f)
-                            .overScrollAlpha(
-                                finalAlpha = 0.35f
-                            )
-                    )
-                }
-            },
-            contentWindowInsets = windowInsets,
-            containerColor = Color.Transparent
-        ) { padding ->
-            Background {
-                Box {
-                    StarBackground(
-                        modifier = Modifier.overScrollAlpha()
-                    )
-                    content(padding)
-                }
+
+                            Spacer(modifier = Modifier.width(spacing.medium))
+                        }
+                    },
+                    navigationIcon = {
+                        AnimatedContent(
+                            targetState = onBackPressed,
+                            label = "app-scaffold-icon"
+                        ) { onBackPressed ->
+                            if (onBackPressed != null) {
+                                IconButton(
+                                    icon = backStackEntry?.navigationIcon
+                                        ?: Icons.AutoMirrored.Rounded.ArrowBack,
+                                    contentDescription = null,
+                                    onClick = onBackPressed,
+                                    modifier = Modifier.wrapContentSize()
+                                )
+                            }
+                        }
+                    },
+                    modifier = Modifier
+                        .hazeChild(hazeState, style = HazeStyle(blurRadius = 6.dp))
+                        .fillMaxWidth()
+                )
+            }
+        },
+        contentWindowInsets = windowInsets,
+        containerColor = Color.Transparent
+    ) { padding ->
+        Background {
+            Box {
+                StarBackground()
+                content(padding)
             }
         }
     }

diff --git a/feature/foryou/src/main/java/com/m3u/feature/foryou/components/HeadlineBackground.kt b/feature/foryou/src/main/java/com/m3u/feature/foryou/components/HeadlineBackground.kt
@@ -26,7 +26,6 @@ import coil.compose.AsyncImage
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.m3u.core.architecture.preferences.hiltPreferences
-import com.m3u.material.overscroll.overScrollScaleCenter
 import com.m3u.material.transformation.BlurTransformation
 import com.m3u.ui.helper.LocalHelper
 import com.m3u.ui.helper.Metadata
@@ -78,7 +77,6 @@ internal fun HeadlineBackground(modifier: Modifier = Modifier) {
             modifier = modifier
                 .fillMaxWidth()
                 .background(MaterialTheme.colorScheme.background)
-                .overScrollScaleCenter()
                 .offset {
                     IntOffset(
                         x = 0,

diff --git a/.../playlist/src/main/java/com/m3u/feature/playlist/internal/SmartphonePlaylistScreenImpl.kt b/.../playlist/src/main/java/com/m3u/feature/playlist/internal/SmartphonePlaylistScreenImpl.kt
@@ -109,7 +109,9 @@ internal fun SmartphonePlaylistScreenImpl(
     val configuration = LocalConfiguration.current
     val focusManager = LocalFocusManager.current
 
-    val scaffoldState = rememberBackdropScaffoldState(BackdropValue.Concealed)
+    val scaffoldState = rememberBackdropScaffoldState(
+        initialValue = BackdropValue.Concealed
+    )
     val connection = remember {
         object : NestedScrollConnection {
             override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
@@ -152,6 +154,7 @@ internal fun SmartphonePlaylistScreenImpl(
 
     BackdropScaffold(
         scaffoldState = scaffoldState,
+        gesturesEnabled = isAtTopState.value,
         appBar = {},
         frontLayerShape = RectangleShape,
         peekHeight = 0.dp,

diff --git a/material/src/main/java/com/m3u/material/overscroll/OverScrollEffect.kt b/material/src/main/java/com/m3u/material/overscroll/OverScrollEffect.kt