From dd2339ec34ba4f31689887d88d914d0026863e21 Mon Sep 17 00:00:00 2001 From: anonTree1417 Date: Tue, 31 Mar 2020 18:49:39 +0000 Subject: [PATCH 1/2] Small design changes (#327) Merge remote-tracking branch 'remotes/main/master' into add-styling Restoring branches_list.xml Small design changes. Co-authored-by: anonTree1417 Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/327 Reviewed-by: M M Arif Reviewed-by: 6543 <6543@noreply.gitea.io> --- app/src/main/res/layout/list_labels.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/list_labels.xml b/app/src/main/res/layout/list_labels.xml index 241789a3..52c85dbd 100644 --- a/app/src/main/res/layout/list_labels.xml +++ b/app/src/main/res/layout/list_labels.xml @@ -26,12 +26,14 @@ + android:scaleType="fitEnd" + android:src="@drawable/ic_dotted_menu_horizontal" /> Date: Tue, 31 Mar 2020 18:53:36 +0000 Subject: [PATCH 2/2] Adjusting proportions of issue labels. (#325) Merge remote-tracking branch 'remotes/main/master' into fab-issue Adjusting sizes in LabelsAdapter Adjusting proportions of issue labels. Co-authored-by: anonTree1417 Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/325 Reviewed-by: M M Arif --- .../org/mian/gitnex/activities/IssueDetailActivity.java | 8 ++++---- .../main/java/org/mian/gitnex/adapters/LabelsAdapter.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) 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 675e20b7..65ce4753 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -427,7 +427,7 @@ public class IssueDetailActivity extends BaseActivity { if(singleIssue.getLabels() != null) { labelsScrollView.setVisibility(View.VISIBLE); - int width = 33; + int width = 25; for (int i = 0; i < singleIssue.getLabels().size(); i++) { String labelColor = singleIssue.getLabels().get(i).getColor(); @@ -443,11 +443,11 @@ public class IssueDetailActivity extends BaseActivity { .beginConfig() .useFont(Typeface.DEFAULT) .textColor(new ColorInverter().getContrastColor(color)) - .fontSize(36) + .fontSize(30) .width((width * labelName.length()) - ((width / 4) * labelName.length())) - .height(60) + .height(50) .endConfig() - .buildRoundRect(labelName, color, 8); + .buildRoundRect(labelName, color, 10); labelsView.setImageDrawable(drawable); labelsLayout.addView(labelsView); diff --git a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java index d4ec1ed7..6f7ebd23 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java @@ -145,11 +145,11 @@ public class LabelsAdapter extends RecyclerView.Adapter