From 78f6e07457624f7b5cde6557ef681945072d3d8f Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Mon, 23 Dec 2013 21:53:25 +0100
Subject: [PATCH] Mobile: implement follow mode

---
 mobile/plugins/user-location.user.js          |  28 ++++++++++++
 .../ic_action_location_follow.png             | Bin 0 -> 646 bytes
 .../ic_action_location_follow.png             | Bin 0 -> 451 bytes
 .../ic_action_location_follow.png             | Bin 0 -> 820 bytes
 .../ic_action_location_follow.png             | Bin 0 -> 1236 bytes
 .../cradle/iitc_mobile/IITC_JSInterface.java  |  10 +++++
 .../com/cradle/iitc_mobile/IITC_Mobile.java   |  41 +++++++++++++-----
 .../cradle/iitc_mobile/IITC_UserLocation.java |  14 ++++++
 8 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 mobile/res/drawable-hdpi/ic_action_location_follow.png
 create mode 100644 mobile/res/drawable-mdpi/ic_action_location_follow.png
 create mode 100644 mobile/res/drawable-xhdpi/ic_action_location_follow.png
 create mode 100644 mobile/res/drawable-xxhdpi/ic_action_location_follow.png

diff --git a/mobile/plugins/user-location.user.js b/mobile/plugins/user-location.user.js
index 24a76147..c11ddf94 100644
--- a/mobile/plugins/user-location.user.js
+++ b/mobile/plugins/user-location.user.js
@@ -21,6 +21,7 @@
 window.plugin.userLocation = function() {};
 
 window.plugin.userLocation.locationLayer = new L.LayerGroup();
