Gitea/GitNex-Android-App
1
0
Fork 0
mirror of https://codeberg.org/gitnex/GitNex synced 2025-02-10 09:00:50 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into new-font-testing

Browse Source
This commit is contained in:
M M Arif 2019-09-19 11:27:09 +05:00
commit a59e818aa2
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package org.mian.gitnex.adapters;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -42,13 +41,12 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
private TextView labelId; private TextView labelId;
private TextView labelColor; private TextView labelColor;
private ImageView labelsView; private ImageView labelsView;
private ImageView labelsOptionsMenu;
private LabelsViewHolder(View itemView) { private LabelsViewHolder(View itemView) {
super(itemView); super(itemView);
labelsView = itemView.findViewById(R.id.labelsView); labelsView = itemView.findViewById(R.id.labelsView);
labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu); ImageView labelsOptionsMenu = itemView.findViewById(R.id.labelsOptionsMenu);
labelTitle = itemView.findViewById(R.id.labelTitle); labelTitle = itemView.findViewById(R.id.labelTitle);
labelId = itemView.findViewById(R.id.labelId); labelId = itemView.findViewById(R.id.labelId);
labelColor = itemView.findViewById(R.id.labelColor); labelColor = itemView.findViewById(R.id.labelColor);
@ -146,6 +144,7 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
TextDrawable drawable = TextDrawable.builder() TextDrawable drawable = TextDrawable.builder()
.beginConfig() .beginConfig()
//.useFont(Typeface.DEFAULT) //.useFont(Typeface.DEFAULT)
.bold()
.textColor(new ColorInverter().getContrastColor(color)) .textColor(new ColorInverter().getContrastColor(color))
.fontSize(36) .fontSize(36)
.width(LabelWidthCalculator.customWidth(getMaxLabelLength())) .width(LabelWidthCalculator.customWidth(getMaxLabelLength()))

23
app/src/main/res/layout/fragment_repo_info.xml
View File

@ -69,7 +69,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
@ -87,7 +87,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
@ -105,7 +105,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:autoLink="web" android:autoLink="web"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
@ -124,9 +124,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:autoLink="web" android:autoLink="web"
android:textColorLink="@color/lightBlue"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
<TextView <TextView
@ -143,7 +144,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoZero" android:text="@string/infoTabRepoZero"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
@ -161,7 +162,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoDefaultBranchText" android:text="@string/infoTabRepoDefaultBranchText"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
@ -179,7 +180,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:autoLink="web" android:autoLink="web"
android:textColorLink="@color/lightBlue" android:textColorLink="@color/lightBlue"
@ -199,7 +200,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:autoLink="web" android:autoLink="web"
android:textColorLink="@color/lightBlue" android:textColorLink="@color/lightBlue"
@ -219,7 +220,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoBlank" android:text="@string/infoTabRepoBlank"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:autoLink="web" android:autoLink="web"
android:textColorLink="@color/lightBlue" android:textColorLink="@color/lightBlue"
@ -239,7 +240,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoZero" android:text="@string/infoTabRepoZero"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>
@ -256,7 +257,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="@string/infoTabRepoDummyTime" android:text="@string/infoTabRepoDummyTime"
android:textSize="16sp" android:textSize="14sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:textColor="@color/colorWhite"/> android:textColor="@color/colorWhite"/>

2
app/src/main/res/values/strings.xml
View File

@ -151,7 +151,7 @@
<string name="infoTabRepoSshUrl">SSH URL</string> <string name="infoTabRepoSshUrl">SSH URL</string>
<string name="infoTabRepoCloneUrl">Clone URL</string> <string name="infoTabRepoCloneUrl">Clone URL</string>
<string name="infoTabRepoRepoUrl">Repo URL</string> <string name="infoTabRepoRepoUrl">Repo URL</string>
<string name="infoTabRepoForksCount">Forks Count</string> <string name="infoTabRepoForksCount">Forks</string>
<string name="infoTabRepoCreatedAt">Created</string> <string name="infoTabRepoCreatedAt">Created</string>
<string name="infoTabRepoUpdatedAt">Last Updated</string> <string name="infoTabRepoUpdatedAt">Last Updated</string>
<string name="infoTabRepoDummyTime">2018&#8211;10&#8211;30 08:25:25</string> <string name="infoTabRepoDummyTime">2018&#8211;10&#8211;30 08:25:25</string>