diff options
| author | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 21:40:16 +0100 |
|---|---|---|
| committer | Fup Duck <fupduck@sacknagel.com> | 2017-12-14 21:40:16 +0100 |
| commit | a9b915ef35523aad21f70bddee2103cfb0d8ddb4 (patch) | |
| tree | 1ff6f42b4aa7826865f959bc25501ef27008f9d7 | |
| parent | 08ec840de9657085d9a0baaab54f6b33e16a12d0 (diff) | |
| parent | 18e24819eed388d349dbf6d7cd21534d7074bf5d (diff) | |
Merge remote-tracking branch '0xacab/0.9.8' into 0.9.8/sidebar
| -rw-r--r-- | app/src/main/res/drawable-hdpi/ic_splash_background.png | bin | 0 -> 39702 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xhdpi/ic_splash_background.png | bin | 0 -> 64868 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable-xxxhdpi/ic_splash_background.png | bin | 0 -> 131879 bytes | |||
| -rw-r--r-- | app/src/main/res/drawable/splash_page.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_splash_background.png b/app/src/main/res/drawable-hdpi/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..3e5f7871 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_splash_background.png diff --git a/app/src/main/res/drawable-xhdpi/ic_splash_background.png b/app/src/main/res/drawable-xhdpi/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..c2135c04 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_splash_background.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash_background.png b/app/src/main/res/drawable-xxxhdpi/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..1b8046fa --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_splash_background.png diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml index 0a083c7e..44112f06 100644 --- a/app/src/main/res/drawable/splash_page.xml +++ b/app/src/main/res/drawable/splash_page.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_colorsquare" + <item android:drawable="@drawable/ic_splash_background" android:gravity="fill_horizontal|fill_vertical"/> - <item android:drawable="@drawable/mask" - android:gravity="center" > + <item> + <bitmap + android:src="@drawable/mask" + android:gravity="center" /> </item> </layer-list>
\ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index a64779e5..80607409 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> + <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimary</item> </style> |
