Merge pull request #88 from mattvb91/v1.3.x

v1.3.1

Author: mattvb91

.travis.yml

@@ -19,11 +19,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-25.0.3
+    - build-tools-26.0.2
 
     # The SDK version used to compile your project
     - android-19
-    - android-25
 
     # Additional components
     - extra-google-m2repository
@@ -41,6 +40,10 @@ android:
     - 'android-support-.+'
 
 before_script:
+  - mkdir -p app/build/intermediates/assets/release/
+  - cp -R app/src/main/assets/sql/ app/build/intermediates/assets/release/sql
+  - mkdir -p app/build/intermediates/assets/debug/
+  - cp -R app/src/main/assets/sql/ app/build/intermediates/assets/debug/sql
   - mv app/src/debug/google-services.json app/google-services.json
   - mv app/src/debug/res/values/keys.xml app/src/main/res/values/keys.xml
   - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a

app/build.gradle

@@ -3,17 +3,18 @@ apply plugin: 'com.android.application'
 repositories {
     mavenCentral()
     maven { url "http://dl.bintray.com/pixplicity/maven" }
+    google()
 }
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "mavonie.subterminal"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 34
-        versionName "1.3.0"
+        versionCode 35
+        versionName "1.3.1"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -32,9 +33,10 @@ android {
 }
 
 def supportLibraryVersion = '25.3.1'
