Update Android icon and add camera resolution toast.

Author: philip-lamb

Android/app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -636,7 +636,16 @@ int main(int argc, char *argv[])
                 }
 #endif
                 if (!gPostVideoSetupDone) {
-                    
+#ifdef ANDROID
+                    char *toast;
+                    if (asprintf(&toast, "Camera: %dx%d", vs->getVideoWidth(), vs->getVideoHeight()) < 0) {
+                        ARLOGe("asprintf");
+                    } else {
+                        SDL_AndroidShowToast(toast, 1, -1, 0, 0); // int duration = 1 = long, int gravity = -1 = don't care, int xoffset, int yoffset
+                        free(toast);
+                    }
+#endif
+
                     gCameraIsFrontFacing = false;
                     AR2VideoParamT *vid = vs->getAR2VideoParam();
 

Android/app/src/main/res/mipmap-mdpi/ic_launcher.png

@@ -768,7 +768,7 @@ - (void)glkView:(GLKView *)view drawInRect:(CGRect)rect
 
         if (!gPostVideoSetupDone) {
 
-            [ARViewController displayToastWithMessage:[NSString stringWithFormat:@"Camera: %dx%d", vs->getVideoWidth(), vs->getVideoHeight()]];
+            [ARViewController displayToastWithMessage:[NSString stringWithFormat:@"Camera: %dx%d", vs->getVideoWidth(), vs->getVideoHeight()] durationSeconds:5.0f];
 
             gCameraIsFrontFacing = false;
             AR2VideoParamT *vid = vs->getAR2VideoParam();
@@ -1382,7 +1382,7 @@ - (void)documentInteractionControllerDidEndPreview:(UIDocumentInteractionControl
 
 }
 
-+ (void)displayToastWithMessage:(NSString *)toastMessage
++ (void)displayToastWithMessage:(NSString *)toastMessage durationSeconds:(float)durationSeconds
 {
     [[NSOperationQueue mainQueue] addOperationWithBlock:^ {
         UIWindow * keyWindow = [[UIApplication sharedApplication] keyWindow];
@@ -1400,7 +1400,7 @@ + (void)displayToastWithMessage:(NSString *)toastMessage
 
         [keyWindow addSubview:toastView];
 
-        [UIView animateWithDuration: 3.0f
+        [UIView animateWithDuration: durationSeconds
                               delay: 0.0
                             options: UIViewAnimationOptionCurveEaseOut
                          animations: ^{
@@ -1413,6 +1413,10 @@ + (void)displayToastWithMessage:(NSString *)toastMessage
     }];
 }
 
++ (void)displayToastWithMessage:(NSString *)toastMessage {
+    [ARViewController displayToastWithMessage:toastMessage durationSeconds:3.5f];
+}
+
 @end
 
 // Save parameters file and index file with info about it, then signal thread that it's ready for upload.