[Gekidou] Update Splash Screen / App icons and Android snooze Push Notifications (#5658)

* Android push notification snooze

* Android splash & icons

* iOS splash & icons

* Update project assets

* Replace iOS assets using Fastlane

* Remove configure_telemetry_android from Fastlane script

* Update Fastlane with master branch

* Fix Android fastlane build

* replace reference for com.mattermost.rnbeta.* imports

* Set iOS ENTRY_FILE as index.ts

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.mattermost.rnbeta">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mattermost.rnbeta">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
@@ -43,16 +44,23 @@
           <category android:name="android.intent.category.BROWSABLE" />
           <data android:scheme="mattermost" />
         </intent-filter>
-          <intent-filter>
-              <action android:name="android.intent.action.VIEW" />
-              <category android:name="android.intent.category.DEFAULT" />
-              <category android:name="android.intent.category.BROWSABLE" />
-              <data android:scheme="mmauthbeta" />
-          </intent-filter>
+        <intent-filter>
+          <action android:name="android.intent.action.VIEW" />
+          <category android:name="android.intent.category.DEFAULT" />
+          <category android:name="android.intent.category.BROWSABLE" />
+          <data android:scheme="mmauthbeta" />
+        </intent-filter>
       </activity>
-      <service android:name=".NotificationDismissService" android:enabled="true" android:exported="false" />
-      <receiver android:name=".NotificationReplyBroadcastReceiver" android:enabled="true" android:exported="false" />
-        <activity android:name="com.reactnativenavigation.controllers.NavigationActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:resizeableActivity="true"/>
+      <service android:name=".NotificationDismissService"
+                android:enabled="true"
+                android:exported="false" />
+      <receiver android:name=".NotificationReplyBroadcastReceiver"
+               android:enabled="true"
+               android:exported="false" />
+        <activity
+                android:name="com.reactnativenavigation.controllers.NavigationActivity"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+                android:resizeableActivity="true"/>
         <activity
                 android:name="com.mattermost.share.ShareActivity"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize"

android/app/src/main/java/com/mattermost/helpers/CustomPushNotificationHelper.java

@@ -30,10 +30,7 @@ import androidx.core.app.RemoteInput;
 import androidx.core.graphics.drawable.IconCompat;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.mattermost.rnbeta.NotificationDismissService;
-import com.mattermost.rnbeta.NotificationPreferences;
-import com.mattermost.rnbeta.NotificationReplyBroadcastReceiver;
-import com.mattermost.rnbeta.R;
+import com.mattermost.rnbeta.*;
 import com.wix.reactnativenotifications.core.NotificationIntentAdapter;
 import com.wix.reactnativenotifications.core.notification.PushNotificationProps;
 

android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java

@@ -1,11 +1,13 @@
 package com.mattermost.rnbeta;
 
 import android.app.Notification;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.service.notification.StatusBarNotification;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
@@ -53,10 +55,23 @@ public class CustomPushNotification extends PushNotification {
                 return;
             }
 
-            notifications.remove(notificationId);
-            saveNotificationsMap(context, notificationsInChannel);
-            final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+            final NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
             notificationManager.cancel(notificationId);
+            notifications.remove(notificationId);
+            final StatusBarNotification[] statusNotifications = notificationManager.getActiveNotifications();
+            boolean hasMore = false;
+            for (final StatusBarNotification status : statusNotifications) {
+                if (status.getNotification().extras.getString("channel_id").equals(channelId)) {
+                    hasMore = true;
+                    break;
+                }
+            }
+
+            if (!hasMore) {
+                notificationsInChannel.remove(channelId);
+            }
+
+            saveNotificationsMap(context, notificationsInChannel);
         }
     }
 

android/app/src/main/res/layout/launch_screen.xml

@@ -4,22 +4,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    tools:context=".SplashScreenActivity">
+    android:background="@color/splashscreen_bg"
+    android:orientation="vertical">
 
     <ImageView
-        android:id="@+id/imgLogo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/app_name"
-        android:maxWidth="100dp"
-        android:maxHeight="100dp"
-        android:scaleType="centerInside"
-        android:src="@drawable/splash"
+        android:id="@+id/splashBackgroundImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/splash_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/splashIcon"
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:contentDescription="@string/app_name"
+        android:src="@drawable/splash"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/values-night/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="transparent">#00000000</color>
+    <color name="splashscreen_bg">#1E325C</color>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -2,4 +2,5 @@
 <resources>
     <color name="white">#FFFFFF</color>
     <color name="transparent">#00000000</color>
-</resources>
+    <color name="splashscreen_bg">#FFFFFF</color>
+</resources>

android/app/src/main/res/values/strings.xml

@@ -18,4 +18,6 @@
     <string name="timeout_description">How long in milliseconds the mobile app should wait for the server to respond.</string>
     <string name="vendor_title">EMM Vendor or Company Name</string>
     <string name="vendor_description">Name of the EMM vendor or company deploying the app. Used in help text when prompting for passcodes so users are aware why the app is being protected.</string>
+    <string name="inAppSessionAuth_title">In-App Session Auth</string>
+    <string name="inAppSessionAuth_description">Instead of default flow from the mobile browser, enforce SSO with the WebView.</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,18 +1,9 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">    
-    </style>
-
-    <style name="LightTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:windowBackground">@android:color/background_light</item>
-
-    </style>
-
-    <style name="DarkTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="android:windowBackground">@android:color/background_dark</item>
+        <item name="android:windowBackground">@color/splashscreen_bg</item>
 
     </style>
 

android/app/src/main/res/xml/app_restrictions.xml

@@ -7,6 +7,12 @@
             android:description="@string/inAppPinCode_description"
             android:restrictionType="string"
             android:defaultValue="false" />
+    <restriction
+            android:key="inAppSessionAuth"
+            android:title="@string/inAppSessionAuth_title"
+            android:description="@string/inAppSessionAuth_description"
+            android:restrictionType="string"
+            android:defaultValue="false" />
     <restriction
             android:key="blurApplicationScreen"
             android:title="@string/blurApplicationScreen_title"