diff --git a/app/app-release.apk b/app/app-release.apk deleted file mode 100644 index d40186e..0000000 Binary files a/app/app-release.apk and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index 9a659bb..720cfeb 100644 --- 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 index e0442a2..945dbb8 100644 --- 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 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{ 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 index 660a59c..e0540cb 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ - #4CAF50 - #388E3C + #009688 + #00796B #2962FF #CFD8DC #FFFFFF @@ -9,5 +9,5 @@ #29a329 #b30000 #000000 - #448AFF + #01579B