Merge branch 'develop' into api-copyright

Author: jpdillingham

api/QCVOC.Api/Veterans/Data/DTO/VeteranEnrollRequest.cs

@@ -42,7 +42,7 @@ public class VeteranEnrollRequest
         /// <summary>
         ///     Gets or sets the number of the card presently assigned to the Veteran.
         /// </summary>
-        [Range(minimum: 1000, maximum: 9999)]
+        [Range(minimum: 0, maximum: 9999)]
         public int? CardNumber { get; set; }
 
         /// <summary>

api/QCVOC.Api/Veterans/Data/DTO/VeteranUpdateRequest.cs

@@ -42,7 +42,7 @@ public class VeteranUpdateRequest
         /// <summary>
         ///     Gets or sets the number of the card presently assigned to the Veteran.
         /// </summary>
-        [Range(minimum: 1000, maximum: 9999)]
+        [Range(minimum: 0, maximum: 9999)]
         public int? CardNumber { get; set; }
 
         /// <summary>

mobile-new/app/build.gradle

@@ -4,10 +4,10 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "org.qccoders.qcvoc"
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 5
+        versionName "0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -19,14 +19,12 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-
     implementation 'com.google.android.gms:play-services-vision:15.0.2+'
     implementation 'com.android.support:design:28+'
-
 }

mobile-new/app/release/app-release.apk

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"0.5","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

mobile-new/app/release/output.json

@@ -3,7 +3,6 @@
     package="org.qccoders.qcvoc">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-feature android:name="android.hardware.Camera"/>
     <uses-permission android:name="android.permission.CAMERA"/>
 
     <application

mobile-new/app/src/main/AndroidManifest.xml

@@ -7,9 +7,11 @@
 
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
@@ -19,9 +21,20 @@
 import com.google.android.gms.samples.vision.barcodereader.BarcodeCaptureActivity;
 import com.google.android.gms.vision.barcode.Barcode;
 
+import static android.view.KeyEvent.KEYCODE_VOLUME_DOWN;
+import static android.view.KeyEvent.KEYCODE_VOLUME_UP;
+
 public class MainActivity extends AppCompatActivity {
     private WebView webview;
+    private boolean developmentEnvironment = false;
     private ProgressBar progressBar;
+    private String callback;
+
+    private final int[] environmentCode = {KEYCODE_VOLUME_UP, KEYCODE_VOLUME_UP, KEYCODE_VOLUME_UP,
+            KEYCODE_VOLUME_DOWN, KEYCODE_VOLUME_UP, KEYCODE_VOLUME_UP, KEYCODE_VOLUME_DOWN,
+            KEYCODE_VOLUME_UP, KEYCODE_VOLUME_UP, KEYCODE_VOLUME_UP, KEYCODE_VOLUME_UP,
+            KEYCODE_VOLUME_DOWN};
+    private int codeIndex = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,11 +62,13 @@ public void onPageFinished(WebView view, String url) {
         webview.addJavascriptInterface(this, "Android");
         webview.getSettings().setJavaScriptEnabled(true);
         webview.getSettings().setDomStorageEnabled(true);
-        webview.loadUrl("http://qcvoc-dev.s3-website-us-east-1.amazonaws.com");
+        webview.loadUrl("http://qcvoc-prod.s3-website-us-east-1.amazonaws.com");
     }
 
     @JavascriptInterface
-    public void scanBarcode() {
+    public void scanBarcode(String callback) {
+        this.callback = callback;
+
         Intent intent = new Intent(this, BarcodeCaptureActivity.class);
         intent.putExtra(BarcodeCaptureActivity.AutoFocus, true);
 
@@ -68,8 +83,42 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             Log.d("MainActivity", barcode.displayValue);
 
             webview.evaluateJavascript(
-                    "window.barcodeScanned(" + barcode.displayValue + ");",
+                    callback + "(" + barcode.displayValue + ");",
                     null);
         }
     }
+
+    @Override
+    public boolean onKeyUp(int keycode, KeyEvent event) {
+
+        if (event.getKeyCode() == environmentCode[codeIndex]) {
+            codeIndex += 1;
+        } else {
+            codeIndex = 0;
+        }
+
+        if (codeIndex == environmentCode.length) {
+            codeIndex = 0;
+            developmentEnvironment = !developmentEnvironment;
+
+            String message = "Environment switched to " +
+                    (developmentEnvironment ? "development" : "production");
+
+            Log.d("MainActivity", message);
+
+            Snackbar.make(
+                    findViewById(R.id.mainLayout),
+                    message,
+                    Snackbar.LENGTH_SHORT)
+                    .show();
+
+            String newUrl = developmentEnvironment
+                    ? "http://qcvoc-dev.s3-website-us-east-1.amazonaws.com"
+                    : "http://qcvoc-prod.s3-website-us-east-1.amazonaws.com";
+
+            webview.loadUrl(newUrl);
+        }
+
+        return super.onKeyUp(keycode, event);
+    }
 }

mobile-new/app/src/main/java/org/qccoders/qcvoc/MainActivity.java

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/mainLayout"
     tools:context=".MainActivity">
 
     <WebView

mobile-new/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,15 @@
+{
+    "extends": "react-app",
+    "rules": {
+        "semi": ["error", "always"],
+        "comma-dangle": ["error", "always-multiline"],
+        "no-const-assign": "error"
+    },
+    "parserOptions": {
+        "ecmaVersion": 7,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "jsx": true
+        }
+    }
+  }