From 59659a944d213788848292bc6397f1514a68cac6 Mon Sep 17 00:00:00 2001 From: fkloft Date: Mon, 20 Apr 2015 20:59:04 +0200 Subject: [PATCH] [missions] use android panes. show missions in pane to allow switching between mission view and map mission lists are still displayed in dialogs --- images/missions.svg | 16 +++ mobile/res/drawable-hdpi/ic_missions.png | Bin 0 -> 1015 bytes mobile/res/drawable-mdpi/ic_missions.png | Bin 0 -> 790 bytes mobile/res/drawable-xhdpi/ic_missions.png | Bin 0 -> 1418 bytes mobile/res/drawable-xxhdpi/ic_missions.png | Bin 0 -> 1992 bytes plugins/missions.css | 11 ++ plugins/missions.user.js | 112 +++++++++++++++++---- style.css | 54 ++++++++++ 8 files changed, 172 insertions(+), 21 deletions(-) create mode 100644 images/missions.svg create mode 100644 mobile/res/drawable-hdpi/ic_missions.png create mode 100644 mobile/res/drawable-mdpi/ic_missions.png create mode 100644 mobile/res/drawable-xhdpi/ic_missions.png create mode 100644 mobile/res/drawable-xxhdpi/ic_missions.png diff --git a/images/missions.svg b/images/missions.svg new file mode 100644 index 00000000..f9cf8429 --- /dev/null +++ b/images/missions.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/mobile/res/drawable-hdpi/ic_missions.png b/mobile/res/drawable-hdpi/ic_missions.png new file mode 100644 index 0000000000000000000000000000000000000000..4ce992165b5a19da92b47f5515f9a1544a540fd5 GIT binary patch literal 1015 zcmV9dRBf* ziWmW70R%L8Gv-@zJwlj>y7&r0sDLqGqJV&l{Dyo&MQ9rn1d0e1@EKK6d<1;tH9|y~ zHde)FG65Z6(IcXWe255}{G#|QL~I$g9W4RV0pv~CeZsU6MZSyx=oX<7Tj%XQ0VT*o zxiZ>8{c9#(5Z9zOWR8g?BFRHJ0d>@po0!5~S;m1!@)@^mOj%>6JvMT&lN?w_{fkrb z{Uh)axCNY-@uz@;a{Ugt!S*~_24=`|A}WkxR=`zl+GN$~tB|+}915_Z$+n4ac7Neo zfdRH}cZ*8p0o3;SI&cTLhFXzvU|z=D2ae&dHg|hPHi;BNF#zgz(wE)@E8^Mb22}sN%@+c7S^;UxK`j2a9oURlI<#s z>ih%XFmMHxyc2XEXkrr7T!}THU#`CZ&&`3Z6<85xLmu+3(s%+m3oM}a{h!FT9c4PK zxe~)UbX>ihtn%Kg3)c1yvv0+VDhzlKt;bHa!3z(bj{pYE8? z+r|1|hmg*RNqe9x2Q=9hDje)2K1o&@?*ea(xi#P_-C+Z9J55(5s>wYaTDbzsmeE1f zcHpRkXk}$IRU-=_STrVCBlE#0BBsv!#)go0BIRZ-)N#_yT&e?2tm70mfOH3%cC~xVFXm7J|i)CsO}9-4Rs9E=&#CG6-MoZjqMXrNF74| l#cS4oie3MveosKJ@du13g#R;p+MWOa002ovPDHLkV1iP^x61$k literal 0 HcmV?d00001 diff --git a/mobile/res/drawable-mdpi/ic_missions.png b/mobile/res/drawable-mdpi/ic_missions.png new file mode 100644 index 0000000000000000000000000000000000000000..0cf7a4684d55785b711f1e30ecddb52d4d789ca1 GIT binary patch literal 790 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 a1M5FBArM~MY2obv0000 0) { if(len > 1000) - len = Math.round(len / 100) / 10 + "km"; + len = Math.round(len / 100) / 10 + 'km'; else - len = Math.round(len * 10) / 10 + "m"; + len = Math.round(len * 10) / 10 + 'm'; var infoLength = container.appendChild(document.createElement('span')); infoLength.className = 'plugin-mission-info length help'; @@ -466,11 +501,13 @@ window.plugin.missions = { title.href = perma; title.addEventListener('click', function(ev) { + show('map'); selectPortalByLatLng(lat, lng); ev.preventDefault(); return false; }, false); title.addEventListener('dblclick', function(ev) { + show('map'); zoomToAndShowPortal(waypoint.portal.guid, [lat, lng]); ev.preventDefault(); return false; @@ -630,7 +667,7 @@ window.plugin.missions = { this.cacheByPortalGuid = JSON.parse(localStorage['plugins-missions-portalcache'] || '{}'); this.cacheByMissionGuid = JSON.parse(localStorage['plugins-missions-missioncache'] || '{}'); - if("plugins-missions-settings" in localStorage) { + if('plugins-missions-settings' in localStorage) { var settings = JSON.parse(localStorage['plugins-missions-settings'] || '{}'); localStorage['plugins-missions-checkedMissions'] = JSON.stringify(settings.checkedMissions); localStorage['plugins-missions-checkedWaypoints'] = JSON.stringify(settings.checkedWaypoints); @@ -834,6 +871,14 @@ window.plugin.missions = { } }, + onPaneChanged: function(pane) { + if(pane == 'plugin-missions') { + document.body.appendChild(this.mobilePane); + } else if(this.mobilePane.parentNode) { + this.mobilePane.parentNode.removeChild(this.mobilePane); + } + }, + setup: function() { this.cacheByPortalGuid = {}; this.cacheByMissionGuid = {}; @@ -846,6 +891,31 @@ window.plugin.missions = { $('