app: revert using included sesl_roboto font set (#68)

Signed-off-by: BlackMesa123 <[email protected]>

Author: salvogiangri

yanndroid/oneui/src/main/java/androidx/appcompat/widget/SeslDropDownItemTextView.java

@@ -31,7 +31,7 @@ public SeslDropDownItemTextView(Context context, AttributeSet attributeSet, int
     public void setChecked(boolean z) {
         Context context;
         super.setChecked(z);
-        setTypeface(ResourcesCompat.getFont(getContext(), R.font.sesl_roboto), z ? 1 : 0);
+        setTypeface(Typeface.create("sec-roboto-light", z ? 1 : 0));
         if (z && (context = getContext()) != null && getCurrentTextColor() == -65281) {
             Log.w(TAG, "text color reload!");
             ColorStateList colorStateList = ResourcesCompat.getColorStateList(context.getResources(), R.color.sesl_spinner_dropdown_text_color, context.getTheme());

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/AboutPage.java

@@ -108,7 +108,7 @@ public void onClick(View view) {
         });
 
         if (mIsOneUI4) {
-            app_name.setTypeface(ResourcesCompat.getFont(context, R.font.sesl_roboto), Typeface.NORMAL);
+            app_name.setTypeface(Typeface.create(getResources().getString(R.string.sesl_font_family_regular), Typeface.NORMAL));
             app_name.setTextSize(0, getResources().getDimension(R.dimen.sesl4_about_app_name_text_size));
             version.setTextSize(0, getResources().getDimension(R.dimen.sesl4_about_secondary_text_size));
             about_optional_text.setTextSize(0, getResources().getDimension(R.dimen.sesl4_about_secondary_text_size));

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/menu/PopupMenu.java

@@ -170,7 +170,7 @@ private TextView createTitleView() {
                 context.getResources().getDimensionPixelSize(R.dimen.sesl_context_menu_title_end_padding),
                 context.getResources().getDimensionPixelSize(R.dimen.sesl_context_menu_title_bottom_padding));
         titleView.setTextColor(context.getResources().getColor(R.color.item_color));
-        titleView.setTypeface(ResourcesCompat.getFont(context, R.font.sesl_roboto), Typeface.BOLD);
+        titleView.setTypeface(Typeface.create(context.getResources().getString(R.string.sesl_font_family_regular), Typeface.BOLD));
         titleView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
         titleView.setMaxLines(2);
         titleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getResources().getDimensionPixelSize(R.dimen.sesl_context_menu_title_text_size));

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/preference/HorizontalRadioPreference.java

@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.Typeface;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
@@ -323,10 +324,10 @@ private void invalidate() {
             if (!mIsDividerEnabled)
                 radioButton.jumpDrawablesToCurrentState();
             tv1.setSelected(z);
-            tv1.setTypeface(null, z ? 1 : 0);
+            tv1.setTypeface(Typeface.create("sec-roboto-light", z ? 1 : 0));
             if (tv2 != null) {
                 tv2.setSelected(z);
-                tv2.setTypeface(null, z ? 1 : 0);
+                tv2.setTypeface(Typeface.create("sec-roboto-light", z ? 1 : 0));
             }
             if (mIsColorFilterEnabled && imageView != null) {
                 imageView.setColorFilter(z ? mSelectedColor : mUnselectedColor);

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/sesl/tabs/SamsungBaseTabLayout.java

@@ -45,7 +45,6 @@
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.TooltipCompat;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.util.Pools;
 import androidx.core.view.AccessibilityDelegateCompat;
@@ -90,14 +89,15 @@ public class SamsungBaseTabLayout extends HorizontalScrollView {
     public boolean inlineLabel;
     public int mBadgeColor;
     public int mBadgeTextColor;
+    public Typeface mBoldTypeface;
     public int mDepthStyle;
     public int mIconTextGap;
     public boolean mIsScaledTextSizeType;
+    public Typeface mNormalTypeface;
     public int mRequestedTabWidth;
     public int mSubTabIndicatorHeight;
     public int mSubTabSelectedIndicatorColor;
     public int mTabSelectedIndicatorColor;
-    public Typeface mTypeface;
     public int mode;
     public TabLayoutOnPageChangeListener pageChangeListener;
     public PagerAdapter pagerAdapter;
@@ -197,7 +197,9 @@ public SamsungBaseTabLayout(Context var1, AttributeSet var2, int var3) {
         }
 
         Resources var12 = this.getResources();
-        this.mTypeface = ResourcesCompat.getFont(var1, R.font.sesl_roboto);
+        String var13 = var12.getString(R.string.sesl_font_family_regular);
+        this.mBoldTypeface = Typeface.create(var13, 1);
+        this.mNormalTypeface = Typeface.create(var13, 0);
         this.mSubTabIndicatorHeight = var12.getDimensionPixelSize(R.dimen.sesl_tablayout_subtab_indicator_height);
         if (var9.hasValue(R.styleable.SamsungTabLayout_tabTextColor)) {
             this.tabTextColors = MaterialResources.getColorStateList(var1, var9, R.styleable.SamsungTabLayout_tabTextColor);
@@ -1087,7 +1089,7 @@ public final void setSelectedTabView(int var1, boolean var2) {
                         if (var4 == var1) {
                             if (var8.textView != null) {
                                 this.startTextColorChangeAnimation(var8.textView, this.getSelectedTabTextColor());
-                                var8.textView.setTypeface(mTypeface, Typeface.BOLD);
+                                var8.textView.setTypeface(this.mBoldTypeface);
                                 var8.textView.setSelected(true);
                             }
 
@@ -1106,7 +1108,7 @@ public final void setSelectedTabView(int var1, boolean var2) {
                             }
 
                             if (var8.textView != null) {
-                                var8.textView.setTypeface(mTypeface, Typeface.NORMAL);
+                                var8.textView.setTypeface(this.mNormalTypeface);
                                 this.startTextColorChangeAnimation(var8.textView, this.tabTextColors.getDefaultColor());
                                 var8.textView.setSelected(false);
                             }
@@ -2290,7 +2292,7 @@ public final boolean startTabTouchAnimation(MotionEvent var1, KeyEvent var2) {
                 if (var3 != 0) {
                     if (var3 != 1) {
                         if (var3 == 3) {
-                            this.textView.setTypeface(mTypeface, Typeface.NORMAL);
+                            this.textView.setTypeface(SamsungBaseTabLayout.this.mNormalTypeface);
                             var5 = SamsungBaseTabLayout.this;
                             var5.startTextColorChangeAnimation(this.textView, var5.tabTextColors.getDefaultColor());
                             var6 = this.mIndicatorView;
@@ -2303,7 +2305,7 @@ public final boolean startTabTouchAnimation(MotionEvent var1, KeyEvent var2) {
                             if (var7 != null) {
                                 var4 = var7.view.textView;
                                 if (var4 != null) {
-                                    var4.setTypeface(mTypeface, Typeface.BOLD);
+                                    var4.setTypeface(SamsungBaseTabLayout.this.mBoldTypeface);
                                     var8 = SamsungBaseTabLayout.this;
                                     var8.startTextColorChangeAnimation(var7.view.textView, var8.getSelectedTabTextColor());
                                 }
@@ -2341,7 +2343,7 @@ public final boolean startTabTouchAnimation(MotionEvent var1, KeyEvent var2) {
                         if (this.tab.position != SamsungBaseTabLayout.this.getSelectedTabPosition()) {
                             TextView var9 = this.textView;
                             if (var9 != null) {
-                                var9.setTypeface(mTypeface, Typeface.BOLD);
+                                var9.setTypeface(SamsungBaseTabLayout.this.mBoldTypeface);
                                 var5 = SamsungBaseTabLayout.this;
                                 var5.startTextColorChangeAnimation(this.textView, var5.getSelectedTabTextColor());
                                 var6 = this.mIndicatorView;
@@ -2354,7 +2356,7 @@ public final boolean startTabTouchAnimation(MotionEvent var1, KeyEvent var2) {
                                 if (var7 != null) {
                                     var4 = var7.view.textView;
                                     if (var4 != null) {
-                                        var4.setTypeface(mTypeface, Typeface.NORMAL);
+                                        var4.setTypeface(SamsungBaseTabLayout.this.mNormalTypeface);
                                         var8 = SamsungBaseTabLayout.this;
                                         var8.startTextColorChangeAnimation(var7.view.textView, var8.tabTextColors.getDefaultColor());
                                     }

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/view/OptionButton.java

@@ -103,7 +103,7 @@ public void setIcon(Drawable icon) {
     public void setButtonSelected(Boolean selected) {
         this.mSelected = selected;
         setTextColor(mSelected);
-        textView.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sesl_roboto), mSelected ? Typeface.BOLD : Typeface.NORMAL);
+        textView.setTypeface(Typeface.create(getResources().getString(R.string.sesl_font_family_regular), mSelected ? Typeface.BOLD : Typeface.NORMAL));
     }
 
     public void toggleButtonSelected() {

yanndroid/oneui/src/main/res/font/sec_medium.ttf

@@ -57,7 +57,7 @@
                             android:layout_height="fill_parent"
                             android:background="@drawable/setting_dialog_action_button_ripple"
                             android:focusable="true"
-                            android:fontFamily="@font/sesl_roboto"
+                            android:fontFamily="@string/sesl_font_family_regular"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:singleLine="true"
@@ -86,7 +86,7 @@
                             android:layout_height="fill_parent"
                             android:background="@drawable/setting_dialog_action_button_ripple"
                             android:focusable="true"
-                            android:fontFamily="@font/sesl_roboto"
+                            android:fontFamily="@string/sesl_font_family_regular"
                             android:gravity="center"
                             android:includeFontPadding="false"
                             android:text="@string/sesl_done"