Merge pull request #47 from mattvb91/v1.1.x

V1.1.x

Author: mattvb91

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "mavonie.subterminal"
         minSdkVersion 19
         targetSdkVersion 24
-        versionCode 16
-        versionName "1.1.0"
+        versionCode 17
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="mavonie.subterminal"
-          android:versionName="1.1.0">
+          android:versionName="1.1.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_GPS"/>

app/src/main/java/mavonie/subterminal/Models/Model.java

@@ -27,6 +27,8 @@
  */
 abstract public class Model implements BaseColumns, Serializable {
 
+    public static String EMPTY_LIST_ITEM = " - ";
+
     /**
      * dbColumns data types
      */

app/src/main/java/mavonie/subterminal/Models/Skydive/Dropzone.java

@@ -336,6 +336,9 @@ public static ArrayList<String> getCountiesForSelect(String country) {
 
         Cursor cursor = _db.getReadableDatabase().rawQuery(query, null);
 
+        //Add empty selection
+        itemsForSelect.add(EMPTY_LIST_ITEM);
+
         if (cursor.moveToFirst()) {
             while (cursor.isAfterLast() == false) {
                 String string = cursor.getString(1);

app/src/main/java/mavonie/subterminal/SignatureActivity.java

@@ -19,6 +19,8 @@
 import mavonie.subterminal.Models.Image;
 import mavonie.subterminal.Models.Signature;
 import mavonie.subterminal.Utils.Subterminal;
+import mavonie.subterminal.Utils.UIHelper;
+import mavonie.subterminal.Views.JumpView;
 
 /**
  * Signature activity
@@ -71,6 +73,8 @@ public void onClick(View view) {
 
                 Bitmap signatureBitmap = mSignaturePad.getSignatureBitmap();
                 addJpgSignatureToGallery(signatureBitmap);
+
+                UIHelper.openFragmentForEntity(Subterminal.getActiveModel());
             }
         });
     }

app/src/main/java/mavonie/subterminal/Skydive/Dropzone.java

@@ -66,7 +66,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                     wheres.put(wheres.size(), whereCountry);
                 }
 
-                if (local != null) {
+                if (local != null && local != Model.EMPTY_LIST_ITEM) {
                     HashMap<String, Object> whereLocal = new HashMap<>();
                     whereLocal.put(Model.FILTER_WHERE_FIELD, mavonie.subterminal.Models.Skydive.Dropzone.COLUMN_NAME_ADDRESS_LEVEL_1);
                     whereLocal.put(Model.FILTER_WHERE_VALUE, "'" + local.toString() + "'");

app/src/main/java/mavonie/subterminal/Skydive/ViewAdapters/DropzoneRecycler.java

@@ -102,11 +102,7 @@ public int getItemViewType(int position) {
 
     @Override
     public int getItemCount() {
-        if (!Subterminal.getUser().isPremium() & !Subterminal.isTesting()) {
-            return mValues.size() + (mValues.size() / ITEMS_PER_AD);
-        }
-
-        return mValues.size();
+         return mValues.size();
     }
 
     public class ViewHolder extends RecyclerView.ViewHolder {

app/src/main/java/mavonie/subterminal/Skydive/ViewAdapters/SkydiveRecycler.java

@@ -134,14 +134,9 @@ public int getItemViewType(int position) {
 
     @Override
     public int getItemCount() {
-        if (!Subterminal.getUser().isPremium() & !Subterminal.isTesting()) {
-            return mValues.size() + (mValues.size() / ITEMS_PER_AD);
-        }
-
         return mValues.size();
     }
 
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         public final View mView;
         public final TextView listDropzone;

app/src/main/java/mavonie/subterminal/ViewAdapters/ExitRecycler.java

@@ -121,10 +121,6 @@ public int getItemViewType(int position) {
 
     @Override
     public int getItemCount() {
-        if (!Subterminal.getUser().isPremium() & !Subterminal.isTesting()) {
-            return mValues.size() + (mValues.size() / ITEMS_PER_AD);
-        }
-
         return mValues.size();
     }
 

app/src/main/java/mavonie/subterminal/ViewAdapters/JumpRecycler.java

@@ -134,10 +134,6 @@ public int getItemViewType(int position) {
 
     @Override
     public int getItemCount() {
-        if (!Subterminal.getUser().isPremium() & !Subterminal.isTesting()) {
-            return mValues.size() + (mValues.size() / ITEMS_PER_AD);
-        }
-
         return mValues.size();
     }