From 34d1c023de43a3c07d7531a156b438e625bc23d6 Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Fri, 7 Aug 2015 13:45:56 -0500
Subject: [PATCH] #1856 - Initial conversion to Material Design components

---
 .mason                                        |   2 +-
 .../mapbox/mapboxgl/testapp/MainActivity.java |  21 ++-
 .../src/main/res/layout/activity_main.xml     | 122 +++++++++++-------
 .../src/main/res/values/colors.xml            |   7 +
 .../src/main/res/values/dimens.xml            |   4 +
 .../src/main/res/values/styles.xml            |  10 +-
 src/mbgl/util/geojsonvt                       |   2 +-
 7 files changed, 118 insertions(+), 50 deletions(-)
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
 create mode 100644 android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml

diff --git a/.mason b/.mason
index d8597d94453..abdc131273c 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit d8597d944533dbb5e28d08dfdba22a82c93171b7
+Subproject commit abdc131273c3e50e42f245b1166c27de4c34c582
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 df524f99059..a637ee3f2bd 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
@@ -3,7 +3,9 @@
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -33,7 +35,7 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
 
@@ -49,6 +51,7 @@ public class MainActivity extends ActionBarActivity {
     //
 
     // Used for the UI
+    private DrawerLayout mDrawerLayout;
     private MapView mapView;
     private TextView mFpsTextView;
     private FrameLayout mMapFrameLayout;
@@ -79,6 +82,17 @@ protected void onCreate(Bundle savedInstanceState) {
 
         // Load the layout
         setContentView(R.layout.activity_main);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        final ActionBar ab = getSupportActionBar();
+        ab.setHomeAsUpIndicator(R.drawable.ic_menu);
+        ab.setDisplayHomeAsUpEnabled(true);
+
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+
+
         mapView = (MapView) findViewById(R.id.mainMapView);
         // Load the access token
         try {
@@ -120,6 +134,8 @@ public boolean onTouch(View v, MotionEvent event) {
         mFpsTextView.setText("");
 
         mMapFrameLayout = (FrameLayout) findViewById(R.id.layout_map);
+
+/*
         // Add a toolbar as the action bar
         Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar_main);
         setSupportActionBar(mainToolbar);
@@ -136,6 +152,7 @@ public boolean onTouch(View v, MotionEvent event) {
         mClassSpinner = (Spinner) findViewById(R.id.spinner_class);
         mOutdoorsClassAdapter = ArrayAdapter.createFromResource(getSupportActionBar().getThemedContext(),
                 R.array.outdoors_class_list, android.R.layout.simple_spinner_dropdown_item);
+*/
 
         if (savedInstanceState != null) {
             mapView.setMyLocationEnabled(savedInstanceState.getBoolean(STATE_IS_GPS_ON, false));
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
index 0cf914a0668..6cae3922954 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_main.xml
@@ -1,59 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+
+<android.support.v4.widget.DrawerLayout
+    android:id="@+id/drawer_layout"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar_main"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:minHeight="?attr/actionBarSize"
-        android:background="?attr/colorPrimary">
-
-        <Spinner
-            android:id="@+id/spinner_style"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <Spinner
-            android:id="@+id/spinner_class"
-            android:visibility="invisible"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </android.support.v7.widget.Toolbar>
-
-    <FrameLayout
-        android:id="@+id/layout_map"
+
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/main_content"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-<!--
-        <fragment
-            android:name="com.mapbox.mapboxgl.testapp.MapFragment"
-            android:id="@+id/fragment_map"
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:context="${packageName}.${activityClass}"
-            tools:layout="@layout/fragment_main" />
--->
+            android:layout_height="wrap_content"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <com.mapbox.mapboxgl.views.MapView
-            android:id="@+id/mainMapView"
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+
+        </android.support.design.widget.AppBarLayout>
+
+        <FrameLayout
+            android:id="@+id/layout_map"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            />
+            >
 
-        <TextView
-            android:id="@+id/view_fps"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/label_fps"
-            android:layout_margin="10dp" />
+            <!--
+                    <fragment
+                        android:name="com.mapbox.mapboxgl.testapp.MapFragment"
+                        android:id="@+id/fragment_map"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:context="${packageName}.${activityClass}"
+                        tools:layout="@layout/fragment_main" />
+            -->
+
+            <com.mapbox.mapboxgl.views.MapView
+                android:id="@+id/mainMapView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                />
+
+            <TextView
+                android:id="@+id/view_fps"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="@string/label_fps"
+                android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        </FrameLayout>
+
+
+        <!--
+                <android.support.design.widget.FloatingActionButton
+                    android:id="@+id/fab"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|bottom"
+                    android:layout_margin="@dimen/fab_margin"
+                    />
+        -->
+
+    </android.support.design.widget.CoordinatorLayout>
+
+
+    <android.support.design.widget.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        tools:headerLayout="@layout/nav_header"
+        tools:menu="@menu/drawer_view"/>
 
-    </FrameLayout>
-</LinearLayout>
+</android.support.v4.widget.DrawerLayout>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
new file mode 100644
index 00000000000..ac3b4fc30d6
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="primary">#1E8CAB</color>
+    <color name="primaryDark">#166B83</color>
+    <color name="accent">#E55E5E</color>
+    <color name="white">#FFFFFF</color>
+</resources>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
new file mode 100644
index 00000000000..f76eef07c3b
--- /dev/null
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
index 2399c78beef..200665796e9 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/values/styles.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar" />
+
     <style name="AppTheme" parent="AppBaseTheme" />
+
+    <style name="AppBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="colorAccent">@color/accent</item>
+        <item name="android:windowBackground">@color/white</item>
+    </style>
+
 </resources>
diff --git a/src/mbgl/util/geojsonvt b/src/mbgl/util/geojsonvt
index 995ffc72c55..ed99a6290fa 160000
--- a/src/mbgl/util/geojsonvt
+++ b/src/mbgl/util/geojsonvt
@@ -1 +1 @@
-Subproject commit 995ffc72c556da4b4880a6036fbcf7159fc5ecce
+Subproject commit ed99a6290fa42107a982e7f3675aae49d29026b1