Procházet zdrojové kódy

Merge branch 'master' into new-font-testing

tags/2.1.0
M M Arif před 1 měsícem
rodič
revize
4867524b4f
4 změnil soubory, kde provedl 13 přidání a 4 odebrání
  1. +9
    -1
      app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java
  2. +1
    -1
      app/src/main/res/layout/badge.xml
  3. +2
    -2
      app/src/main/res/layout/fragment_repo_info.xml
  4. +1
    -0
      app/src/main/res/values/colors.xml

+ 9
- 1
app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java Zobrazit soubor

@@ -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);

}
}


+ 1
- 1
app/src/main/res/layout/badge.xml Zobrazit soubor

@@ -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"

+ 2
- 2
app/src/main/res/layout/fragment_repo_info.xml Zobrazit soubor

@@ -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"

+ 1
- 0
app/src/main/res/values/colors.xml Zobrazit soubor

@@ -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>

Načítá se…
Zrušit
Uložit