OrgGitea
/
GitNex
mirror of https://codeberg.org/gitnex/GitNex.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into new-font-testing

This commit is contained in:
M M Arif 2019-09-19 11:28:07 +05:00
parent a59e818aa2 aeca4a0edb
commit 4867524b4f
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
View File

@ -10,7 +10,9 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import android.annotation.SuppressLint;
import android.content.Intent; import android.content.Intent;
import android.content.res.ColorStateList;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -80,13 +82,19 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
if(tinyDb.getBoolean("enableCounterIssueBadge")) { if(tinyDb.getBoolean("enableCounterIssueBadge")) {
View tabHeader = LayoutInflater.from(this).inflate(R.layout.badge, null); @SuppressLint("InflateParams") View tabHeader = LayoutInflater.from(this).inflate(R.layout.badge, null);
textViewBadge = tabHeader.findViewById(R.id.counterBadge); textViewBadge = tabHeader.findViewById(R.id.counterBadge);
if(!tinyDb.getString("issuesCounter").isEmpty()) { if(!tinyDb.getString("issuesCounter").isEmpty()) {
getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1); getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
} }
Objects.requireNonNull(tabLayout.getTabAt(1)).setCustomView(tabHeader); Objects.requireNonNull(tabLayout.getTabAt(1)).setCustomView(tabHeader);
TabLayout.Tab tabOpenIssues = tabLayout.getTabAt(1);
ColorStateList textColor = tabLayout.getTabTextColors();
assert tabOpenIssues != null;
TextView openIssueTabView = Objects.requireNonNull(tabOpenIssues.getCustomView()).findViewById(R.id.counterBadgeText);
openIssueTabView.setTextColor(textColor);
} }
} }

2
app/src/main/res/layout/badge.xml
View File

@ -13,7 +13,7 @@
android:textSize="16sp" android:textSize="16sp"
app:textAllCaps="true" app:textAllCaps="true"
android:text="@string/tab_text_issues" android:text="@string/tab_text_issues"
android:textColor="@color/white" /> android:textColor="@color/lightGray" />
<TextView <TextView
android:id="@+id/counterBadge" android:id="@+id/counterBadge"

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

@ -37,7 +37,7 @@
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:textColor="@color/white"/> android:textColor="@color/lightGray"/>
<ImageView <ImageView
android:id="@+id/repoMetaDataExpandCollapse" android:id="@+id/repoMetaDataExpandCollapse"
@ -285,7 +285,7 @@
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:autoLink="web" android:autoLink="web"
android:textColorLink="@color/lightBlue" android:textColorLink="@color/lightBlue"
android:textColor="@color/white"/> android:textColor="@color/lightGray"/>
<ImageView <ImageView
android:id="@+id/repoFilenameExpandCollapse" android:id="@+id/repoFilenameExpandCollapse"

1
app/src/main/res/values/colors.xml
View File

@ -23,5 +23,6 @@
<color name="colorDarkGreen">#009486</color> <color name="colorDarkGreen">#009486</color>
<color name="darkRed">#e74c3c</color> <color name="darkRed">#e74c3c</color>
<color name="lightBlue">#3faef7</color> <color name="lightBlue">#3faef7</color>
<color name="lightGray">#b6bbbf</color>
</resources> </resources>