Add House Styles Switcher (#803)

* #793 - Updating SDK, Tools, and Support Libraries to API 25

* #793 - Updating CircleCI to use Android 25

*  #700 - Adding House Styles switcher to Settings

* #700 - Importing specific classes instead of wildcard package

* #700 - Updating tests

app/build.gradle

@@ -122,8 +122,8 @@ gradle.startParameter.getTaskNames().each { task ->
 }
 
 dependencies {
-  compile 'com.android.support:appcompat-v7:25.0.1'
-  compile 'com.android.support:support-v4:25.0.1'
+  compile 'com.android.support:appcompat-v7:25.1.0'
+  compile 'com.android.support:support-v4:25.1.0'
   compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   compile 'com.mapzen:mapzen-android-sdk:1.2.1'
   compile "com.google.dagger:dagger:$dagger_version"

app/src/main/kotlin/com/mapzen/erasermap/controller/MainActivity.kt

@@ -22,7 +22,13 @@ import android.widget.RelativeLayout
 import android.widget.Toast
 import com.mapzen.android.graphics.MapView
 import com.mapzen.android.graphics.MapzenMap
+import com.mapzen.android.graphics.model.BubbleWrapStyle
 import com.mapzen.android.graphics.model.CameraType
+import com.mapzen.android.graphics.model.CinnabarStyle
+import com.mapzen.android.graphics.model.MapStyle
+import com.mapzen.android.graphics.model.RefillStyle
+import com.mapzen.android.graphics.model.WalkaboutStyle
+import com.mapzen.android.graphics.model.ZincStyle
 import com.mapzen.android.lost.api.Status
 import com.mapzen.android.search.MapzenSearch
 import com.mapzen.erasermap.CrashReportService
@@ -211,6 +217,10 @@ class MainActivity : AppCompatActivity(), MainViewController,
         autoCompleteAdapter?.notifyDataSetChanged()
         invalidateOptionsMenu()
 
+        // Update Style all the time, as there's no access
+        // to MapzenMap.getStyle() (yet)
+        setMapStyle(settings.mapzenStyle)
+
         if (enableLocation) {
             enableLocation = false
             checkPermissionAndEnableLocation()
@@ -668,6 +678,22 @@ class MainActivity : AppCompatActivity(), MainViewController,
         mapzenMap?.setZoom(zoom, duration)
     }
 
+    override fun setMapStyle(styleKey: String) {
+        val index = resources.getStringArray(R.array.mapzen_styles_values).indexOf(styleKey)
+        Log.i("MainActivity", "Style = " + styleKey + "; Index = " + index)
+
+        var mapStyle:MapStyle
+        when (index) {
+            0 -> mapStyle = BubbleWrapStyle()
+            1 -> mapStyle = RefillStyle()
+            2 -> mapStyle = WalkaboutStyle()
+            3 -> mapStyle = CinnabarStyle()
+            4 -> mapStyle = ZincStyle()
+            else -> mapStyle = BubbleWrapStyle()
+        }
+        mapzenMap?.setStyle(mapStyle)
+    }
+
     override fun placeSearch(gid: String) {
         mapzenSearch.setLocationProvider(presenter.getPeliasLocationProvider())
         mapzenSearch.place(gid, (PlaceCallback()))

app/src/main/kotlin/com/mapzen/erasermap/controller/MainViewController.kt

@@ -83,6 +83,7 @@ interface MainViewController {
     fun setMapPosition(lngLat: LngLat, duration: Int)
     fun setMapZoom(zoom: Float)
     fun setMapZoom(zoom: Float, duration: Int)
+    fun setMapStyle(styleKey: String)
     fun getCurrentSearchPosition(): Int
     fun toastify(resId: Int)
     fun focusSearchView()

app/src/main/kotlin/com/mapzen/erasermap/model/AndroidAppSettings.kt

@@ -17,6 +17,7 @@ class AndroidAppSettings(val application: EraserMapApplication) : AppSettings {
 
     companion object {
         val KEY_DISTANCE_UNITS: String = "list_distance_units"
+        val KEY_MAPZEN_STYLES: String = "list_mapzen_styles"
         val KEY_MOCK_LOCATION_ENABLED: String = "checkbox_mock_location"
         val KEY_MOCK_LOCATION_VALUE: String = "edittext_mock_location"
         val KEY_MOCK_ROUTE_ENABLED: String = "checkbox_mock_route"
@@ -54,6 +55,18 @@ class AndroidAppSettings(val application: EraserMapApplication) : AppSettings {
             prefs.edit().putString(KEY_DISTANCE_UNITS, value.toString()).commit()
         }
 
+    override var mapzenStyle: String
+        get()  {
+            val value = prefs.getString(KEY_MAPZEN_STYLES, null)
+            if (value != null) {
+                return value
+            }
+            return application.applicationContext.getString(R.string.styles_default);
+        }
+        set(value) {
+            prefs.edit().putString(KEY_MAPZEN_STYLES, value).commit()
+        }
+
     /**
      * Mock location checkbox setting.
      */

app/src/main/kotlin/com/mapzen/erasermap/model/AppSettings.kt

@@ -9,6 +9,7 @@ import java.io.File
 
 interface AppSettings {
     var distanceUnits: MapzenRouter.DistanceUnits
+    var mapzenStyle: String
     var isMockLocationEnabled: Boolean
     var mockLocation: Location
     var isMockRouteEnabled: Boolean

app/src/main/kotlin/com/mapzen/erasermap/view/SettingsFragment.kt

@@ -41,6 +41,7 @@ public class SettingsFragment : PreferenceFragment(), Preference.OnPreferenceCha
             initMockDebugPrefs()
         }
         initDistanceUnitsPref()
+        initMapzenStylesPref()
         initEraseHistoryPref()
     }
 
@@ -50,6 +51,10 @@ public class SettingsFragment : PreferenceFragment(), Preference.OnPreferenceCha
                 updateDistanceUnitsPref(preference, value)
                 return true
             }
+            if (AndroidAppSettings.KEY_MAPZEN_STYLES.equals(preference.key)) {
+                updateMapzenStylesPref(preference, value)
+                return true
+            }
         }
         if (preference is Preference && value is Boolean) {
             if (AndroidAppSettings.KEY_TILE_DEBUG_ENABLED.equals(preference.key)) {
@@ -96,12 +101,25 @@ public class SettingsFragment : PreferenceFragment(), Preference.OnPreferenceCha
         findPreference(key).onPreferenceChangeListener = this
     }
 
+    private fun initMapzenStylesPref() {
+        val key = AndroidAppSettings.KEY_MAPZEN_STYLES
+        val value = settings?.mapzenStyle
+        updateMapzenStylesPref(findPreference(key), value.toString())
+        findPreference(key).onPreferenceChangeListener = this
+    }
+
     private fun updateDistanceUnitsPref(preference: Preference, value: String) {
         val index = resources.getStringArray(R.array.distance_units_values).indexOf(value)
         val text = resources.getStringArray(R.array.distance_units_entries)[index]
         preference.summary = text
     }
 
+    private fun updateMapzenStylesPref(preference: Preference, value: String) {
+        val index = resources.getStringArray(R.array.mapzen_styles_values).indexOf(value)
+        val text = resources.getStringArray(R.array.mapzen_styles_entries)[index]
+        preference.summary = text
+    }
+
     private fun initTileDebugPref() {
         findPreference(AndroidAppSettings.KEY_TILE_DEBUG_ENABLED).onPreferenceChangeListener = this
         updateTileDebugPref(settings?.isTileDebugEnabled ?: false)

app/src/main/res/values/arrays.xml

@@ -8,4 +8,18 @@
         <item>miles</item>
         <item>kilometers</item>
     </string-array>
+    <string-array name="mapzen_styles_entries">
+        <item>Bubble Wrap</item>
+        <item>Refill</item>
+        <item>Walkabout</item>
+        <item>Cinnabar</item>
+        <item>Zinc</item>
+    </string-array>
+    <string-array name="mapzen_styles_values">
+        <item>bubbleWrap</item>
+        <item>refill</item>
+        <item>walkabout</item>
+        <item>cinnabar</item>
+        <item>zinc</item>
+    </string-array>
 </resources>

app/src/main/res/values/settings.xml

@@ -3,6 +3,11 @@
     <!-- Routing category -->
     <string name="category_routing_title">Routing</string>
 
+    <!-- Styles -->
+    <string name="category_styles">House Styles</string>
+    <string name="styles_title">Styles</string>
+    <string name="styles_default">bubbleWrap</string>
+
     <!-- Privacy category -->
     <string name="category_privacy_title">Privacy</string>
 

app/src/main/res/xml/preferences.xml

@@ -12,6 +12,17 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/category_styles">
+
+        <ListPreference
+            android:key="list_mapzen_styles"
+            android:title="@string/styles_title"
+            android:entries="@array/mapzen_styles_entries"
+            android:entryValues="@array/mapzen_styles_values"
+            android:defaultValue="@string/styles_default"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/category_privacy_title">
 
         <com.mapzen.erasermap.view.ReadOnlyPreference

app/src/test/kotlin/com/mapzen/erasermap/controller/TestMainController.kt

@@ -14,6 +14,7 @@ class TestMainController : MainViewController {
     var reverseGeoCodeResults: List<Feature>? = null
     var lngLat: LngLat? = null
     var zoom: Float = 0f
+    var mapzenStyle: String = ""
     var tilt: Float = 0f
     var muted: Boolean = false
     var rotation: Float = 0f
@@ -214,7 +215,7 @@ class TestMainController : MainViewController {
     override fun placeSearch(gid: String) {
         placeSearchPoint = LngLat(0.0, 0.0)
     }
- 
+
 //    override fun emptyPlaceSearch() {
 //        isReverseGeocodeVisible = true
 //    }
@@ -369,6 +370,10 @@ class TestMainController : MainViewController {
         this.zoom = zoom
     }
 
+    override fun setMapStyle(styleKey: String) {
+        this.mapzenStyle = styleKey
+    }
+
     override fun getCurrentSearchPosition(): Int {
         return currentSearchItemPosition
     }

app/src/test/kotlin/com/mapzen/erasermap/model/TestAppSettings.kt

@@ -10,6 +10,7 @@ import java.io.File
 
 class TestAppSettings : AppSettings {
     override var distanceUnits: MapzenRouter.DistanceUnits = MapzenRouter.DistanceUnits.MILES
+    override var mapzenStyle: String = "bubbleWrap"
     override var isMockLocationEnabled: Boolean = false
     override var mockLocation: Location = TestHelper.getTestAndroidLocation()
     override var isMockRouteEnabled: Boolean = false

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.2.2'
+    classpath 'com.android.tools.build:gradle:2.2.3'
   }
 }