From bfc43b646571136cd07f885fc52fe28e39c0842b Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 15 Mar 2022 19:31:55 +0500 Subject: [PATCH] Add assignees to list --- app/build.gradle | 2 +- .../java/org/mian/gitnex/actions/AssigneesActions.java | 5 +---- .../org/mian/gitnex/activities/CreateIssueActivity.java | 4 ++-- .../mian/gitnex/activities/CreatePullRequestActivity.java | 2 +- .../org/mian/gitnex/activities/IssueDetailActivity.java | 8 ++++---- .../org/mian/gitnex/adapters/AssigneesListAdapter.java | 2 ++ .../main/res/layout/custom_assignees_selection_dialog.xml | 4 ++-- .../main/res/layout/custom_labels_selection_dialog.xml | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1e30bece..6eb725c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ dependencies { implementation "androidx.work:work-runtime:$work_version" implementation "io.mikael:urlbuilder:2.0.9" implementation "org.codeberg.gitnex-garage:emoji-java:v5.1.2" - implementation "org.codeberg.gitnex:tea4j:1.1.2" + implementation "org.codeberg.gitnex:tea4j:1.1.3" coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5" implementation 'androidx.biometric:biometric:1.1.0' implementation 'com.github.chrisvest:stormpot:2.4.2' diff --git a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java index 706d063b..99065ece 100644 --- a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java +++ b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java @@ -13,7 +13,6 @@ import org.mian.gitnex.adapters.AssigneesListAdapter; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.databinding.CustomAssigneesSelectionDialogBinding; import org.mian.gitnex.helpers.Toasty; -import org.mian.gitnex.helpers.contexts.AccountContext; import java.util.List; import retrofit2.Call; import retrofit2.Callback; @@ -66,7 +65,7 @@ public class AssigneesActions { Call> call = RetrofitClient .getApiInterface(ctx) - .getCollaborators(((BaseActivity) ctx).getAccount().getAuthorization(), repoOwner, repoName); + .getAllAssignees(((BaseActivity) ctx).getAccount().getAuthorization(), repoOwner, repoName); call.enqueue(new Callback>() { @@ -85,8 +84,6 @@ public class AssigneesActions { if(assigneesList_.size() > 0) { - AccountContext userInfo = ((BaseActivity) ctx).getAccount(); - assigneesList.add(new Collaborators(userInfo.getFullName(), userInfo.getAccount().getUserName(), userInfo.getUserInfo().getAvatar())); assigneesList.addAll(assigneesList_); } else { diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java index 16be9056..c1f851b7 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java @@ -175,7 +175,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis View view = assigneesBinding.getRoot(); dialogAssignees.setContentView(view); - assigneesBinding.cancel.setOnClickListener(assigneesBinding_ -> dialogAssignees.dismiss()); + assigneesBinding.save.setOnClickListener(assigneesBinding_ -> dialogAssignees.dismiss()); dialogAssignees.show(); AssigneesActions.getRepositoryAssignees(ctx, repository.getOwner(), repository.getName(), assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding); @@ -195,7 +195,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis View view = labelsBinding.getRoot(); dialogLabels.setContentView(view); - labelsBinding.cancel.setOnClickListener(labelsBinding_ -> dialogLabels.dismiss()); + labelsBinding.save.setOnClickListener(labelsBinding_ -> dialogLabels.dismiss()); dialogLabels.show(); LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, dialogLabels, labelsAdapter, labelsBinding); diff --git a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java index 5968ae9b..71328e3a 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java @@ -229,7 +229,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis View view = labelsBinding.getRoot(); dialogLabels.setContentView(view); - labelsBinding.cancel.setOnClickListener(editProperties -> dialogLabels.dismiss()); + labelsBinding.save.setOnClickListener(editProperties -> dialogLabels.dismiss()); dialogLabels.show(); LabelsActions.getRepositoryLabels(ctx, repository.getOwner(), repository.getName(), labelsList, dialogLabels, labelsAdapter, labelsBinding); diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index 893145e8..dcca372a 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -266,7 +266,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt assigneesAdapter.updateList(currentAssignees); dialogAssignees = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert); - dialogAssignees.setCancelable(false); + dialogAssignees.setCancelable(true); if (dialogAssignees.getWindow() != null) { @@ -278,7 +278,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt View view = assigneesBinding.getRoot(); dialogAssignees.setContentView(view); - assigneesBinding.cancel.setOnClickListener(assigneesBinding_ -> { + assigneesBinding.save.setOnClickListener(assigneesBinding_ -> { currentAssignees = new ArrayList<>(new LinkedHashSet<>(currentAssignees)); assigneesListData = new ArrayList<>(new LinkedHashSet<>(assigneesListData)); @@ -303,7 +303,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt labelsAdapter.updateList(currentLabelsIds); dialogLabels = new Dialog(ctx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert); - dialogLabels.setCancelable(false); + dialogLabels.setCancelable(true); if (dialogLabels.getWindow() != null) { @@ -315,7 +315,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt View view = labelsBinding.getRoot(); dialogLabels.setContentView(view); - labelsBinding.cancel.setOnClickListener(labelsBinding_ -> { + labelsBinding.save.setOnClickListener(labelsBinding_ -> { currentLabelsIds = new ArrayList<>(new LinkedHashSet<>(currentLabelsIds)); labelsIds = new ArrayList<>(new LinkedHashSet<>(labelsIds)); diff --git a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java index ff594d95..64c2c23f 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/AssigneesListAdapter.java @@ -1,5 +1,6 @@ package org.mian.gitnex.adapters; +import android.annotation.SuppressLint; import android.content.Context; import android.text.Html; import android.view.LayoutInflater; @@ -131,6 +132,7 @@ public class AssigneesListAdapter extends RecyclerView.Adapter list) { currentAssignees = list; diff --git a/app/src/main/res/layout/custom_assignees_selection_dialog.xml b/app/src/main/res/layout/custom_assignees_selection_dialog.xml index 729f440f..8f093bf2 100644 --- a/app/src/main/res/layout/custom_assignees_selection_dialog.xml +++ b/app/src/main/res/layout/custom_assignees_selection_dialog.xml @@ -84,12 +84,12 @@ android:orientation="vertical" >