From 37367e142f0f62fa8fbe7868c08de8fd5859c196 Mon Sep 17 00:00:00 2001 From: M M Arif Date: Mon, 1 Jun 2020 14:19:34 +0000 Subject: [PATCH] Fixes for rc1 (#523) Fix commits query limit Fix text colors for auto theme Fix text color in grid views fix file size for dir Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/523 Reviewed-by: opyale --- .../mian/gitnex/activities/CommitsActivity.java | 16 +++++++--------- .../org/mian/gitnex/adapters/FilesAdapter.java | 1 + .../gitnex/adapters/RepoStargazersAdapter.java | 7 ------- .../gitnex/adapters/RepoWatchersAdapter.java | 7 ------- .../gitnex/adapters/TeamMembersByOrgAdapter.java | 7 ------- .../org/mian/gitnex/interfaces/ApiInterface.java | 2 +- .../res/layout/list_members_by_team_by_org.xml | 3 ++- app/src/main/res/layout/list_repo_stargazers.xml | 3 ++- app/src/main/res/layout/list_repo_watchers.xml | 3 ++- 9 files changed, 15 insertions(+), 34 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 ee7042d2..6dcf7035 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java @@ -23,7 +23,6 @@ import org.mian.gitnex.adapters.CommitsAdapter; import org.mian.gitnex.clients.AppApiService; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.StaticGlobalVariables; -import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.helpers.Version; import org.mian.gitnex.interfaces.ApiInterface; import org.mian.gitnex.models.Commits; @@ -102,7 +101,7 @@ public class CommitsActivity extends BaseActivity { swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> { swipeRefresh.setRefreshing(false); - loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName); + loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit); adapter.notifyDataChanged(); }, 200)); @@ -113,7 +112,7 @@ public class CommitsActivity extends BaseActivity { if(commitsList.size() == resultLimit || pageSize == resultLimit) { int page = (commitsList.size() + resultLimit) / resultLimit; - loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName); + loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit); } @@ -124,13 +123,13 @@ public class CommitsActivity extends BaseActivity { recyclerView.setAdapter(adapter); api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx); - loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName); + loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit); } - private void loadInitial(String token, String repoOwner, String repoName, String branchName) { + private void loadInitial(String token, String repoOwner, String repoName, String branchName, int resultLimit) { - Call> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName); + Call> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName, resultLimit); call.enqueue(new Callback>() { @@ -175,13 +174,13 @@ public class CommitsActivity extends BaseActivity { } - private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName) { + 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)); - Call> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName); + Call> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit); call.enqueue(new Callback>() { @@ -204,7 +203,6 @@ public class CommitsActivity extends BaseActivity { } else { - Toasty.info(ctx, getString(R.string.noMoreData)); adapter.setMoreDataAvailable(false); } diff --git a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java index 1565fb86..bb9d61b7 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java @@ -165,6 +165,7 @@ public class FilesAdapter extends RecyclerView.Adapter mergePullRequest(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body MergePullRequest jsonStr); @GET("repos/{owner}/{repo}/commits") // get all commits - Call> getRepositoryCommits(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("sha") String branchName); + Call> getRepositoryCommits(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("sha") String branchName, @Query("limit") int limit); @PATCH("repos/{owner}/{repo}/milestones/{index}") // close / reopen milestone Call closeReopenMilestone(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body Milestones jsonStr); diff --git a/app/src/main/res/layout/list_members_by_team_by_org.xml b/app/src/main/res/layout/list_members_by_team_by_org.xml index 32ac648c..74014172 100644 --- a/app/src/main/res/layout/list_members_by_team_by_org.xml +++ b/app/src/main/res/layout/list_members_by_team_by_org.xml @@ -20,6 +20,7 @@ android:gravity="top|center_horizontal" android:layout_marginTop="1dp" android:text="@string/orgMember" + android:textColor="?attr/primaryTextColor" android:textSize="14sp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/list_repo_stargazers.xml b/app/src/main/res/layout/list_repo_stargazers.xml index b82e12d1..ac2775e7 100644 --- a/app/src/main/res/layout/list_repo_stargazers.xml +++ b/app/src/main/res/layout/list_repo_stargazers.xml @@ -20,6 +20,7 @@ android:gravity="top|center_horizontal" android:layout_marginTop="1dp" android:text="@string/starMember" + android:textColor="?attr/primaryTextColor" android:textSize="14sp" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/list_repo_watchers.xml b/app/src/main/res/layout/list_repo_watchers.xml index 1c38c5b1..36557767 100644 --- a/app/src/main/res/layout/list_repo_watchers.xml +++ b/app/src/main/res/layout/list_repo_watchers.xml @@ -20,6 +20,7 @@ android:gravity="top|center_horizontal" android:layout_marginTop="1dp" android:text="@string/watcherMember" + android:textColor="?attr/primaryTextColor" android:textSize="14sp" /> - \ No newline at end of file +