etc
/
VancedMicroG
mirror of https://github.com/YTVanced/VancedMicroG
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Various changes 

- Fix possible issue with null locations
- Various theme updates
- Fix map issue on 64-bit systems
- Update version code #205
This commit is contained in:
Marvin W 2016-10-02 20:13:28 +02:00
parent 0ae11ab9bf
commit cb356d2fea
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
7 changed files with 192 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/GmsApi vendored

@ -1 +1 @@
Subproject commit acec513b19aaba856722fc22c9adf3f5e0ea3ac7
Subproject commit 107d70080ad5f8389db97dc0bb7f36d52af46afe

2
extern/vtm vendored

@ -1 +1 @@
Subproject commit ec4f12b576906b01d8bf2f1033c8014b6affeb8b
Subproject commit b651e095f019649de2adc578264c8d582551f657

2
play-services-core/build.gradle
View File

@ -62,7 +62,7 @@ android {
versionName getMyVersionName()
def x = getMyVersionCode()
// We are not allowed to freely choose the hundreds column as it defines the device type
versionCode(9450200 + x % 100 + ((int) (x / 100)) * 1000)
versionCode(9683000 + x % 100 + ((int) (x / 100)) * 1000)
ndk {
abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86"

1
play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java
View File

@ -83,6 +83,7 @@ public class LocationRequestHelper {
* @return whether to continue sending reports to this {@link LocationRequestHelper}
*/
public boolean report(Location location) {
if (location == null) return true;
if (lastReport != null) {
if (location.getTime() - lastReport.getTime() < locationRequest.getFastestInterval()) {
return true;

223
vtm-microg-theme/resources/assets/styles/microg.xml
View File

@ -1,32 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<rendertheme base-text-scale="1.25" map-background="#F0EDE5"
<rendertheme base-text-scale="1.25" map-background="#EAEAEA"
version="1" xmlns="http://opensciencemap.org/rendertheme"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
<style-line cap="butt" fix="true" id="fix" width="1.0"/>
<style-text fill="#AA333333" id="road:z12" k="name" priority="2" size="14" stroke="#eeeeee"
stroke-width="2.0"/>
<style-text fill="#AA333333" id="road:z13" k="name" priority="3" size="14" stroke="#eeeeee"
stroke-width="2.0"/>
<style-text fill="#AA333333" id="road:z14" k="name" priority="4" size="14" stroke="#eeeeee"
stroke-width="2.0"/>
<style-text fill="#AA333333" id="road:z16" k="name" priority="6" size="14" stroke="#eeeeee"
stroke-width="2.0"/>
<style-text fill="#AA333333" id="road:z12" k="name" priority="2" size="16" stroke="#eeeeee"
stroke-width="5.0"/>
<style-text fill="#AA333333" id="road:z13" k="name" priority="3" size="16" stroke="#eeeeee"
stroke-width="5.0"/>
<style-text fill="#AA333333" id="road:z14" k="name" priority="4" size="16" stroke="#eeeeee"
stroke-width="5.0"/>
<style-text fill="#AA333333" id="road:z16" k="name" priority="6" size="16" stroke="#eeeeee"
stroke-width="5.0"/>
<style-text fill="#FF783B03" id="road:orange" k="name" priority="6" size="16" stroke="#eeeeee"
stroke-width="5.0"/>
<style-text style="bold" caption="true" fill="#000000" id="park" k="name" priority="0"
size="17" stroke="#eeeeee" stroke-width="2.0"/>
<style-text caption="true" dy="-14" fill="#00afff" id="transit" k="name" priority="5" size="16"
stroke="#eeeeee" stroke-width="5.0"/>
<style-text caption="true" dy="-10" fill="#00afff" id="transit-small" k="name" priority="5"
size="16"
stroke="#eeeeee" stroke-width="5.0"/>
<style-area fill="#33AA0000" id="debug" stroke="#FF0000" stroke-width="1"/>
<style-line id="debug" stroke="#00FF00"/>
<style-line id="building" stroke="#dcdcdc" use="fix" width="1.0"/>
<style-line id="building-poi" stroke="#EBD5AA" use="fix" width="1.0"/>
<style-line id="sub-building" stipple="10" stipple-stroke="#00000000" stipple-width="1.0"
use="building"/>
<style-area fill="#fff2f2f2" id="building" mesh="true"/>
<style-area fill="#ffFAEDD4" id="building-poi" mesh="true"/>
<style-line cap="square" id="road-fix" use="fix"/>
<style-line id="tertiary:z12" stroke="#ffffff" use="fix" width="1.0"/>
<style-line id="secondary:z12" stroke="#ffffff" use="fix" width="1.0"/>
<style-line id="trunk:z12" stroke="#FFF1B9" use="fix" width="1.0"/>
<style-line id="primary:z12" stroke="#ffebaf" use="fix" width="1.0"/>
<style-line id="motorway_link:z12" stroke="#fde7c4" use="fix" width="1.0"/>
<style-line id="motorway:z12" stroke="#fed89d" use="fix" width="1.5"/>
@ -36,22 +50,33 @@
<style-line id="residential:z18" stroke="#ffffff" width="1.0"/>
<style-line id="tertiary:z18" stroke="#ffffff" width="1.2"/>
<style-line id="secondary:z18" stroke="#ffffff" width="1.4"/>
<style-line id="trunk:z18" stroke="#FFF1B9" width="1.6"/>
<style-line id="primary:z18" stroke="#ffebaf" width="1.6"/>
<style-line id="motorway_link:z18" stroke="#fde7c4" width="1.1"/>
<style-line id="motorway:z18" stroke="#fed89d" width="2.0"/>
<style-line id="waterstream:z18" stroke="#A3CCFF" width="0.2"/>
<style-line fix="true" id="river:z14" stroke="#A3CCFF" width="1.5"/>
<style-line fix="true" id="river:z18" stroke="#A3CCFF" width="2.5"/>
<style-line fix="true" id="waterstream:z14" stroke="#A3CCFF" width="1.0"/>
<style-line fix="true" id="waterstream:z18" stroke="#A3CCFF" width="2.0"/>
<style-area fill="#CBE6A3" id="green"/>
<style-area blend="10" blend-fill="#D6E9B9" fill="#D4E4C9" id="lightgreen"/>
<style-area blend="10" blend-fill="#DDE6D5" fill="#D4E4C9" id="graygreen"/>
<style-area blend="10" blend-fill="#DAE8D1" fill="#D4E4C9" id="sportgreen"/>
<style-area blend="14" blend-fill="#EAEAEA" fill="#F0E0C8" id="city"/>
<style-area blend="17" blend-fill="#EAEAEA" fill="#EFE4D6" id="city"/>
<style-area fill="#CEE7A5" id="national_park"/>
<style-area fill="#F9EDF1" id="medical"/>
<style-area fill="#E4E4DF" id="education"/>
<style-area fill="#EAEAEA" id="residential"/>
<m closed="yes" k="landuse" v="residential">
<m closed="yes" k="boundary" v="administrative">
<m k="place" v="suburb">
<area use="residential"/>
</m>
</m>
<m closed="yes" k="landuse" v="residential|commercial">
<area use="residential"/>
</m>
@ -64,7 +89,8 @@
</m>
<m closed="yes" k="leisure" v="park|garden">
<area use="green"/>
<area use="lightgreen"/>
<text use="park"/>
</m>
<m closed="yes" k="leisure" v="golf_course|miniature_golf">
@ -79,7 +105,17 @@
<area use="lightgreen"/>
</m>
<m closed="yes" k="landuse" v="retail" zoom-max="18">
<m closed="yes" k="boundary" v="national_park">
<area use="national_park"/>
<text use="park"/>
</m>
<m closed="yes" k="leisure" v="nature_reserve">
<area use="national_park"/>
<text use="park"/>
</m>
<m closed="yes" k="landuse" v="retail">
<area use="city"/>
</m>
@ -91,6 +127,10 @@
<area use="city"/>
</m>
<m closed="yes" k="shop" v="mall">
<area use="city"/>
</m>
<m closed="yes" k="amenity" v="college|university|school|kindergarten">
<area use="education"/>
</m>
@ -110,8 +150,45 @@
</m>
<m k="waterway">
<m k="waterway" v="stream">
<line use="waterstream:z18"/>
<m k="waterway" v="stream|drain|ditch">
<m zoom-max="15">
<m k="tunnel" v="~|no">
<line use="waterstream:z14"/>
</m>
<m k="tunnel" v="yes">
<line stipple="10" stipple-stroke="#00000000" stipple-width="1.0"
use="waterstream:z14"/>
</m>
</m>
<m zoom-min="15">
<m k="tunnel" v="~|no">
<line use="waterstream:z18"/>
</m>
<m k="tunnel" v="yes">
<line stipple="10" stipple-stroke="#00000000" stipple-width="1.0"
use="waterstream:z14"/>
</m>
</m>
</m>
<m k="waterway" v="river|canal">
<m zoom-max="15" zoom-min="12">
<m k="tunnel" v="~|no">
<line use="river:z14"/>
</m>
<m k="tunnel" v="yes">
<line stipple="10" stipple-stroke="#00000000" stipple-width="1.0"
use="river:z14"/>
</m>
</m>
<m zoom-min="15">
<m k="tunnel" v="~|no">
<line use="river:z18"/>
</m>
<m k="tunnel" v="yes">
<line stipple="10" stipple-stroke="#00000000" stipple-width="1.0"
use="river:z18"/>
</m>
</m>
</m>
</m>
@ -122,10 +199,10 @@
<m e="way">
<outline-layer fix="true" id="motorway:z12" stroke="#7ac87800" width="1.2"/>
<outline-layer fix="true" id="motorway_link:z12" stroke="#47fea200" width="0.8"/>
<outline-layer fix="true" id="primary:z12" stroke="#65ca9f00" width="1.4"/>
<outline-layer fix="true" id="trunk:z12" stroke="#65ca9f00" width="1.4"/>
<outline-layer fix="true" id="motorway:z18" stroke="#7ac87800" width="1.8"/>
<outline-layer fix="true" id="motorway_link:z18" stroke="#47fea200" width="1.2"/>
<outline-layer fix="true" id="primary:z18" stroke="#65ca9f00" width="2.1"/>
<outline-layer fix="true" id="trunk:z18" stroke="#65ca9f00" width="1.8"/>
<!--<outline-layer id="primary" stroke="#aa7f7700" width="0.1"/>-->
<m k="highway">
@ -136,48 +213,54 @@
</m>
<m k="highway" v="trunk_link|motorway_link">
<m zoom-max="13">
<line outline="motorway_link:z12" stroke="#80fdf0db"
<line outline="motorway_link:z12" stroke="#E0DEDA"
use="motorway_link:z12"/>
</m>
<m zoom-min="13">
<line outline="motorway_link:z18" stroke="#80fdf0db"
<line outline="motorway_link:z18" stroke="#E0DEDA"
use="motorway_link:z18"/>
</m>
</m>
<m k="highway" v="pedestrian">
<line fade="13" stroke="#80ffffff" use="pedestrian:z18"/>
<line fade="13" stroke="#E0DEDA" use="pedestrian:z18"/>
</m>
<m k="highway" v="residential|road|living_street|unclassified">
<line fade="13" stroke="#80ffffff" use="residential:z18"/>
<line fade="13" stroke="#E0DEDA" use="residential:z18"/>
</m>
<m k="highway" v="tertiary|secondary_link">
<line stroke="#80ffffff" use="tertiary:z12"/>
<line stroke="#80ffffff" use="tertiary:z18"/>
<line stroke="#E0DEDA" use="tertiary:z12"/>
<line stroke="#E0DEDA" use="tertiary:z18"/>
</m>
<m k="highway" v="secondary|primary_link">
<line stroke="#80ffffff" use="secondary:z12"/>
<line stroke="#80ffffff" use="secondary:z18"/>
<line stroke="#E0DEDA" use="secondary:z12"/>
<line stroke="#E0DEDA" use="secondary:z18"/>
</m>
<m k="highway" v="primary">
<m k="highway" v="trunk|primary">
<m zoom-max="13">
<line outline="primary:z12" stroke="#80fffaea" use="primary:z12"/>
<line outline="trunk:z12" stroke="#E0DEDA" use="trunk:z12"/>
</m>
<m zoom-min="13">
<line outline="primary:z18" stroke="#80fffaea" use="primary:z18"/>
<line outline="trunk:z18" stroke="#E0DEDA" use="trunk:z18"/>
</m>
</m>
<m k="highway" v="motorway|trunk">
<m k="highway" v="motorway">
<m zoom-max="13">
<line outline="motorway:z12" stroke="#80fef0db" use="motorway:z12"/>
<line outline="motorway:z12" stroke="#E0DEDA" use="motorway:z12"/>
</m>
<m zoom-min="13">
<line outline="motorway:z12" stroke="#80fef0db" use="motorway:z18"/>
<line outline="motorway:z12" stroke="#E0DEDA" use="motorway:z18"/>
</m>
<outline outline="motorway"/>
</m>
</m>
<m k="tunnel|bridge" v="~|no">
<m k="highway" v="service">
<m k="service" v="driveway|alley">
<line use="walkway:z18"/>
<text use="road:z16"/>
</m>
</m>
<m k="highway" v="path|cycleway|footway|track|steps">
<line use="walkway:z18"/>
<text use="road:z16"/>
@ -217,22 +300,45 @@
</m>
<m k="highway" v="primary">
<m zoom-max="13">
<line outline="primary:z12" use="primary:z12"/>
<line outline="trunk:z12" use="primary:z12"/>
</m>
<m zoom-min="13">
<line outline="primary:z18" use="primary:z18"/>
<line outline="trunk:z18" use="primary:z18"/>
</m>
<m zoom-min="12">
<text use="road:z12"/>
<text use="road:orange"/>
</m>
<!-- disabled for mapsforge/vtm#193
<text caption="true" fill="#111111" k="ref" priority="2" size="10"
stroke="#FFDC36" stroke-width="16.0"/>
-->
</m>
<m k="highway" v="motorway|trunk">
<m k="highway" v="trunk">
<m zoom-max="13">
<line outline="trunk:z12" use="trunk:z12"/>
</m>
<m zoom-min="13">
<line outline="trunk:z18" use="trunk:z18"/>
</m>
<m zoom-min="12">
<text use="road:orange"/>
</m>
<!-- disabled for mapsforge/vtm#193
<text caption="true" fill="#111111" k="ref" priority="2" size="10"
stroke="#FFDC36" stroke-width="16.0"/>
-->
</m>
<m k="highway" v="motorway">
<m zoom-max="13">
<line outline="motorway:z12" use="motorway:z12"/>
</m>
<m zoom-min="13">
<line outline="motorway:z18" use="motorway:z18"/>
</m>
<!-- disabled for mapsforge/vtm#193
<text caption="true" fill="#eeeeee" k="ref" priority="2" size="14"
stroke="#E79608" stroke-width="16.0"/>
-->
<outline outline="motorway"/>
</m>
</m>
@ -289,15 +395,15 @@
<line cap="square" outline="bridge" use="secondary:z18"/>
<text use="road:z12"/>
</m>
<m v="primary">
<m v="trunk|primary">
<m zoom-max="13">
<line cap="square" outline="bridge" use="primary:z12"/>
<line cap="square" outline="bridge" use="trunk:z12"/>
</m>
<m zoom-min="13">
<line cap="square" outline="bridge" use="primary:z18"/>
<line cap="square" outline="bridge" use="trunk:z18"/>
</m>
</m>
<m v="motorway|trunk">
<m v="motorway">
<m zoom-max="13">
<line cap="square" outline="bridge" use="motorway:z12"/>
</m>
@ -328,7 +434,8 @@
<m k="railway" v="tram|light_rail|subway|narrow_gauge|rail">
<m k="tunnel" v="~|no">
<line stipple="20" stipple-stroke="#AAAAAA" stipple-width="0.1" stroke="#CCCCCC"
use="fix"/>
use="fix"
width="0.1"/>
</m>
<m k="tunnel" v="yes">
<line stipple="20" stipple-stroke="#AAAAAA" stipple-width="1.0" stroke="#00000000"
@ -347,15 +454,22 @@
</m>
<m k="building">
<m k="indoor|tunnel" v="yes">
<m k="indoor|tunnel" v="yes" zoom-min="17">
<line use="sub-building"/>
</m>
<m k="indoor|tunnel" v="~|no">
<m k="indoor|tunnel" v="~|no" zoom-min="17">
<line use="building"/>
<m closed="yes">
<area use="building"/>
<m k="shop" v="~">
<m closed="yes">
<area use="building"/>
</m>
<!--<extrusion line-color="#ffdcdcdc" side-color="#66dcdcdc" top-color="#f2f2f2"/>-->
</m>
<m k="shop" v="mall">
<m closed="yes">
<area use="building-poi"/>
</m>
</m>
<extrusion line-color="#ffdcdcdc" side-color="#66dcdcdc" top-color="#f2f2f2"/>
<caption style="bold" fill="#4040ff" k="name" priority="9" size="14"
stroke="#ffffff" stroke-width="2.0"/>
<caption style="bold" fill="#606060" k="addr:housenumber" priority="10" size="10"
@ -387,9 +501,8 @@
stroke="#ffffff" stroke-width="2.0"/>
</m>
<m zoom-max="9">
<caption dy="14" fill="#000000" k="name" priority="1" size="16"
stroke="#ffffff" stroke-width="2.0"
symbol="assets:symbols/dot_white.svg"/>
<caption fill="#000000" k="name" priority="1" size="16"
stroke="#ffffff" stroke-width="2.0"/>
</m>
</m>
<m v="city">
@ -412,6 +525,18 @@
stroke="#ffffff" stroke-width="2.0"/>
</m>
</m>
<m k="railway">
<m v="station">
<m zoom-max="16">
<text use="transit-small"/>
<symbol src="assets:symbols/transit/train_station_small.svg"/>
</m>
<m zoom-min="16">
<text use="transit"/>
<symbol src="assets:symbols/transit/train_station.svg"/>
</m>
</m>
</m>
<m k="addr:housenumber" zoom-min="18">
<caption style="bold" fill="#606060" k="addr:housenumber" size="10" stroke="#ffffff"

7
vtm-microg-theme/resources/assets/symbols/transit/train_station.svg Normal file
View File

@ -0,0 +1,7 @@
<svg width="256" height="256" viewBox="0 0 67.733332 67.733336" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(0 -229.27)">
<rect x="6.35" y="238.26" width="55.033" height="55.033" ry="7.4083" opacity=".4"/>
<rect x="6.35" y="235.62" width="55.033" height="55.033" ry="7.4083" fill="#00afff"/>
<path d="m25.929 243.55c-4.6905 0-8.4667 3.7762-8.4667 8.4669v19.58c0 2.3453 1.8881 4.2334 4.2333 4.2334h0.47852l-4.0235 8.1796 4.7253 0.0216 3.9688-4.7244h14.308l3.9688 4.7244 4.7253-0.0216-4.0246-8.1796h0.21497c2.3453 0 4.2333-1.8881 4.2333-4.2334v-19.58c0-4.6907-3.7761-8.4669-8.4667-8.4669zm0.52917 4.2334h14.817c2.3453 0 4.2333 1.8881 4.2333 4.2334v9.5252h-23.283v-9.5252c0-2.3453 1.8881-4.2334 4.2333-4.2334zm-4.2333 18.521h5.2917v5.2918h-5.2917zm17.992 0h5.2917v5.2918h-5.2917z" fill="#fff"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 834 B

7
vtm-microg-theme/resources/assets/symbols/transit/train_station_small.svg Normal file
View File

@ -0,0 +1,7 @@
<svg width="256" height="256" viewBox="-33.866666 -33.866666 135.466664 135.466664" xmlns="http://www.w3.org/2000/svg">
<g transform="translate(0 -229.27)">
<rect x="6.35" y="238.26" width="55.033" height="55.033" ry="7.4083" opacity=".4"/>
<rect x="6.35" y="235.62" width="55.033" height="55.033" ry="7.4083" fill="#00afff"/>
<path d="m25.929 243.55c-4.6905 0-8.4667 3.7762-8.4667 8.4669v19.58c0 2.3453 1.8881 4.2334 4.2333 4.2334h0.47852l-4.0235 8.1796 4.7253 0.0216 3.9688-4.7244h14.308l3.9688 4.7244 4.7253-0.0216-4.0246-8.1796h0.21497c2.3453 0 4.2333-1.8881 4.2333-4.2334v-19.58c0-4.6907-3.7761-8.4669-8.4667-8.4669zm0.52917 4.2334h14.817c2.3453 0 4.2333 1.8881 4.2333 4.2334v9.5252h-23.283v-9.5252c0-2.3453 1.8881-4.2334 4.2333-4.2334zm-4.2333 18.521h5.2917v5.2918h-5.2917zm17.992 0h5.2917v5.2918h-5.2917z" fill="#fff"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 854 B