Skip to content

Commit 2cef985

Browse files
committed
Release 7.1: Adaptive icon, Material Design 2 improved a lot and bug fixes
1 parent 18b8e62 commit 2cef985

31 files changed

+36
-22
lines changed
77.7 KB
Loading

app/src/main/res/drawable/ic_splash.png

100644100755
-52.8 KB
Loading

app/src/main/res/font/lato.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
3+
app:fontProviderAuthority="com.google.android.gms.fonts"
4+
app:fontProviderPackage="com.google.android.gms"
5+
app:fontProviderQuery="Lato"
6+
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
7+
</font-family>

app/src/main/res/layout/pixel_activity.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:id="@+id/imageView"
1313
android:layout_width="match_parent"
1414
android:layout_height="140dp"
15-
android:src="@drawable/ic_splash"
15+
android:src="@drawable/ic_homepage"
1616
android:contentDescription="@string/welcome_title"
1717
android:layout_margin="5dp" />
1818

@@ -39,7 +39,7 @@
3939
android:fontFamily="@font/open_sans_reg"
4040
android:gravity="center"
4141
android:text="@string/welcome_description"
42-
android:textColor="@color/textPrimaryColor"
42+
android:textColor="@color/textUnderColor"
4343
android:textSize="15sp"
4444
app:layout_constraintBottom_toBottomOf="parent"
4545
app:layout_constraintLeft_toLeftOf="parent"
@@ -51,7 +51,7 @@
5151
android:layout_height="1dp"
5252
android:paddingLeft="5dp"
5353
android:paddingRight="5dp"
54-
android:background="@color/colorDivider"
54+
android:background="@android:color/transparent"
5555
android:layout_marginStart="10dp"
5656
android:layout_marginEnd="10dp"
5757
android:layout_margin="20dp" />

app/src/main/res/layout/pixel_activity_about.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
style="@style/about_subtitle_text"
143143
android:fontFamily="@font/open_sans_reg"
144144
android:text="@string/about_bug_subtitle"
145-
android:textColor="@color/textSecondaryColor" />
145+
android:textColor="@color/textUnderColor" />
146146

147147
</LinearLayout>
148148

@@ -202,7 +202,7 @@
202202
style="@style/about_subtitle_text"
203203
android:fontFamily="@font/open_sans_reg"
204204
android:text="@string/about_author_subtitle"
205-
android:textColor="@color/textSecondaryColor" />
205+
android:textColor="@color/textUnderColor" />
206206

207207
</LinearLayout>
208208

@@ -271,7 +271,7 @@
271271
style="@style/about_subtitle_text"
272272
android:fontFamily="@font/open_sans_reg"
273273
android:text="@string/about_library1_subtitle"
274-
android:textColor="@color/textSecondaryColor" />
274+
android:textColor="@color/textUnderColor" />
275275

276276
</LinearLayout>
277277

@@ -290,7 +290,7 @@
290290
style="@style/about_subtitle_text"
291291
android:fontFamily="@font/open_sans_reg"
292292
android:text="@string/about_library2_subtitle"
293-
android:textColor="@color/textSecondaryColor" />
293+
android:textColor="@color/textUnderColor" />
294294

295295
</LinearLayout>
296296

@@ -309,7 +309,7 @@
309309
style="@style/about_subtitle_text"
310310
android:fontFamily="@font/open_sans_reg"
311311
android:text="@string/about_library3_subtitle"
312-
android:textColor="@color/textSecondaryColor" />
312+
android:textColor="@color/textUnderColor" />
313313

314314
</LinearLayout>
315315

@@ -328,7 +328,7 @@
328328
style="@style/about_subtitle_text"
329329
android:fontFamily="@font/open_sans_reg"
330330
android:text="@string/about_library4_subtitle"
331-
android:textColor="@color/textSecondaryColor" />
331+
android:textColor="@color/textUnderColor" />
332332

333333
</LinearLayout>
334334

@@ -347,7 +347,7 @@
347347
style="@style/about_subtitle_text"
348348
android:fontFamily="@font/open_sans_reg"
349349
android:text="@string/about_library5_subtitle"
350-
android:textColor="@color/textSecondaryColor" />
350+
android:textColor="@color/textUnderColor" />
351351

352352
</LinearLayout>
353353

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@mipmap/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5+
</adaptive-icon>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@mipmap/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5+
</adaptive-icon>
2.43 KB
Loading
Loading
Loading
Loading
1.51 KB
Loading
Loading
Loading
Loading
4.2 KB
Loading
Loading
Loading
Loading
5.71 KB
Loading
Loading
Loading
Loading
8.29 KB
Loading
Loading
Loading
Loading

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#4285f4</color>
3+
<color name="colorPrimary">#3f7aff</color>
44
<color name="colorPrimaryDark">#fff</color>
5-
<color name="colorAccent">#4285f4</color>
5+
<color name="colorAccent">#3f7aff</color>
66
<color name="colorWhite">#fff</color>
77
<color name="colorBottom">#fff</color>
8-
<color name="colorDivider">#424242</color>
9-
<color name="textPrimaryColor">#000</color>
10-
<color name="iconPrimaryColor">#000</color>
11-
<color name="textSecondaryColor">#000</color>
8+
<color name="textPrimaryColor">#212121</color>
9+
<color name="iconPrimaryColor">#212121</color>
10+
<color name="textSecondaryColor">#212121</color>
11+
<color name="textUnderColor">#666666</color>
1212
<color name="bottomIcon">#5f6368</color>
1313
</resources>
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<array name="preloaded_fonts" translatable="false">
4+
<item>@font/lato</item>
45
<item>@font/open_sans_reg</item>
56
</array>
67
</resources>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<string name="welcome_title">Welcome to Pixel Theme</string>
55
<string name="welcome_description">Give a fresh new look to your phone \n\u0020by using different accent color combos!</string>
66
<string name="download">Download</string>
7-
<string name="attention">ATTENTION</string>
7+
<string name="attention">Attention</string>
88
<string name="launch_error">Substratum is not currently installed on your phone.</string>
99

1010
<string name="ok">OK</string>

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

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
</style>
1919

2020
<!-- Dialog Theme -->
21-
<style name="DialogApp" parent="@style/Theme.AppCompat.Dialog.Alert">
22-
<item name="android:textColor">@color/textPrimaryColor</item>
23-
<item name="android:textColorPrimary">@color/textPrimaryColor</item>
24-
<item name="android:colorBackground">@color/colorPrimaryDark</item>
25-
<item name="android:colorAccent">@color/colorPrimary</item>
21+
<style name="DialogApp" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog">
2622
<item name="android:windowBackground">@drawable/dialog_theme</item>
2723
<item name="android:textAppearanceSmall">@style/MyTextAppearance</item>
2824
<item name="android:textAppearanceMedium">@style/MyTextAppearance</item>

0 commit comments

Comments
 (0)