From 62f50fa35d602ae12e4c9fbd65d31d237578c6eb Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 15 Apr 2021 00:29:29 +0200 Subject: [PATCH] Add splash screen to Talk App Resolves #836 Signed-off-by: Andy Scherzinger --- app/src/gplay/AndroidManifest.xml | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../nextcloud/talk/activities/MainActivity.kt | 3 ++- app/src/main/res/drawable/launch_screen.xml | 26 +++++++++++++++++++ app/src/main/res/values/styles.xml | 7 +++++ 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/launch_screen.xml diff --git a/app/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml index 23ad1e6bb..9a878b36f 100644 --- a/app/src/gplay/AndroidManifest.xml +++ b/app/src/gplay/AndroidManifest.xml @@ -30,7 +30,7 @@ android:label="@string/nc_app_name" android:networkSecurityConfig="@xml/network_security_config" android:supportsRtl="true" - android:theme="@style/AppTheme" + android:theme="@style/AppTheme.Launcher" tools:replace="label, icon, theme, name, allowBackup" tools:ignore="UnusedAttribute, ExportedService"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d10568e05..51bfa3869 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,7 +78,7 @@ android:largeHeap="true" android:networkSecurityConfig="@xml/network_security_config" android:supportsRtl="true" - android:theme="@style/AppTheme" + android:theme="@style/AppTheme.Launcher" android:requestLegacyExternalStorage="true" tools:ignore="UnusedAttribute" tools:replace="label, icon, theme, name, allowBackup"> diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index 17c7a5aab..430eca8a8 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -103,7 +103,8 @@ class MainActivity : BaseActivity(), ActionBarProvider { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + // Set the default theme to replace the launch screen theme. + setTheme(R.style.AppTheme) setContentView(R.layout.activity_main) NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) 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 000000000..e941cf769 --- /dev/null +++ b/app/src/main/res/drawable/launch_screen.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3da191053..0f91348e2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -124,4 +124,11 @@ + + +