diff options
author | Leith Bade <leith@mapbox.com> | 2015-05-16 12:47:23 +1000 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2015-05-16 12:47:23 +1000 |
commit | 9ceda19363848d18db3aaf3edcbbada7dc96dd05 (patch) | |
tree | 6e126ae9163cc03476f38e8868b4bbfe36f5122f | |
parent | b021c4f39c43cfd2e0280f27b5aec3cfdbb61b71 (diff) | |
parent | 7a2548edf1fa54bb2c910d5d20e43f2c4033c0f5 (diff) | |
download | qtlocation-mapboxgl-9ceda19363848d18db3aaf3edcbbada7dc96dd05.tar.gz |
Merge pull request #1571 from mapbox/android-styles
Update Android to use new styles
-rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java | 46 | ||||
-rw-r--r-- | android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml | 16 |
2 files changed, 22 insertions, 40 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 bd7100d98d..65cb17462f 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,58 +316,50 @@ 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; - // Outdoors + // Light case 2: - mMapFragment.getMap().setStyleUrl("asset://styles/outdoors-v7.json"); + mMapFragment.getMap().setStyleUrl("asset://styles/light-v7.json"); mMapFragment.getMap().removeAllClasses(); - mClassSpinner.setVisibility(View.VISIBLE); - mClassSpinner.setAdapter(mOutdoorsClassAdapter); - mClassSpinner.setOnItemSelectedListener(new OutdoorClassSpinnerListener()); + mClassSpinner.setVisibility(View.INVISIBLE); + mClassSpinner.setAdapter(null); + mClassSpinner.setOnItemSelectedListener(null); break; - // Satellite + // Dark 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().setStyleUrl("asset://styles/dark-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"); + // Outdoors + case 4: + mMapFragment.getMap().setStyleUrl("asset://styles/outdoors-v7.json"); mMapFragment.getMap().removeAllClasses(); - mClassSpinner.setVisibility(View.INVISIBLE); - mClassSpinner.setAdapter(null); - mClassSpinner.setOnItemSelectedListener(null); + mClassSpinner.setVisibility(View.VISIBLE); + mClassSpinner.setAdapter(mOutdoorsClassAdapter); + mClassSpinner.setOnItemSelectedListener(new OutdoorClassSpinnerListener()); break; default: diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml index 7b4e51b473..901e231929 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> |