2.0.17

android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "io.filen.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 216
-        versionName "2.0.16"
+        versionCode 217
+        versionName "2.0.17"
     }
     splits {
         abi {
@@ -208,6 +208,7 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.core:core-splashscreen:1.0.0-beta01"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.fbjni'

android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme"
+      android:theme="@style/BootTheme"
       android:hardwareAccelerated="true"
       android:largeHeap="true"
       android:requestLegacyExternalStorage="true">
@@ -29,6 +29,7 @@
         android:windowSoftInputMode="adjustPan"
         android:hardwareAccelerated="true"
         android:documentLaunchMode="never"
+        android:exported="true"
         android:screenOrientation="unspecified">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />

android/app/src/main/java/io/filen/app/MainActivity.java

@@ -2,27 +2,12 @@
 
 import android.os.Bundle;
 import com.facebook.react.ReactActivity;
-import org.devio.rn.splashscreen.SplashScreen;
-import android.content.res.Configuration;
+import com.facebook.react.ReactActivityDelegate;
+import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
-    switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
-      case Configuration.UI_MODE_NIGHT_YES:
-          setTheme(R.style.DarkTheme);
-
-          break;
-      case Configuration.UI_MODE_NIGHT_NO:
-          setTheme(R.style.LightTheme);
-          break;
-      default:
-          setTheme(R.style.LightTheme);
-    }
-
-    SplashScreen.show(this);
-
     //super.onCreate(savedInstanceState); // RN-Screens bug when trying to open the app from saved state
     super.onCreate(null);
   }
@@ -35,4 +20,16 @@ protected void onCreate(Bundle savedInstanceState) {
   protected String getMainComponentName() {
     return "Filen";
   }
+
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return new ReactActivityDelegate(this, getMainComponentName()) {
+
+      @Override
+      protected void loadApp(String appKey) {
+        RNBootSplash.init(getPlainActivity());
+        super.loadApp(appKey);
+      }
+    };
+  }
 }

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

@@ -1,13 +1,11 @@
 <resources>
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+        <item name="android:windowBackground">#000000</item>
     </style>
-
-    <style name="LightTheme" parent="AppTheme">
-        <item name="launchImage">@drawable/screen</item>
-    </style>
-
-    <style name="DarkTheme" parent="AppTheme">
-        <item name="launchImage">@drawable/screen_dark</item>
+    <style name="BootTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 </resources>

android/build.gradle

@@ -3,9 +3,9 @@
 buildscript {
     ext {
         buildToolsVersion = "30.0.2"
-        minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        minSdkVersion = 23
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "22.0.7026061"
     }
     repositories {

ios/Filen.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		3D8900C427ACCC1700C43F8A /* ShareExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 3D8900BA27ACCC1700C43F8A /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		3D8900C927ACCC6200C43F8A /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D8900C827ACCC6200C43F8A /* ShareViewController.swift */; };
 		3DE7BC3B27D1739300A5C0EE /* RNBackgroundFetch+AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DE7BC3A27D1739300A5C0EE /* RNBackgroundFetch+AppDelegate.m */; };
+		3DFD662428457F7300A6B664 /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3DFD662328457F7300A6B664 /* BootSplash.storyboard */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		C96D787E92A95319F0489030 /* libPods-ShareExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAA59C1E4CF12EDD4403145 /* libPods-ShareExtension.a */; };
 		DE28B25F01C487E70C5F60C4 /* libPods-Filen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C078319821E15D538950AA1 /* libPods-Filen.a */; };
