Skip to content

Commit ddb3976

Browse files
antonisantonis
authored
Merge pull request #17273 from wordpress-mobile/issue/17266-launch-screen
Adds splash screen for Android 12+
2 parents 420bb5d + e73c305 commit ddb3976

7 files changed

Lines changed: 88 additions & 1 deletion

File tree

‎RELEASE-NOTES.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
21.0
44
-----
5-
5+
* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
66

77
20.9
88
-----

‎WordPress/src/jetpack/res/drawable/ic_splash.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="25dp"
3+
android:height="24dp"
4+
android:viewportHeight="24"
5+
android:viewportWidth="25">
6+
<path
7+
android:fillColor="#ffffff"
8+
android:pathData="M12.5,0L12.5,0A12,12 0,0 1,24.5 12L24.5,12A12,12 0,0 1,12.5 24L12.5,24A12,12 0,0 1,0.5 12L0.5,12A12,12 0,0 1,12.5 0z" />
9+
<path
10+
android:fillColor="#069E08"
11+
android:pathData="M12.5,0C5.889,0 0.5,5.374 0.5,12C0.5,18.626 5.874,24 12.5,24C19.126,24 24.5,18.626 24.5,12C24.5,5.374 19.126,0 12.5,0ZM11.882,13.988H5.904L11.882,2.356V13.988ZM13.104,21.615V9.983H19.067L13.104,21.615Z" />
12+
</vector>

‎WordPress/src/main/res/drawable/splash_icon.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
2+
<item android:top="64dp" android:left="64dp" android:right="64dp" android:bottom="64dp"
3+
android:drawable="@drawable/ic_splash"/>
4+
</layer-list>

‎WordPress/src/main/res/values-night-v31/styles.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<style name="WordPress" parent="Base.Wordpress">
5+
<item name="android:navigationBarColor">?attr/colorSurface</item>
6+
<item name="android:windowSplashScreenBackground">?attr/colorOnPrimary</item>
7+
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
8+
</style>
9+
</resources>

‎WordPress/src/main/res/values-v31/styles.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<style name="WordPress" parent="Base.Wordpress">
5+
<item name="android:navigationBarColor">@android:color/white</item>
6+
<item name="android:windowLightNavigationBar">true</item>
7+
<item name="android:windowSplashScreenBackground">?attr/colorOnPrimary</item>
8+
<item name="android:windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
9+
</style>
10+
</resources>

‎WordPress/src/wordpress/res/drawable-night/ic_splash.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M2,12C2,6.5 6.5,2 12,2C17.5,2 22,6.5 22,12C22,17.5 17.5,22 12,22C6.5,22 2,17.5 2,12ZM12,21.5C6.7,21.5 2.5,17.2 2.5,12C2.5,6.7 6.8,2.5 12,2.5C17.3,2.5 21.5,6.8 21.5,12C21.5,17.3 17.3,21.5 12,21.5Z"
8+
android:fillColor="#FFFFFF"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M17.17,9.338C17.458,9.908 17.8,10.583 17.8,11.6C17.8,12.3 17.6,13.2 17.3,14.3L16.4,17.2L13.3,8C13.8,8 14.3,7.9 14.3,7.9C14.7,7.9 14.7,7.2 14.2,7.2C14.2,7.2 12.8,7.3 11.9,7.3C11,7.3 9.6,7.2 9.6,7.2C9.1,7.2 9,7.9 9.5,7.9C9.5,7.9 9.9,8 10.4,8L11.8,11.7L9.9,17.3L6.8,8C7.3,8 7.8,7.9 7.8,7.9C8.2,7.9 8.2,7.2 7.7,7.2C7.7,7.2 6.3,7.3 5.4,7.3H4.8C6.4,5 9,3.4 12,3.4C14.2,3.4 16.3,4.3 17.8,5.7H17.7C16.9,5.7 16.3,6.4 16.3,7.2C16.3,7.821 16.615,8.364 16.965,8.967C17.01,9.044 17.055,9.121 17.1,9.2C17.123,9.245 17.146,9.291 17.17,9.338Z"
12+
android:fillColor="#FFFFFF"
13+
android:fillType="evenOdd"/>
14+
<path
15+
android:pathData="M9.6,20.2L12.2,12.7L14.7,19.9C14.8,19.9 14.8,20 14.8,20C14,20.3 13,20.5 12,20.5C11.2,20.5 10.4,20.4 9.6,20.2Z"
16+
android:fillColor="#FFFFFF"
17+
android:fillType="evenOdd"/>
18+
<path
19+
android:pathData="M3.4,12C3.4,15.4 5.4,18.3 8.2,19.7L4.2,8.5C3.7,9.6 3.4,10.8 3.4,12Z"
20+
android:fillColor="#FFFFFF"
21+
android:fillType="evenOdd"/>
22+
<path
23+
android:pathData="M19.55,8.35C19.525,8.2 19.5,8.05 19.5,7.9C20.2,9.1 20.6,10.5 20.6,12.1C20.6,15.3 18.9,18 16.3,19.5L18.9,11.9C19.4,10.6 19.6,9.7 19.6,8.8C19.6,8.65 19.575,8.5 19.55,8.35Z"
24+
android:fillColor="#FFFFFF"
25+
android:fillType="evenOdd"/>
26+
</vector>

