From 7a2548edf1fa54bb2c910d5d20e43f2c4033c0f5 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Wed, 15 Apr 2015 14:30:09 +1000
Subject: [PATCH] Update Android to use new styles

---
 .../mapbox/mapboxgl/testapp/MainActivity.java | 58 ++++++++-----------
 .../src/main/res/values/strings.xml           | 16 ++---
 2 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
index bd7100d98..65cb17462 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
@@ -128,8 +128,6 @@ public class MainActivity extends ActionBarActivity {
         mClassSpinner = (Spinner) findViewById(R.id.spinner_class);
         mOutdoorsClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.outdoors_class_list, android.R.layout.simple_spinner_dropdown_item);
-        mSatelliteClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
-                R.array.satellite_class_list, android.R.layout.simple_spinner_dropdown_item);
 
         // Prepare for GPS
         mLocationClient = new LostApiClient.Builder(this).build();
@@ -318,18 +316,37 @@ public class MainActivity extends ActionBarActivity {
         @Override
         public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
             switch (position) {
-                // Bright
+
+                // Mapbox Streets
                 case 0:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/bright-v7.json");
+                    mMapFragment.getMap().setStyleUrl("asset://styles/mapbox-streets-v7.json");
                     mMapFragment.getMap().removeAllClasses();
                     mClassSpinner.setVisibility(View.INVISIBLE);
                     mClassSpinner.setAdapter(null);
                     mClassSpinner.setOnItemSelectedListener(null);
                     break;
 
-                // Basic
+                // Emerald
                 case 1:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/basic-v7.json");
+                    mMapFragment.getMap().setStyleUrl("asset://styles/emerald-v7.json");
+                    mMapFragment.getMap().removeAllClasses();
+                    mClassSpinner.setVisibility(View.INVISIBLE);
+                    mClassSpinner.setAdapter(null);
+                    mClassSpinner.setOnItemSelectedListener(null);
+                    break;
+
+                // Light
+                case 2:
+                    mMapFragment.getMap().setStyleUrl("asset://styles/light-v7.json");
+                    mMapFragment.getMap().removeAllClasses();
+                    mClassSpinner.setVisibility(View.INVISIBLE);
+                    mClassSpinner.setAdapter(null);
+                    mClassSpinner.setOnItemSelectedListener(null);
+                    break;
+
+                // Dark
+                case 3:
+                    mMapFragment.getMap().setStyleUrl("asset://styles/dark-v7.json");
                     mMapFragment.getMap().removeAllClasses();
                     mClassSpinner.setVisibility(View.INVISIBLE);
                     mClassSpinner.setAdapter(null);
@@ -337,7 +354,7 @@ public class MainActivity extends ActionBarActivity {
                     break;
 
                 // Outdoors
-                case 2:
+                case 4:
                     mMapFragment.getMap().setStyleUrl("asset://styles/outdoors-v7.json");
                     mMapFragment.getMap().removeAllClasses();
                     mClassSpinner.setVisibility(View.VISIBLE);
@@ -345,33 +362,6 @@ public class MainActivity extends ActionBarActivity {
                     mClassSpinner.setOnItemSelectedListener(new OutdoorClassSpinnerListener());
                     break;
 
-                // Satellite
-                case 3:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/satellite-v7.json");
-                    mMapFragment.getMap().removeAllClasses();
-                    mClassSpinner.setVisibility(View.VISIBLE);
-                    mClassSpinner.setAdapter(mSatelliteClassAdapter);
-                    mClassSpinner.setOnItemSelectedListener(new SatelliteClassSpinnerListener());
-                    break;
-
-                // Pencil
-                case 4:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/pencil-v7.json");
-                    mMapFragment.getMap().removeAllClasses();
-                    mClassSpinner.setVisibility(View.INVISIBLE);
-                    mClassSpinner.setAdapter(null);
-                    mClassSpinner.setOnItemSelectedListener(null);
-                    break;
-
-                // Empty
-                case 5:
-                    mMapFragment.getMap().setStyleUrl("asset://styles/empty-v7.json");
-                    mMapFragment.getMap().removeAllClasses();
-                    mClassSpinner.setVisibility(View.INVISIBLE);
-                    mClassSpinner.setAdapter(null);
-                    mClassSpinner.setOnItemSelectedListener(null);
-                    break;
-
                 default:
                     onNothingSelected(parent);
                     break;
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 7b4e51b47..901e23192 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -12,12 +12,10 @@
     <string name="compass_desc">Map compass. Click to reset the map rotation to North.</string>
 
     <string-array name="style_list">
-        <item>Bright</item>
-        <item>Basic</item>
-        <item>Outdoors</item>
-        <item>Satellite</item>
-        <item>Pencil</item>
-        <item>Empty</item>
+        <item>Mapbox Streets</item>
+        <item>Emerald</item>
+        <item>Light</item>
+        <item>Dark</item>
     </string-array>
 
     <string-array name="outdoors_class_list">
@@ -25,10 +23,4 @@
         <item>Night</item>
     </string-array>
 
-    <string-array name="satellite_class_list">
-        <item>Labels + Contours</item>
-        <item>Labels Only</item>
-        <item>No Labels</item>
-    </string-array>
-
 </resources>