Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 040a91a

Browse files
salvogiangrisalvogiangri
authored
app: replace sec-roboto-light with sans-serif (#69)
This should fix all the issues with rendering in Andrid Studio Signed-off-by: BlackMesa123 <[email protected]>
1 parent c1b8940 commit 040a91a

File tree

15 files changed

+50
-55
lines changed

15 files changed

+50
-55
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public SeslDropDownItemTextView(Context context, AttributeSet attributeSet, int
3131
public void setChecked(boolean z) {
3232
Context context;
3333
super.setChecked(z);
34-
setTypeface(Typeface.create("sec-roboto-light", z ? 1 : 0));
34+
setTypeface(Typeface.create(z ? "sans-serif-medium" : "sans-serif", 0));
3535
if (z && (context = getContext()) != null && getCurrentTextColor() == -65281) {
3636
Log.w(TAG, "text color reload!");
3737
ColorStateList colorStateList = ResourcesCompat.getColorStateList(context.getResources(), R.color.sesl_spinner_dropdown_text_color, context.getTheme());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private TextView createTitleView() {
170170
context.getResources().getDimensionPixelSize(R.dimen.sesl_context_menu_title_end_padding),
171171
context.getResources().getDimensionPixelSize(R.dimen.sesl_context_menu_title_bottom_padding));
172172
titleView.setTextColor(context.getResources().getColor(R.color.item_color));
173-
titleView.setTypeface(Typeface.create(context.getResources().getString(R.string.sesl_font_family_regular), Typeface.BOLD));
173+
titleView.setTypeface(Typeface.create(context.getResources().getString(R.string.sesl_font_family_bold), Typeface.NORMAL));
174174
titleView.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
175175
titleView.setMaxLines(2);
176176
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@ private void invalidate() {
324324
if (!mIsDividerEnabled)
325325
radioButton.jumpDrawablesToCurrentState();
326326
tv1.setSelected(z);
327-
tv1.setTypeface(Typeface.create("sec-roboto-light", z ? 1 : 0));
327+
tv1.setTypeface(Typeface.create(z ? "sans-serif-medium" : "sans-serif", 0));
328328
if (tv2 != null) {
329329
tv2.setSelected(z);
330-
tv2.setTypeface(Typeface.create("sec-roboto-light", z ? 1 : 0));
330+
tv2.setTypeface(Typeface.create(z ? "sans-serif-medium" : "sans-serif", 0));
331331
}
332332
if (mIsColorFilterEnabled && imageView != null) {
333333
imageView.setColorFilter(z ? mSelectedColor : mUnselectedColor);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,8 @@ public SamsungBaseTabLayout(Context var1, AttributeSet var2, int var3) {
197197
}
198198

199199
Resources var12 = this.getResources();
200-
String var13 = var12.getString(R.string.sesl_font_family_regular);
201-
this.mBoldTypeface = Typeface.create(var13, 1);
202-
this.mNormalTypeface = Typeface.create(var13, 0);
200+
this.mBoldTypeface = Typeface.create(var12.getString(R.string.sesl_font_family_bold), 0);
201+
this.mNormalTypeface = Typeface.create(var12.getString(R.string.sesl_font_family_regular), 0);
203202
this.mSubTabIndicatorHeight = var12.getDimensionPixelSize(R.dimen.sesl_tablayout_subtab_indicator_height);
204203
if (var9.hasValue(R.styleable.SamsungTabLayout_tabTextColor)) {
205204
this.tabTextColors = MaterialResources.getColorStateList(var1, var9, R.styleable.SamsungTabLayout_tabTextColor);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void setIcon(Drawable icon) {
103103
public void setButtonSelected(Boolean selected) {
104104
this.mSelected = selected;
105105
setTextColor(mSelected);
106-
textView.setTypeface(Typeface.create(getResources().getString(R.string.sesl_font_family_regular), mSelected ? Typeface.BOLD : Typeface.NORMAL));
106+
textView.setTypeface(Typeface.create(getResources().getString(mSelected ? R.string.sesl_font_family_bold : R.string.sesl_font_family_regular), Typeface.NORMAL));
107107
}
108108

109109
public void toggleButtonSelected() {

‎yanndroid/oneui/src/main/res/layout-land/setting_color_picker_oui4_layout.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,13 @@
5757
android:layout_height="fill_parent"
5858
android:background="@drawable/setting_dialog_action_button_ripple"
5959
android:focusable="true"
60-
android:fontFamily="@string/sesl_font_family_regular"
60+
android:fontFamily="@string/sesl_font_family_bold"
6161
android:gravity="center"
6262
android:includeFontPadding="false"
6363
android:singleLine="true"
6464
android:text="@string/sesl_cancel"
6565
android:textColor="@color/sesl_dialog_button_text_color"
66-
android:textSize="16.0sp"
67-
android:textStyle="bold" />
66+
android:textSize="16.0sp" />
6867
</RelativeLayout>
6968

7069
<View
@@ -86,13 +85,12 @@
8685
android:layout_height="fill_parent"
8786
android:background="@drawable/setting_dialog_action_button_ripple"
8887
android:focusable="true"
89-
android:fontFamily="@string/sesl_font_family_regular"
88+
android:fontFamily="@string/sesl_font_family_bold"
9089
android:gravity="center"
9190
android:includeFontPadding="false"
9291
android:text="@string/sesl_done"
9392
android:textColor="@color/sesl_dialog_button_text_color"
94-
android:textSize="16.0sp"
95-
android:textStyle="bold" />
93+
android:textSize="16.0sp" />
9694
</RelativeLayout>
9795
</LinearLayout>
9896
</LinearLayout>

‎yanndroid/oneui/src/main/res/layout/design_layout_snackbar_include.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
android:layout_height="wrap_content"
1717
android:layout_gravity="start|center"
1818
android:layout_weight="1.0"
19-
android:fontFamily="sec-roboto-light"
19+
android:fontFamily="@string/sesl_font_family_regular"
2020
android:gravity="center_vertical"
2121
android:minHeight="17.0dip"
2222
android:paddingStart="@dimen/sesl_design_snackbar_text_padding_left"
@@ -31,7 +31,7 @@
3131
android:layout_height="fill_parent"
3232
android:layout_gravity="end|center"
3333
android:background="@drawable/sem_snackbar_action_button_background"
34-
android:fontFamily="sec-roboto-light"
34+
android:fontFamily="@string/sesl_font_family_regular"
3535
android:gravity="center"
3636
android:minHeight="44.0dip"
3737
android:paddingLeft="@dimen/sesl_design_snackbar_action_padding_left"

‎yanndroid/oneui/src/main/res/layout/radio_preference_item.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:layout_width="fill_parent"
3333
android:layout_height="wrap_content"
3434
android:focusable="false"
35-
android:fontFamily="sec-roboto-light"
35+
android:fontFamily="@string/sesl_font_family_regular"
3636
android:gravity="center"
3737
android:textColor="@color/radio_preference_text_color"
3838
android:textSize="@dimen/widget_two_btn_preference_text_size" />
@@ -51,7 +51,7 @@
5151
android:layout_height="wrap_content"
5252
android:layout_marginBottom="@dimen/widget_multi_btn_preference_icon_margin_bottom"
5353
android:focusable="false"
54-
android:fontFamily="sec-roboto-light"
54+
android:fontFamily="@string/sesl_font_family_regular"
5555
android:gravity="center"
5656
android:textColor="@color/radio_preference_text_color"
5757
android:textSize="@dimen/widget_multi_btn_preference_icon_text_size" />
@@ -61,7 +61,7 @@
6161
android:layout_width="fill_parent"
6262
android:layout_height="wrap_content"
6363
android:focusable="false"
64-
android:fontFamily="sec-roboto-light"
64+
android:fontFamily="@string/sesl_font_family_regular"
6565
android:gravity="center"
6666
android:textColor="@color/radio_preference_text_color"
6767
android:textSize="@dimen/widget_multi_btn_preference_text_size" />

‎yanndroid/oneui/src/main/res/layout/samsung_related_card.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:layout_height="wrap_content"
1515
android:layout_marginBottom="@dimen/widget_related_card_title_text_margin_bottom"
1616
android:layout_weight="1.0"
17-
android:fontFamily="sec-roboto-light"
17+
android:fontFamily="@string/sesl_font_family_regular"
1818
android:paddingStart="@dimen/widget_related_card_view_margin_start_end"
1919
android:text="@string/sec_relative_description"
2020
android:textColor="@color/sesl_primary_text_color"

‎yanndroid/oneui/src/main/res/layout/samsung_related_card_preference.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:layout_height="wrap_content"
3434
android:layout_marginBottom="@dimen/widget_related_card_title_text_margin_bottom"
3535
android:layout_weight="1.0"
36-
android:fontFamily="sec-roboto-light"
36+
android:fontFamily="@string/sesl_font_family_regular"
3737
android:paddingStart="@dimen/widget_related_card_view_margin_start_end"
3838
android:text="@string/sec_relative_description"
3939
android:textColor="@color/sesl_primary_text_color"

0 commit comments

Comments
 (0)