+window.plugin.userLocation.follow = false;
 
 window.plugin.userLocation.setup = function() {
   $('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:mobile/plugins/user-location.css@@').appendTo('head');
@@ -59,10 +60,20 @@ window.plugin.userLocation.setup = function() {
   window.plugin.userLocation.circle = circle;
   window.plugin.userLocation.icon = icon;
 
+  window.map.on('movestart', window.plugin.userLocation.onMoveStart);
   window.map.on('zoomend', window.plugin.userLocation.onZoomEnd);
   window.plugin.userLocation.onZoomEnd();
 };
 
+window.plugin.userLocation.onMoveStart = function(e) {
+  if(window.plugin.userLocation.moving)
+    return;
+
+  window.plugin.userLocation.follow = false;
+  if(typeof android !== 'undefined' && android && android.setFollowMode)
+    android.setFollowMode(window.plugin.userLocation.follow);
+};
+
 window.plugin.userLocation.onZoomEnd = function() {
   if(window.map.getZoom() < 16)
     window.plugin.userLocation.locationLayer.removeLayer(window.plugin.userLocation.circle);
@@ -71,6 +82,13 @@ window.plugin.userLocation.onZoomEnd = function() {
 };
 
 window.plugin.userLocation.locate = function(lat, lng, accuracy) {
+  if(window.plugin.userLocation.follow) {
+    window.plugin.userLocation.follow = false;
+    if(typeof android !== 'undefined' && android && android.setFollowMode)
+      android.setFollowMode(window.plugin.userLocation.follow);
+    return;
+  }
+
   var latlng = new L.LatLng(lat, lng);
 
   var latAccuracy = 180 * accuracy / 40075017;
@@ -85,12 +103,22 @@ window.plugin.userLocation.locate = function(lat, lng, accuracy) {
   zoom = Math.min(zoom,17);
 
   window.map.setView(latlng, zoom);
+
+  window.plugin.userLocation.follow = true;
+  if(typeof android !== 'undefined' && android && android.setFollowMode)
+    android.setFollowMode(window.plugin.userLocation.follow);
 }
 
 window.plugin.userLocation.onLocationChange = function(lat, lng) {
   var latlng = new L.LatLng(lat, lng);
   window.plugin.userLocation.marker.setLatLng(latlng);
   window.plugin.userLocation.circle.setLatLng(latlng);
+
+  if(window.plugin.userLocation.follow) {
+    window.plugin.userLocation.moving = true;
+    window.map.setView(latlng);
+    window.plugin.userLocation.moving = false;
+  }
 };
 
 window.plugin.userLocation.onOrientationChange = function(direction) {
diff --git a/mobile/res/drawable-hdpi/ic_action_location_follow.png b/mobile/res/drawable-hdpi/ic_action_location_follow.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa706a81e844bd6d2b8e0ad0214fe235e325be11
GIT binary patch
literal 646
zcmV;10(t$3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006_Nkl<ZXx{Bu
zv30^Q5dGoNGC-o91++kVIqA&+VSuCu`Y-?tVER0}XMo%S?hONYfi&m$?kTc^92p4F
zufR__>7;*m{{%!tL_}N?cS9N0MKuNR3IJr(e5iHC10K!<fFAk=Mt_|`qZk9<x&Oe_
z(Et+uyajLsKxEY6>KxETHQ~+90NnpD{0JZekdsmM#U0Q^^$1|WLEE4PP+CK$jxj4T
zYJV{YbWtq@O#mPVkdaYkM{1qfbI7RW*&WbDmGP+p0P$%aJmO>_(riga&Cce4b@IJW
zFoc~^PtGSHuAk@T{5N6S!`%R9n-2~~a!CYTR2o1Ez~0Orz>bU}$D9q*sRr=ulbw8T
zAQ72l<=Dt8fQ@7G;BOlqV`C-cM=~UZW`a5g$L7-$Y^1gmY%90c2<rf6j;2UuEwnim
zDbJB;Y~J%)!Ec~huy*A6v_}l5)-9AA1MpF?K61J_{j!DMzHrSc8y%&KN>a3LD~{t1
z%52V|=R1;x3}yl_zezdWMWMANzMgzj+%K>tqqe_tz~&rhhD7KeyGZ%QflGx>h2##N
zg_;UFVO1%y>v76Ehf<wbYlU-wi_OthY*-%nIN_2Mjm@J^*XA3<nGjwNmJ{m}o!IeM
z7d^if$<PkuqS!1Px3uPTw{PM6+}^xps}_=Cn0|mI?|TS2?dS>Kd|OQKI=~A^4ZjSu
z`Mghmd@U^{^?iQ)zfJv3JgeNq!&VEwH9PVms71Ker^OCuKKbX|)y#)Ld|toiejo%$
gWSoeIh=?1+7tRa+-uUY^5dZ)H07*qoM6N<$f<XBxQ2+n{

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-mdpi/ic_action_location_follow.png b/mobile/res/drawable-mdpi/ic_action_location_follow.png
new file mode 100644
index 0000000000000000000000000000000000000000..64e9f660d04fe0f254559aa38b0c6a72886c8175
GIT binary patch
literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004sNkl<ZSi|j?
zF>b;@5Jg|2v_3#^&jt1X(3_+uIY9c59=Q+n901XixHo-#0rw^ca1M~>ue376#$F;4
z$x|84-<jFnKYteJtv3%dNij1?G4qLW<5|PdcN5o_KE<n+M;-tZU<{awI|EYSJ&VHf
z>;;&l7z1-407_s7?ByN+BgYqKQJ9{s0FxAVN?roXEDGOhaL+0v{t4Hr0PXx0$bpwE
z3il28f$&4&)6NCx&bRvcXp<|+)aim8*i`&$`R?mD(bNSK9p};sey5_QBBIgvRz8GX
zYVE|Q4aY!f?@~LP*Wl;Epf#mpbS}V%?bfCzaMs1_j<jpN5=vTKh1<7OzJs+UDOQ#%
zSrjh*loB4CfLozSiVukl4%<yb%-s35e0b{0flLZ#ZPS1+E0~dDbS7a61eNxRmFQUV
zYP$xCaWNtK0v_sw=;Bh`*aZp@E8yB*N6j!=3wzQ;Y&(u;!0nN7JXCiCz$dUc>p1?+
t2Z`^abmger|9lhrzKZky&q;5-_6@2Ov`p`IX-NP8002ovPDHLkV1le<&N%=8

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xhdpi/ic_action_location_follow.png b/mobile/res/drawable-xhdpi/ic_action_location_follow.png
new file mode 100644
index 0000000000000000000000000000000000000000..c058a2b4f350ab6740b474bd4355924f388ebf15
GIT binary patch
literal 820
zcmV-41Izr0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008}Nkl<Zc-rk+
z%aNln5Pi6OB><K?2`B;Xl=nUf-~h%6?0qHxlfc}U;!Xmc0C$D}oWLBmU8U6^5J<pK
z=vBFD?7{jx_2+fVfQN^Nhlhv9Q4wr4v8Y-BK=50lET%2iaoUi40U+m>*lH1{qq~47
zz!TuJz-m!H0g!UQO8|t*BM$%#00K}`7B{;mKvZoA;03@1Ks52|9e@(R2W9bNcLa#4
zec==rY94u>I5ZX^KUYu|f9!$)KJ~Yr+};7G*}Q2$9HsnHErtNxTw6o1fS=!$)9m;J
z%ZX!M*n%R(8m=zmL$L7X3(Dfca@?m{T!e(cq1peHHveFAB}d~6b}M=O-!9z2l@3rB
zcXe6Z@K{$K8$8$BkFWra_OH@Mqnj61`-^>BNCB>+EdDgGguC?7yKQy|9Gm{2&x@)}
z*`E{5BMpyH8^#1{R|p&isE)GuGBGu3t$rxwiK;E7>|hmWZDWAE;bLI(_lY&X0C4B;
z_My<MVLbvk?M2e*mjeMZnK4D83v@hJ$8RHE%jy=8N`Kb_K5x_Q5j;j8YRy_!BS4H1
zpa__`$PEY(TM&>adAcvvB@PHkc&t8c@NF$qaW+(8eGG@D1UWziU`Qi`oRPlqG^R<;
zhNhm6q^zY05Sn>NI-FdSEocoXyjz%90BLf3J`#XjwzS9~5Em1^XHEe75NT?Fp*Y}@
zfNtdfkGX2l#swNBP^!dzIwGOzE0UBsXU}tTWR|IcWSxt`K#0*61dJ*%uIg<10`)*;
zII2V!C4gH}vL4qJCAXO-+5q^Y(IywA4%x&7fPa1aLCMM`?RDZQ)!bNl7|7$&W&^$<
zVlB~*+!B)(CO15s_wJ?sgWPr}%Hpf-xUQt|O$vx1cXNcp%?oAo9nWbEe=)LvnZD!y
z>nxX7V;z9kA9*#VWQJp2j`n1Se57Eak&5zZ^82|S@3Dqs{y;(#A5t9YCo&VFyLGnM
yS_kYFo&Zn4!ExSjZn@h`@bK{P@bK{PSQ%fTRcI!uV6=n)0000<MNUMnLSTXn6nGy1

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xxhdpi/ic_action_location_follow.png b/mobile/res/drawable-xxhdpi/ic_action_location_follow.png
new file mode 100644
index 0000000000000000000000000000000000000000..423a873f5a025ec0c8404c9f80cfb79c2201845d
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000D=Nkl<Zc-rk;
zF;eR=5PdMTIY4j^2QWS9P3V&YBt6h4>BH~I0g|2%ebRp&0QV#Z@CAOsGCyC)k?dHq
z4e!k`VUn@5yU*HPNh<*aK@bE%5ClOG1VIqQPr*qWg^pj}I{+^Bzf(!1+NjG}OJAG|
z08iR?S8Y_}lum#IkN|=NkN|=NkN|=cvAl^_3?P>Lza#&fpa5h5QUIzAle3cs8@&(U
z8bI&Jrq%#9Dv5rR0JkNEf&6tUZaxFB0<cm^l#zh1#vgeyypaf%L<<t|VfYIGQ)r88
z2JFPgZ{^e29DsBA>{{AO0ZdgAr9YN{`1O4N;ND{NrTFk|!M4vOh72uaJgOvG{Wt>R
z*Y_!an*-U*qN*%LvZ&F4?CC`%(ey_UAc1zCV~h;IOeN9UQ{O!RlbkrC06c^a&~;42
z@{GR*aO=zX03dDON?)e<G5^*h;DFl+?uQS=pP=sOG_b-Z<Im~{g3{;A@Y9XR`h7-#
zq?*ed<JUSvl^OTM@Y66viW+JJOmo~$?aKoq!=t0j?Hd6y!yV}XS0&LyiR`H-x&5Uf
zx8DJH1F(_yvx4o<@pav4;d{n>;@S8e0MA<5mr1sh6=<XA`cUC@pDJW+q6;z^ZC1c2
zJu%7%#ny;A^31ce;o^!i0KW|Fcn!!Q2>4G=*F0Z>;~d8=&UFCHr7hQZpe#DHg8)%l
zH{PPavy%$NnYfZ*kg-$X*+z|kYduK1tnKVA7gUXji#rk-cNSe*L4dC8(lHQDJjyhY
zK5ST8bZIsLvihiFQ!;2*3D=;yanz}?BOo@opRHrM=^F#vC=gk97M&VRfWEusvaa8Q
z|Lw@nQQ+cIltrgT6QCQ?WjE^@;o#EO)}m7-@O3^QE-?Zw0}^mqVg$qvaUd-^Yc5QH
z2=U~>DBXYrl<mu=_t^1e3pNubNB{{SDh|S___||!r3t%$abQ>GA(cc|wG$vwUReUQ
z(lVjgAvnDSB;d_cCf67jq^Dx%Wv2fg;nLT+MW;p+kd~OnuYD<LFyy+#2uRyRfIeKi
zQmbimZ6V52tlN|#Yqzy7C}-W@W%|GJJPKS%zIN29(P^kY%!iHve&$go*V@maMVD3(
zurauy*nxz#ClY1_cI3LD5(IAq$OgCmwv7rrJFD3Eu0>$_o<!!efXw$ySogPa!3u?k
zBV$4aVC-r@kuA39&^iKi1Kv6A%kGzxFA5To$uqaE!Bb?qD;cy)gQbc8+W&r~iF?W|
z@pVhD*0Wife5SJksY;@u@4oA-j=uL<@KnI~eV7kwOhfb^gaE0tH<f@->LlSn1>R$*
z<Ez2;1H|3D<d86^!T5t5<G+M-jdh%od_w*qy_xS*ihI>}J=1%ll4u;#9(C-9J;1!M
z)x$?QdEcY)`}in#HyU4L3yLNm)LvC}WL1_I2H-($r}R(H?Riy!XA-KqtmE@GU0&94
z#EhBO)znM^FKlWM8N9NrL1gHc_FW+V#uHxJ7l@QU+E?Q?USZGDL=r#(2ogX72ogX7
yh#GL#V%hbLlazE41VIo4K@bE%5ClOGO~zm3W8~qDH(jg%0000<MNUMnLSTYlV@l!x

literal 0
HcmV?d00001

diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
index 93372fd1..d51f0e59 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
@@ -189,4 +189,14 @@ public class IITC_JSInterface {
             }
         });
     }
+
+    @JavascriptInterface
+    public void setFollowMode(final boolean follow) {
+        mIitc.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mIitc.getUserLocation().setFollowMode(follow);
+            }
+        });
+    }
 }
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index c6d8d07f..711be309 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -400,18 +400,32 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mNavigationHelper != null) {
-            boolean visible = !mNavigationHelper.isDrawerOpened();
+        boolean visible = false;
+        if (mNavigationHelper != null)
+            visible = !mNavigationHelper.isDrawerOpened();
 
-            for (int i = 0; i < menu.size(); i++)
-                if (menu.getItem(i).getItemId() != R.id.action_settings) {
-                    // clear cookies is part of the advanced menu
-                    if (menu.getItem(i).getItemId() == R.id.menu_clear_cookies) {
-                        menu.getItem(i).setVisible(mAdvancedMenu & visible);
-                    } else {
-                        menu.getItem(i).setVisible(visible);
-                    }
-                }
+        for (int i = 0; i < menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+
+            switch (item.getItemId()) {
+                case R.id.action_settings:
+                    item.setVisible(true);
+                    break;
+
+                case R.id.menu_clear_cookies:
+                    item.setVisible(mAdvancedMenu && visible);
+                    break;
+
+                case R.id.locate:
+                    item.setVisible(visible);
+                    item.setIcon(mUserLocation.isFollowing()
+                            ? R.drawable.ic_action_location_follow
+                            : R.drawable.ic_action_location_found);
+                    break;
+
+                default:
+                    item.setVisible(visible);
+            }
         }
 
         return super.onPrepareOptionsMenu(menu);
@@ -473,6 +487,7 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
     public void reloadIITC() {
         mNavigationHelper.reset();
         mMapSettings.reset();
+        mUserLocation.reset();
         mBackStack.clear();
         // iitc starts on map after reload
         mCurrentPane = Pane.MAP;
@@ -633,4 +648,8 @@ public class IITC_Mobile extends Activity implements OnSharedPreferenceChangeLis
     public IITC_MapSettings getMapSettings() {
         return mMapSettings;
     }
+
+    public IITC_UserLocation getUserLocation() {
+        return mUserLocation;
+    }
 }
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_UserLocation.java b/mobile/src/com/cradle/iitc_mobile/IITC_UserLocation.java
index 516f1589..551ee404 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_UserLocation.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_UserLocation.java
@@ -25,6 +25,7 @@ public class IITC_UserLocation implements LocationListener, SensorEventListener
     private SensorManager mSensorManager = null;
     private float[] mValuesGravity = null, mValuesGeomagnetic = null;
     private double mOrientation = 0;
+    private boolean mFollowing = false;
 
     public IITC_UserLocation(IITC_Mobile iitc) {
         mIitc = iitc;
@@ -95,6 +96,10 @@ public class IITC_UserLocation implements LocationListener, SensorEventListener
         return mLastLocation != null;
     }
 
+    public boolean isFollowing() {
+        return mFollowing;
+    }
+
     public void locate() {
         // do not touch the javascript while iitc boots
         if (mIitc.isLoading()) return;
@@ -122,6 +127,15 @@ public class IITC_UserLocation implements LocationListener, SensorEventListener
         updateListeners();
     }
 
+    public void reset() {
+        setFollowMode(false);
+    }
+
+    public void setFollowMode(boolean follow) {
+        mFollowing = follow;
+        mIitc.invalidateOptionsMenu();
+    }
+
     /**
      * set the location mode to use. Available modes:
      * 0: don't show user's position