From 1e52649b7615a285727f6c5e4f32341a49c07acf Mon Sep 17 00:00:00 2001 From: M M Arif Date: Wed, 1 Apr 2020 14:44:38 +0500 Subject: [PATCH] Added to labels, issue comment --- .../adapters/ExploreRepositoriesAdapter.java | 8 +- .../gitnex/adapters/IssueCommentsAdapter.java | 41 ++++++++-- .../mian/gitnex/adapters/LabelsAdapter.java | 81 +++++++------------ .../gitnex/adapters/MyReposListAdapter.java | 6 +- .../gitnex/adapters/ReposListAdapter.java | 6 +- .../adapters/RepositoriesByOrgAdapter.java | 2 + .../adapters/StarredReposListAdapter.java | 6 +- .../layout/bottom_sheet_issue_comments.xml | 49 +++++++++++ .../layout/bottom_sheet_labels_in_list.xml | 60 ++++++++++++++ .../bottom_sheet_repository_in_list.xml | 12 +++ app/src/main/res/menu/issue_comment_menu.xml | 15 ---- app/src/main/res/menu/labels_menu.xml | 14 ---- 12 files changed, 206 insertions(+), 94 deletions(-) create mode 100644 app/src/main/res/layout/bottom_sheet_issue_comments.xml create mode 100644 app/src/main/res/layout/bottom_sheet_labels_in_list.xml delete mode 100644 app/src/main/res/menu/issue_comment_menu.xml delete mode 100644 app/src/main/res/menu/labels_menu.xml diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java index 98424c34..22ff2ab8 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java @@ -89,7 +89,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter { + 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 { + repoWatchers.setOnClickListener(watchers -> { Intent intentW = new Intent(context, RepoWatchersActivity.class); intentW.putExtra("repoFullNameForWatchers", fullName.getText()); @@ -120,7 +122,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter { + + 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 { - final Context context = v.getContext(); - //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle); + final Context context = v.getContext(); - PopupMenu popupMenu = new PopupMenu(context, v); - popupMenu.inflate(R.menu.labels_menu); + @SuppressLint("InflateParams") + View view = LayoutInflater.from(context).inflate(R.layout.bottom_sheet_labels_in_list, null); - Object menuHelper; - Class[] argTypes; - try { + TextView labelMenuEdit = view.findViewById(R.id.labelMenuEdit); + TextView labelMenuDelete = view.findViewById(R.id.labelMenuDelete); + TextView bottomSheetHeader = view.findViewById(R.id.bottomSheetHeader); - Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup"); - fMenuHelper.setAccessible(true); - menuHelper = fMenuHelper.get(popupMenu); - argTypes = new Class[] { boolean.class }; - menuHelper.getClass().getDeclaredMethod("setForceShowIcon", - argTypes).invoke(menuHelper, true); + bottomSheetHeader.setText(labelTitle.getText()); + BottomSheetDialog dialog = new BottomSheetDialog(context); + dialog.setContentView(view); + dialog.show(); - } catch (Exception e) { + labelMenuEdit.setOnClickListener(editLabel -> { - popupMenu.show(); - return; + Intent intent = new Intent(context, CreateLabelActivity.class); + 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() { - @Override - public boolean onMenuItemClick(MenuItem item) { - switch (item.getItemId()) { - case R.id.labelMenuEdit: + labelMenuDelete.setOnClickListener(deleteLabel -> { - Intent intent = new Intent(context, CreateLabelActivity.class); - intent.putExtra("labelId", labelId.getText()); - intent.putExtra("labelTitle", labelTitle.getText()); - intent.putExtra("labelColor", labelColor.getText()); - intent.putExtra("labelAction", "edit"); - context.startActivity(intent); - break; + 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)); + dialog.dismiss(); - 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(); - - } }); } diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java index de8ce9d1..3a339e06 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java @@ -88,7 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter { + 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 { + repoWatchers.setOnClickListener(watchers -> { Intent intentW = new Intent(context, RepoWatchersActivity.class); intentW.putExtra("repoFullNameForWatchers", fullNameMy.getText()); diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java index ad444b8a..fce07051 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java @@ -91,7 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter { + 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 { + repoWatchers.setOnClickListener(watchers -> { Intent intentW = new Intent(context, RepoWatchersActivity.class); intentW.putExtra("repoFullNameForWatchers", fullName.getText()); diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java index 9b44ed7d..c2521e4f 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java @@ -88,7 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter { + 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 { + repoWatchers.setOnClickListener(watchers -> { Intent intentW = new Intent(context, RepoWatchersActivity.class); intentW.putExtra("repoFullNameForWatchers", fullName.getText()); diff --git a/app/src/main/res/layout/bottom_sheet_issue_comments.xml b/app/src/main/res/layout/bottom_sheet_issue_comments.xml new file mode 100644 index 00000000..8f978a16 --- /dev/null +++ b/app/src/main/res/layout/bottom_sheet_issue_comments.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/bottom_sheet_labels_in_list.xml b/app/src/main/res/layout/bottom_sheet_labels_in_list.xml new file mode 100644 index 00000000..9527ffad --- /dev/null +++ b/app/src/main/res/layout/bottom_sheet_labels_in_list.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/bottom_sheet_repository_in_list.xml b/app/src/main/res/layout/bottom_sheet_repository_in_list.xml index e370244e..be1c0d65 100644 --- a/app/src/main/res/layout/bottom_sheet_repository_in_list.xml +++ b/app/src/main/res/layout/bottom_sheet_repository_in_list.xml @@ -17,6 +17,18 @@ android:orientation="vertical" android:layout_height="wrap_content"> + + - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/labels_menu.xml b/app/src/main/res/menu/labels_menu.xml deleted file mode 100644 index 402bae55..00000000 --- a/app/src/main/res/menu/labels_menu.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - \ No newline at end of file