Add "jump to top" functionality

app/src/main/java/com/capyreader/app/MainActivity.kt

@@ -5,6 +5,7 @@ import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.setThreadPolicy
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import com.capyreader.app.common.AppPreferences
@@ -16,6 +17,7 @@ import org.koin.compose.koinInject
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         enableStrictModeOnDebug()
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         val theme = get<AppPreferences>().theme
 

app/src/main/java/com/capyreader/app/ui/articles/ArticleLayout.kt

@@ -15,6 +15,9 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults.pinnedScrollBehavior
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.TopAppBarState
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
@@ -115,13 +118,19 @@ fun ArticleLayout(
         scaffoldNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
     }
 
-    val navigateFromDrawerToList = suspend {
+    val openNextList = suspend {
         scaffoldNavigator.navigateTo(ListDetailPaneScaffoldRole.List)
-        listState.scrollToItem(0)
         delay(200)
+        listState.scrollToItem(0)
         drawerState.close()
     }
 
+    val closeDrawer = {
+        coroutineScope.launch {
+            drawerState.close()
+        }
+    }
+
     val showSnackbar = { message: String ->
         coroutineScope.launch {
             snackbarHost.showSnackbar(message)
@@ -137,6 +146,12 @@ fun ArticleLayout(
         }
     }
 
+    val jumpToTop = {
+        coroutineScope.launch {
+            listState.scrollToItem(0)
+        }
+    }
+
     ArticleScaffold(
         drawerState = drawerState,
         scaffoldNavigator = scaffoldNavigator,
@@ -145,23 +160,31 @@ fun ArticleLayout(
                 folders = folders,
                 feeds = feeds,
                 onSelectFolder = {
-                    webViewNavigator.clearView()
-                    onSelectFolder(it)
-                    coroutineScope.launch {
-                        navigateFromDrawerToList()
+                    if (!filter.isFolderSelect(it)) {
+                        webViewNavigator.clearView()
+                        onSelectFolder(it.title)
+                        coroutineScope.launch {
+                            openNextList()
+                        }
+                    } else {
+                        closeDrawer()
                     }
                 },
                 onSelectFeed = {
-                    webViewNavigator.clearView()
                     coroutineScope.launch {
-                        onSelectFeed(it)
-                        navigateFromDrawerToList()
+                        if (!filter.isFeedSelected(it)) {
+                            webViewNavigator.clearView()
+                            onSelectFeed(it.id)
+                            openNextList()
+                        } else {
+                            closeDrawer()
+                        }
                     }
                 },
                 onFeedAdded = { feedID ->
                     coroutineScope.launch {
                         onSelectFeed(feedID)
-                        navigateFromDrawerToList()
+                        openNextList()
 
                         showSnackbar(addFeedSuccessMessage)
 
@@ -172,9 +195,13 @@ fun ArticleLayout(
                 },
                 onNavigateToSettings = onNavigateToSettings,
                 onFilterSelect = {
-                    onSelectArticleFilter()
-                    coroutineScope.launch {
-                        navigateFromDrawerToList()
+                    if (!filter.hasArticlesSelected()) {
+                        onSelectArticleFilter()
+                        coroutineScope.launch {
+                            openNextList()
+                        }
+                    } else {
+                        closeDrawer()
                     }
                 },
                 filter = filter,
@@ -183,14 +210,20 @@ fun ArticleLayout(
             )
         },
         listPane = {
+            val scrollBehavior = pinnedBehavior(filter)
+
             Scaffold(
+                modifier = Modifier
+                    .nestedScroll(scrollBehavior.nestedScrollConnection),
                 topBar = {
                     TopAppBar(
+                        scrollBehavior = scrollBehavior,
                         title = {
                             FilterAppBarTitle(
                                 filter = filter,
                                 allFeeds = allFeeds,
                                 folders = folders,
+                                onRequestJumpToTop = { jumpToTop() }
                             )
                         },
                         navigationIcon = {
@@ -320,6 +353,16 @@ fun findCurrentFeed(filter: ArticleFilter, feeds: List<Feed>): Feed? {
     return null
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun pinnedBehavior(filter: ArticleFilter): TopAppBarScrollBehavior {
+    val topAppBarState = rememberSaveable(filter, saver = TopAppBarState.Saver) {
+        TopAppBarState(0f, 0f, 0f)
+    }
+
+    return pinnedScrollBehavior(topAppBarState)
+}
+
 @Preview
 @Composable
 fun ArticleLayoutPreview() {

app/src/main/java/com/capyreader/app/ui/articles/ArticleList.kt

@@ -1,7 +1,11 @@
 package com.capyreader.app.ui.articles
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.layout.systemGesturesPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
@@ -41,7 +45,8 @@ fun ArticleList(
     }
 
     LazyColumn(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .fillMaxSize(),
         state = listState,
     ) {
         items(

app/src/main/java/com/capyreader/app/ui/articles/ArticleRow.kt

@@ -7,7 +7,13 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.displayCutout
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -18,6 +24,7 @@ import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.MaterialTheme.typography
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
@@ -29,6 +36,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -188,6 +196,17 @@ private fun ArticleImage(
 @Composable
 fun PlaceholderArticleRow(imagePreview: ImagePreview) {
     ListItem(
+        supportingContent = {
+            if (imagePreview == ImagePreview.LARGE) {
+                Surface(
+                    Modifier
+                        .fillMaxWidth()
+                        .aspectRatio(3 / 2f)
+                        .background(colorScheme.surfaceContainer)
+                        .clip(RoundedCornerShape(8.dp))
+                ) {}
+            }
+        },
         trailingContent = {
             if (imagePreview == ImagePreview.SMALL) {
                 Box(
@@ -333,3 +352,11 @@ fun ArticleRowPreview_Unread() {
         currentTime = LocalDateTime.now(),
     )
 }
+
+@Preview
+@Composable
+fun ArticleRowPreviewPlaceholder() {
+    CapyTheme {
+        PlaceholderArticleRow(ImagePreview.LARGE)
+    }
+}

app/src/main/java/com/capyreader/app/ui/articles/ArticleScaffold.kt

@@ -1,9 +1,7 @@
 package com.capyreader.app.ui.articles
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.ModalDrawerSheet
@@ -17,11 +15,11 @@ import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
+import com.capyreader.app.ui.components.safeEdgePadding
 import com.capyreader.app.ui.theme.CapyTheme
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
@@ -42,25 +40,21 @@ fun ArticleScaffold(
             }
         },
     ) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            ListDetailPaneScaffold(
-                directive = scaffoldNavigator.scaffoldDirective,
-                value = scaffoldNavigator.scaffoldValue,
-                listPane = {
-                    AnimatedPane {
-                        listPane()
-                    }
-                },
-                detailPane = {
-                    AnimatedPane {
-                        detailPane()
-                    }
+        ListDetailPaneScaffold(
+            modifier = Modifier.safeEdgePadding(),
+            directive = scaffoldNavigator.scaffoldDirective,
+            value = scaffoldNavigator.scaffoldValue,
+            listPane = {
+                AnimatedPane {
+                    listPane()
+                }
+            },
+            detailPane = {
+                AnimatedPane {
+                    detailPane()
                 }
-            )
-        }
+            }
+        )
     }
 }
 

app/src/main/java/com/capyreader/app/ui/articles/FeedList.kt

@@ -32,6 +32,7 @@ import com.jocmp.capy.ArticleStatus
 import com.jocmp.capy.Feed
 import com.jocmp.capy.Folder
 import com.capyreader.app.R
+import com.capyreader.app.ui.components.safeEdgePadding
 import com.capyreader.app.ui.fixtures.FeedPreviewFixture
 import com.capyreader.app.ui.fixtures.FolderPreviewFixture
 import com.capyreader.app.ui.navigationTitle
@@ -43,8 +44,8 @@ fun FeedList(
     folders: List<Folder> = emptyList(),
     feeds: List<Feed> = emptyList(),
     onFilterSelect: () -> Unit,
-    onSelectFolder: (folderTitle: String) -> Unit,
-    onSelectFeed: (feedID: String) -> Unit,
+    onSelectFolder: (folder: Folder) -> Unit,
+    onSelectFeed: (feed: Feed) -> Unit,
     onFeedAdded: (feedID: String) -> Unit,
     onSelectStatus: (status: ArticleStatus) -> Unit,
     onNavigateToSettings: () -> Unit,
@@ -60,6 +61,7 @@ fun FeedList(
 
     Column(
         Modifier
+            .safeEdgePadding()
             .fillMaxSize()
     ) {
         Column(

app/src/main/java/com/capyreader/app/ui/articles/FeedRow.kt

@@ -11,15 +11,15 @@ import com.capyreader.app.ui.fixtures.FeedPreviewFixture
 fun FeedRow(
     selected: Boolean,
     feed: Feed,
-    onSelect: (id: String) -> Unit,
+    onSelect: (feed: Feed) -> Unit,
 ) {
     NavigationDrawerItem(
         icon = { FaviconBadge(url = feed.faviconURL) },
         label = { ListTitle(feed.title) },
         badge = { CountBadge(count = feed.count) },
         selected = selected,
         onClick = {
-            onSelect(feed.id)
+            onSelect(feed)
         }
     )
 }