midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merging master

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-11-12 12:25:36 +01:00
commit b329bbbdb3
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
State.ts
View file

@ -22,7 +22,7 @@ export default class State {
// The singleton of the global state // The singleton of the global state
public static state: State; public static state: State;
public static vNumber = "0.1.2e"; public static vNumber = "0.1.2f";
// The user journey states thresholds when a new feature gets unlocked // The user journey states thresholds when a new feature gets unlocked
public static userJourney = { public static userJourney = {

3
UI/Popup/EditableTagRendering.ts
View file

@ -35,11 +35,14 @@ export default class EditableTagRendering extends UIElement {
if (this._configuration.question !== undefined) { if (this._configuration.question !== undefined) {
// 2.3em total width // 2.3em total width
if(State.state.featureSwitchUserbadge.data){
this._editButton = this._editButton =
Svg.pencil_ui().SetClass("edit-button") Svg.pencil_ui().SetClass("edit-button")
.onClick(() => { .onClick(() => {
self._editMode.setData(true); self._editMode.setData(true);
}); });
}
// And at last, set up the skip button // And at last, set up the skip button

3
UI/Popup/FeatureInfoBox.ts
View file

@ -34,6 +34,9 @@ export class FeatureInfoBox extends UIElement {
layerConfig.titleIcons.map(icon => new TagRenderingAnswer(tags, icon))) layerConfig.titleIcons.map(icon => new TagRenderingAnswer(tags, icon)))
.SetClass("featureinfobox-icons"); .SetClass("featureinfobox-icons");
this._renderings = layerConfig.tagRenderings.map(tr => new EditableTagRendering(tags, tr)); this._renderings = layerConfig.tagRenderings.map(tr => new EditableTagRendering(tags, tr));
if (State.state.featureSwitchUserbadge.data) {
this._questionBox = new QuestionBox(tags, layerConfig.tagRenderings);
}
} }
InnerRender(): string { InnerRender(): string {

4
assets/themes/shops/shop.svg
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"> <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
<g id="hbars"> <g id="hbars">
<rect x="1" y="6" width="11" height="0.5" style="fill:#ac39ac"/> <rect x="1" y="6" width="11" height="0.5" style="fill:#ac39ac"/>
@ -13,4 +13,4 @@
<path id="handle" d="M5.9,4 L7.9,1 A 0.5,0.5 0 0,1 8.83,1.4 L 7.1,4 Z" style="fill:#ac39ac;stroke:none"/> <path id="handle" d="M5.9,4 L7.9,1 A 0.5,0.5 0 0,1 8.83,1.4 L 7.1,4 Z" style="fill:#ac39ac;stroke:none"/>
<path id="body" fill-rule="evenodd" d="M 0,4 L 13,4 11,11 2,11 Z <path id="body" fill-rule="evenodd" d="M 0,4 L 13,4 11,11 2,11 Z
M 1.25,5 L 11.75,5 10.25,10 2.75,10 Z" style="fill:#ac39ac;stroke:none"/> M 1.25,5 L 11.75,5 10.25,10 2.75,10 Z" style="fill:#ac39ac;stroke:none"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 842 B

After

Width:  |  Height:  |  Size: 838 B