@@ -91,6 +92,7 @@
 		3D8900DA27AD522800C43F8A /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = SimpleLineIcons.ttf; sourceTree = "<group>"; };
 		3D8900DB27AD522800C43F8A /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = "<group>"; };
 		3DE7BC3A27D1739300A5C0EE /* RNBackgroundFetch+AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "RNBackgroundFetch+AppDelegate.m"; path = "../node_modules/react-native-background-fetch/ios/RNBackgroundFetch/RNBackgroundFetch+AppDelegate.m"; sourceTree = "<group>"; };
+		3DFD662328457F7300A6B664 /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = Filen/BootSplash.storyboard; sourceTree = "<group>"; };
 		5B9DCD7741E64912425A5CFF /* Pods-Filen-FilenTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Filen-FilenTests.release.xcconfig"; path = "Target Support Files/Pods-Filen-FilenTests/Pods-Filen-FilenTests.release.xcconfig"; sourceTree = "<group>"; };
 		75E159AEB3278EAD3E4BEE46 /* Pods-Filen-FilenTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Filen-FilenTests.debug.xcconfig"; path = "Target Support Files/Pods-Filen-FilenTests/Pods-Filen-FilenTests.debug.xcconfig"; sourceTree = "<group>"; };
 		787CCEEF7C4F434C083A19ED /* Pods-Filen.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Filen.debug.xcconfig"; path = "Target Support Files/Pods-Filen/Pods-Filen.debug.xcconfig"; sourceTree = "<group>"; };
@@ -151,6 +153,7 @@
 			children = (
 				3DE7BC3A27D1739300A5C0EE /* RNBackgroundFetch+AppDelegate.m */,
 				3D89005027AC3EBC00C43F8A /* Filen.entitlements */,
+				3DFD662328457F7300A6B664 /* BootSplash.storyboard */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
@@ -389,6 +392,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3DFD662428457F7300A6B664 /* BootSplash.storyboard in Resources */,
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 			);
@@ -747,7 +751,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Filen/Filen.entitlements;
-				CURRENT_PROJECT_VERSION = 216;
+				CURRENT_PROJECT_VERSION = 217;
 				DEVELOPMENT_TEAM = 7YTW5D2K7P;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Filen/Info.plist;
@@ -756,7 +760,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.16;
+				MARKETING_VERSION = 2.0.17;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -780,15 +784,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Filen/Filen.entitlements;
-				CURRENT_PROJECT_VERSION = 216;
+				CURRENT_PROJECT_VERSION = 217;
 				DEVELOPMENT_TEAM = 7YTW5D2K7P;
 				INFOPLIST_FILE = Filen/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.16;
+				MARKETING_VERSION = 2.0.17;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

ios/Filen/AppDelegate.m

@@ -4,7 +4,7 @@
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
 
-#import "RNSplashScreen.h"
+#import "RNBootSplash.h"
 #import <TSBackgroundFetch/TSBackgroundFetch.h>
 #import <RNShareMenu/ShareMenuManager.h>
 
@@ -52,7 +52,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     self.window.rootViewController = rootViewController;
     [self.window makeKeyAndVisible];
 
-    [RNSplashScreen show];
+    [RNBootSplash initWithStoryboard:@"BootSplash" rootView:rootView];
     [[TSBackgroundFetch sharedInstance] didFinishLaunching];
 
     return YES;

ios/Filen/BootSplash.storyboard

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17147" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17120"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <imageView autoresizesSubviews="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="BootSplashLogo" translatesAutoresizingMaskIntoConstraints="NO" id="3lX-Ut-9ad">
+                                <rect key="frame" x="137.5" y="283.5" width="100" height="100"/>
+                                <accessibility key="accessibilityConfiguration">
+                                    <accessibilityTraits key="traits" image="YES" notEnabled="YES"/>
+                                </accessibility>
+                            </imageView>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                        <color key="backgroundColor" red="0.149019607843137" green="0.192156862745098" blue="0.474509803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <accessibility key="accessibilityConfiguration">
+                            <accessibilityTraits key="traits" notEnabled="YES"/>
+                        </accessibility>
+                        <constraints>
+                            <constraint firstItem="3lX-Ut-9ad" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="Fh9-Fy-1nT"/>
+                            <constraint firstItem="3lX-Ut-9ad" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="nvB-Ic-PnI"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="0.0" y="0.0"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="BootSplashLogo" width="100" height="100"/>
+    </resources>
+</document>