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 c013e970..388648c9 100644 --- a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java +++ b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java @@ -89,8 +89,6 @@ public class AssigneesActions { if(assigneesList_.size() > 0) { - dialogAssignees.show(); - assigneesList.add(new Collaborators(tinyDB.getString("userFullname"), tinyDB.getString("loginUid"), tinyDB.getString("userAvatar"))); assigneesList.addAll(assigneesList_); } diff --git a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java index e6338617..d17ad440 100644 --- a/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java +++ b/app/src/main/java/org/mian/gitnex/actions/LabelsActions.java @@ -84,8 +84,6 @@ public class LabelsActions { if(labelsList_.size() > 0) { - dialogLabels.show(); - labelsList.addAll(labelsList_); } 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 52e060b1..583bfc4d 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java @@ -185,6 +185,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis dialogAssignees.dismiss() ); + dialogAssignees.show(); AssigneesActions.getRepositoryAssignees(ctx, instanceUrl, instanceToken, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding); } @@ -206,6 +207,7 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis dialogLabels.dismiss() ); + dialogLabels.show(); LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, 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 0809b0ba..0f152c03 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java @@ -243,6 +243,7 @@ public class CreatePullRequestActivity extends BaseActivity implements LabelsLis dialogLabels.dismiss() ); + dialogLabels.show(); LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, 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 af6cabae..099d21f1 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -293,6 +293,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt } }); + dialogAssignees.show(); AssigneesActions.getRepositoryAssignees(ctx, instanceUrl, instanceToken, repoOwner, repoName, assigneesList, dialogAssignees, assigneesAdapter, assigneesBinding); } @@ -329,6 +330,7 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt } }); + dialogLabels.show(); LabelsActions.getRepositoryLabels(ctx, instanceUrl, instanceToken, repoOwner, repoName, labelsList, dialogLabels, labelsAdapter, labelsBinding); } diff --git a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java index 75bf2c84..13ff1403 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/ExploreRepositoriesFragment.java @@ -17,6 +17,7 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import org.mian.gitnex.R; import org.mian.gitnex.adapters.ExploreRepositoriesAdapter; @@ -96,6 +97,10 @@ public class ExploreRepositoriesFragment extends Fragment { viewBinding.recyclerViewReposSearch.setLayoutManager(linearLayoutManager); viewBinding.recyclerViewReposSearch.setAdapter(adapter); + DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerViewReposSearch.getContext(), + DividerItemDecoration.VERTICAL); + viewBinding.recyclerViewReposSearch.addItemDecoration(dividerItemDecoration); + viewBinding.searchKeyword.setOnEditorActionListener((v1, actionId, event) -> { if(actionId == EditorInfo.IME_ACTION_SEND) { diff --git a/app/src/main/res/layout/list_commits.xml b/app/src/main/res/layout/list_commits.xml index a4709be7..33e9cd98 100644 --- a/app/src/main/res/layout/list_commits.xml +++ b/app/src/main/res/layout/list_commits.xml @@ -22,38 +22,25 @@ android:textColor="?attr/primaryTextColor" android:textSize="18sp" /> - - -