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 d0df8d69..493494b4 100644 --- a/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java +++ b/app/src/main/java/org/mian/gitnex/actions/AssigneesActions.java @@ -47,7 +47,7 @@ public class AssigneesActions { if (issueAssigneesList.getAssignees() != null) { - if (issueAssigneesList.getAssignees().size() > 0) { + if (!issueAssigneesList.getAssignees().isEmpty()) { for (int i = 0; i < issueAssigneesList.getAssignees().size(); @@ -105,7 +105,7 @@ public class AssigneesActions { assert assigneesList_ != null; - if (assigneesList_.size() > 0) { + if (!assigneesList_.isEmpty()) { assigneesList.addAll(assigneesList_); materialAlertDialogBuilder.show(); 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 1b6ddd1f..f3fca5a8 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -40,6 +40,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.amulyakhare.textdrawable.TextDrawable; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.bottomsheet.BottomSheetDialog; @@ -161,8 +163,8 @@ public class IssueDetailActivity extends BaseActivity private AttachmentsAdapter attachmentsAdapter; private static final List contentUri = new ArrayList<>(); private InputMethodManager imm; - private float buttonAlphaStatDisabled = .5F; - private float buttonAlphaStatEnabled = 1F; + private final float buttonAlphaStatDisabled = .5F; + private final float buttonAlphaStatEnabled = 1F; private enum Mode { EDIT, @@ -1346,6 +1348,7 @@ public class IssueDetailActivity extends BaseActivity .diskCacheStrategy(DiskCacheStrategy.ALL) .placeholder(R.drawable.loader_animated) .centerCrop() + .apply(RequestOptions.bitmapTransform(new RoundedCorners(20))) .into(assigneesView); viewBinding.frameAssignees.addView(assigneesView); @@ -1424,7 +1427,7 @@ public class IssueDetailActivity extends BaseActivity .height(height) .endConfig() .buildRoundRect( - labelName, color, AppUtil.getPixelsFromDensity(ctx, 18)); + labelName, color, AppUtil.getPixelsFromDensity(ctx, 6)); labelsView.setImageDrawable(drawable); viewBinding.frameLabels.addView(labelsView); diff --git a/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java b/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java index f0ef2cb4..35c15fcf 100644 --- a/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/ProfileActivity.java @@ -60,6 +60,7 @@ public class ProfileActivity extends BaseActivity implements BottomSheetListener } else { Toasty.warning(ctx, ctx.getResources().getString(R.string.userInvalidUserName)); finish(); + return; } setSupportActionBar(toolbar); diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java index 0f77f676..9e9f632a 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreIssuesAdapter.java @@ -301,7 +301,7 @@ public class ExploreIssuesAdapter extends RecyclerView.Adapter .buildRoundRect( labelName, color, - AppUtil.getPixelsFromDensity(context, 18)); + AppUtil.getPixelsFromDensity(context, 6)); labelsView.setImageDrawable(drawable); frameLabels.addView(labelsView); diff --git a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java index 606ed16c..b7fb52df 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java @@ -269,7 +269,7 @@ public class PullRequestsAdapter extends RecyclerView.Adapter 0) { + if (!response.body().isEmpty()) { issuesList.clear(); issuesList.addAll(response.body()); adapter.notifyDataChanged(); @@ -357,7 +357,7 @@ public class IssuesFragment extends Fragment { if (response.code() == 200) { List result = response.body(); assert result != null; - if (result.size() > 0) { + if (!result.isEmpty()) { pageSize = result.size(); issuesList.addAll(result); } else { diff --git a/app/src/main/res/drawable/app_logo.xml b/app/src/main/res/drawable/app_logo.xml index 5482b0a2..f75dab9f 100644 --- a/app/src/main/res/drawable/app_logo.xml +++ b/app/src/main/res/drawable/app_logo.xml @@ -1,6 +1,6 @@ - + app:cardCornerRadius="@dimen/dimen16dp"> + + + + diff --git a/app/src/main/res/layout/custom_about_dialog.xml b/app/src/main/res/layout/custom_about_dialog.xml index a97738e6..6d0a3e4a 100644 --- a/app/src/main/res/layout/custom_about_dialog.xml +++ b/app/src/main/res/layout/custom_about_dialog.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - app:cardCornerRadius="@dimen/dimen36dp"> + app:cardCornerRadius="@dimen/dimen16dp"> + android:src="@drawable/gitnex" /> @@ -52,8 +52,7 @@ android:layout_marginTop="@dimen/dimen6dp" android:text="@string/appName" android:textColor="?attr/primaryTextColor" - android:textSize="@dimen/dimen24sp" - android:textStyle="bold" /> + android:textSize="@dimen/dimen24sp" /> @@ -62,6 +63,7 @@ android:id="@+id/userAvatar" android:layout_width="match_parent" android:layout_height="match_parent" + android:src="@drawable/loader_animated" android:contentDescription="@string/generalImgContentText" /> diff --git a/app/src/main/res/layout/layout_reaction_badge.xml b/app/src/main/res/layout/layout_reaction_badge.xml index 67dbc217..50047100 100644 --- a/app/src/main/res/layout/layout_reaction_badge.xml +++ b/app/src/main/res/layout/layout_reaction_badge.xml @@ -6,21 +6,21 @@ style="?attr/materialCardViewFilledStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="6dp" + android:layout_marginEnd="@dimen/dimen6dp" app:cardBackgroundColor="?attr/inputBackgroundColor" - app:cardCornerRadius="15dp" + app:cardCornerRadius="@dimen/dimen10dp" app:cardElevation="0dp"> diff --git a/app/src/main/res/layout/layout_reaction_button.xml b/app/src/main/res/layout/layout_reaction_button.xml index 24a317de..72a7fe14 100644 --- a/app/src/main/res/layout/layout_reaction_button.xml +++ b/app/src/main/res/layout/layout_reaction_button.xml @@ -8,7 +8,7 @@ android:layout_height="@dimen/dimen40dp" android:layout_marginEnd="@dimen/dimen8dp" app:cardBackgroundColor="?attr/inputBackgroundColor" - app:cardCornerRadius="@dimen/dimen20dp" + app:cardCornerRadius="@dimen/dimen10dp" app:cardElevation="@dimen/dimen0dp"> diff --git a/app/src/main/res/layout/list_collaborators.xml b/app/src/main/res/layout/list_collaborators.xml index 99a861be..16af85c3 100644 --- a/app/src/main/res/layout/list_collaborators.xml +++ b/app/src/main/res/layout/list_collaborators.xml @@ -25,6 +25,7 @@ android:layout_width="@dimen/dimen60dp" android:layout_height="@dimen/dimen60dp" style="?attr/materialCardViewElevatedStyle" + android:backgroundTint="@android:color/transparent" android:layout_gravity="center" app:cardElevation="@dimen/dimen0dp" app:cardCornerRadius="@dimen/dimen16dp"> diff --git a/app/src/main/res/layout/list_collaborators_search.xml b/app/src/main/res/layout/list_collaborators_search.xml index dc6003c1..4a4c9f6a 100644 --- a/app/src/main/res/layout/list_collaborators_search.xml +++ b/app/src/main/res/layout/list_collaborators_search.xml @@ -25,6 +25,7 @@ android:layout_width="@dimen/dimen32dp" android:layout_height="@dimen/dimen32dp" style="?attr/materialCardViewElevatedStyle" + android:backgroundTint="@android:color/transparent" app:cardElevation="@dimen/dimen0dp" android:layout_marginEnd="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen8dp"> diff --git a/app/src/main/res/layout/list_commits.xml b/app/src/main/res/layout/list_commits.xml index aaf5d8ed..456faad6 100644 --- a/app/src/main/res/layout/list_commits.xml +++ b/app/src/main/res/layout/list_commits.xml @@ -52,6 +52,7 @@ android:layout_width="@dimen/dimen32dp" android:layout_height="@dimen/dimen32dp" style="?attr/materialCardViewElevatedStyle" + android:backgroundTint="@android:color/transparent" app:cardElevation="@dimen/dimen0dp" android:layout_marginEnd="@dimen/dimen6dp" app:cardCornerRadius="@dimen/dimen8dp"> diff --git a/app/src/main/res/layout/list_dashboard_activity.xml b/app/src/main/res/layout/list_dashboard_activity.xml index 43ad1a1b..b7c8d65c 100644 --- a/app/src/main/res/layout/list_dashboard_activity.xml +++ b/app/src/main/res/layout/list_dashboard_activity.xml @@ -35,6 +35,7 @@ android:layout_width="@dimen/dimen32dp" android:layout_height="@dimen/dimen32dp" style="?attr/materialCardViewElevatedStyle" + android:backgroundTint="@android:color/transparent" app:cardElevation="@dimen/dimen0dp" android:layout_marginEnd="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen8dp"> diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml index fc862bd0..e654e614 100644 --- a/app/src/main/res/layout/list_issue_comments.xml +++ b/app/src/main/res/layout/list_issue_comments.xml @@ -53,6 +53,7 @@ diff --git a/app/src/main/res/layout/list_labels.xml b/app/src/main/res/layout/list_labels.xml index c98a7bc9..f1ef9511 100644 --- a/app/src/main/res/layout/list_labels.xml +++ b/app/src/main/res/layout/list_labels.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="?attr/materialCardViewElevatedStyle" - app:cardCornerRadius="@dimen/dimen16dp" + app:cardCornerRadius="@dimen/dimen8dp" app:cardElevation="@dimen/dimen0dp" app:contentPaddingBottom="@dimen/dimen4dp" app:contentPaddingLeft="@dimen/dimen12dp" diff --git a/app/src/main/res/layout/list_most_visited_repos.xml b/app/src/main/res/layout/list_most_visited_repos.xml index 3461c076..e5483d57 100644 --- a/app/src/main/res/layout/list_most_visited_repos.xml +++ b/app/src/main/res/layout/list_most_visited_repos.xml @@ -33,8 +33,8 @@ diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml index a69e9f05..a6445b0d 100644 --- a/app/src/main/res/layout/list_pr.xml +++ b/app/src/main/res/layout/list_pr.xml @@ -35,6 +35,7 @@ android:layout_width="@dimen/dimen32dp" android:layout_height="@dimen/dimen32dp" style="?attr/materialCardViewElevatedStyle" + android:backgroundTint="@android:color/transparent" app:cardElevation="@dimen/dimen0dp" android:layout_marginEnd="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen8dp"> diff --git a/app/src/main/res/layout/list_reaction_authors.xml b/app/src/main/res/layout/list_reaction_authors.xml index ccb8a717..86d43e19 100644 --- a/app/src/main/res/layout/list_reaction_authors.xml +++ b/app/src/main/res/layout/list_reaction_authors.xml @@ -15,6 +15,7 @@ diff --git a/app/src/main/res/layout/list_users.xml b/app/src/main/res/layout/list_users.xml index c74c4d05..94806f00 100644 --- a/app/src/main/res/layout/list_users.xml +++ b/app/src/main/res/layout/list_users.xml @@ -25,6 +25,7 @@ android:layout_width="@dimen/dimen32dp" android:layout_height="@dimen/dimen32dp" style="?attr/materialCardViewFilledStyle" + android:backgroundTint="@android:color/transparent" app:cardElevation="@dimen/dimen0dp" android:layout_marginEnd="@dimen/dimen12dp" app:cardCornerRadius="@dimen/dimen8dp"> diff --git a/app/src/main/res/layout/list_users_grid.xml b/app/src/main/res/layout/list_users_grid.xml index 843dc1cf..2b2bcc83 100644 --- a/app/src/main/res/layout/list_users_grid.xml +++ b/app/src/main/res/layout/list_users_grid.xml @@ -25,6 +25,7 @@ android:layout_width="@dimen/dimen60dp" android:layout_height="@dimen/dimen60dp" style="?attr/materialCardViewElevatedStyle" + android:backgroundTint="@android:color/transparent" android:layout_gravity="center" app:cardElevation="@dimen/dimen0dp" app:cardCornerRadius="@dimen/dimen12dp"> diff --git a/app/src/main/res/layout/list_wiki.xml b/app/src/main/res/layout/list_wiki.xml index b7bb3486..8b762f49 100644 --- a/app/src/main/res/layout/list_wiki.xml +++ b/app/src/main/res/layout/list_wiki.xml @@ -33,8 +33,8 @@ diff --git a/app/src/main/res/layout/nav_user_accounts.xml b/app/src/main/res/layout/nav_user_accounts.xml index 081f6520..550a065c 100644 --- a/app/src/main/res/layout/nav_user_accounts.xml +++ b/app/src/main/res/layout/nav_user_accounts.xml @@ -15,6 +15,7 @@ android:id="@+id/userAccountAvatar" android:layout_width="match_parent" android:layout_height="match_parent" + android:src="@drawable/loader_animated" android:contentDescription="@string/generalImgContentText" />