Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3787 from ByteHamster/splash-for-all-screens 

Display splash for all screens
This commit is contained in:
H. Lehmann 2020-02-05 00:54:44 +01:00 committed by GitHub
parent 3f85413b8d 116125f721
commit 8036498484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View File

@ -33,6 +33,7 @@
android:label="@string/app_name"
android:backupAgent=".core.backup.OpmlBackupAgent"
android:restoreAnyVersion="true"
android:theme="@style/Theme.AntennaPod.Splash"
android:usesCleartextTraffic="true"
android:logo="@mipmap/ic_launcher">
@ -53,12 +54,7 @@
<activity
android:name=".activity.SplashActivity"
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Theme.AntennaPod.Dark.Splash">
<!-- android:launchMode="singleTask" removed for #2948, so that
when app is launched again, the app will go to the last activity users use
(if the app has been used recently, e.g., last 30 minutes),
rather than always go to MainActivity (launched by SplashActivity here) -->
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>

6
core/src/main/res/values-v26/styles.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.AntennaPod.Splash" parent="Theme.Base.AntennaPod.Splash">
<item name="android:windowSplashscreenContent">@drawable/bg_splash</item>
</style>
</resources>

6
core/src/main/res/values/styles.xml
View File

@ -268,7 +268,11 @@
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
</style>
<style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
<style name="Theme.AntennaPod.Splash" parent="Theme.Base.AntennaPod.Splash">
<!-- Room for API dependent attributes -->
</style>
<style name="Theme.Base.AntennaPod.Splash" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@drawable/bg_splash</item>
<item name="colorPrimary">@color/ic_launcher_background</item>
<item name="colorPrimaryDark">@color/ic_launcher_background</item>