New option in CommentMoreBottomSheetFragment: Jump to Top-Level Comment. Fix the color of @drawable/ic_keyboard_double_arrow_up_day_night_24dp. Fix issues in CommentsRecyclerViewAdapter.getNextParentCommentPosition and CommentsRecyclerViewAdapter.getPreviousParentCommentPosition.

Author: Docile-Alligator

app/src/main/java/ml/docilealligator/infinityforreddit/activities/ViewPostDetailActivity.java

@@ -737,6 +737,15 @@ public void fetchMorePosts(boolean changePage) {
         }
     }
 
+    public void scrollToTopLevelComment(int position) {
+        if (mSectionsPagerAdapter != null) {
+            ViewPostDetailFragment fragment = mSectionsPagerAdapter.getCurrentFragment();
+            if (fragment != null) {
+                fragment.scrollToTopLevelComment(position);
+            }
+        }
+    }
+
     @Subscribe
     public void onAccountSwitchEvent(SwitchAccountEvent event) {
         if (!getClass().getName().equals(event.excludeActivityClassName)) {

app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentsRecyclerViewAdapter.java

@@ -1142,7 +1142,7 @@ public int getNextParentCommentPosition(int currentPosition) {
             if (mIsSingleCommentThreadMode) {
                 for (int i = currentPosition + 1; i - 1 < mVisibleComments.size() && i - 1 >= 0; i++) {
                     if (mVisibleComments.get(i - 1).getDepth() == 0) {
-                        return i;
+                        return i + 1;
                     }
                 }
             } else {
@@ -1161,7 +1161,7 @@ public int getPreviousParentCommentPosition(int currentPosition) {
             if (mIsSingleCommentThreadMode) {
                 for (int i = currentPosition - 1; i - 1 >= 0; i--) {
                     if (mVisibleComments.get(i - 1).getDepth() == 0) {
-                        return i;
+                        return i + 1;
                     }
                 }
             } else {

app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/CommentMoreBottomSheetFragment.java

@@ -197,8 +197,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Intent intent = new Intent(activity, CommentFilterPreferenceActivity.class);
             intent.putExtra(CommentFilterPreferenceActivity.EXTRA_COMMENT, comment);
             activity.startActivity(intent);
+
+            dismiss();
         });
 
+        if (comment.getDepth() > 0 && activity instanceof ViewPostDetailActivity) {
+            binding.jumpToTopLevelCommentCommentMoreBottomSheetFragment.setVisibility(View.VISIBLE);
+            binding.jumpToTopLevelCommentCommentMoreBottomSheetFragment.setOnClickListener(view -> {
+                if (activity instanceof ViewPostDetailActivity) {
+                    ((ViewPostDetailActivity) activity).scrollToTopLevelComment(bundle.getInt(EXTRA_POSITION));
+                }
+
+                dismiss();
+            });
+        }
+
         if (activity.typeface != null) {
             Utils.setFontToAllTextViews(binding.getRoot(), activity.typeface);
         }

app/src/main/java/ml/docilealligator/infinityforreddit/fragments/ViewPostDetailFragment.java

@@ -1861,6 +1861,20 @@ public void scrollToPreviousParentComment() {
         }
     }
 
+    public void scrollToTopLevelComment(int position) {
+        RecyclerView chooseYourView = mCommentsRecyclerView == null ? binding.postDetailRecyclerViewViewPostDetailFragment : mCommentsRecyclerView;
+        if (mCommentsAdapter != null && chooseYourView != null) {
+            int viewPosition = mCommentsRecyclerView == null ? (!isSingleCommentThreadMode ? position + 1 : position + 2) : (!isSingleCommentThreadMode ? position : position + 1);
+            int previousParentPosition = mCommentsAdapter.getPreviousParentCommentPosition(viewPosition);
+            if (previousParentPosition < 0) {
+                return;
+            }
+            mSmoothScroller.setTargetPosition(mCommentsRecyclerView == null && !isSingleCommentThreadMode ? previousParentPosition + 1 : previousParentPosition);
+            mIsSmoothScrolling = true;
+            chooseYourView.getLayoutManager().startSmoothScroll(mSmoothScroller);
+        }
+    }
+
     public void delayTransition() {
         TransitionManager.beginDelayedTransition((mCommentsRecyclerView == null ? binding.postDetailRecyclerViewViewPostDetailFragment : mCommentsRecyclerView), new AutoTransition());
     }

app/src/main/res/drawable/ic_keyboard_double_arrow_up_day_night_24dp.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="24">
   <path
       android:fillColor="@android:color/black"
       android:pathData="M6,17.59l1.41,1.41l4.59,-4.58l4.59,4.58l1.41,-1.41l-6,-6z"/>

app/src/main/res/layout/fragment_comment_more_bottom_sheet.xml

@@ -200,6 +200,26 @@
             android:visibility="gone"
             app:drawableStartCompat="@drawable/ic_notifications_day_night_24dp" />
 
+        <TextView
+            android:id="@+id/jump_to_top_level_comment_comment_more_bottom_sheet_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:drawablePadding="48dp"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:paddingStart="32dp"
+            android:paddingTop="16dp"
+            android:paddingEnd="32dp"
+            android:paddingBottom="16dp"
+            android:text="@string/jump_to_top_level_comment"
+            android:textColor="?attr/primaryTextColor"
+            android:textSize="?attr/font_default"
+            android:fontFamily="?attr/font_family"
+            android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_keyboard_double_arrow_up_day_night_24dp" />
+
     </LinearLayout>
 
 </androidx.core.widget.NestedScrollView>

app/src/main/res/values/strings.xml

@@ -1536,4 +1536,6 @@
     <string name="proxy_http">HTTP</string>
     <string name="proxy_socks">SOCKS</string>
     <string name="proxy_direct">Direct</string>
+    
+    <string name="jump_to_top_level_comment">Jump to Top-Level Comment</string>
 </resources>