refactor: Rewrite (composable) ExpandedAppBar

Much more optimized but still a bit sluggish, and still doesn't have SearchBar support

Author: null2264

CHANGELOG.md

@@ -55,7 +55,7 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
 - Update dependency gradle to v8.12
 - Update user agent (@Hiirbaf)
 - Update serialization to v1.8.1
-- Update dependency io.github.fornewid:material-motion-compose-core to v1.2.1
+- Update dependency io.github.fornewid:material-motion-compose-core to v2.0.1
 - Update lifecycle to v2.9.0
 - Update dependency org.jsoup:jsoup to v1.21.2
 - Update dependency org.jetbrains.kotlinx:kotlinx-collections-immutable to v0.4.0
@@ -72,13 +72,13 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
 - Update dependency androidx.sqlite:sqlite to v2.5.1
 - Update dependency androidx.recyclerview:recyclerview to v1.4.0
 - Update dependency androidx.core:core-ktx to v1.16.0
-- Update dependency androidx.compose:compose-bom to v2025.05.01
+- Update dependency androidx.compose:compose-bom to v2025.11.00
 - Update aboutlibraries to v11.6.3
 - Update plugin kotlinter to v5.1.0
 - Update plugin gradle-versions to v0.52.0
 - Update okhttp monorepo to v5.0.0-alpha.16
-- Update moko to v0.24.5
-- Update kotlin monorepo to v2.1.21
+- Update moko to v0.25.1
+- Update kotlin monorepo to v2.2.21
 - Update dependency org.jetbrains.kotlinx:kotlinx-coroutines-bom to v1.10.2
 - Update dependency me.zhanghai.android.libarchive:library to v1.1.5
 - Update dependency io.insert-koin:koin-bom to v4.0.4
@@ -89,6 +89,7 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
 - Update null2264/actions digest to 363cb9c
 - Update dependency io.github.pdvrieze.xmlutil:core-android to v0.91.1
 - Improve X-Requested-With spoof to support newer WebView versions (@Hiirbaf)
+- Update agp to v8.10.1
 
 ## [1.9.7.3]
 

app/src/main/java/yokai/presentation/Scaffold.kt

@@ -9,11 +9,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarDefaults.topAppBarColors
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.Modifier
@@ -27,14 +23,17 @@ import androidx.core.view.WindowInsetsControllerCompat
 import dev.icerock.moko.resources.compose.stringResource
 import yokai.i18n.MR
 import yokai.presentation.component.ToolTipButton
