From 69aad81933fe0657fdf39d36103adef76a37d837 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Fri, 13 Dec 2013 00:12:18 +0100
Subject: [PATCH] mobile: show portal counts in nav drawer

---
 .../drawable-hdpi/ic_action_data_usage.png    | Bin 0 -> 633 bytes
 .../drawable-mdpi/ic_action_data_usage.png    | Bin 0 -> 464 bytes
 .../drawable-xhdpi/ic_action_data_usage.png   | Bin 0 -> 848 bytes
 .../drawable-xxhdpi/ic_action_data_usage.png  | Bin 0 -> 1293 bytes
 plugins/portal-counts.user.js                 |  55 +++++++++++++-----
 5 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 mobile/res/drawable-hdpi/ic_action_data_usage.png
 create mode 100644 mobile/res/drawable-mdpi/ic_action_data_usage.png
 create mode 100644 mobile/res/drawable-xhdpi/ic_action_data_usage.png
 create mode 100644 mobile/res/drawable-xxhdpi/ic_action_data_usage.png

diff --git a/mobile/res/drawable-hdpi/ic_action_data_usage.png b/mobile/res/drawable-hdpi/ic_action_data_usage.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f83a027be2d4b1fd1a607a8980af3cb2c1d08e
GIT binary patch
literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!8%ab#RCwC#SkY~RFc5{Pzbw!JSbzaS
z{?h?iAPhhU$N;7PVSwg8$$w#hEWiL|0Q#Tasb|%)DB<uy63I`pEP=7_;k)Pad7guV
zgM)*^1H+e^=yJI{L$`z$Lkpn=#*h|T4XuP$`M&>k7X-j?G<HLVbAUt&AX49q02rS^
zmuQdBm?QNKw8MaD_CO+^l>iuy?y)0RL7eGto{e!I+L%5d;S|1axwb3>jL%`=)HI%O
z95^k`wWGPGC14nj+rRG_TQTMhY3}I=kk9KbvF`OxzS4xWhCBgM8x^n^bSe5SJbw|E
z_Jr0F-+_$^SaciodGvh>U}<bb3D6;>biS~3lOc#{O|czVD!KbdZKl9dl0eLqMUh>Q
zBoJx`&Rhs338(|6nUO#sNkHL%=>fE4%&9pA#+<~cI^T@(#gqh|nB!O6gbT(OB#G-=
z?m){4tPT=e=uXVfT1f&*eWKBM`!5NOiq(<?N{%-7AZ3s!B?(kowrH~pEs<y#YuXc_
ze5dS6w1(y^28ry7kC#JpERKvSIgIEWz<xI-F6bivDj~hBJ8{P)z6E1e7Da)#j<{l7
z@)yiMmm5KNvJC2X!<A}og<@f;B<M;>&mYFTKE9GN2YO}V-pVRl?F`VLM<fQ3ZCPcq
z!WNQ&_n$;yMMg*7U+Hm_&x;b!F8kRCH7dPZmliwDgV~F_4h{|u4h|2E9{~mc^0(S{
T`i^LW00000NkvXXu0mjfA-og_

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-mdpi/ic_action_data_usage.png b/mobile/res/drawable-mdpi/ic_action_data_usage.png
new file mode 100644
index 0000000000000000000000000000000000000000..02ebf1eb8731214fb437fcd3192ee00331adea65
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUza!Eu%RCwC#R?AVtFc7tvTvGrkzzwJY
z7l65k0?3_E00ltqNdfU4C?Eyk23$ZWzy&yOXP#y}#?~hmT+q(!Shl6zw@<q(Wm%FW
z|6Nqb<gV*hc&wosnh$<A&>C7PrOwd-!1<QWjk6Q9gx-!!7Z7hz0KoAQk3Az6r#lnj
z08}=@$Od!Uxd4uIet@yV;GcXyT9!9h^I)@o<3W4QX!H;CN;MArIc<b9z=V4j+TrLK
z?}a4UkWzgA^4RM8sl>D~VD@&$Xiu*F^sp5KKywez5z1X(1Hfc`49TZ{EF23<mSGi%
ziLff5xEz1Z0pMcb1CdwOGE(XVEXnXLHUm=Qg;zTT2+p_J3I<TKk*qv}*;pLa*8nio
zKe6EyOvot~T7vkt*a{PAqtfZ*Jb>;!*J!RWx}8-fbS{P-$4<&IRs^g8KD$oo#DIA1
z=LE)UXxTqMILENI{EG`o%W=``c=0YIzkMZ3k|fDRfB^tyQ`X?bm6sd<0000<MNUMn
GLSTX@smP}Q

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xhdpi/ic_action_data_usage.png b/mobile/res/drawable-xhdpi/ic_action_data_usage.png
new file mode 100644
index 0000000000000000000000000000000000000000..487f4f8294147f3df37c9c73a8c3883e179efee6
GIT binary patch
literal 848
zcmV-W1F!svP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!@<~KNRCwC#TETJKFc2g?`KAE605+if
ztpdXQ<pRh8<bRw3Sb+48Q~>=C{SO;p0a5|ZU%@%c3<g8mBya?w@$C$T8i@pSdxyKj
z9ivDf5C{YUfj}S-d_=@P7P(w5x9YOONHO}*Vl*`3I6hr90ZMQZc%#PJa*A4wqavcY
zDgq#Q4vqJL1R|?QMovlh@8=*Qo<aC6w65a}ZB|N%7WZZ9@_pj;WDRAI1So+%tIN*V
z-)Cs98o2+L#Zp9Iq2_$y_}@27!jsSkLwFKA>l6N!`F{e`7R$Y^g*BHa0Gced{Y--0
zD*^W-9)Gr6mewk<_Tm<>Go0CTx6em<`N)BU-J%4*;hCoR6><N42jsqwQ~U@21ZXk7
z!-E=6_?&x8<~H~*-Yp<E9A2%)Bkg}O&#_j(1Z%=$2km$J?@Zp_!IFM6kx<wqO12iD
zoBlou0~;?}0H(dxv|j~6z}hA(+E~DfDU8iRf^Pz<zzA6RARyJ^cpDf2sZRo$C_H!}
zpu;U4X*u%oB{4Y<7>L_7&HxqDeD(sx@fY8RA<F0f;A(>(OIpAuhi9qSQBn%*sIf{}
zLE`!Rz+wR>SK&1h_S!)zcmi76nEMV1j|?QVJ_(4p%2EaiZRiB(@jsivDhme^8s7x0
zxur*ysDP6Vj{vl*I_H<5zCQ;E+lisIwrQo=MuDUDd6w{nb4D?Ngrm1Gh{{W&SwXHl
zMm2UEB{7ijFvj$4+h#6#fL;m8mB3VxATNGEq2$D53C)PQgLPHPsWmpx2PAysY;D7u
zeyY)T@N()G-Z*Nf><L*<+<kq_*SE)8*JdflVaN<wcViPI((D9ZQTLohiY3niX2|MD
zATvGaj`0o9_PHBDR1V*w3%}*)5HHpq$20W(i~9Y3;P(t+HZjs&w)XgvFG!@CR{uLq
ze4io9OgJ5$7Xl!})K_F$Bs_23e;u#L^bqm!UXmJ!<5ORgtGV{MKp+qZ1OkCTAP|`N
aE5HEp7&QJzmp9J<0000<MNUMnLSTY#tAhLh

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xxhdpi/ic_action_data_usage.png b/mobile/res/drawable-xxhdpi/ic_action_data_usage.png
new file mode 100644
index 0000000000000000000000000000000000000000..76631a4d16910c25b4075203c29ab67a75d9a35f
GIT binary patch
literal 1293
zcmV+o1@iidP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$uSrBfRCwC#TrqOnFc1VaDWeA{50D?A
z^mck#z4QR9kKIRpfYZx;<la^vsSh6@KEQqe(>r(0X-s1Xi6Q|IBzI>p5@&3RxWygz
zfFqOw00000000000000000000004kCBMSWiUteE`^f97#Mr|P94<V-ZLT$(2qbN#1
z!0AT6pbu{6)cO@~mr~nO+YlKW5MVYs8+uG_CL`Si*fUnt)<i}M0^W^(MITcOqx}@G
zcpwt)J52x?p5yuA$cRrRu5(MsXtB%-D@z`+;CptC05amWjCvE+hvGK<|C7Z~#oln&
z2?8Y6FR2Ypp+O9iRwVFLuv(h?o*N?1#vh9D`-TyJSJVI&!;n4z=02rs6oB!$(>G<}
zu;nmR3kkiNjn77(RG0)^==!%1DbL(|50IGum}h)4{M-VuD@Tu>%HT+w?g6HlKNNDx
zj~=&SVlNh&8-hfs3=ed0s=~%l`p`TAB*~iQBtBV}4xNCvXOzA)&I1-XF_qVOCe-fb
zx=)?EYyb(1MiC%uJGwk%shLW<7a~~uUp0V$f%GYS6=YC7y!yB>{QVd9hO%md{{N3B
z5}c?a7alOyjL#2zcR<NJhq5$WKoyOf5Q1jf^+Q7pT&8bf5g<ERdhCBt?ZH6$7_0~A
z54Ud7=r{E-C<4y4>y2t3&VwXC)@43Sz9DXc+n9`PF4Wod06klbReLcCk$|%f5pWhF
z0lNB0T1>zoL;^-yf`t%NQzDj~lz}7o<nZ1rBH=}(=u_x5nsp(vIO2~jitTGOS2oF@
z-~FxpRn%oe?AM?}P!1CHUb$=&bM<kP2O&r^I+u=YdDYX=NKD8Je$v+;AmAe=u8f{T
z!V{68nn*&=p;4ZFc7#b#|F=3jOF*nmjw9clk*&_Pho6c=BtV~BYsmv->(ey}FCh}J
zbCoTYB*A6gu?s!~)k#1`p1L9-ybvVGRaTGpZExS5_&lkQU_0+fZ6=boRnS(uzNpg$
zgoJC$iP|<~8M@J~$5jh(EqSKRY<Uwb0kQ?DyL|2SpF+Zo4fSJto7F`krq}CF>-GX6
zfhW#e%Y6%yfVDmuOB~JxmnQlmNV4U!B&06#i=Kl{?%#CO=Yo-DcveZQ*OxwPhlGSO
zhICTl=j;`woEPYLZkT1}h5eiHw_+4;kb>Y}s`x$v$9^Ye^ezeD5x>ky;Xh|O&YJpL
z9dm+|n-?uPpS#-QcDWiF=Y*nxHtK4t8<mB-q+sZAR$$=cElE}mrnllJb=Hm=yfh0w
zn_}kj8GLL>nv$TT?!sLe+3N$UXYTqLdLBBN8b}z?2wYZ?pge-Bl)uPto4nJ@xe+~2
zBh9oNz#(8&Ve{rvTG{aPm_vZqqY4^(Sclw?OH%%xA`wM`epmSmh29VA@L86!_k@W-
zeenBNk1P+1ge6((=D!;h2}6?jU5WnBGkzkXz-s|nlMifKsP~uVj0Y}d4gee<k(%8&
zuqh`FFVyiP%XkfbC(0?#grB~ismeXsBe;b8*r|)%J+dq(E5)IGHIsm2D+3~9AGdLE
zYXD@l`siW+00000000000000000000003w={s}MuWoq&WaRQ`;00000NkvXXu0mjf
Du`fX#

literal 0
HcmV?d00001

diff --git a/plugins/portal-counts.user.js b/plugins/portal-counts.user.js
index f1deeaef..520e0514 100644
--- a/plugins/portal-counts.user.js
+++ b/plugins/portal-counts.user.js
@@ -2,7 +2,7 @@
 // @id             iitc-plugin-portals-count@yenky
 // @name           IITC plugin: Show total counts of portals
 // @category       Info
-// @version        0.0.9.@@DATETIMEVERSION@@
+// @version        0.0.10.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@
@@ -19,15 +19,16 @@
 // PLUGIN START ////////////////////////////////////////////////////////
 
 /* whatsnew
-* 0.0.8 : use dialog() instead of alert()
-* 0.0.6 : ignoring outside bounds portals (even if close to)
-* 0.0.5 : changed table layout, added some colors
-* 0.0.4 : reverse show order of portals, using MAX_PORTAL_LEVEL now for array, changed table layout to be more compact, cleaned up code
-* 0.0.3 : fixed incorrect rounded portal levels, adjusted viewport
-* 0.0.2 : fixed counts to be reset after scrolling
-* 0.0.1 : initial release, show count of portals
-* todo : 
-*/ 
+* 0.0.10 : show in nav drawer on mobile devices
+* 0.0.9  : fix for new intel map
+* 0.0.8  : use dialog() instead of alert()
+* 0.0.6  : ignoring outside bounds portals (even if close to)
+* 0.0.5  : changed table layout, added some colors
+* 0.0.4  : reverse show order of portals, using MAX_PORTAL_LEVEL now for array, changed table layout to be more compact, cleaned up code
+* 0.0.3  : fixed incorrect rounded portal levels, adjusted viewport
+* 0.0.2  : fixed counts to be reset after scrolling
+* 0.0.1  : initial release, show count of portals
+*/
 
 // use own namespace for plugin
 window.plugin.portalcounts = function() {};
@@ -97,17 +98,39 @@ window.plugin.portalcounts.getPortals = function(){
     counts += '<tr><td>No Portals in range!</td></tr>';
   counts += '</table>';
 
-
   var total = window.plugin.portalcounts.enlP + window.plugin.portalcounts.resP + window.plugin.portalcounts.neuP;
-  dialog({
-    html: '<div id="portalcounts">' + counts + '</div>',
-    title: 'Portal counts: ' + total + ' ' + (total == 1 ? 'portal' : 'portals'),
-  });
+  var title = total + ' ' + (total == 1 ? 'portal' : 'portals');
+
+  if(typeof android !== 'undefined' && android && android.addPane) {
+    $('<div id="portalcounts" class="mobile">'
+    + '<div class="ui-dialog-titlebar"><span class="ui-dialog-title ui-dialog-title-active">' + title + '</span></div>'
+    + counts
+    + '</div>').appendTo(document.body);
+  } else {
+    dialog({
+      html: '<div id="portalcounts">' + counts + '</div>',
+      title: 'Portal counts: ' + title,
+    });
+  }
 }
 
+window.plugin.portalcounts.onPaneChanged = function(pane) {
+  if(pane == "plugin-portalcounts")
+    window.plugin.portalcounts.getPortals();
+  else
+    $("#portalcounts").remove()
+};
+
 var setup =  function() {
-  $('#toolbox').append(' <a onclick="window.plugin.portalcounts.getPortals()" title="Display a summary of portals in the current view">Portal counts</a>');
+  if(typeof android !== 'undefined' && android && android.addPane) {
+    android.addPane("plugin-portalcounts", "Portal counts", "ic_action_data_usage");
+    addHook("paneChanged", window.plugin.portalcounts.onPaneChanged);
+  } else {
+    $('#toolbox').append(' <a onclick="window.plugin.portalcounts.getPortals()" title="Display a summary of portals in the current view">Portal counts</a>');
+  }
+
   $('head').append('<style>' + 
+    '#portalcounts.mobile {background: transparent; border: 0 none !important; height: 100% !important; width: 100% !important; left: 0 !important; top: 0 !important; position: absolute; overflow: auto; }' +
     '#portalcounts table {margin-top:5px; border-collapse: collapse; empty-cells: show; width:100%; clear: both;}' +
     '#portalcounts table td, #portalcounts table th {border-bottom: 1px solid #0b314e; padding:3px; color:white; background-color:#1b415e}' +
     '#portalcounts table tr.res th {  background-color: #005684; }' +