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

Commit 6cf80a3

Browse files
committed
- font: debug: sans-serif | release: sec-roboto-light -> avoids render problems but uses correct font in releases
1 parent c1b8940 commit 6cf80a3

File tree

4 files changed

+33
-9
lines changed

4 files changed

+33
-9
lines changed

yanndroid/oneui/build.gradle

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,38 @@ android {
8181
release {
8282
minifyEnabled false
8383
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
84+
resValue "string", "sesl_font_family_regular", "sec-roboto-light"
85+
}
86+
debug {
87+
resValue "string", "sesl_font_family_regular", "sans-serif"
8488
}
8589
}
8690
compileOptions {
8791
sourceCompatibility JavaVersion.VERSION_1_8
8892
targetCompatibility JavaVersion.VERSION_1_8
8993
}
94+
95+
/*project.gradle.addBuildListener(new BuildListener() {
96+
@Override
97+
void settingsEvaluated(Settings settings) {}
98+
99+
@Override
100+
void projectsLoaded(Gradle gradle) {}
101+
102+
@Override
103+
void projectsEvaluated(Gradle gradle) {
104+
print("change to sec-roboto-light")
105+
File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
106+
stringFile.write(stringFile.getText('UTF-8').replace("<string name=\"sesl_font_family_regular\" translatable=\"false\">sans-serif-thin</string>", "<string name=\"sesl_font_family_regular\" translatable=\"false\">sec-roboto-light</string>"), 'UTF-8')
107+
}
108+
109+
@Override
110+
void buildFinished(BuildResult result) {
111+
print("change to sans-serif-thin")
112+
File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
113+
stringFile.write(stringFile.getText('UTF-8').replace("<string name=\"sesl_font_family_regular\" translatable=\"false\">sec-roboto-light</string>", "<string name=\"sesl_font_family_regular\" translatable=\"false\">sans-serif-thin</string>"), 'UTF-8')
114+
}
115+
})*/
90116
}
91117

92118
dependencies {

yanndroid/oneui/src/main/res/layout/samsung_drawer_optionbutton.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,14 @@
3131
android:layout_weight="1"
3232
android:ellipsize="marquee"
3333
android:singleLine="true"
34-
android:text="OptionButton"
3534
android:textAlignment="viewStart"
3635
android:textSize="18dp" />
3736

3837
<com.google.android.material.textview.MaterialTextView
3938
android:id="@+id/optionbutton_counter"
4039
style="?android:attr/textAppearanceSmall"
4140
android:layout_width="wrap_content"
42-
android:layout_height="wrap_content"
43-
android:text="0" />
41+
android:layout_height="wrap_content" />
4442

4543
</LinearLayout>
4644

yanndroid/oneui/src/main/res/values/strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22
<string name="closed" translatable="false">closed</string>
33
<string name="opened" translatable="false">opened</string>
4-
<string name="sesl_font_family_regular" translatable="false">sec-roboto-light</string>
4+
<!--<string name="sesl_font_family_regular" translatable="false">sans-serif-thin</string>-->
55
<string name="app_name" translatable="false" />
66
<string name="sesl_appbar_scrolling_view_behavior" translatable="false">de.dlyt.yanndroid.oneui.sesl.appbar.SamsungAppBarLayout$ScrollingViewBehavior</string>
77

@@ -17,7 +17,7 @@
1717

1818

1919
<string name="action_settings">Settings</string>
20-
<string name="sec_relative_description">Looking for something else?</string> <!--Uyghur and Tibetan missing-->
20+
<string name="sec_relative_description">Looking for something else?</string>
2121

2222
<string name="action_search">Search</string>
2323
<string name="sesl_searchview_description_clear">Clear search field</string>

yanndroid/oneui/src/main/res/values/styles.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,15 +367,15 @@
367367
<item name="android:textSize">@dimen/sesl_toolbar_title_text_size</item>
368368
<item name="android:textStyle">normal</item>
369369
<item name="android:textColor">@color/sesl_action_bar_text_color_title</item>
370-
<item name="fontFamily">sec-roboto-light</item>
370+
<item name="fontFamily">@string/sesl_font_family_regular</item>
371371
<item name="textAllCaps">false</item>
372372
</style>
373373

374374
<style name="ActionBarSubtitleTextStyle" parent="@style/SubheadTextStyle">
375375
<item name="android:textSize">@dimen/sesl_toolbar_subtitle_text_size</item>
376376
<item name="android:textStyle">normal</item>
377377
<item name="android:textColor">@color/sesl_action_bar_text_color_subtitle</item>
378-
<item name="fontFamily">sec-roboto-light</item>
378+
<item name="fontFamily">@string/sesl_font_family_regular</item>
379379
<item name="textAllCaps">false</item>
380380
</style>
381381

@@ -491,7 +491,7 @@
491491
<item name="android:textSize">@dimen/widget_related_card_text_size</item>
492492
<item name="android:textStyle">bold</item>
493493
<item name="android:textColor">?colorPrimaryDark</item>
494-
<item name="android:fontFamily">sec-roboto-light</item>
494+
<item name="android:fontFamily">@string/sesl_font_family_regular</item>
495495
</style>
496496

497497

@@ -576,7 +576,7 @@
576576
<item name="android:textColor">@color/item_color</item>
577577
<item name="android:ellipsize">end</item>
578578
<item name="android:maxLines">1</item>
579-
<item name="android:fontFamily">sec-roboto-light</item>
579+
<item name="android:fontFamily">@string/sesl_font_family_regular</item>
580580
<item name="android:textAlignment">center</item>
581581
</style>
582582

0 commit comments

Comments
 (0)