mirrors/GitNex
1
0
Fork 0
mirror of https://codeberg.org/gitnex/GitNex.git synced 2024-12-16 15:48:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into improve-images-loading

Browse Source
This commit is contained in:
6543 2020-03-31 20:40:08 +00:00
commit 786ac3999a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
View File

@ -427,7 +427,7 @@ public class IssueDetailActivity extends BaseActivity {
if(singleIssue.getLabels() != null) { if(singleIssue.getLabels() != null) {
labelsScrollView.setVisibility(View.VISIBLE); labelsScrollView.setVisibility(View.VISIBLE);
int width = 33; int width = 25;
for (int i = 0; i < singleIssue.getLabels().size(); i++) { for (int i = 0; i < singleIssue.getLabels().size(); i++) {
String labelColor = singleIssue.getLabels().get(i).getColor(); String labelColor = singleIssue.getLabels().get(i).getColor();
@ -443,11 +443,11 @@ public class IssueDetailActivity extends BaseActivity {
.beginConfig() .beginConfig()
.useFont(Typeface.DEFAULT) .useFont(Typeface.DEFAULT)
.textColor(new ColorInverter().getContrastColor(color)) .textColor(new ColorInverter().getContrastColor(color))
.fontSize(36) .fontSize(30)
.width((width * labelName.length()) - ((width / 4) * labelName.length())) .width((width * labelName.length()) - ((width / 4) * labelName.length()))
.height(60) .height(50)
.endConfig() .endConfig()
.buildRoundRect(labelName, color, 8); .buildRoundRect(labelName, color, 10);
labelsView.setImageDrawable(drawable); labelsView.setImageDrawable(drawable);
labelsLayout.addView(labelsView); labelsLayout.addView(labelsView);

6
app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
View File

@ -145,11 +145,11 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
//.useFont(Typeface.DEFAULT) //.useFont(Typeface.DEFAULT)
.bold() .bold()
.textColor(new ColorInverter().getContrastColor(color)) .textColor(new ColorInverter().getContrastColor(color))
.fontSize(36) .fontSize(40)
.width(LabelWidthCalculator.customWidth(getMaxLabelLength())) .width(LabelWidthCalculator.customWidth(getMaxLabelLength()))
.height(60) .height(65)
.endConfig() .endConfig()
.buildRoundRect(labelName, color, 8); .buildRoundRect(labelName, color, 10);
holder.labelsView.setImageDrawable(drawable); holder.labelsView.setImageDrawable(drawable);
} }

8
app/src/main/res/layout/list_labels.xml
View File

@ -26,12 +26,14 @@
<ImageView <ImageView
android:id="@+id/labelsOptionsMenu" android:id="@+id/labelsOptionsMenu"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_weight="0.15"
android:contentDescription="@string/labelMenuContentDesc"
android:gravity="end" android:gravity="end"
android:src="@drawable/ic_dotted_menu_horizontal" android:scaleType="fitEnd"
android:contentDescription="@string/labelMenuContentDesc" /> android:src="@drawable/ic_dotted_menu_horizontal" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"