mirror of
https://codeberg.org/gitnex/GitNex
synced 2024-12-23 00:48:57 +01:00
Merge branch 'master' into new-font-testing
This commit is contained in:
commit
4867524b4f
@ -10,7 +10,9 @@ import androidx.fragment.app.FragmentStatePagerAdapter;
|
||||
import androidx.viewpager.widget.ViewPager;
|
||||
import retrofit2.Call;
|
||||
import retrofit2.Callback;
|
||||
import android.annotation.SuppressLint;
|
||||
import android.content.Intent;
|
||||
import android.content.res.ColorStateList;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
@ -80,13 +82,19 @@ public class RepoDetailActivity extends AppCompatActivity implements RepoBottomS
|
||||
|
||||
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);
|
||||
if(!tinyDb.getString("issuesCounter").isEmpty()) {
|
||||
getRepoInfo(instanceUrl, Authorization.returnAuthentication(getApplicationContext(), loginUid, instanceToken), repoOwner, repoName1);
|
||||
}
|
||||
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);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -13,7 +13,7 @@
|
||||
android:textSize="16sp"
|
||||
app:textAllCaps="true"
|
||||
android:text="@string/tab_text_issues"
|
||||
android:textColor="@color/white" />
|
||||
android:textColor="@color/lightGray" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/counterBadge"
|
||||
|
@ -37,7 +37,7 @@
|
||||
android:paddingBottom="10dp"
|
||||
android:paddingStart="0dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:textColor="@color/white"/>
|
||||
android:textColor="@color/lightGray"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/repoMetaDataExpandCollapse"
|
||||
@ -285,7 +285,7 @@
|
||||
android:paddingEnd="0dp"
|
||||
android:autoLink="web"
|
||||
android:textColorLink="@color/lightBlue"
|
||||
android:textColor="@color/white"/>
|
||||
android:textColor="@color/lightGray"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/repoFilenameExpandCollapse"
|
||||
|
@ -23,5 +23,6 @@
|
||||
<color name="colorDarkGreen">#009486</color>
|
||||
<color name="darkRed">#e74c3c</color>
|
||||
<color name="lightBlue">#3faef7</color>
|
||||
<color name="lightGray">#b6bbbf</color>
|
||||
|
||||
</resources>
|
||||
|
Loading…
Reference in New Issue
Block a user