Quick comment navigation

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

@@ -460,6 +460,8 @@ class MainActivity : ComponentActivity() {
                             showCollapsedCommentContent = appSettings?.showCollapsedCommentContent ?: false,
                             showActionBarByDefault = appSettings?.showCommentActionBarByDefault ?: true,
                             showVotingArrowsInListView = appSettings?.showVotingArrowsInListView ?: true,
+                            showParentCommentNavigationButtons = appSettings?.showParentCommentNavigationButtons ?: true,
+                            navigateParentCommentsWithVolumeButtons = appSettings?.navigateParentCommentsWithVolumeButtons ?: false,
                             onClickSortType = { commentSortType ->
                                 postViewModel.updateSortType(commentSortType)
                                 postViewModel.getData(account)
@@ -494,6 +496,8 @@ class MainActivity : ComponentActivity() {
                             showCollapsedCommentContent = appSettings?.showCollapsedCommentContent ?: false,
                             showActionBarByDefault = appSettings?.showCommentActionBarByDefault ?: true,
                             showVotingArrowsInListView = appSettings?.showVotingArrowsInListView ?: true,
+                            showParentCommentNavigationButtons = appSettings?.showParentCommentNavigationButtons ?: true,
+                            navigateParentCommentsWithVolumeButtons = appSettings?.navigateParentCommentsWithVolumeButtons ?: false,
                             onClickSortType = { commentSortType ->
                                 postViewModel.updateSortType(commentSortType)
                                 postViewModel.getData(account)

app/src/main/java/com/jerboa/db/AppDB.kt

@@ -93,6 +93,16 @@ data class AppSettings(
         defaultValue = "1",
     )
     val showVotingArrowsInListView: Boolean,
+    @ColumnInfo(
+        name = "show_parent_comment_navigation_buttons",
+        defaultValue = "1",
+    )
+    val showParentCommentNavigationButtons: Boolean,
+    @ColumnInfo(
+        name = "navigate_parent_comments_with_volume_buttons",
+        defaultValue = "0",
+    )
+    val navigateParentCommentsWithVolumeButtons: Boolean,
     @ColumnInfo(
         name = "use_custom_tabs",
         defaultValue = "1",
@@ -414,8 +424,20 @@ val MIGRATION_14_15 = object : Migration(14, 15) {
     }
 }
 
+val MIGRATION_15_16 = object : Migration(15, 16) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL(UPDATE_APP_CHANGELOG_UNVIEWED)
+        database.execSQL(
+            "ALTER TABLE AppSettings add column show_parent_comment_navigation_buttons INTEGER NOT NULL default 1",
+        )
+        database.execSQL(
+            "ALTER TABLE AppSettings add column navigate_parent_comments_with_volume_buttons INTEGER NOT NULL default 0",
+        )
+    }
+}
+
 @Database(
-    version = 15,
+    version = 16,
     entities = [Account::class, AppSettings::class],
     exportSchema = true,
 )
@@ -454,6 +476,7 @@ abstract class AppDB : RoomDatabase() {
                         MIGRATION_12_13,
                         MIGRATION_13_14,
                         MIGRATION_14_15,
+                        MIGRATION_15_16,
                     )
                     // Necessary because it can't insert data on creation
                     .addCallback(object : Callback() {

app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt

@@ -180,6 +180,8 @@ fun CommentBodyPreview() {
 
 fun LazyListScope.commentNodeItem(
     node: CommentNodeData,
+    increaseLazyListIndexTracker: () -> Unit,
+    addToParentIndexes: () -> Unit,
     isFlat: Boolean,
     isExpanded: (commentId: Int) -> Boolean,
     toggleExpanded: (commentId: Int) -> Unit,
@@ -217,8 +219,14 @@ fun LazyListScope.commentNodeItem(
         XXL_PADDING
     }
 
+    if (node.depth == 0) {
+        addToParentIndexes()
+    }
+
     val showMoreChildren = isExpanded(commentId) && node.children.isNullOrEmpty() && node
         .commentView.counts.child_count > 0 && !isFlat
+
+    increaseLazyListIndexTracker()
     item(key = commentId) {
         var viewSource by remember { mutableStateOf(false) }
 
@@ -350,6 +358,7 @@ fun LazyListScope.commentNodeItem(
         }
     }
 
+    increaseLazyListIndexTracker()
     item(key = "${commentId}_show_more_children") {
         AnimatedVisibility(
             visible = showMoreChildren,
@@ -363,6 +372,8 @@ fun LazyListScope.commentNodeItem(
     node.children?.also { nodes ->
         commentNodeItems(
             nodes = nodes,
+            increaseLazyListIndexTracker = increaseLazyListIndexTracker,
+            addToParentIndexes = addToParentIndexes,
             isFlat = isFlat,
             toggleExpanded = toggleExpanded,
             toggleActionBar = toggleActionBar,
@@ -619,6 +630,8 @@ fun CommentNodesPreview() {
     val tree = buildCommentsTree(comments, false)
     CommentNodes(
         nodes = tree,
+        increaseLazyListIndexTracker = {},
+        addToParentIndexes = {},
         isFlat = false,
         onUpvoteClick = {},
         onDownvoteClick = {},

app/src/main/java/com/jerboa/ui/components/comment/CommentNodes.kt

@@ -16,6 +16,8 @@ import com.jerboa.db.Account
 @Composable
 fun CommentNodes(
     nodes: List<CommentNodeData>,
+    increaseLazyListIndexTracker: () -> Unit,
+    addToParentIndexes: () -> Unit,
     isFlat: Boolean,
     listState: LazyListState,
     onUpvoteClick: (commentView: CommentView) -> Unit,
@@ -48,6 +50,8 @@ fun CommentNodes(
     LazyColumn(state = listState) {
         commentNodeItems(
             nodes = nodes,
+            increaseLazyListIndexTracker = increaseLazyListIndexTracker,
+            addToParentIndexes = addToParentIndexes,
             isFlat = isFlat,
             isExpanded = { commentId -> !unExpandedComments.contains(commentId) },
             toggleExpanded = { commentId ->
@@ -94,6 +98,8 @@ fun CommentNodes(
 
 fun LazyListScope.commentNodeItems(
     nodes: List<CommentNodeData>,
+    increaseLazyListIndexTracker: () -> Unit,
+    addToParentIndexes: () -> Unit,
     isFlat: Boolean,
     isExpanded: (commentId: Int) -> Boolean,
     toggleExpanded: (commentId: Int) -> Unit,
@@ -124,6 +130,8 @@ fun LazyListScope.commentNodeItems(
     nodes.forEach { node ->
         commentNodeItem(
             node = node,
+            increaseLazyListIndexTracker = increaseLazyListIndexTracker,
+            addToParentIndexes = addToParentIndexes,
             isFlat = isFlat,
             isExpanded = isExpanded,
             toggleExpanded = toggleExpanded,

app/src/main/java/com/jerboa/ui/components/person/PersonProfileActivity.kt

@@ -514,6 +514,8 @@ fun UserTabs(
                                 PullRefreshIndicator(loading, pullRefreshState, Modifier.align(Alignment.TopCenter))
                                 CommentNodes(
                                     nodes = nodes,
+                                    increaseLazyListIndexTracker = {},
+                                    addToParentIndexes = {},
                                     isFlat = true,
                                     listState = listState,
                                     onMarkAsReadClick = {},

app/src/main/java/com/jerboa/ui/components/post/PostActivity.kt

@@ -1,18 +1,25 @@
 package com.jerboa.ui.components.post
 
 import android.util.Log
+import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.Sort
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -23,16 +30,27 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.key
+import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.jerboa.PostViewMode
 import com.jerboa.R
@@ -66,6 +84,8 @@ import com.jerboa.ui.components.common.getCurrentAccount
 import com.jerboa.ui.components.common.simpleVerticalScrollbar
 import com.jerboa.ui.components.home.SiteViewModel
 import com.jerboa.ui.components.post.edit.PostEditViewModel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 @Composable
 fun CommentsHeaderTitle(
@@ -85,7 +105,7 @@ fun CommentsHeaderTitle(
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class, ExperimentalComposeUiApi::class)
 @Composable
 fun PostActivity(
     postViewModel: PostViewModel,
@@ -98,6 +118,8 @@ fun PostActivity(
     showCollapsedCommentContent: Boolean,
     showActionBarByDefault: Boolean,
     showVotingArrowsInListView: Boolean,
+    showParentCommentNavigationButtons: Boolean,
+    navigateParentCommentsWithVolumeButtons: Boolean,
     onClickSortType: (CommentSortType) -> Unit,
     selectedSortType: CommentSortType,
 ) {
@@ -113,9 +135,13 @@ fun PostActivity(
     val unExpandedComments = remember { mutableStateListOf<Int>() }
     val commentsWithToggledActionBar = remember { mutableStateListOf<Int>() }
     var showSortOptions by remember { mutableStateOf(false) }
+    val focusRequester = remember { FocusRequester() }
 
     val listState = rememberLazyListState()
+    var lazyListIndexTracker: Int
+    val parentListStateIndexes = remember { mutableStateListOf<Int>() }
     val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
+    val scope = rememberCoroutineScope()
 
     val pullRefreshState = rememberPullRefreshState(
         refreshing = postLoading,
@@ -135,8 +161,55 @@ fun PostActivity(
         )
     }
 
+    LaunchedEffect(Unit) {
+        focusRequester.requestFocus()
+    }
+
     Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
+        modifier = Modifier
+            .nestedScroll(scrollBehavior.nestedScrollConnection)
+            .focusRequester(focusRequester)
+            .focusable()
+            .onKeyEvent { keyEvent ->
+                if (navigateParentCommentsWithVolumeButtons) {
+                    if (keyEvent.key == Key.VolumeUp) {
+                        scrollToPreviousParentComment(scope, parentListStateIndexes, listState)
+                    } else if (keyEvent.key == Key.VolumeDown) {
+                        scrollToNextParentComment(scope, parentListStateIndexes, listState)
+                    }
+                    true
+                } else {
+                    false
+                }
+            },
+        bottomBar = {
+            if (showParentCommentNavigationButtons) {
+                BottomAppBar(
+                    containerColor = MaterialTheme.colorScheme.background.copy(alpha = .75f),
+                    modifier = Modifier.height(50.dp),
+                    content = {
+                        IconButton(modifier = Modifier.weight(.5f), onClick = {
+                            scrollToPreviousParentComment(scope, parentListStateIndexes, listState)
+                        }) {
+                            Icon(
+                                modifier = Modifier.scale(1.5f),
+                                imageVector = Icons.Filled.KeyboardArrowUp,
+                                contentDescription = "Up",
+                            )
+                        }
+                        IconButton(modifier = Modifier.weight(.5f), onClick = {
+                            scrollToNextParentComment(scope, parentListStateIndexes, listState)
+                        }) {
+                            Icon(
+                                modifier = Modifier.scale(1.5f),
+                                imageVector = Icons.Filled.KeyboardArrowDown,
+                                contentDescription = "Down",
+                            )
+                        }
+                    },
+                )
+            }
+        },
         topBar = {
             Column {
                 TopAppBar(
@@ -169,6 +242,8 @@ fun PostActivity(
         },
         content = { padding ->
             Box(modifier = Modifier.pullRefresh(pullRefreshState)) {
+                parentListStateIndexes.clear()
+                lazyListIndexTracker = 2
                 PullRefreshIndicator(
                     postLoading,
                     pullRefreshState,
@@ -184,7 +259,7 @@ fun PostActivity(
                         LazyColumn(
                             state = listState,
                             modifier = Modifier
-                                .padding(padding)
+                                .padding(top = padding.calculateTopPadding())
                                 .simpleVerticalScrollbar(listState),
                         ) {
                             item(key = "${postView.post.id}_listing") {
@@ -342,6 +417,12 @@ fun PostActivity(
 
                                     commentNodeItems(
                                         nodes = commentTree,
+                                        increaseLazyListIndexTracker = {
+                                            lazyListIndexTracker++
+                                        },
+                                        addToParentIndexes = {
+                                            parentListStateIndexes.add(lazyListIndexTracker)
+                                        },
                                         isFlat = false,
                                         isExpanded = { commentId ->
                                             !unExpandedComments.contains(
@@ -480,6 +561,11 @@ fun PostActivity(
 
                                 else -> {}
                             }
+                            if (showParentCommentNavigationButtons) {
+                                item {
+                                    Spacer(modifier = Modifier.height(padding.calculateBottomPadding()))
+                                }
+                            }
                         }
                     }
 
@@ -489,3 +575,29 @@ fun PostActivity(
         },
     )
 }
+
+private fun scrollToNextParentComment(
+    scope: CoroutineScope,
+    parentListStateIndexes: SnapshotStateList<Int>,
+    listState: LazyListState,
+) {
+    scope.launch {
+        parentListStateIndexes.firstOrNull { parentIndex -> parentIndex > listState.firstVisibleItemIndex }
+            ?.let { nearestNextIndex ->
+                listState.animateScrollToItem(nearestNextIndex)
+            }
+    }
+}
+
+private fun scrollToPreviousParentComment(
+    scope: CoroutineScope,
+    parentListStateIndexes: SnapshotStateList<Int>,
+    listState: LazyListState,
+) {
+    scope.launch {
+        parentListStateIndexes.lastOrNull { parentIndex -> parentIndex < listState.firstVisibleItemIndex }
+            ?.let { nearestPreviousIndex ->
+                listState.animateScrollToItem(nearestPreviousIndex)
+            }
+    }
+}