Merge pull request #11 from canthonyscott/development

Development
canthonyscott · Oct 19, 2016 · e1c1ff5 · e1c1ff5
2 parents 91509c4 + da44262
commit e1c1ff5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.canthonyscott.microinjectioncalc"
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 25
-        versionName "1.7"
+        versionCode 26
+        versionName "1.7.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/canthonyscott/microinjectioncalc/MOInjection.java b/app/src/main/java/com/canthonyscott/microinjectioncalc/MOInjection.java
@@ -1,5 +1,6 @@
 package com.canthonyscott.microinjectioncalc;
 
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -49,7 +50,7 @@ public class MOInjection extends AppCompatActivity{
     private ArrayAdapter<Morpholino> adapter;
 
     // color used for the fab below
-    private final static String primaryColor = "#4CAF50";
+    private final static String primaryColor = "#2962FF";
 
     // some variables needed for broad scope
     private Context context;
@@ -307,6 +308,18 @@ public class DownloadOligos extends AsyncTask<String, Void, String>{
         StringBuilder result;
         JSONObject jsonObject;
         JSONArray jsonArray;
+        ProgressDialog pDialog;
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            pDialog = new ProgressDialog(MOInjection.this);
+            pDialog.setMessage("Connecting...");
+            pDialog.setIndeterminate(false);
+            pDialog.setCancelable(true);
+            pDialog.show();
+
+        }
 
         @Override
         protected String doInBackground(String... params) {
@@ -329,6 +342,7 @@ protected String doInBackground(String... params) {
         @Override
         protected void onPostExecute(String s) {
             super.onPostExecute(s);
+            pDialog.dismiss();
             if (s.equals("failed")){
                 Toast.makeText(context, "You must be logged in. Redirecting...", Toast.LENGTH_LONG).show();
                //  send to log-in screen

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#4CAF50</color>
-    <color name="colorPrimaryDark">#388E3C</color>
+    <color name="colorPrimary">#009688</color>
+    <color name="colorPrimaryDark">#00796B</color>
     <color name="colorAccent">#2962FF</color>
     <color name="hintColor">#CFD8DC</color>
     <color name="white">#FFFFFF</color>
     <color name="grey">#808080</color>
     <color name="success">#29a329</color>
     <color name="failed">#b30000</color>
     <color name="black">#000000</color>
-    <color name="colorButtons">#448AFF</color>
+    <color name="colorButtons">#01579B</color>
 </resources>