+def firebaseVersion = '11.4.2'
 
 dependencies {
-    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:multidex:1.0.2'
 
     compile fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
@@ -49,12 +51,11 @@ dependencies {
     compile('com.facebook.fresco:fresco:1.3.0') {
         exclude group: 'com.parse.bolts', module: 'bolts-tasks';
     }
-    compile 'com.google.firebase:firebase-core:10.2.6'
-    compile 'com.google.firebase:firebase-crash:10.2.6'
-    compile 'com.google.firebase:firebase-messaging:10.2.6'
-    compile 'com.google.firebase:firebase-ads:10.2.6'
-
-    compile 'com.google.android.gms:play-services-maps:10.2.6'
+    compile "com.google.firebase:firebase-core:${firebaseVersion}"
+    compile "com.google.firebase:firebase-crash:${firebaseVersion}"
+    compile "com.google.firebase:firebase-messaging:${firebaseVersion}"
+    compile "com.google.firebase:firebase-ads:${firebaseVersion}"
+    compile "com.google.android.gms:play-services-maps:${firebaseVersion}"
 
     compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile "com.android.support:support-v4:${supportLibraryVersion}"
@@ -65,8 +66,8 @@ dependencies {
     compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile "com.android.support:design:${supportLibraryVersion}"
 
-    compile 'com.jakewharton:butterknife:8.6.0'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.0'
+    compile 'com.jakewharton:butterknife:8.7.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.7.0'
 
     compile 'co.lujun:androidtagview:1.1.3'
     compile 'com.github.developer-shivam:crescento:1.1.0'
@@ -93,12 +94,14 @@ dependencies {
     compile 'com.github.AhmadNemati:WindView:1.1.1'
     compile 'com.github.zurche:open-weather-map-android-wrapper:v0.1'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'org.robolectric:robolectric:3.3.2'
-    testCompile "org.robolectric:shadows-multidex:3.3.2"
+    testCompile 'org.robolectric:robolectric:3.5.1'
+    testCompile "org.robolectric:shadows-multidex:3.5.1"
     testCompile 'junit:junit:4.12'
     testCompile 'org.xerial:sqlite-jdbc:3.8.11.2'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+
+    compile 'ie.mavon.sqlitemodel:sqlitemodel:1.0.0'
 }
 
 

app/src/androidTest/java/mavonie/subterminal/ExitTest.java

@@ -33,10 +33,6 @@ public void setMode() {
     public void addExitTest() throws InterruptedException {
         navigateToExits();
 
-        ViewInteraction appCompatTextView = onView(
-                allOf(withId(android.R.id.title), withText("All"), isDisplayed()));
-        appCompatTextView.perform(click());
-
         ViewInteraction floatingActionButton = onView(
                 allOf(withId(R.id.fab), isDisplayed()));
         floatingActionButton.perform(click());
@@ -78,39 +74,18 @@ public void navigateToExits() {
         appCompatCheckedTextView.perform(click());
     }
 
-    @Test
-    public void tabTest() {
-
-        navigateToExits();
-
-        navigateTab("All");
-        navigateTab("My Exits");
-
-        navigateTab("All");
-        navigateTab("My Exits");
-    }
-
     @Test
     public void clickRandomItemTest() throws InterruptedException {
         addExitTest();
         addExitTest();
 
         navigateToExits();
 
-        navigateTab("All");
-
         //Magic happening
         int x = getRandomRecyclerPosition(R.id.list);
 
         onView(withId(R.id.list))
                 .perform(RecyclerViewActions
                         .actionOnItemAtPosition(x, click()));
     }
-
-    public void navigateTab(String tab) {
-        ViewInteraction appCompatTextView = onView(
-                allOf(withId(android.R.id.title), withText(tab), isDisplayed()));
-        appCompatTextView.perform(click());
-    }
-
 }

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.3.0">
+          android:versionName="1.3.1">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_GPS"/>

app/src/main/assets/sql/create.sql

@@ -16,7 +16,6 @@ CREATE TABLE gear (
 
 CREATE TABLE exit (
     _id INTEGER PRIMARY KEY,
-    global_id TEXT,
     name TEXT,
     rockdrop_distance INTEGER,
     altitude_to_landing INTEGER,
@@ -28,19 +27,6 @@ CREATE TABLE exit (
     synced INTEGER DEFAULT 0,
     deleted INTEGER DEFAULT 0);
 
-CREATE TABLE exit_details (
-    _id INTEGER PRIMARY KEY,
-    exit_id INTEGER,
-    rules TEXT,
-    difficulty_tracking_exit INTEGER,
-    difficulty_tracking_freefall INTEGER,
-    difficulty_tracking_landing INTEGER,
-    difficulty_tracking_overall INTEGER,
-    difficulty_wingsuit_exit INTEGER,
-    difficulty_wingsuit_freefall INTEGER,
-    difficulty_wingsuit_landing INTEGER,
-    difficulty_wingsuit_overall INTEGER);
-
 CREATE TABLE jump (
         _id INTEGER PRIMARY KEY,
         date DATE,

app/src/main/assets/sql/upgrade-0035.sql

@@ -0,0 +1,21 @@
+DELETE FROM exit WHERE global_id IS NOT NULL;
+ALTER TABLE exit RENAME TO exit_old;
+
+CREATE TABLE exit (
+    _id INTEGER PRIMARY KEY,
+    name TEXT,
+    rockdrop_distance INTEGER,
+    altitude_to_landing INTEGER,
+    description TEXT,
+    latitude DOUBLE,
+    longtitude DOUBLE,
+    object_type INTEGER,
+    height_unit INTEGER DEFAULT 0,
+    synced INTEGER DEFAULT 0,
+    deleted INTEGER DEFAULT 0);
+
+INSERT INTO exit SELECT _id, name, rockdrop_distance, altitude_to_landing, description, latitude, longtitude,
+object_type, height_unit, synced, deleted FROM exit_old;
+
+DROP TABLE exit_old;
+DROP TABLE exit_details;

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

@@ -94,14 +94,10 @@ public void onClick(View v) {
             });
         }
 
-        HashMap<String, Object> whereNotGlobal = new HashMap<>();
-        whereNotGlobal.put(Model.FILTER_WHERE_FIELD, Exit.COLUMN_NAME_GLOBAL_ID);
-        whereNotGlobal.put(Model.FILTER_WHERE_VALUE, null);
-
         skydiveCount.setText(Integer.toString(Subterminal.getUser().getSettings().getSkydiveStartJumpNo() + new Skydive().count(Synchronizable.getActiveParams())));
         baseCount.setText(Integer.toString(Subterminal.getUser().getSettings().getBaseStartJumpNo() + new Jump().count(Synchronizable.getActiveParams())));
         dropzoneCount.setText(Integer.toString(Dropzone.getDropzonesVisitedCount()));
-        exitsCount.setText(Integer.toString(new Exit().count(whereNotGlobal)));
+        exitsCount.setText(Integer.toString(new Exit().count()));
 
         setPieChartData();
         setBarChartData();
@@ -268,23 +264,18 @@ private void setPieChartData() {
 
         Query buildingQuery = new Query(Exit.COLUMN_NAME_OBJECT_TYPE, Exit.TYPE_BUILDING);
         buildingQuery.getWheres().put(buildingQuery.getWheres().size(), Synchronizable.getActiveParams());
-        buildingQuery.addWhere(Exit.COLUMN_NAME_GLOBAL_ID, null);
 
         Query antennaQuery = new Query(Exit.COLUMN_NAME_OBJECT_TYPE, Exit.TYPE_ANTENNA);
         antennaQuery.getWheres().put(antennaQuery.getWheres().size(), Synchronizable.getActiveParams());
-        antennaQuery.addWhere(Exit.COLUMN_NAME_GLOBAL_ID, null);
 
         Query spanQuery = new Query(Exit.COLUMN_NAME_OBJECT_TYPE, Exit.TYPE_SPAN);
         spanQuery.getWheres().put(spanQuery.getWheres().size(), Synchronizable.getActiveParams());
-        spanQuery.addWhere(Exit.COLUMN_NAME_GLOBAL_ID, null);
 
         Query earthQuery = new Query(Exit.COLUMN_NAME_OBJECT_TYPE, Exit.TYPE_EARTH);
         earthQuery.getWheres().put(earthQuery.getWheres().size(), Synchronizable.getActiveParams());
-        earthQuery.addWhere(Exit.COLUMN_NAME_GLOBAL_ID, null);
 
         Query otherQuery = new Query(Exit.COLUMN_NAME_OBJECT_TYPE, Exit.TYPE_OTHER);
         otherQuery.getWheres().put(otherQuery.getWheres().size(), Synchronizable.getActiveParams());
-        otherQuery.addWhere(Exit.COLUMN_NAME_GLOBAL_ID, null);
 
         int buildings = new Exit().count(buildingQuery.getParams());
         int antennas = new Exit().count(antennaQuery.getParams());

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

@@ -1,38 +1,56 @@
 package mavonie.subterminal;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTabHost;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-public class Exit extends Fragment {
+import mavonie.subterminal.Models.Model;
+import mavonie.subterminal.Models.Synchronizable;
+import mavonie.subterminal.Utils.BaseFragment;
+import mavonie.subterminal.Utils.DB.Query;
+import mavonie.subterminal.ViewAdapters.ExitRecycler;
 
-    private FragmentTabHost mTabHost;
-
-    public static final String TAB = "TAB";
-
-    public static final int TAB_MY_EXITS = 0;
-    public static final int TAB_ALL_EXITS = 1;
+/**
+ * Exit list fragment
+ */
+public class Exit extends BaseFragment {
 
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_exit_list, container, false);
+
+        RecyclerView recyclerView = (RecyclerView) view;
+        recyclerView.setLayoutManager(new LinearLayoutManager(view.getContext()));
+        recyclerView.setAdapter(new ExitRecycler(new mavonie.subterminal.Models.Exit().getItems(getQuery().getParams()), getmListener()));
 
-        View rootView = inflater.inflate(R.layout.fragment_tabs, container, false);
+        return view;
+    }
 
+    @NonNull
+    private Query getQuery() {
+        Query query = new Query();
+        query.orderDir(mavonie.subterminal.Models.Exit.COLUMN_NAME_NAME, Model.FILTER_ORDER_DIR_ASC);
+        query.getParams().putAll(Synchronizable.getActiveParams());
 
-        mTabHost = (FragmentTabHost) rootView.findViewById(android.R.id.tabhost);
-        mTabHost.setup(getActivity(), getChildFragmentManager(), R.id.realtabcontent);
+        return query;
+    }
 
-        Bundle args = new Bundle();
-        args.putInt(TAB, TAB_MY_EXITS);
+    @Override
+    public void onResume() {
+        super.onResume();
 
-        mTabHost.addTab(mTabHost.newTabSpec(Integer.toString(TAB_MY_EXITS)).setIndicator("My Exits"),
-                ExitTabs.class, args);
-        mTabHost.addTab(mTabHost.newTabSpec(Integer.toString(TAB_ALL_EXITS)).setIndicator("All"),
-                ExitTabs.class, null);
+        // Set title
+        String title = getString(R.string.title_exit) + " (" + new mavonie.subterminal.Models.Exit().count(getQuery().getParams()) + ")";
+        MainActivity.getActivity().setTitle(title);
+    }
 
-        return rootView;
+    @Override
+    protected String getItemClass() {
+        return mavonie.subterminal.Models.Exit.class.getCanonicalName();
     }
-}
+}