From 8768c87b8ad992b02adb8110bdafd0c381d2abf1 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Tue, 18 Aug 2020 19:55:34 +0200 Subject: [PATCH] Update missing progress bars (#652) update missing progress bars Co-authored-by: M M Arif Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/652 --- .../gitnex/activities/CommitsActivity.java | 10 +++---- .../gitnex/activities/RepoForksActivity.java | 7 +++-- app/src/main/res/layout/activity_commits.xml | 11 ++++++- app/src/main/res/layout/activity_forks.xml | 30 ++++++++++++------- .../res/layout/activity_repo_stargazers.xml | 16 +++++----- .../res/layout/activity_repo_watchers.xml | 16 +++++----- 6 files changed, 53 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java index 19a1f702..14c567f8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java @@ -52,6 +52,7 @@ public class CommitsActivity extends BaseActivity { private List commitsList; private CommitsAdapter adapter; private ApiInterface api; + private ProgressBar progressLoadMore; @Override protected int getLayoutResourceId() { @@ -84,6 +85,7 @@ public class CommitsActivity extends BaseActivity { ImageView closeActivity = findViewById(R.id.close); noData = findViewById(R.id.noDataCommits); + progressLoadMore = findViewById(R.id.progressLoadMore); progressBar = findViewById(R.id.progress_bar); SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh); @@ -176,9 +178,7 @@ public class CommitsActivity extends BaseActivity { private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) { - //add loading progress view - commitsList.add(new Commits("load")); - adapter.notifyItemInserted((commitsList.size() - 1)); + progressLoadMore.setVisibility(View.VISIBLE); Call> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit); @@ -189,9 +189,6 @@ public class CommitsActivity extends BaseActivity { if(response.isSuccessful()) { - //remove loading view - commitsList.remove(commitsList.size() - 1); - List result = response.body(); assert result != null; @@ -208,6 +205,7 @@ public class CommitsActivity extends BaseActivity { } adapter.notifyDataChanged(); + progressLoadMore.setVisibility(View.GONE); } else { diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java index dc27b254..4f05111d 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoForksActivity.java @@ -53,6 +53,7 @@ public class RepoForksActivity extends BaseActivity { private RecyclerView recyclerView; private List forksList; private RepoForksAdapter adapter; + private ProgressBar progressLoadMore; @Override protected int getLayoutResourceId() { @@ -86,6 +87,7 @@ public class RepoForksActivity extends BaseActivity { ImageView closeActivity = findViewById(R.id.close); noData = findViewById(R.id.noData); + progressLoadMore = findViewById(R.id.progressLoadMore); progressBar = findViewById(R.id.progress_bar); SwipeRefreshLayout swipeRefresh = findViewById(R.id.pullToRefresh); @@ -184,9 +186,7 @@ public class RepoForksActivity extends BaseActivity { private void loadMore(String instanceUrl, String instanceToken, String repoOwner, String repoName, int page, int resultLimit) { - //add loading progress view - forksList.add(new UserRepositories("load")); - adapter.notifyItemInserted((forksList.size() - 1)); + progressLoadMore.setVisibility(View.VISIBLE); Call> call = RetrofitClient .getInstance(instanceUrl, ctx) @@ -219,6 +219,7 @@ public class RepoForksActivity extends BaseActivity { } adapter.notifyDataChanged(); + progressLoadMore.setVisibility(View.GONE); } else { diff --git a/app/src/main/res/layout/activity_commits.xml b/app/src/main/res/layout/activity_commits.xml index 8da19c24..3b889389 100644 --- a/app/src/main/res/layout/activity_commits.xml +++ b/app/src/main/res/layout/activity_commits.xml @@ -48,7 +48,7 @@ + + + + + + - - diff --git a/app/src/main/res/layout/activity_repo_stargazers.xml b/app/src/main/res/layout/activity_repo_stargazers.xml index 93c4fb62..3d33409b 100644 --- a/app/src/main/res/layout/activity_repo_stargazers.xml +++ b/app/src/main/res/layout/activity_repo_stargazers.xml @@ -3,6 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primaryBackgroundColor" android:orientation="vertical"> @@ -52,6 +53,13 @@ android:background="?attr/primaryBackgroundColor" android:gravity="center"/> + + - - diff --git a/app/src/main/res/layout/activity_repo_watchers.xml b/app/src/main/res/layout/activity_repo_watchers.xml index da09e8e4..ae94904b 100644 --- a/app/src/main/res/layout/activity_repo_watchers.xml +++ b/app/src/main/res/layout/activity_repo_watchers.xml @@ -3,6 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:background="?attr/primaryBackgroundColor" android:orientation="vertical"> @@ -52,6 +53,13 @@ android:background="?attr/primaryBackgroundColor" android:gravity="center"/> + + - -