new icons and version numbers for release

app/android/app/build.gradle

@@ -80,7 +80,7 @@ android {
         applicationId "com.proofofpassport"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3
+        versionCode 9
         versionName "1.0"
         externalNativeBuild {
             cmake {

app/android/app/src/main/AndroidManifest.xml

@@ -15,9 +15,10 @@
       android:name=".MainApplication"
       android:largeHeap="true"
       android:label="@string/app_name"
-      android:icon="@mipmap/passport_logo"
+      android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher"
       android:allowBackup="false"
-      tools:replace="android:allowBackup, android:icon, android:name"
+      tools:replace="android:allowBackup, android:icon, android:roundIcon, android:name"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"

app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@drawable/ic_launcher"/>
+</adaptive-icon>

app/ios/Podfile.lock

@@ -630,7 +630,7 @@ SPEC CHECKSUMS:
   React-Core: 8293312ad137ea82fd2c29deb163dbc24aa4e00e
   React-CoreModules: 32fab1d62416849a3b6dac6feff9d54e5ddc2d1e
   React-cxxreact: 55d0f7cb6b4cc09ba9190797f1da87182d1a2fb6
-  React-debug: 2aafa5b6cea5ab76043c20d72663aa0204e49020
+  React-debug: 7e61555c8158126c6cd98c3154381ad3821aaaca
   React-jsc: 0db8e8cc2074d979c37ffa7b8d7c914833960497
   React-jsi: 58677ff4848ceb6aeb9118fe03448a843ea5e16a
   React-jsiexecutor: 2c15ba1bace70177492368d5180b564f165870fd
@@ -640,7 +640,7 @@ SPEC CHECKSUMS:
   react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
   react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
   react-native-nfc-manager: 3134770f9afcb586c0ae859e747fda3106ec1f76
-  React-NativeModulesApple: 1d8e4abb2fc6d80bdd13dcf128ee548804eb4a24
+  React-NativeModulesApple: 0438665fc7473be6edc496e823e6ea0b0537b46c
   React-perflogger: 6bd153e776e6beed54c56b0847e1220a3ff92ba5
   React-RCTActionSheet: c0b62af44e610e69d9a2049a682f5dba4e9dff17
   React-RCTAnimation: fe7005136b58f58871cab2f70732343b6e330d30
@@ -654,9 +654,9 @@ SPEC CHECKSUMS:
   React-RCTVibration: ea3a68a49873a54ced927c90923fc6932baf344a
   React-rncore: 9672a017af4a7da7495d911f0b690cbcae9dd18d
   React-runtimeexecutor: 369ae9bb3f83b65201c0c8f7d50b72280b5a1dbc
-  React-runtimescheduler: 053752ab29d2747602f81c76d1bd7ede9412ef69
-  React-utils: d3799712bc7003f1ad6501a37189384bf87c25f1
-  ReactCommon: e639ff94ef1db3d9dd184decec9b02a6fbcc638e
+  React-runtimescheduler: ec1066a4f2d1152eb1bc3fb61d69376b3bc0dde0
+  React-utils: d55ba834beb39f01b0b470ae43478c0a3a024abe
+  ReactCommon: 68e3a815fbb69af3bb4196e04c6ae7abb306e7a8
   RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688

app/ios/ProofOfPassport.xcodeproj/project.pbxproj

@@ -628,8 +628,8 @@
 				CODE_SIGN_ENTITLEMENTS = ProofOfPassport/ProofOfPassport.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 47;
-				DEVELOPMENT_TEAM = X53ZR86F22;
+				CURRENT_PROJECT_VERSION = 52;
+				DEVELOPMENT_TEAM = 5B29R5LYHQ;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -741,13 +741,13 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoproKit/Libs",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.warroom.proofofpassport-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = com.warroom.proofofpassport;
 				PRODUCT_NAME = ProofOfPassport;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/ProofOfPassport-Bridging-Header.h";
@@ -764,8 +764,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ProofOfPassport/ProofOfPassport.entitlements;
-				CURRENT_PROJECT_VERSION = 47;
-				DEVELOPMENT_TEAM = X53ZR86F22;
+				CURRENT_PROJECT_VERSION = 52;
+				DEVELOPMENT_TEAM = 5B29R5LYHQ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/DoubleConversion\"",
@@ -876,13 +876,13 @@
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/MoproKit/Libs",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.warroom.proofofpassport-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = com.warroom.proofofpassport;
 				PRODUCT_NAME = ProofOfPassport;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/ProofOfPassport-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

app/ios/ProofOfPassport/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,354 +1,204 @@
 {
-  "images" : [
+  "images": [
     {
-      "filename" : "40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
+      "size": "60x60",
+      "expected-size": "180",
+      "filename": "180.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
     },
     {
-      "filename" : "60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
+      "size": "40x40",
+      "expected-size": "80",
+      "filename": "80.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
     },
     {
-      "filename" : "29.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
+      "size": "40x40",
+      "expected-size": "120",
+      "filename": "120.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
     },
     {
-      "filename" : "58.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
+      "size": "60x60",
+      "expected-size": "120",
+      "filename": "120.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
     },
     {
-      "filename" : "87.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
+      "size": "57x57",
+      "expected-size": "57",
+      "filename": "57.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "1x"
     },
     {
-      "filename" : "80.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
+      "size": "29x29",
+      "expected-size": "58",
+      "filename": "58.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
     },
     {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
+      "size": "29x29",
+      "expected-size": "29",
+      "filename": "29.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "1x"
     },
     {
-      "filename" : "57.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
+      "size": "29x29",
+      "expected-size": "87",
+      "filename": "87.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
     },
     {
-      "filename" : "114.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
+      "size": "57x57",
+      "expected-size": "114",
+      "filename": "114.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
     },
     {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
+      "size": "20x20",
+      "expected-size": "40",
+      "filename": "40.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
     },
     {
-      "filename" : "180.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
+      "size": "20x20",
+      "expected-size": "60",
+      "filename": "60.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
     },
     {
-      "filename" : "20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
+      "size": "1024x1024",
+      "filename": "1024.png",
+      "expected-size": "1024",
+      "idiom": "ios-marketing",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "scale": "1x"
     },
     {
-      "filename" : "40.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
+      "size": "40x40",
+      "expected-size": "80",
+      "filename": "80.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     },
     {
-      "filename" : "29.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
+      "size": "72x72",
+      "expected-size": "72",
+      "filename": "72.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "1x"
     },
     {
-      "filename" : "58.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
+      "size": "76x76",
+      "expected-size": "152",
+      "filename": "152.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     },
     {
-      "filename" : "40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
+      "size": "50x50",
+      "expected-size": "100",
+      "filename": "100.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     },
     {
-      "filename" : "80.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
+      "size": "29x29",
+      "expected-size": "58",
+      "filename": "58.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     },
     {
-      "filename" : "50.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
+      "size": "76x76",
+      "expected-size": "76",
+      "filename": "76.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "1x"
     },
     {
-      "filename" : "100.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
+      "size": "29x29",
+      "expected-size": "29",
+      "filename": "29.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "1x"
     },
     {
-      "filename" : "72.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
+      "size": "50x50",
+      "expected-size": "50",
+      "filename": "50.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "1x"
     },
     {
-      "filename" : "144.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
+      "size": "72x72",
+      "expected-size": "144",
+      "filename": "144.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     },
     {
-      "filename" : "76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
+      "size": "40x40",
+      "expected-size": "40",
+      "filename": "40.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "1x"
     },
     {
-      "filename" : "152.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
+      "size": "83.5x83.5",
+      "expected-size": "167",
+      "filename": "167.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     },
     {
-      "filename" : "167.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
+      "size": "20x20",
+      "expected-size": "20",
+      "filename": "20.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "1x"
     },
     {
-      "filename" : "1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "1024.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "48.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "24x24",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "55.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "27.5x27.5",
-      "subtype" : "42mm"
-    },
-    {
-      "filename" : "58.png",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "87.png",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "66.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "33x33",
-      "subtype" : "45mm"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "40x40",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "88.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "44x44",
-      "subtype" : "40mm"
-    },
-    {
-      "filename" : "92.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "46x46",
-      "subtype" : "41mm"
-    },
-    {
-      "filename" : "100.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "50x50",
-      "subtype" : "44mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "51x51",
-      "subtype" : "45mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "54x54",
-      "subtype" : "49mm"
-    },
-    {
-      "filename" : "172.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "86x86",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "196.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "98x98",
-      "subtype" : "42mm"
-    },
-    {
-      "filename" : "216.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "108x108",
-      "subtype" : "44mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "117x117",
-      "subtype" : "45mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "129x129",
-      "subtype" : "49mm"
-    },
-    {
-      "filename" : "1024.png",
-      "idiom" : "watch-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "102.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "45x45",
-      "subtype" : "41mm"
+      "size": "20x20",
+      "expected-size": "40",
+      "filename": "40.png",
+      "folder": "Assets.xcassets/AppIcon.appiconset/",
+      "idiom": "ipad",
+      "scale": "2x"
     }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
+  ]
 }