Migrate to Android SDK 1.0.8, Tangram 0.4.1 (#714)

* Migrate to tangram 0.4.1 via android sdk 1.0.7 * Android SDK 1.0.8
mapzen · Aug 5, 2016 · 4cddb50 · 4cddb50
1 parent d6e0fe6
commit 4cddb50
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 45 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -128,7 +128,7 @@ gradle.startParameter.getTaskNames().each { task ->
 dependencies {
   compile 'com.android.support:appcompat-v7:23.4.0'
   compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  compile 'com.mapzen:mapzen-android-sdk:1.0.7-SNAPSHOT'
+  compile 'com.mapzen:mapzen-android-sdk:1.0.8'
   compile 'com.google.dagger:dagger:2.0'
   compile 'com.google.dagger:dagger-compiler:2.0'
   compile 'javax.annotation:javax.annotation-api:1.2'

diff --git a/app/src/main/java/com/mapzen/erasermap/AndroidModule.java b/app/src/main/java/com/mapzen/erasermap/AndroidModule.java
@@ -1,7 +1,7 @@
 package com.mapzen.erasermap;
 
-import com.mapzen.android.ApiKeyConstants;
-import com.mapzen.android.MapzenSearch;
+import com.mapzen.android.core.ApiKeyConstants;
+import com.mapzen.android.search.MapzenSearch;
 import com.mapzen.android.lost.api.LostApiClient;
 import com.mapzen.erasermap.model.AndroidAppSettings;
 import com.mapzen.erasermap.model.ApiKeys;

diff --git a/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java b/app/src/main/java/com/mapzen/erasermap/EraserMapApplication.java
@@ -1,7 +1,6 @@
 package com.mapzen.erasermap;
 
 import com.mapzen.erasermap.controller.MainActivity;
-import com.mapzen.erasermap.model.ApiKeys;
 import com.mapzen.erasermap.receiver.MockLocationReceiver;
 import com.mapzen.erasermap.view.DistanceView;
 import com.mapzen.erasermap.view.InitActivity;
@@ -12,9 +11,6 @@
 import com.mapzen.erasermap.view.ViewAboutPreference;
 import com.mapzen.erasermap.view.VoiceNavigationController;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import android.app.Application;
 
 import javax.inject.Singleton;

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt b/app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt
@@ -20,11 +20,11 @@ import android.widget.LinearLayout
 import android.widget.RadioButton
 import android.widget.RelativeLayout
 import android.widget.Toast
-import com.mapzen.android.MapView
-import com.mapzen.android.MapzenMap
-import com.mapzen.android.MapzenSearch
+import com.mapzen.android.graphics.MapView
+import com.mapzen.android.graphics.MapzenMap
+import com.mapzen.android.search.MapzenSearch
 import com.mapzen.android.lost.api.LocationServices
-import com.mapzen.android.model.CameraType
+import com.mapzen.android.graphics.model.CameraType
 import com.mapzen.erasermap.CrashReportService
 import com.mapzen.erasermap.EraserMapApplication
 import com.mapzen.erasermap.R
@@ -241,6 +241,7 @@ class MainActivity : AppCompatActivity(), MainViewController,
     }
 
     private fun configureMapzenMap() {
+        mapzenMap?.setPersistMapData(true)
         mapzenMap?.setLongPressResponder({
             x, y ->
             confidenceHandler.longPressed = true

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt
@@ -3,8 +3,8 @@ package com.mapzen.erasermap.model
 import android.content.Context
 import android.location.Location
 import android.preference.PreferenceManager
-import com.mapzen.android.MapzenMap
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.graphics.MapzenMap
+import com.mapzen.android.routing.MapzenRouter
 import com.mapzen.erasermap.EraserMapApplication
 import com.mapzen.erasermap.R
 import com.mapzen.pelias.SavedSearch

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt
@@ -2,8 +2,8 @@ package com.mapzen.erasermap.model
 
 import android.content.Context
 import android.location.Location
-import com.mapzen.android.MapzenMap
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.graphics.MapzenMap
+import com.mapzen.android.routing.MapzenRouter
 import com.mapzen.pelias.SavedSearch
 import java.io.File
 

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocation.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocation.kt
@@ -1,7 +1,7 @@
 package com.mapzen.erasermap.model
 
 import android.location.Location
-import com.mapzen.android.MapzenMap
+import com.mapzen.android.graphics.MapzenMap
 import com.mapzen.pelias.PeliasLocationProvider
 
 interface MapzenLocation : PeliasLocationProvider {

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocationImpl.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/MapzenLocationImpl.kt
@@ -5,7 +5,7 @@ import android.graphics.PointF
 import android.location.Location
 import android.util.Log
 import android.view.WindowManager
-import com.mapzen.android.MapzenMap
+import com.mapzen.android.graphics.MapzenMap
 import com.mapzen.android.lost.api.LocationRequest
 import com.mapzen.android.lost.api.LocationServices
 import com.mapzen.android.lost.api.LostApiClient

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/RouterFactory.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/RouterFactory.kt
@@ -1,7 +1,7 @@
 package com.mapzen.erasermap.model
 
 import android.content.Context
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.routing.MapzenRouter
 
 interface RouterFactory {
     public fun getRouter(context: Context): MapzenRouter

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaHttpHandler.java b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaHttpHandler.java
@@ -1,7 +1,6 @@
 package com.mapzen.erasermap.model;
 
-import com.mapzen.android.TurnByTurnHttpHandler;
-import com.mapzen.valhalla.HttpHandler;
+import com.mapzen.android.routing.TurnByTurnHttpHandler;
 
 import retrofit.RequestInterceptor;
 import retrofit.RestAdapter;

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouteManager.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouteManager.kt
@@ -1,7 +1,7 @@
 package com.mapzen.erasermap.model
 
 import android.content.Context
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.routing.MapzenRouter
 import com.mapzen.erasermap.BuildConfig
 import com.mapzen.model.ValhallaLocation
 import com.mapzen.pelias.SimpleFeature

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouterFactory.kt b/app/src/main/kotlin/com/mapzen/erasermap/model/ValhallaRouterFactory.kt
@@ -1,7 +1,7 @@
 package com.mapzen.erasermap.model
 
 import android.content.Context
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.routing.MapzenRouter
 
 public class ValhallaRouterFactory : RouterFactory {
     override fun getRouter(context: Context): MapzenRouter {

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/DistanceView.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/DistanceView.kt
@@ -3,7 +3,7 @@ package com.mapzen.erasermap.view
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.TextView
-import com.mapzen.android.MapzenDistanceFormatter
+import com.mapzen.android.routing.MapzenDistanceFormatter
 import com.mapzen.erasermap.EraserMapApplication
 import com.mapzen.erasermap.model.AppSettings
 import javax.inject.Inject

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/RouteModeView.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/RouteModeView.kt
@@ -15,8 +15,8 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.mapzen.android.MapzenMap
-import com.mapzen.android.model.EaseType
+import com.mapzen.android.graphics.MapzenMap
+import com.mapzen.android.graphics.model.EaseType
 import com.mapzen.erasermap.EraserMapApplication
 import com.mapzen.erasermap.R
 import com.mapzen.erasermap.model.AppSettings

diff --git a/app/src/main/kotlin/com/mapzen/erasermap/view/SearchResultsView.kt b/app/src/main/kotlin/com/mapzen/erasermap/view/SearchResultsView.kt
@@ -11,7 +11,7 @@ import android.view.inputmethod.EditorInfo
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.mapzen.android.MapzenSearch
+import com.mapzen.android.search.MapzenSearch
 import com.mapzen.erasermap.EraserMapApplication
 import com.mapzen.erasermap.R
 import com.mapzen.erasermap.controller.MainActivity

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:background="@color/color_primary"
     tools:context=".MainActivity">
 
-    <com.mapzen.android.MapView
+    <com.mapzen.android.graphics.MapView
         android:id="@+id/map"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/test/java/com/mapzen/erasermap/TestAndroidModule.java b/app/src/test/java/com/mapzen/erasermap/TestAndroidModule.java
@@ -1,6 +1,6 @@
 package com.mapzen.erasermap;
 
-import com.mapzen.android.MapzenSearch;
+import com.mapzen.android.search.MapzenSearch;
 import com.mapzen.android.lost.api.LostApiClient;
 import com.mapzen.erasermap.model.ApiKeys;
 import com.mapzen.erasermap.model.AppSettings;
@@ -20,7 +20,6 @@
 import com.mapzen.erasermap.util.MockIntentFactory;
 import com.mapzen.erasermap.view.Speaker;
 import com.mapzen.erasermap.view.TestSpeakerbox;
-import com.mapzen.pelias.Pelias;
 
 import com.squareup.otto.Bus;
 

diff --git a/app/src/test/kotlin/com/mapzen/erasermap/model/TestAppSettings.kt b/app/src/test/kotlin/com/mapzen/erasermap/model/TestAppSettings.kt
@@ -2,14 +2,13 @@ package com.mapzen.erasermap.model
 
 import android.content.Context
 import android.location.Location
-import com.mapzen.android.MapzenMap
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.graphics.MapzenMap
+import com.mapzen.android.routing.MapzenRouter
 import com.mapzen.erasermap.dummy.TestHelper
 import com.mapzen.pelias.SavedSearch
-import com.mapzen.valhalla.Router
 import java.io.File
 
-public class TestAppSettings : AppSettings {
+class TestAppSettings : AppSettings {
     override var distanceUnits: MapzenRouter.DistanceUnits = MapzenRouter.DistanceUnits.MILES
     override var isMockLocationEnabled: Boolean = false
     override var mockLocation: Location = TestHelper.getTestAndroidLocation()

diff --git a/app/src/test/kotlin/com/mapzen/erasermap/model/TestMapzenLocation.kt b/app/src/test/kotlin/com/mapzen/erasermap/model/TestMapzenLocation.kt
@@ -1,12 +1,12 @@
 package com.mapzen.erasermap.model
 
 import android.location.Location
-import com.mapzen.android.MapzenMap
+import com.mapzen.android.graphics.MapzenMap
 import com.mapzen.pelias.BoundingBox
 import org.mockito.Mockito
 
-public class TestMapzenLocation : MapzenLocation {
-    public var connected = false
+class TestMapzenLocation : MapzenLocation {
+    var connected = false
 
     override var mapzenMap: MapzenMap? = null
 

diff --git a/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouter.kt b/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouter.kt
@@ -1,16 +1,16 @@
 package com.mapzen.erasermap.model
 
 import android.content.Context
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.routing.MapzenRouter
 import com.mapzen.valhalla.RouteCallback
 import java.util.ArrayList
 
-public class TestRouter(context: Context) : MapzenRouter(context) {
-    public var locations: ArrayList<DoubleArray> = ArrayList()
-    public var isFetching: Boolean = false
-    public var units: MapzenRouter.DistanceUnits = MapzenRouter.DistanceUnits.MILES
-    public var bearing: Float = 0f
-    public var name: String? = null
+class TestRouter(context: Context) : MapzenRouter(context) {
+    var locations: ArrayList<DoubleArray> = ArrayList()
+    var isFetching: Boolean = false
+    var units: MapzenRouter.DistanceUnits = MapzenRouter.DistanceUnits.MILES
+    var bearing: Float = 0f
+    var name: String? = null
 
     override fun clearLocations(): MapzenRouter {
         locations.clear()

diff --git a/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouterFactory.kt b/app/src/test/kotlin/com/mapzen/erasermap/model/TestRouterFactory.kt
@@ -1,9 +1,9 @@
 package com.mapzen.erasermap.model
 
 import android.content.Context
-import com.mapzen.android.MapzenRouter
+import com.mapzen.android.routing.MapzenRouter
 
-public class TestRouterFactory : RouterFactory {
+class TestRouterFactory : RouterFactory {
 
     companion object {
         var router: TestRouter? = null