‎WordPress/src/wordpress/res/drawable/ic_splash.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M2,12C2,6.5 6.5,2 12,2C17.5,2 22,6.5 22,12C22,17.5 17.5,22 12,22C6.5,22 2,17.5 2,12ZM12,21.5C6.7,21.5 2.5,17.2 2.5,12C2.5,6.7 6.8,2.5 12,2.5C17.3,2.5 21.5,6.8 21.5,12C21.5,17.3 17.3,21.5 12,21.5Z"
8+
android:fillColor="#000000"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M17.17,9.338C17.458,9.908 17.8,10.583 17.8,11.6C17.8,12.3 17.6,13.2 17.3,14.3L16.4,17.2L13.3,8C13.8,8 14.3,7.9 14.3,7.9C14.7,7.9 14.7,7.2 14.2,7.2C14.2,7.2 12.8,7.3 11.9,7.3C11,7.3 9.6,7.2 9.6,7.2C9.1,7.2 9,7.9 9.5,7.9C9.5,7.9 9.9,8 10.4,8L11.8,11.7L9.9,17.3L6.8,8C7.3,8 7.8,7.9 7.8,7.9C8.2,7.9 8.2,7.2 7.7,7.2C7.7,7.2 6.3,7.3 5.4,7.3H4.8C6.4,5 9,3.4 12,3.4C14.2,3.4 16.3,4.3 17.8,5.7H17.7C16.9,5.7 16.3,6.4 16.3,7.2C16.3,7.821 16.615,8.364 16.965,8.967C17.01,9.044 17.055,9.121 17.1,9.2C17.123,9.245 17.146,9.291 17.17,9.338Z"
12+
android:fillColor="#000000"
13+
android:fillType="evenOdd"/>
14+
<path
15+
android:pathData="M9.6,20.2L12.2,12.7L14.7,19.9C14.8,19.9 14.8,20 14.8,20C14,20.3 13,20.5 12,20.5C11.2,20.5 10.4,20.4 9.6,20.2Z"
16+
android:fillColor="#000000"
17+
android:fillType="evenOdd"/>
18+
<path
19+
android:pathData="M3.4,12C3.4,15.4 5.4,18.3 8.2,19.7L4.2,8.5C3.7,9.6 3.4,10.8 3.4,12Z"
20+
android:fillColor="#000000"
21+
android:fillType="evenOdd"/>
22+
<path
23+
android:pathData="M19.55,8.35C19.525,8.2 19.5,8.05 19.5,7.9C20.2,9.1 20.6,10.5 20.6,12.1C20.6,15.3 18.9,18 16.3,19.5L18.9,11.9C19.4,10.6 19.6,9.7 19.6,8.8C19.6,8.65 19.575,8.5 19.55,8.35Z"
24+
android:fillColor="#000000"
25+
android:fillType="evenOdd"/>
26+
</vector>

0 commit comments

Comments
 (0)