From 014ebd2f133c883eec652b7ea598acc71924a217 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 28 Nov 2014 00:58:48 +1100
Subject: [PATCH] Add compass for #644

---
 .../com/mapbox/mapboxgl/app/MainActivity.java |  27 ++++++++++++++++++
 .../src/main/res/drawable-mdpi/compass.png    | Bin 0 -> 2376 bytes
 .../app/src/main/res/layout/activity_main.xml |  11 ++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 android/java/app/src/main/res/drawable-mdpi/compass.png

diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
index d75bded3b..7a42306c8 100644
--- a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
+++ b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
@@ -14,6 +14,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -39,6 +40,9 @@ public class MainActivity extends ActionBarActivity {
     // The FPS label
     TextView mFpsTextView;
 
+    // The compass
+    ImageView mCompassView;
+
     //
     // Lifecycle events
     //
@@ -53,9 +57,14 @@ public class MainActivity extends ActionBarActivity {
         setContentView(R.layout.activity_main);
         mMapFragment = (MapFragment)getSupportFragmentManager().findFragmentById(R.id.fragment_map);
         mMapFragment.getMap().setOnFpsChangedListener(new MyOnFpsChangedListener());
+        mMapFragment.getMap().setOnMapChangedListener(new MyOnMapChangedListener());
+
         mFpsTextView = (TextView)findViewById(R.id.view_fps);
         mFpsTextView.setText("");
 
+        mCompassView = (ImageView)findViewById(R.id.view_compass);
+        mCompassView.setOnClickListener(new CompassOnClickListener());
+
         // Add a toolbar as the action bar
         Toolbar mainToolbar = (Toolbar)findViewById(R.id.toolbar_main);
         setSupportActionBar(mainToolbar);
@@ -197,4 +206,22 @@ public class MainActivity extends ActionBarActivity {
             mFpsTextView.setText(getResources().getString(R.string.label_fps) + String.format(" %4.2f", fps));
         }
     }
+
+    // Called when map state changes
+    public class MyOnMapChangedListener implements MapView.OnMapChangedListener {
+
+        @Override
+        public void onMapChanged() {
+            mCompassView.setRotation((float)mMapFragment.getMap().getDirection());
+        }
+    }
+
+    // Called when someone presses the compass
+    public class CompassOnClickListener implements View.OnClickListener {
+
+        @Override
+        public void onClick(View view) {
+            mMapFragment.getMap().resetNorth();
+        }
+    }
 }
diff --git a/android/java/app/src/main/res/drawable-mdpi/compass.png b/android/java/app/src/main/res/drawable-mdpi/compass.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e7e08d2455e10b98d529d45ae3a9646956027c
GIT binary patch
literal 2376
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

literal 0
HcmV?d00001

diff --git a/android/java/app/src/main/res/layout/activity_main.xml b/android/java/app/src/main/res/layout/activity_main.xml
index b69df55de..d14f2ead9 100644
--- a/android/java/app/src/main/res/layout/activity_main.xml
+++ b/android/java/app/src/main/res/layout/activity_main.xml
@@ -30,7 +30,16 @@
             tools:context="${packageName}.${activityClass}"
             tools:layout="@layout/fragment_main" />
 
-            <TextView
+        <ImageView
+            android:id="@+id/view_compass"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|top"
+            android:padding="10dp"
+            android:contentDescription="Map compass. Click to reset the map rotation to North."
+            android:src="@drawable/compass"/>
+
+        <TextView
                 android:id="@+id/view_fps"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"