Merge pull request #101 from ItsCalebJones/dev

Space Launch Now v2.0.0

.gitignore

@@ -19,3 +19,5 @@ projectFilesBackup/.idea/workspace.xml
 
 *.apk
 
+keystore.properties
+mobile/keystore.properties

build.gradle

@@ -7,12 +7,12 @@ buildscript {
         google()
     }
     dependencies {
-        classpath "io.realm:realm-gradle-plugin:4.2.0"
+        classpath "io.realm:realm-gradle-plugin:4.3.1"
         classpath 'com.android.tools.build:gradle:3.0.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'org.moallemi.gradle.advanced-build-version:gradle-plugin:1.6.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
     }
@@ -34,9 +34,10 @@ task clean(type: Delete) {
 ext {
 
     app = [
-            versionMajor : 1,
-            versionMinor : 8,
-            versionPatch : 2
+            versionMajor : 2,
+            versionMinor : 0,
+            versionPatch : 0
+
     ]
     // Sdk and tools
     minSdkVersion = 15
@@ -45,8 +46,8 @@ ext {
     buildToolsVersion = '23.0.3'
 
     // App dependencies
-    supportLibraryVersion = '27.0.1'
-    playServicesVersion = '11.6.0'
+    supportLibraryVersion = '27.0.2'
+    playServicesVersion = '11.8.0'
 
     sdk = 25
     buildTools = "25.0.0" //keep 25.0.0 for Continuous Integration

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Constants.java

@@ -24,15 +24,17 @@ public final class Constants {
     public static final String ACTION_GET_UP_LAUNCHES_MINI = "GET_UP_LAUNCHES_MINI";
     public static final String ACTION_UPDATE_LAUNCH_CARD = "UPDATE_LAUNCH_CARD";
     public static final String ACTION_UPDATE_WORD_TIMER = "UPDATE_WORD_TIMER";
+    public static final String ACTION_UPDATE_LAUNCH_LIST = "UPDATE_LAUNCH_LIST";
     public static int NOTIF_ID = 568975;
-
     public static int NOTIF_ID_DAY = 568985;
     public static int NOTIF_ID_HOUR = 568995;
 
     public static int DB_SCHEMA_VERSION_1_5_5 = 188;
     public static int DB_SCHEMA_VERSION_1_5_6 = 189;
     public static int DB_SCHEMA_VERSION_1_8_0 = 320;
     public static int DB_SCHEMA_VERSION_1_8_1 = 322;
+    public static int DB_SCHEMA_VERSION_1_8_2 = 323;
+    public static int DB_SCHEMA_VERSION_2_0_0 = 324;
 
     public static String FORECAST_IO_BASE_URL = "https://api.forecast.io/";
     public static String API_BASE_URL = "https://api.spacelaunchnow.me/";

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Agency.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Agency.java

@@ -1,5 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Family.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Family.java

@@ -1,4 +1,4 @@
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/LSP.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/LSP.java

@@ -1,4 +1,4 @@
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Launch.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Launch.java

@@ -1,7 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
-
-import com.google.gson.annotations.SerializedName;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import java.util.Date;
 
@@ -38,6 +36,7 @@ public class Launch extends RealmObject {
 
     private Integer inhold;
     private Integer tbdtime;
+    private Integer tbddate;
     private Integer eventID;
 
     private Location location;
@@ -367,4 +366,11 @@ public void setLsp(LSP lsp) {
         this.lsp = lsp;
     }
 
+    public Integer getTbddate() {
+        return tbddate;
+    }
+
+    public void setTbddate(Integer tbddate) {
+        this.tbddate = tbddate;
+    }
 }

data/src/main/java/me/calebjones/spacelaunchnow/data/models/LaunchMini.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/LaunchMini.java

@@ -1,5 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import java.util.Date;
 

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Location.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Location.java

@@ -1,5 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Mission.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Mission.java

@@ -1,5 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Pad.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Pad.java

@@ -1,5 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/Rocket.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/Rocket.java

@@ -1,5 +1,5 @@
 
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;

data/src/main/java/me/calebjones/spacelaunchnow/data/models/RocketFamily.java → data/src/main/java/me/calebjones/spacelaunchnow/data/models/launchlibrary/RocketFamily.java

@@ -1,4 +1,4 @@
-package me.calebjones.spacelaunchnow.data.models;
+package me.calebjones.spacelaunchnow.data.models.launchlibrary;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;