mattvb91 · mattvb91 · Jan 5, 2017 · Jan 2, 2017 · Jan 5, 2017 · Jan 5, 2017
diff --git a/app/build.gradle b/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 {

diff --git a/app/src/main/AndroidManifest.xml b/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"/>

diff --git a/app/src/main/java/mavonie/subterminal/Models/Model.java b/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
      */

diff --git a/app/src/main/java/mavonie/subterminal/Models/Skydive/Dropzone.java b/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);

diff --git a/app/src/main/java/mavonie/subterminal/SignatureActivity.java b/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());
             }
         });
     }

diff --git a/app/src/main/java/mavonie/subterminal/Skydive/Dropzone.java b/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() + "'");

diff --git a/app/src/main/java/mavonie/subterminal/Skydive/ViewAdapters/DropzoneRecycler.java b/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 {

diff --git a/app/src/main/java/mavonie/subterminal/Skydive/ViewAdapters/SkydiveRecycler.java b/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;

diff --git a/app/src/main/java/mavonie/subterminal/ViewAdapters/ExitRecycler.java b/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();
     }
 

diff --git a/app/src/main/java/mavonie/subterminal/ViewAdapters/JumpRecycler.java b/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();
     }
 

diff --git a/app/src/main/res/layout/fragment_dropzone.xml b/app/src/main/res/layout/fragment_dropzone.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
     android:id="@+id/card_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:cardCornerRadius="4dp">
+    app:cardUseCompatPadding="true">
 
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/layout/fragment_dropzone_filter.xml b/app/src/main/res/layout/fragment_dropzone_filter.xml
@@ -6,7 +6,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     app:cardCornerRadius="4dp"
-    app:cardElevation="13dp">
+    app:cardElevation="13dp"
+    app:cardUseCompatPadding="true">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -17,8 +18,8 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="10dp"
             android:autoLink="web"
+            android:paddingTop="10dp"
             android:text="Thanks to skydivelocations.com  for dropzone data. \n\nIf your dropzone is missing please see skydivelocations.com"
             android:textSize="7pt"></TextView>
 

diff --git a/app/src/main/res/layout/fragment_dropzone_view.xml b/app/src/main/res/layout/fragment_dropzone_view.xml
@@ -1,5 +1,6 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:ads="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -15,7 +16,6 @@
 
             <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
                 android:id="@+id/card_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -202,7 +202,9 @@
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_margin="1dp"
+                app:cardUseCompatPadding="true">
 
                 <TableLayout
                     android:layout_width="match_parent"
@@ -243,7 +245,9 @@
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_margin="1dp"
+                app:cardUseCompatPadding="true">
 
                 <TableLayout
                     android:layout_width="match_parent"
@@ -263,7 +267,6 @@
                     </TableRow>
 
 
-
                 </TableLayout>
             </android.support.v7.widget.CardView>
         </RelativeLayout>

diff --git a/app/src/main/res/layout/fragment_exit_view.xml b/app/src/main/res/layout/fragment_exit_view.xml
@@ -1,7 +1,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ads="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:ads="http://schemas.android.com/apk/res-auto">
+    android:layout_height="match_parent">
 
     <RelativeLayout
         android:id="@+id/exit_view_layout"
@@ -14,7 +15,6 @@
             android:layout_height="wrap_content">
 
             <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/card_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -140,23 +140,24 @@
 
             <com.google.android.gms.ads.AdView
                 android:id="@+id/adView"
-                ads:adSize="BANNER"
-                ads:adUnitId="@string/banner_ad_unit_id"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"></com.google.android.gms.ads.AdView>
+                android:layout_centerHorizontal="true"
+                ads:adSize="BANNER"
+                ads:adUnitId="@string/banner_ad_unit_id"></com.google.android.gms.ads.AdView>
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/exit_view_images_card"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/exit_view_add_banner"
-            android:padding="10dp">
+            android:layout_below="@+id/exit_view_add_banner">
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_margin="10dp"
+                app:cardUseCompatPadding="true">
 
                 <TableLayout
                     android:layout_width="match_parent"
@@ -205,7 +206,8 @@
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="10dp">
+                android:layout_margin="10dp"
+                app:cardUseCompatPadding="true">
 
                 <TableLayout
                     android:layout_width="match_parent"
@@ -391,12 +393,13 @@
             android:id="@+id/exit_view_map_card"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/exit_view_difficulty_card"
-            android:padding="10dp">
+            android:layout_below="@+id/exit_view_difficulty_card">
 
             <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:layout_margin="10dp"
+                app:cardUseCompatPadding="true">
 
                 <TableLayout
                     android:layout_width="match_parent"

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release
+        version="1.1.1"
+        versioncode="17">
+        <change>Fixed crashes on lists</change>
+        <change>Improved dropzone filtering</change>
+        <change>UI Improvements</change>
+    </release>
     <release
         version="1.1.0"
         versioncode="16">
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ @@
      */
     abstract public class Model implements BaseColumns, Serializable {
+        public static String EMPTY_LIST_ITEM = " - ";
         /**
          * dbColumns data types
          */
@@ Expand Down @@