Merge branch 'main' into feat/ToastNotification

bcgov · Nov 19, 2024 · b828d97 · b828d97
2 parents 17b356e + c4298f7
commit b828d97
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java b/app/android/app/src/main/java/ca/bc/gov/BCWallet/MainActivity.java
@@ -7,9 +7,17 @@
 import androidx.core.app.NotificationManagerCompat;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.os.Bundle;
 
 public class MainActivity extends ReactActivity {
 
+  // react-native-screens override
+  // https://github.com/software-mansion/react-native-screens#android
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+      super.onCreate(null);
+  }
+
   /**
    * Detects changes in device orientation and sends them to JavaScript by broadcasting an event.
    * This is used to support the camera on different tablet orientations.

diff --git a/app/ios/AriesBifold.xcodeproj/project.pbxproj b/app/ios/AriesBifold.xcodeproj/project.pbxproj
@@ -534,7 +534,7 @@
 			baseConfigurationReference = 6228B39BEBDEB177D0C79D99 /* Pods-AriesBifold.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AriesBifold/AriesBifold.entitlements;
 				CURRENT_PROJECT_VERSION = 444;
@@ -573,7 +573,7 @@
 			baseConfigurationReference = CD48035C19AD8C07DE719567 /* Pods-AriesBifold.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = AriesBifold/AriesBifold.entitlements;
 				CURRENT_PROJECT_VERSION = 1;

diff --git a/app/ios/AriesBifold/AppDelegate.m b/app/ios/AriesBifold/AppDelegate.m
@@ -17,6 +17,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   // They will be passed down to the ViewController used by React Native.
   self.initialProps = @{};
 
+  // Because certain file operations can reset resource values, we
+  // excluded file’s resource values each time the application starts.
   [self excludeDotAFJFolderFromBackup];
 
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
@@ -68,8 +70,10 @@ - (void)excludeDotAFJFolderFromBackup {
                                         forKey:NSURLIsExcludedFromBackupKey 
                                          error:&error];
 
-    if (!success) {
-        NSLog(@"Error excluding folder %@ from backup: %@", folderName, error);
+    if (success) {
+      NSLog(@"Excluded folder %@ from backup.", folderName);
+    } else {
+      NSLog(@"Error excluding folder %@ from backup: %@", folderName, error);
     }
 }