From e9ac39301d456c641bb09802c229bae4162f848c Mon Sep 17 00:00:00 2001 From: Johan von Forstner Date: Sat, 20 Jun 2020 20:35:21 +0200 Subject: [PATCH] add splash screen (fixes #27) --- app/src/main/AndroidManifest.xml | 3 +- .../java/net/vonforst/evmap/MapsActivity.kt | 2 + .../res/drawable/ic_appicon_splashscreen.xml | 49 +++++++++++++++++++ app/src/main/res/drawable/launch_screen.xml | 8 +++ app/src/main/res/values/styles.xml | 4 ++ 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ic_appicon_splashscreen.xml create mode 100644 app/src/main/res/drawable/launch_screen.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 90ffab04..3841d82a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,7 +27,8 @@ + android:label="@string/title_activity_maps" + android:theme="@style/AppTheme.LaunchScreen"> diff --git a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt index 3966654a..324d9607 100644 --- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt +++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt @@ -45,6 +45,8 @@ class MapsActivity : AppCompatActivity() { } override fun onCreate(savedInstanceState: Bundle?) { + // set theme to AppTheme to end launch screen + setTheme(R.style.AppTheme) super.onCreate(savedInstanceState) setContentView(R.layout.activity_maps) diff --git a/app/src/main/res/drawable/ic_appicon_splashscreen.xml b/app/src/main/res/drawable/ic_appicon_splashscreen.xml new file mode 100644 index 00000000..cc15ae59 --- /dev/null +++ b/app/src/main/res/drawable/ic_appicon_splashscreen.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml new file mode 100644 index 00000000..06e1b656 --- /dev/null +++ b/app/src/main/res/drawable/launch_screen.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d6f57870..7a5158c4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,6 +17,10 @@ +