-import yokai.presentation.core.ExpandedAppBar
+import yokai.presentation.core.JayAppBarScrollBehavior
+import yokai.presentation.core.JayExpandedTopAppBar
+import yokai.presentation.core.JayTopAppBar
+import yokai.presentation.core.enterAlwaysAppBarScrollBehavior
 
 @Composable
 fun YokaiScaffold(
     onNavigationIconClicked: () -> Unit,
     modifier: Modifier = Modifier,
     title: String = "",
-    scrollBehavior: TopAppBarScrollBehavior? = null,
+    scrollBehavior: JayAppBarScrollBehavior? = null,
     fab: @Composable () -> Unit = {},
     navigationIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack,
     navigationIconLabel: String = stringResource(MR.strings.back),
@@ -43,7 +42,7 @@ fun YokaiScaffold(
     snackbarHost: @Composable () -> Unit = {},
     content: @Composable (PaddingValues) -> Unit,
 ) {
-    val scrollBehaviorOrDefault = scrollBehavior ?: TopAppBarDefaults.enterAlwaysScrollBehavior(state = rememberTopAppBarState())
+    val scrollBehaviorOrDefault = scrollBehavior ?: enterAlwaysAppBarScrollBehavior()
     val view = LocalView.current
     val useDarkIcons = MaterialTheme.colorScheme.surface.luminance() > .5
     val (color, scrolledColor) = getTopAppBarColor(title)
@@ -61,7 +60,7 @@ fun YokaiScaffold(
         floatingActionButton = fab,
         topBar = {
             when (appBarType) {
-                AppBarType.SMALL -> TopAppBar(
+                AppBarType.SMALL -> JayTopAppBar(
                     title = {
                         Text(text = title)
                     },
@@ -80,7 +79,7 @@ fun YokaiScaffold(
                     scrollBehavior = scrollBehaviorOrDefault,
                     actions = actions,
                 )
-                AppBarType.LARGE -> ExpandedAppBar(
+                AppBarType.LARGE -> JayExpandedTopAppBar(
                     title = {
                         Text(text = title)
                     },

app/src/main/java/yokai/presentation/extension/repo/ExtensionRepoScreen.kt

@@ -41,6 +41,7 @@ import yokai.presentation.AppBarType
 import yokai.presentation.YokaiScaffold
 import yokai.presentation.component.EmptyScreen
 import yokai.presentation.component.ToolTipButton
+import yokai.presentation.core.enterAlwaysCollapsedAppBarScrollBehavior
 import yokai.presentation.extension.repo.component.ExtensionRepoInput
 import yokai.presentation.extension.repo.component.ExtensionRepoItem
 import yokai.util.Screen
@@ -67,8 +68,7 @@ class ExtensionRepoScreen(
             onNavigationIconClicked = onBackPress,
             title = title,
             appBarType = AppBarType.SMALL,
-            scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
-                state = rememberTopAppBarState(),
+            scrollBehavior = enterAlwaysCollapsedAppBarScrollBehavior(
                 canScroll = { listState.firstVisibleItemIndex > 0 || listState.firstVisibleItemScrollOffset > 0 },
             ),
             actions = {

app/src/main/java/yokai/presentation/settings/SettingsCommonWidget.kt

@@ -7,8 +7,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -29,15 +27,16 @@ import yokai.presentation.component.Gap
 import yokai.presentation.component.preference.Preference
 import yokai.presentation.component.preference.PreferenceItem
 import yokai.presentation.component.preference.widget.PreferenceGroupHeader
+import yokai.presentation.core.JayAppBarScrollBehavior
 import yokai.presentation.core.drawVerticalScrollbar
-import yokai.presentation.core.enterAlwaysCollapsedScrollBehavior
+import yokai.presentation.core.enterAlwaysCollapsedAppBarScrollBehavior
 
 @Composable
 fun SettingsScaffold(
     title: String,
     appBarType: AppBarType? = null,
     appBarActions: @Composable RowScope.() -> Unit = {},
-    appBarScrollBehavior: TopAppBarScrollBehavior? = null,
+    appBarScrollBehavior: JayAppBarScrollBehavior? = null,
     snackbarHost: @Composable () -> Unit = {},
     content: @Composable (PaddingValues) -> Unit,
 ) {
@@ -73,10 +72,8 @@ fun SettingsScaffold(
         title = title,
         appBarType = appBarType,
         appBarActions = appBarActions,
-        appBarScrollBehavior = enterAlwaysCollapsedScrollBehavior(
-            state = rememberTopAppBarState(),
+        appBarScrollBehavior = enterAlwaysCollapsedAppBarScrollBehavior(
             canScroll = { listState.canScrollForward || listState.canScrollBackward },
-            isAtTop = { listState.firstVisibleItemIndex == 0 && listState.firstVisibleItemScrollOffset == 0 },
         ),
     ) { innerPadding ->
         PreferenceScreen(

app/src/main/java/yokai/presentation/settings/screen/about/AboutLibraryLicenseScreen.kt

@@ -6,8 +6,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Public
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalUriHandler
@@ -23,6 +21,7 @@ import yokai.i18n.MR
 import yokai.presentation.AppBarType
 import yokai.presentation.YokaiScaffold
 import yokai.presentation.component.ToolTipButton
+import yokai.presentation.core.enterAlwaysAppBarScrollBehavior
 import yokai.util.Screen
 
 class AboutLibraryLicenseScreen(
@@ -45,9 +44,7 @@ class AboutLibraryLicenseScreen(
             },
             title = name,
             appBarType = AppBarType.SMALL,
-            scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(
-                state = rememberTopAppBarState(),
-            ),
+            scrollBehavior = enterAlwaysAppBarScrollBehavior(),
             actions = {
                 if (website != null) {
                     ToolTipButton(

app/src/main/java/yokai/presentation/settings/screen/about/AboutLicenseScreen.kt

@@ -1,7 +1,6 @@
 package yokai.presentation.settings.screen.about
 
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.navigator.LocalNavigator
@@ -13,6 +12,7 @@ import eu.kanade.tachiyomi.util.compose.currentOrThrow
 import yokai.i18n.MR
 import yokai.presentation.AppBarType
 import yokai.presentation.YokaiScaffold
+import yokai.presentation.core.pinnedAppBarScrollBehavior
 import yokai.util.Screen
 
 class AboutLicenseScreen : Screen() {
@@ -25,7 +25,7 @@ class AboutLicenseScreen : Screen() {
             onNavigationIconClicked = backPress,
             title = stringResource(MR.strings.open_source_licenses),
             appBarType = AppBarType.SMALL,
-            scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(),
+            scrollBehavior = pinnedAppBarScrollBehavior(),
         ) { innerPadding ->
             LibrariesContainer(
                 modifier = Modifier.fillMaxSize(),

app/src/main/java/yokai/presentation/settings/screen/about/AboutScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.material.icons.outlined.Public
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -62,7 +61,7 @@ import yokai.domain.DialogHostState
 import yokai.i18n.MR
 import yokai.presentation.component.preference.widget.TextPreferenceWidget
 import yokai.presentation.core.components.LinkIcon
-import yokai.presentation.core.enterAlwaysCollapsedScrollBehavior
+import yokai.presentation.core.enterAlwaysCollapsedAppBarScrollBehavior
 import yokai.presentation.core.icons.CustomIcons
 import yokai.presentation.core.icons.Discord
 import yokai.presentation.core.icons.GitHub
@@ -113,10 +112,8 @@ class AboutScreen : Screen() {
             snackbarHost = {
                 SnackbarHost(hostState = snackbarHostState)
             },
-            appBarScrollBehavior = enterAlwaysCollapsedScrollBehavior(
-                state = rememberTopAppBarState(),
+            appBarScrollBehavior = enterAlwaysCollapsedAppBarScrollBehavior(
                 canScroll = { listState.canScrollForward || listState.canScrollBackward },
-                isAtTop = { listState.firstVisibleItemIndex == 0 && listState.firstVisibleItemScrollOffset == 0 },
             ),
             content = { contentPadding ->
                 LazyColumn(

buildSrc/src/main/kotlin/yokai/build/ProjectExtensions.kt

@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginE
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 val Project.androidx get() = the<LibrariesForAndroidx>()
 val Project.compose get() = the<LibrariesForCompose>()
@@ -41,8 +42,8 @@ internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *,
         }
     }
     tasks.withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = AndroidConfig.JavaVersion.toString()
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(AndroidConfig.JavaVersion.toString()))
             // freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
             // freeCompilerArgs += "-Xcontext-receivers"
             // Treat all Kotlin warnings as errors (disabled by default)

gradle/androidx.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 activity = "1.9.3"
-agp = "8.7.3"
+agp = "8.10.1"
 lifecycle = "2.9.0"
 
 [libraries]

gradle/compose.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-compose = "2025.05.01"
+compose = "2025.11.00"
 
 [libraries]
 bom = { module = "androidx.compose:compose-bom", version.ref = "compose" }
 animation = { module = "androidx.compose.animation:animation" }
 foundation = { module = "androidx.compose.foundation:foundation" }
 material3 = { module = "androidx.compose.material3:material3" }
-material-motion = { module = "io.github.fornewid:material-motion-compose-core", version = "1.2.1" }
+material-motion = { module = "io.github.fornewid:material-motion-compose-core", version = "2.0.1" }
 ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 icons = { module = "androidx.compose.material:material-icons-extended" }