Improve dark mode support.

gonativeio · Aug 1, 2022 · bd96d3c · bd96d3c
1 parent 8f55c2a
commit bd96d3c
Show file tree

Hide file tree

Showing 26 changed files with 542 additions and 113 deletions.
diff --git a/GoNativeIOS.xcodeproj/project.pbxproj b/GoNativeIOS.xcodeproj/project.pbxproj
diff --git a/LeanIOS/Assets.xcassets/Contents.json b/LeanIOS/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/LeanIOS/Assets.xcassets/navigationBarTintColor.colorset/Contents.json b/LeanIOS/Assets.xcassets/navigationBarTintColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.431",
+          "green" : "0.286",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.914",
+          "green" : "0.808",
+          "red" : "0.686"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LeanIOS/Assets.xcassets/sidebarBackgroundColor.colorset/Contents.json b/LeanIOS/Assets.xcassets/sidebarBackgroundColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.431",
+          "green" : "0.286",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.914",
+          "green" : "0.808",
+          "red" : "0.686"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LeanIOS/Assets.xcassets/statusBarBackgroundColor.colorset/Contents.json b/LeanIOS/Assets.xcassets/statusBarBackgroundColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.000",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.000",
+          "blue" : "0.000",
+          "green" : "0.000",
+          "red" : "0.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LeanIOS/Assets.xcassets/tabBarTintColor.colorset/Contents.json b/LeanIOS/Assets.xcassets/tabBarTintColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.431",
+          "green" : "0.286",
+          "red" : "0.118"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.914",
+          "green" : "0.808",
+          "red" : "0.686"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LeanIOS/GoNativeJSBridgeLibrary.js b/LeanIOS/GoNativeJSBridgeLibrary.js
@@ -1,30 +1,24 @@
-// this function returns a promise and also supports callback as params.callback
+// this function accepts a callback function as params.callback that will be called with the command results
+// if a callback is not provided it returns a promise that will resolve with the command results
 function addCommandCallback(command, params, persistCallback) {
-    var tempFunctionName = '_gonative_temp_' + Math.random().toString(36).slice(2);
-    var callback;
-    if(params) callback = params.callback;
-    else {
-        params = {
-            'callback': tempFunctionName
-        };
-    }
-    return new Promise(function(resolve, reject) {
-        // declare a temporary function
-        window[tempFunctionName] = function(data) {
-            resolve(data);
-            if (typeof callback === 'function') {
-                callback(data);
-            } else if (typeof callback === 'string' &&
-                typeof window[callback] === 'function'){
-                window[callback](data);
-            }
-            if(!persistCallback){ // if callback is used just once
+    if(params && params.callback){
+        // execute command with provided callback function
+        addCommand(command, params, persistCallback);
+    } else {
+        // create a temporary function and return a promise that executes command
+        var tempFunctionName = '_gonative_temp_' + Math.random().toString(36).slice(2);
+        if(!params) params = {};
+        params.callback = tempFunctionName;
+        return new Promise(function(resolve, reject) {
+            // declare a temporary function
+            window[tempFunctionName] = function(data) {
+                resolve(data);
                 delete window[tempFunctionName];
             }
-        }
-        // execute command
-        addCommand(command, params);
-    });
+            // execute command
+            addCommand(command, params);
+        });
+    }
 }
 
 function addCallbackFunction(callbackFunction, persistCallback){
@@ -167,6 +161,9 @@ gonative.navigationLevels = {
 gonative.statusbar = {
     set: function (params){
         addCommand("gonative://statusbar/set", params);
+    },
+    matchBodyBackgroundColor: function (params){
+        addCommand("gonative://statusbar/matchBodyBackgroundColor", params);
     }
 };
 
@@ -177,6 +174,11 @@ gonative.screen = {
             params = {brightness: data};
         }
         addCommand("gonative://screen/setBrightness", params);
+    },
+    setMode: function(params) {
+        if (params.mode) {
+            addCommand("gonative://screen/setMode", params);
+        }
     }
 };
 
@@ -314,3 +316,24 @@ gonative.android.audio = {
         addCommand("gonative://audio/requestFocus", params);
     }
 };
+
+//////////////////////////////////////
+////   Webpage Helper Functions   ////
+//////////////////////////////////////
+
+function gonative_match_statusbar_to_body_background_color() {
+    let rgb = window.getComputedStyle(document.body, null).getPropertyValue('background-color');
+    let sep = rgb.indexOf(",") > -1 ? "," : " ";
+    rgb = rgb.substring(rgb.indexOf('(')+1).split(")")[0].split(sep).map(function(x) { return x * 1; });
+    if(rgb.length === 4){
+        rgb = rgb.map(function(x){ return parseInt(x * rgb[3]); })
+    }
+    let hex = '#' + rgb[0].toString(16).padStart(2,'0') + rgb[1].toString(16).padStart(2,'0') + rgb[2].toString(16).padStart(2,'0');
+    let luma = 0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2]; // per ITU-R BT.709
+    if(luma > 40){
+        gonative.statusbar.set({'style': 'dark', 'color': hex});
+    }
+    else{
+        gonative.statusbar.set({'style': 'light', 'color': hex});
+    }
+}
diff --git a/LeanIOS/Images.xcassets/Contents.json b/LeanIOS/Images.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/LeanIOS/Images.xcassets/HeaderImage.imageset/Contents.json b/LeanIOS/Images.xcassets/HeaderImage.imageset/Contents.json
@@ -1,23 +1,56 @@
 {
   "images" : [
     {
+      "filename" : "header.png",
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "header.png"
+      "scale" : "1x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "headerDark.png",
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "header@2x.png"
+      "scale" : "1x"
     },
     {
+      "filename" : "header@2x.png",
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "header@3x.png"
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "headerDark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "header@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "headerDark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/LeanIOS/Images.xcassets/HeaderImage.imageset/headerDark.png b/LeanIOS/Images.xcassets/HeaderImage.imageset/headerDark.png
diff --git a/LeanIOS/Images.xcassets/HeaderImage.imageset/headerDark@2x.png b/LeanIOS/Images.xcassets/HeaderImage.imageset/headerDark@2x.png
diff --git a/LeanIOS/Images.xcassets/HeaderImage.imageset/headerDark@3x.png b/LeanIOS/Images.xcassets/HeaderImage.imageset/headerDark@3x.png
diff --git a/LeanIOS/Images.xcassets/LaunchBackground.imageset/2xDark.png b/LeanIOS/Images.xcassets/LaunchBackground.imageset/2xDark.png
diff --git a/LeanIOS/Images.xcassets/LaunchBackground.imageset/Contents.json b/LeanIOS/Images.xcassets/LaunchBackground.imageset/Contents.json
@@ -5,17 +5,48 @@
       "scale" : "1x"
     },
     {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
       "filename" : "2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "2xDark.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/LeanIOS/Images.xcassets/LaunchCenter.imageset/2xDark.png b/LeanIOS/Images.xcassets/LaunchCenter.imageset/2xDark.png