Routes pre-packaged to App at Build Time

.gitignore

@@ -1,14 +1,14 @@
 .gradle
 *.iml
 /.idea/*
+*assets/cache
 .DS_Store
 /app/.DS_Store
 apks/
 /app/apks
 /app/src/debug/res/values/google_maps_api.xml
 /app/src/release/res/values/google_maps_api.xml
-/app/build/
-/build/
+build/
 /local.properties
 /captures
-/secrets.properties
+/secrets.properties

app/build.gradle

@@ -8,6 +8,7 @@ apply plugin: 'com.github.ben-manes.versions'
 
 android.buildTypes.each { type ->
     type.buildConfigField 'String', 'PAT_API_KEY', keys.truetime.release // variable defined in `../build.gradle`
+    type.buildConfigField 'String', "PAT_API_BASE_URL", "\"${baseUrls.truetime}\""
 }
 
 android {
@@ -48,6 +49,8 @@ repositories {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile project(path: ':pat-static')
+
     repositories {
         mavenCentral()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
@@ -70,13 +73,6 @@ dependencies {
     compile "io.reactivex:rxandroid:${versions.rx.java}"
     compile "io.reactivex:rxjava:${versions.rx.java}"
     compile "com.github.pwittchen:reactivenetwork:${versions.rx.network}"
-
-    compile "com.squareup.retrofit2:retrofit:${versions.square.retrofit}"
-    compile "com.squareup.retrofit2:converter-gson:${versions.square.retrofit}"
-    compile "com.squareup.retrofit2:adapter-rxjava:${versions.square.retrofit}"
-    compile "org.glassfish:javax.annotation:${versions.java.annotation}"
-    compile "com.squareup.okhttp3:okhttp:${versions.square.okHttp}"
-
     compile "com.jakewharton.timber:timber:${versions.square.timber}"
 
     debugCompile "com.squareup.leakcanary:leakcanary-android:${versions.square.leakCanary}"

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/PatternSelection.java

@@ -1,15 +1,14 @@
 package rectangledbmi.com.pittsburghrealtimetracker.patterns;
 
 import com.google.android.gms.maps.model.LatLng;
+import com.rectanglel.patstatic.patterns.polylines.PolylineView;
+import com.rectanglel.patstatic.patterns.response.Ptr;
 
 import java.util.List;
 
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.polylines.PolylineView;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Ptr;
-
 /**
  * <p>Data Transfer Object that transfers meta info for {@link com.google.android.gms.maps.model.Polyline}
- * creation from the {@link rectangledbmi.com.pittsburghrealtimetracker.patterns.PatternViewModel}
+ * creation from the {@link PatternViewModel}
  * to the {@link PolylineView}.</p>
  *
  * <p>The contract of this class should be that if {@link #isSelected()} is `false`, {@link #getPatterns()}

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/PatternViewModel.java

@@ -13,22 +13,26 @@
 import java.util.Map;
 import java.util.Set;
 
-import rectangledbmi.com.pittsburghrealtimetracker.model.PatApiService;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Pt;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Ptr;
+import com.rectanglel.patstatic.model.PatApiService;
+import com.rectanglel.patstatic.patterns.polylines.PolylineView;
+import com.rectanglel.patstatic.patterns.response.Pt;
+import com.rectanglel.patstatic.patterns.response.Ptr;
+import com.rectanglel.patstatic.patterns.stops.StopView;
 import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either.EitherStopState;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either.MapState;
 import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.rendering.StopRenderRequest;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.selection.StopRenderState;
 import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.rendering.StopRequestAccumulator;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.selection.StopSelection;
+
+import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either.MapState;
 import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either.FullStopSelectionState;
+
+import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.StopRenderState;
+import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.StopSelection;
 import rectangledbmi.com.pittsburghrealtimetracker.selection.Route;
 import rx.Observable;
 import timber.log.Timber;
 
 /**
- * <p>Contains the logic of the {@link rectangledbmi.com.pittsburghrealtimetracker.patterns.polylines.PolylineView} for pre-processing the patternSelections.</p>
+ * <p>Contains the logic of the {@link PolylineView} for pre-processing the patternSelections.</p>
  * <p>Created by epicstar on 7/18/16.</p>
  *
  * @author Jeremy Jao
@@ -76,7 +80,7 @@ private static Observable<PatternSelection> createPatternSelection(PatApiService
     }
 
     /**
-     * <p>Gets an observable so the {@link rectangledbmi.com.pittsburghrealtimetracker.patterns.polylines.PolylineView} can listen to actions to create, show,
+     * <p>Gets an observable so the {@link PolylineView} can listen to actions to create, show,
      * or make a {@link com.google.android.gms.maps.model.Polyline} disappear.</p>
      * <p>{@link PatternSelection#getPatterns()} will be `null` if {@link PatternSelection#isSelected()}
      * is `false`. Otherwise, it will be not be `null` unless the polyline data was unable to </p>
@@ -104,7 +108,7 @@ public Observable<PatternSelection> getPatternSelections() {
     }
 
     /**
-     * <p>Gets an observable so the {@link rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.StopView} only needs
+     * <p>Gets an observable so the {@link StopView} only needs
      *    to implement an {@link rx.Observer} can listen to changes to the state of visible stops.</p>
      * <p>Internally, this will store state changes to map camera and selection changes such that
      *    the only items being emitted will be whether or not a stop will show or not.</p>

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/selection/StopRenderState.java → app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/StopRenderState.java

@@ -1,6 +1,6 @@
-package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.selection;
+package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops;
 
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Pt;
+import com.rectanglel.patstatic.patterns.response.Pt;
 
 /**
  * <p>Rendering info for holding selection states for stops</p>

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/selection/StopSelection.java → app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/StopSelection.java

@@ -1,8 +1,8 @@
-package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.selection;
+package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops;
 
-import java.util.Collection;
+import com.rectanglel.patstatic.patterns.response.Pt;
 
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Pt;
+import java.util.Collection;
 
 /**
  * <p>Immediate selection info for getStopRenderRequests.</p>

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/either/EitherStopState.java

@@ -1,10 +1,11 @@
 package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either;
 
+import rectangledbmi.com.pittsburghrealtimetracker.patterns.PatternViewModel;
 import rx.Observable;
 
 /**
  * <p>Workaround for emitting a zoom or selection state from {@link rx.Observable#merge(Iterable)}
- *    in {@link rectangledbmi.com.pittsburghrealtimetracker.patterns.PatternViewModel#getStopRenderRequests(Observable)}</p>
+ *    in {@link PatternViewModel#getStopRenderRequests(Observable)}</p>
  * <p>Created by epicstar on 10/9/16.</p>
  *
  * @param <T> the class type that is encapsulated in this interface

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/either/FullStopSelectionState.java

@@ -1,9 +1,10 @@
 package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either;
 
+
 import java.util.HashMap;
 import java.util.Map;
 
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.selection.StopRenderState;
+import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.StopRenderState;
 
 /**
  * <p>DTO for the full selection state for stops.</p>

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/rendering/StopRenderRequest.java

@@ -1,6 +1,6 @@
 package rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.rendering;
 
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Pt;
+import com.rectanglel.patstatic.patterns.response.Pt;
 
 /**
  * <p>Rendering info for getStopRenderRequests</p>

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/patterns/stops/rendering/StopRequestAccumulator.java

@@ -4,10 +4,9 @@
 
 import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either.FullStopSelectionState;
 import rectangledbmi.com.pittsburghrealtimetracker.patterns.stops.either.MapState;
-import rx.Observable;
 
 /**
- * <p>DTO for {@link rectangledbmi.com.pittsburghrealtimetracker.patterns.PatternViewModel#getStopRenderRequests(Observable)}
+ * <p>DTO for a pattern view model
  *    to store the selection state, map state, and immediate changes for stop visibility.</p>
  * <p>Created by epicstar on 10/8/16.</p>
  * @author Jeremy Jao

app/src/main/java/rectangledbmi/com/pittsburghrealtimetracker/predictions/PredictionsViewModel.java

@@ -5,9 +5,11 @@
 import java.util.HashSet;
 import java.util.concurrent.TimeUnit;
 
-import rectangledbmi.com.pittsburghrealtimetracker.model.PatApiService;
-import rectangledbmi.com.pittsburghrealtimetracker.patterns.response.Pt;
-import rectangledbmi.com.pittsburghrealtimetracker.vehicles.response.Vehicle;
+import com.rectanglel.patstatic.model.PatApiService;
+import com.rectanglel.patstatic.patterns.response.Pt;
+import com.rectanglel.patstatic.predictions.PredictionsType;
+import com.rectanglel.patstatic.vehicles.response.Vehicle;
+
 import rx.Single;
 import timber.log.Timber;