Merge branch origin/main into objc-rewrite

Natives/Assets.xcassets/AppLogo.imageset/Contents.json

@@ -1,7 +1,27 @@
 {
   "images" : [
     {
-      "filename" : "wordmark.png",
+      "filename" : "AppLogo-Black.png",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "light"
+        }
+      ],
+      "filename" : "AppLogo-Black-1.png",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "AppLogo-White-1.png",
       "idiom" : "universal"
     }
   ],

Natives/Assets.xcassets/Wallpaper.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "wallpaper.png",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

Natives/LoginViewController.m

@@ -47,22 +47,15 @@
     int height = (int) roundf(screenBounds.size.height) - self.navigationController.navigationBar.frame.size.height;
     int rawHeight = (int) roundf(screenBounds.size.height);
 
-    UIImage *wallpaper = [UIImage imageNamed:@"Wallpaper"];
-    UIImageView *background = [[UIImageView alloc] initWithFrame:self.view.frame];
-    background.image = wallpaper;
-    background.clipsToBounds = YES;
-    background.contentMode = UIViewContentModeScaleAspectFill;
-    [self.view addSubview:background];
-
     UIScrollView *scrollView = [[UIScrollView alloc] initWithFrame:self.view.frame];
     scrollView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     [self.view addSubview:scrollView];
 
-    /*if(@available(iOS 13.0, *)) {
+    if(@available(iOS 13.0, *)) {
         [self traitCollectionDidChange:nil];
     } else {
         self.view.backgroundColor = [UIColor whiteColor];
-    } */
+    }
 
 
     
@@ -114,7 +107,7 @@
     } else {
         [button_faq setTitle:@"FAQ" forState:UIControlStateNormal];
     }
-    button_faq.frame = CGRectMake(widthSplit2 - (((width - widthSplit * 2.0) / 2) / 2), (height - 40.0), (width - widthSplit * 2.0) / 2, 40.0);
+    button_faq.frame = CGRectMake(widthSplit2 - (((width - widthSplit * 2.0) / 2) / 2), (height - 80.0), (width - widthSplit * 2.0) / 2, 40.0);
     button_faq.backgroundColor = [UIColor colorWithRed:54/255.0 green:176/255.0 blue:48/255.0 alpha:1.0];
     button_faq.layer.cornerRadius = 5;
     [button_faq setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -132,7 +125,7 @@
     } else {
         [button_login setTitle:@"Sign In" forState:UIControlStateNormal];
     }
-    button_login.frame = CGRectMake(button_faq.frame.origin.x - button_faq.frame.size.width - 20, (height - 40.0), (width - widthSplit * 2.0) / 2, 40.0);
+    button_login.frame = CGRectMake(button_faq.frame.origin.x - button_faq.frame.size.width - 20, (height - 80.0), (width - widthSplit * 2.0) / 2, 40.0);
     button_login.backgroundColor = [UIColor colorWithRed:54/255.0 green:176/255.0 blue:48/255.0 alpha:1.0];
     button_login.layer.cornerRadius = 5;
     [button_login setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -162,7 +155,7 @@
     } else {
         [button_accounts setTitle:@"Accounts" forState:UIControlStateNormal];
     }
-    button_accounts.frame = CGRectMake(button_faq.frame.origin.x + button_faq.frame.size.width + 20, (height - 40.0), (width - widthSplit * 2.0) / 2, 40.0);
+    button_accounts.frame = CGRectMake(button_faq.frame.origin.x + button_faq.frame.size.width + 20, (height - 80.0), (width - widthSplit * 2.0) / 2, 40.0);
     button_accounts.backgroundColor = [UIColor colorWithRed:54/255.0 green:176/255.0 blue:48/255.0 alpha:1.0];
     button_accounts.layer.cornerRadius = 5;
     [button_accounts setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];