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

Commit 8541fa6

Browse files
committed
- revert last commit
- fix for font
1 parent 39b1dcd commit 8541fa6

File tree

4 files changed

+23
-27
lines changed

4 files changed

+23
-27
lines changed

app/build.gradle

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,26 @@ android {
2727
sourceCompatibility JavaVersion.VERSION_1_8
2828
targetCompatibility JavaVersion.VERSION_1_8
2929
}
30+
31+
project.gradle.addBuildListener(new BuildListener() {
32+
@Override
33+
void settingsEvaluated(Settings settings) {}
34+
35+
@Override
36+
void projectsLoaded(Gradle gradle) {}
37+
38+
@Override
39+
void projectsEvaluated(Gradle gradle) {
40+
File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
41+
stringFile.write(stringFile.getText('UTF-8').replace("<string name=\"sesl_font_family_regular\" translatable=\"false\">sans-serif</string>", "<string name=\"sesl_font_family_regular\" translatable=\"false\">sec-roboto-light</string>"), 'UTF-8')
42+
}
43+
44+
@Override
45+
void buildFinished(BuildResult result) {
46+
File stringFile = new File("${projectDir}/src/main/res/values/strings.xml")
47+
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</string>"), 'UTF-8')
48+
}
49+
})
3050
}
3151

3252
dependencies {

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
<string name="app_name" translatable="false">OneUI Sample</string>
33
<string name="nothing"><![CDATA[>Nothing<]]></string>
44
<string name="nothing_summary">Swipe down and see the magic :D</string>
5+
6+
<string name="sesl_font_family_regular" translatable="false">sans-serif</string> <!--todo: remove for release-->
57
</resources>

yanndroid/oneui/build.gradle

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,12 @@ 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"
8884
}
8985
}
9086
compileOptions {
9187
sourceCompatibility JavaVersion.VERSION_1_8
9288
targetCompatibility JavaVersion.VERSION_1_8
9389
}
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-
})*/
11690
}
11791

11892
dependencies {

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

Lines changed: 1 addition & 1 deletion
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">sans-serif-thin</string>-->
4+
<string name="sesl_font_family_regular" translatable="false">sec-roboto-light</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

0 commit comments

Comments
 (0)