Added to labels, issue comment

app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java

@@ -89,7 +89,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
                 TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                 TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
+                bottomSheetHeader.setText(fullName.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -103,7 +105,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 
                 });
 
-                repoStargazers.setOnClickListener(openInBrowser -> {
+                repoStargazers.setOnClickListener(stargazers -> {
 
                     Intent intent = new Intent(context, RepoStargazersActivity.class);
                     intent.putExtra("repoFullNameForStars", fullName.getText());
@@ -112,7 +114,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 
                 });
 
-                repoWatchers.setOnClickListener(openInBrowser -> {
+                repoWatchers.setOnClickListener(watchers -> {
 
                     Intent intentW = new Intent(context, RepoWatchersActivity.class);
                     intentW.putExtra("repoFullNameForWatchers", fullName.getText());

app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java

@@ -7,11 +7,11 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.Spanned;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.squareup.picasso.Picasso;
 import com.vdurmont.emoji.EmojiParser;
 import org.mian.gitnex.R;
@@ -23,7 +23,6 @@ import org.mian.gitnex.helpers.RoundedTransformation;
 import org.mian.gitnex.util.TinyDB;
 import org.mian.gitnex.helpers.ClickListener;
 import org.ocpsoft.prettytime.PrettyTime;
-import java.lang.reflect.Field;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
@@ -33,7 +32,6 @@ import java.util.Locale;
 import java.util.Objects;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 import io.noties.markwon.AbstractMarkwonPlugin;
 import io.noties.markwon.Markwon;
@@ -84,7 +82,40 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
             commendBodyRaw = itemView.findViewById(R.id.commendBodyRaw);
             commentModified = itemView.findViewById(R.id.commentModified);
 
-            commentsOptionsMenu.setOnClickListener(new View.OnClickListener() {
+            commentsOptionsMenu.setOnClickListener(v -> {
+
+                final Context context = v.getContext();
+
+                @SuppressLint("InflateParams")
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_issue_comments, null);
+
+                TextView commentMenuEdit = view.findViewById(R.id.commentMenuEdit);
+                //TextView commentMenuDelete = view.findViewById(R.id.commentMenuDelete);
+
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
+                dialog.setContentView(view);
+                dialog.show();
+
+                commentMenuEdit.setOnClickListener(ediComment -> {
+
+                    Intent intent = new Intent(context, ReplyToIssueActivity.class);
+                    intent.putExtra("commentId", commendId.getText());
+                    intent.putExtra("commentAction", "edit");
+                    intent.putExtra("commentBody", commendBodyRaw.getText());
+                    context.startActivity(intent);
+                    dialog.dismiss();
+
+                });
+
+                /*commentMenuDelete.setOnClickListener(deleteComment -> {
+
+                    dialog.dismiss();
+
+                });*/
+
+            });
+
+            /*commentsOptionsMenu.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
 
@@ -137,7 +168,7 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
                     popupMenu.show();
 
                 }
-            });
+            });*/
 
         }
     }

app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java

@@ -1,27 +1,26 @@
 package org.mian.gitnex.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.amulyakhare.textdrawable.TextDrawable;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateLabelActivity;
 import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.ColorInverter;
 import org.mian.gitnex.helpers.LabelWidthCalculator;
 import org.mian.gitnex.models.Labels;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.recyclerview.widget.RecyclerView;
 
 /**
@@ -50,65 +49,45 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
             labelId = itemView.findViewById(R.id.labelId);
             labelColor = itemView.findViewById(R.id.labelColor);
 
-            labelsOptionsMenu.setOnClickListener(new View.OnClickListener() {
+            labelsOptionsMenu.setOnClickListener(v -> {
-                @Override
-                public void onClick(View v) {
 
-                    final Context context = v.getContext();
+                final Context context = v.getContext();
-                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context, v);
+                @SuppressLint("InflateParams")
-                    popupMenu.inflate(R.menu.labels_menu);
+                View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_labels_in_list, null);
 
-                    Object menuHelper;
+                TextView labelMenuEdit = view.findViewById(R.id.labelMenuEdit);
-                    Class[] argTypes;
+                TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete);
-                    try {
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                bottomSheetHeader.setText(labelTitle.getText());
-                        fMenuHelper.setAccessible(true);
+                BottomSheetDialog dialog = new BottomSheetDialog(context);
-                        menuHelper = fMenuHelper.get(popupMenu);
+                dialog.setContentView(view);
-                        argTypes = new Class[] { boolean.class };
+                dialog.show();
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
-                                argTypes).invoke(menuHelper, true);
 
-                    } catch (Exception e) {
+                labelMenuEdit.setOnClickListener(editLabel -> {
 
-                        popupMenu.show();
+                    Intent intent = new Intent(context, CreateLabelActivity.class);
-                        return;
+                    intent.putExtra("labelId", labelId.getText());
+                    intent.putExtra("labelTitle", labelTitle.getText());
+                    intent.putExtra("labelColor", labelColor.getText());
+                    intent.putExtra("labelAction", "edit");
+                    context.startActivity(intent);
+                    dialog.dismiss();
 
-                    }
+                });
 
-                    popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                labelMenuDelete.setOnClickListener(deleteLabel -> {
-                        @Override
-                        public boolean onMenuItemClick(MenuItem item) {
-                            switch (item.getItemId()) {
-                                case R.id.labelMenuEdit:
 
-                                    Intent intent = new Intent(context, CreateLabelActivity.class);
+                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
-                                    intent.putExtra("labelId", labelId.getText());
+                            context.getResources().getString(R.string.labelDeleteTitle),
-                                    intent.putExtra("labelTitle", labelTitle.getText());
+                            context.getResources().getString(R.string.labelDeleteMessage),
-                                    intent.putExtra("labelColor", labelColor.getText());
+                            context.getResources().getString(R.string.labelDeletePositiveButton),
-                                    intent.putExtra("labelAction", "edit");
+                            context.getResources().getString(R.string.labelDeleteNegativeButton));
-                                    context.startActivity(intent);
+                    dialog.dismiss();
-                                    break;
 
-                                case R.id.labelMenuDelete:
+                });
 
-                                    AlertDialogs.labelDeleteDialog(context, labelTitle.getText().toString(), labelId.getText().toString(),
-                                            context.getResources().getString(R.string.labelDeleteTitle),
-                                            context.getResources().getString(R.string.labelDeleteMessage),
-                                            context.getResources().getString(R.string.labelDeletePositiveButton),
-                                            context.getResources().getString(R.string.labelDeleteNegativeButton));
-                                    break;
-
-                            }
-                            return false;
-                        }
-                    });
-
-                    popupMenu.show();
-
-                }
             });
 
         }

app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java

@@ -88,7 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                 TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
+                bottomSheetHeader.setText(fullNameMy.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -102,7 +104,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
                 });
 
-                repoStargazers.setOnClickListener(openInBrowser -> {
+                repoStargazers.setOnClickListener(stargazers -> {
 
                     Intent intent = new Intent(context, RepoStargazersActivity.class);
                     intent.putExtra("repoFullNameForStars", fullNameMy.getText());
@@ -111,7 +113,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 
                 });
 
-                repoWatchers.setOnClickListener(openInBrowser -> {
+                repoWatchers.setOnClickListener(watchers -> {
 
                     Intent intentW = new Intent(context, RepoWatchersActivity.class);
                     intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText());

app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java

@@ -91,7 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                 TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                 TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
+                bottomSheetHeader.setText(fullName.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -105,7 +107,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 
                 });
 
-                repoStargazers.setOnClickListener(openInBrowser -> {
+                repoStargazers.setOnClickListener(stargazers -> {
 
                     Intent intent = new Intent(context, RepoStargazersActivity.class);
                     intent.putExtra("repoFullNameForStars", fullName.getText());
@@ -114,7 +116,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 
                 });
 
-                repoWatchers.setOnClickListener(openInBrowser -> {
+                repoWatchers.setOnClickListener(watchers -> {
 
                     Intent intentW = new Intent(context, RepoWatchersActivity.class);
                     intentW.putExtra("repoFullNameForWatchers", fullName.getText());

app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java

@@ -88,7 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                 TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
+                bottomSheetHeader.setText(fullName.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();

app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java

@@ -88,7 +88,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 TextView repoOpenInBrowser = view.findViewById(R.id.repoOpenInBrowser);
                 TextView repoStargazers = view.findViewById(R.id.repoStargazers);
                 TextView repoWatchers = view.findViewById(R.id.repoWatchers);
+                TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader);
 
+                bottomSheetHeader.setText(fullName.getText());
                 BottomSheetDialog dialog = new BottomSheetDialog(context);
                 dialog.setContentView(view);
                 dialog.show();
@@ -102,7 +104,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
                 });
 
-                repoStargazers.setOnClickListener(openInBrowser -> {
+                repoStargazers.setOnClickListener(stargazers -> {
 
                     Intent intent = new Intent(context, RepoStargazersActivity.class);
                     intent.putExtra("repoFullNameForStars", fullName.getText());
@@ -111,7 +113,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
 
                 });
 
-                repoWatchers.setOnClickListener(openInBrowser -> {
+                repoWatchers.setOnClickListener(watchers -> {
 
                     Intent intentW = new Intent(context, RepoWatchersActivity.class);
                     intentW.putExtra("repoFullNameForWatchers", fullName.getText());

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="8dp"
+    android:background="?attr/primaryBackgroundColor"
+    android:paddingTop="8dp">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/commentMenuEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/menuEditText"
+                android:drawableStart="@drawable/ic_edit"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+            <TextView
+                android:id="@+id/commentMenuDelete"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/menuDeleteText"
+                android:drawableStart="@drawable/ic_delete"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="16dp"
+                android:visibility="gone" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>

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

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="8dp"
+    android:background="?attr/primaryBackgroundColor"
+    android:paddingTop="8dp">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/bottomSheetHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/labelName"
+                android:paddingStart="18dp"
+                android:paddingEnd="18dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/labelMenuEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/labelMenuEdit"
+                android:drawableStart="@drawable/ic_edit"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+            <TextView
+                android:id="@+id/labelMenuDelete"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/labelMenuDelete"
+                android:drawableStart="@drawable/ic_delete"
+                android:drawablePadding="24dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp"
+                android:padding="16dp" />
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>

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

@@ -17,6 +17,18 @@
             android:orientation="vertical"
             android:layout_height="wrap_content">
 
+            <TextView
+                android:id="@+id/bottomSheetHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/repoName"
+                android:paddingStart="18dp"
+                android:paddingEnd="18dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="16sp" />
+
             <TextView
                 android:id="@+id/repoOpenInBrowser"
                 android:layout_width="match_parent"

app/src/main/res/menu/issue_comment_menu.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/commentMenuEdit"
-        android:icon="@drawable/ic_edit"
-        android:title="@string/menuEditText" />
-
-    <item
-        android:id="@+id/commentMenuDelete"
-        android:icon="@drawable/ic_delete"
-        android:title="@string/menuDeleteText"
-        android:visible="false"/>
-
-</menu>

app/src/main/res/menu/labels_menu.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/labelMenuEdit"
-        android:icon="@drawable/ic_edit"
-        android:title="@string/labelMenuEdit" />
-
-    <item
-        android:id="@+id/labelMenuDelete"
-        android:icon="@drawable/ic_delete"
-        android:title="@string/labelMenuDelete" />
-
-</menu>