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 00000000..f0f83a02 Binary files /dev/null and b/mobile/res/drawable-hdpi/ic_action_data_usage.png differ 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 00000000..02ebf1eb Binary files /dev/null and b/mobile/res/drawable-mdpi/ic_action_data_usage.png differ 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 00000000..487f4f82 Binary files /dev/null and b/mobile/res/drawable-xhdpi/ic_action_data_usage.png differ 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 00000000..76631a4d Binary files /dev/null and b/mobile/res/drawable-xxhdpi/ic_action_data_usage.png differ diff --git a/plugins/portal-counts.user.js b/plugins/portal-counts.user.js index f1deeaef..60a41ec9 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.1.0.@@DATETIMEVERSION@@ // @namespace https://github.com/jonatkins/ingress-intel-total-conversion // @updateURL @@UPDATEURL@@ // @downloadURL @@DOWNLOADURL@@ @@ -19,95 +19,303 @@ // 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.1.0 : display graphs +* 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() {}; +window.plugin.portalcounts = { + BAR_TOP: 20, + BAR_HEIGHT: 180, + BAR_WIDTH: 25, + BAR_PADDING: 5, + RADIUS_INNER: 70, + RADIUS_OUTER: 100, + CENTER_X: 200, + CENTER_Y: 100, +}; //count portals for each level available on the map -window.plugin.portalcounts.getPortals = function(){ +window.plugin.portalcounts.getPortals = function (){ //console.log('** getPortals'); - var retval=false; + var self = window.plugin.portalcounts; var displayBounds = map.getBounds(); - window.plugin.portalcounts.enlP = 0; - window.plugin.portalcounts.resP = 0; - window.plugin.portalcounts.neuP = 0; - - window.plugin.portalcounts.PortalsEnl = new Array(); - window.plugin.portalcounts.PortalsRes = new Array(); + self.enlP = 0; + self.resP = 0; + self.neuP = 0; + + self.PortalsEnl = new Array(); + self.PortalsRes = new Array(); for(var level = window.MAX_PORTAL_LEVEL; level > 0; level--){ - window.plugin.portalcounts.PortalsEnl[level] = 0; - window.plugin.portalcounts.PortalsRes[level] = 0; + self.PortalsEnl[level] = 0; + self.PortalsRes[level] = 0; } - + $.each(window.portals, function(i, portal) { - retval=true; var level = portal.options.level; var team = portal.options.team; // just count portals in viewport if(!displayBounds.contains(portal.getLatLng())) return true; switch (team){ case 1 : - window.plugin.portalcounts.resP++; - window.plugin.portalcounts.PortalsRes[level]++; + self.resP++; + self.PortalsRes[level]++; break; case 2 : - window.plugin.portalcounts.enlP++; - window.plugin.portalcounts.PortalsEnl[level]++; + self.enlP++; + self.PortalsEnl[level]++; break; default: - window.plugin.portalcounts.neuP++; + self.neuP++; break; } }); - + //get portals informations from IITC var minlvl = getMinPortalLevel(); + var total = self.neuP + self.enlP + self.resP; - var counts = '
Enlightened | Resistance |
---|
Enlightened | Resistance | |||||
---|---|---|---|---|---|---|
Level '+level+' | '; if(minlvl > level) counts += 'zoom in to see portals in this level | '; else - counts += ''+window.plugin.portalcounts.PortalsEnl[level]+' | '+window.plugin.portalcounts.PortalsRes[level]+' | '; + counts += ''+self.PortalsEnl[level]+' | '+self.PortalsRes[level]+' | '; counts += '|
Total: | '+window.plugin.portalcounts.enlP+' | '+window.plugin.portalcounts.resP+' | ||||
Total: | '+self.enlP+' | '+self.resP+' | ||||
Neutral: | '; if(minlvl > 0) counts += 'zoom in to see unclaimed portals'; else - counts += window.plugin.portalcounts.neuP; - counts += ' |
No Portals in range!
'; + var total = self.enlP + self.resP + self.neuP; + var title = total + ' ' + (total == 1 ? 'portal' : 'portals'); - var total = window.plugin.portalcounts.enlP + window.plugin.portalcounts.resP + window.plugin.portalcounts.neuP; - dialog({ - html: '