Merge pull request #16 from javfg/rebase-driehle

UX Improvements

.gitignore

@@ -2,4 +2,7 @@ node_modules
 platforms/*
 plugins/*
 merges/*
+.idea/*
+.gradle/*
+indico-checkin.iml
 .DS_Store

package.json

@@ -1,65 +1,62 @@
 {
-    "name": "indico-checkin",
-    "version": "1.5.0",
-    "author": "Indico Team <[email protected]>",
-    "description": "Check-in application for Indico conferences",
-    "contributors": [
-        {
-            "name": "Indico Team",
-            "email": "[email protected]"
-        }
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/indico/indico-checkin.git"
-    },
-    "keywords": [
-        "indico",
-        "checkin",
-        "conference"
-    ],
-    "devDependencies": {
-        "@globules-io/cordova-plugin-ios-xhr": "^1.2.1",
-        "cordova": "^10.0.0",
-        "cordova-android": "^9.1.0",
-        "cordova-ios": "^6.2.0",
-        "cordova-plugin-inappbrowser": "^4.1.0",
-        "cordova-plugin-wkwebviewxhrfix": "^0.1.0",
-        "cordova-remove-cookies": "git+https://github.com/bez4pieci/Phonegap-Cookies-Plugin.git",
-        "eslint-config-indico": "^1.2.1",
-        "eslint-config-prettier": "^8.1.0",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-prettier": "^3.3.1"
-    },
-    "license": "GPL-3.0",
-    "scripts": {
-        "icons": "cordova-icon --icon=res/icon/icon.png --config=www/config.xml"
-    },
-    "cordova": {
-        "plugins": {
-            "cordova-plugin-dialogs": {},
-            "cordova-plugin-network-information": {},
-            "cordova-plugin-splashscreen": {},
-            "cordova-plugin-whitelist": {},
-            "phonegap-plugin-barcodescanner": {
-                "CAMERA_USAGE_DESCRIPTION": "To scan ticket QR codes",
-                "ANDROID_SUPPORT_V4_VERSION": "27.+"
-            },
-            "com.bez4pieci.cookies": {},
-            "cordova-plugin-inappbrowser": {},
-            "@globules-io/cordova-plugin-ios-xhr": {}
-        },
-        "platforms": [
-            "ios",
-            "android"
-        ]
-    },
-    "dependencies": {
-        "cordova-icon": "^1.0.0",
-        "cordova-plugin-dialogs": "2.0.1",
-        "cordova-plugin-network-information": "2.0.1",
-        "cordova-plugin-splashscreen": "6.0.0",
-        "cordova-plugin-whitelist": "1.3.3",
-        "phonegap-plugin-barcodescanner": "8.0.0"
+  "name": "indico-checkin",
+  "version": "1.5.0",
+  "author": "Indico Team <[email protected]>",
+  "description": "Check-in application for Indico conferences",
+  "contributors": [
+    {
+      "name": "Indico Team",
+      "email": "[email protected]"
     }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/indico/indico-checkin.git"
+  },
+  "keywords": [
+    "indico",
+    "checkin",
+    "conference"
+  ],
+  "devDependencies": {
+    "@globules-io/cordova-plugin-ios-xhr": "^1.2.1",
+    "cordova": "^10.0.0",
+    "cordova-android": "^9.1.0",
+    "cordova-icon": "^1.0.0",
+    "cordova-ios": "^6.2.0",
+    "cordova-plugin-dialogs": "2.0.1",
+    "cordova-plugin-inappbrowser": "^4.1.0",
+    "cordova-plugin-network-information": "2.0.1",
+    "cordova-plugin-splashscreen": "6.0.0",
+    "cordova-plugin-whitelist": "1.3.3",
+    "cordova-plugin-wkwebviewxhrfix": "^0.1.0",
+    "cordova-remove-cookies": "git+https://github.com/bez4pieci/Phonegap-Cookies-Plugin.git",
+    "eslint-config-indico": "^1.2.1",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-prettier": "^3.3.1",
+    "phonegap-plugin-barcodescanner": "8.0.1"
+  },
+  "license": "GPL-3.0",
+  "scripts": {
+    "icons": "cordova-icon --icon=res/icon/icon.png --config=www/config.xml"
+  },
+  "cordova": {
+    "plugins": {
+      "cordova-plugin-dialogs": {},
+      "cordova-plugin-network-information": {},
+      "cordova-plugin-splashscreen": {},
+      "cordova-plugin-whitelist": {},
+      "phonegap-plugin-barcodescanner": {
+        "CAMERA_USAGE_DESCRIPTION": "To scan ticket QR codes",
+        "ANDROID_SUPPORT_V4_VERSION": "27.+"
+      },
+      "com.bez4pieci.cookies": {},
+      "cordova-plugin-inappbrowser": {}
+    },
+    "platforms": [
+      "android",
+      "ios"
+    ]
+  }
 }

www/config.xml

@@ -19,11 +19,13 @@
     <preference name="ios-statusbarstyle" value="default" />
     <preference name="detect-data-types" value="true" />
     <preference name="exit-on-suspend" value="false" />
-    <preference name="ShowSplashScreenSpinner" value="true" />
-    <preference name="AutoHideSplashScreen" value="true" />
-    <preference name="android-minSdkVersion" value="21" />
+    <preference name="android-minSdkVersion" value="19" />
     <preference name="android-installLocation" value="auto" />
-     <preference name="allowFileAccessFromFileURLs" value="true" />
+    <preference name="ShowSplashScreenSpinner " value="true" />
+    <preference name="AutoHideSplashScreen" value="true" />
+    <preference name="SplashMaintainAspectRatio" value="true" />
+    <preference name="SplashScreenSpinnerColor" value="#03a4e4" />
+    <preference name="SplashScreenDelay" value="4000" />
     <platform name="android">
         <icon gap:density="ldpi" src="res/icon/android/icon-36-ldpi.png" />
         <icon gap:density="mdpi" src="res/icon/android/icon-48-mdpi.png" />
@@ -37,6 +39,7 @@
         <splash density="port-xxxhdpi" src="res/screen/android/screen-xxxhdpi-portrait.png" />
     </platform>
     <platform name="ios">
+        <preference name="allowFileAccessFromFileURLs" value="true" />
         <icon height="180" src="res/icon/ios/[email protected]" width="180" />
         <icon height="60" src="res/icon/ios/icon-60.png" width="60" />
         <icon height="120" src="res/icon/ios/[email protected]" width="120" />
@@ -58,7 +61,6 @@
         <icon height="1024" src="res/icon/ios/icon-1024.png" width="1024" />
         <splash src="res/screen/ios/Default@2x~universal~anyany.png" />
     </platform>
-    <preference name="SplashScreenDelay" value="4000" />
     <content src="index.html" />
     <allow-navigation href="*" />
     <allow-intent href="tel:*" />
@@ -72,6 +74,6 @@
         <variable name="CAMERA_USAGE_DESCRIPTION" value="To scan ticket QR codes" />
     </plugin>
     <edit-config file="*-Info.plist" mode="merge" target="NSCameraUsageDescription">
-        <string>To easily scan Indico ticket barcodes</string>
+        <string>To easily scan Indico ticket QR codes</string>
     </edit-config>
 </widget>