App: add google play badge on download page, update text

app/AppIndex.svelte

@@ -9,8 +9,9 @@
   const t = Translations.t.app
   const lng = Locale.language
   let fdroid = t.downloadOnFDroid.current
+  let googleplay = t.getOnGoogle.current
 
-  let supportedVersions: { version: number; codename: string } = [
+  let supportedVersions: { version: number; codename: string }[] = [
     { version: 9, codename: "pie" },
     { version: 10, codename: "quince-tart" },
     { version: 11, codename: "red-velvet-cake" },
@@ -80,6 +81,15 @@
           />
         </a>
 
+        <a href="https://play.google.com/store/apps/details?id=org.mapcomplete">
+          <img
+            src={`./googleplay.svg`}
+            alt={$googleplay}
+            class="m-2"
+            style="width: 17rem"
+          />
+        </a>
+
         <a
           rel="noopener"
           href="https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://source.mapcomplete.org/MapComplete/android-wrapper/releases"

app/build_and_deploy.sh

@@ -8,6 +8,8 @@ npm run build:vite:app-landing
 mkdir to_upload
 mv dist/app/* to_upload/
 cp *.png to_upload/
+cp *.svg to_upload/
+
 cp -r .well-known/ to_upload/
 mkdir -p to_upload/assets/fonts
 

app/googleplay.svg

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+
+<svg
+   width="800"
+   height="237.03703"
+   viewBox="0 -47.5 135 39.999999"
+   id="Layer_1"
+   version="1.1"
+   sodipodi:docname="google-play-badge-logo-svgrepo-com.svg"
+   inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     id="namedview23"
+     pagecolor="#ffffff"
+     bordercolor="#999999"
+     borderopacity="1"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="2.0062124"
+     inkscape:cx="133.58506"
+     inkscape:cy="137.8219"
+     inkscape:window-width="1920"
+     inkscape:window-height="1005"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" />
+  <style
+     id="style1">.st0{fill:#a6a6a6}.st1{stroke:#ffffff;stroke-width:.2;stroke-miterlimit:10}.st1,.st2{fill:#fff}.st3{fill:url(#SVGID_1_)}.st4{fill:url(#SVGID_2_)}.st5{fill:url(#SVGID_3_)}.st6{fill:url(#SVGID_4_)}.st7,.st8,.st9{opacity:.2;enable-background:new}.st8,.st9{opacity:.12}.st9{opacity:.25;fill:#fff}</style>
+  <path
+     d="M 130,-7.5 H 5 c -2.8,0 -5,-2.2 -5,-5 v -30 c 0,-2.8 2.2,-5 5,-5 h 125 c 2.8,0 5,2.2 5,5 v 30 c 0,2.8 -2.2,5 -5,5 z"
+     id="path1" />
+  <path
+     class="st0"
+     d="m 130,-46.7 c 2.3,0 4.2,1.9 4.2,4.2 v 30 c 0,2.3 -1.9,4.2 -4.2,4.2 H 5 c -2.3,0 -4.2,-1.9 -4.2,-4.2 v -30 c 0,-2.3 1.9,-4.2 4.2,-4.2 h 125 m 0,-0.8 H 5 c -2.8,0 -5,2.3 -5,5 v 30 c 0,2.8 2.2,5 5,5 h 125 c 2.8,0 5,-2.2 5,-5 v -30 c 0,-2.7 -2.2,-5 -5,-5 z"
+     id="path2" />
+  <path
+     class="st1"
+     d="m 47.4,-37.3 c 0,0.8 -0.2,1.5 -0.7,2 -0.6,0.6 -1.3,0.9 -2.2,0.9 -0.9,0 -1.6,-0.3 -2.2,-0.9 -0.6,-0.6 -0.9,-1.3 -0.9,-2.2 0,-0.9 0.3,-1.6 0.9,-2.2 0.6,-0.6 1.3,-0.9 2.2,-0.9 0.4,0 0.8,0.1 1.2,0.3 0.4,0.2 0.7,0.4 0.9,0.7 l -0.5,0.5 c -0.4,-0.5 -0.9,-0.7 -1.6,-0.7 -0.6,0 -1.2,0.2 -1.6,0.7 -0.5,0.4 -0.7,1 -0.7,1.7 0,0.7 0.2,1.3 0.7,1.7 0.5,0.4 1,0.7 1.6,0.7 0.7,0 1.2,-0.2 1.7,-0.7 0.3,-0.3 0.5,-0.7 0.5,-1.2 h -2.2 v -0.8 h 2.9 z m 4.6,-2.5 h -2.7 v 1.9 h 2.5 v 0.7 h -2.5 v 1.9 H 52 v 0.8 h -3.5 v -6 H 52 Z m 3.3,5.3 h -0.8 v -5.3 h -1.7 v -0.7 H 57 v 0.7 h -1.7 z m 4.6,0 v -6 h 0.8 v 6 z m 4.2,0 h -0.8 v -5.3 h -1.7 v -0.7 h 4.1 v 0.7 H 64 v 5.3 z m 9.5,-0.8 c -0.6,0.6 -1.3,0.9 -2.2,0.9 -0.9,0 -1.6,-0.3 -2.2,-0.9 -0.6,-0.6 -0.9,-1.3 -0.9,-2.2 0,-0.9 0.3,-1.6 0.9,-2.2 0.6,-0.6 1.3,-0.9 2.2,-0.9 0.9,0 1.6,0.3 2.2,0.9 0.6,0.6 0.9,1.3 0.9,2.2 0,0.9 -0.3,1.6 -0.9,2.2 z m -3.8,-0.5 c 0.4,0.4 1,0.7 1.6,0.7 0.6,0 1.2,-0.2 1.6,-0.7 0.4,-0.4 0.7,-1 0.7,-1.7 0,-0.7 -0.2,-1.3 -0.7,-1.7 -0.4,-0.4 -1,-0.7 -1.6,-0.7 -0.6,0 -1.2,0.2 -1.6,0.7 -0.4,0.4 -0.7,1 -0.7,1.7 0,0.7 0.2,1.3 0.7,1.7 z m 5.8,1.3 v -6 h 0.9 l 2.9,4.7 v -4.7 h 0.8 v 6 h -0.8 l -3.1,-4.9 v 4.9 z"
+     id="path3" />
+  <path
+     class="st2"
+     d="m 68.1,-25.7 c -2.4,0 -4.3,1.8 -4.3,4.3 0,2.4 1.9,4.3 4.3,4.3 2.4,0 4.3,-1.8 4.3,-4.3 0,-2.6 -1.9,-4.3 -4.3,-4.3 z m 0,6.8 c -1.3,0 -2.4,-1.1 -2.4,-2.6 0,-1.5 1.1,-2.6 2.4,-2.6 1.3,0 2.4,1 2.4,2.6 0,1.5 -1.1,2.6 -2.4,2.6 z m -9.3,-6.8 c -2.4,0 -4.3,1.8 -4.3,4.3 0,2.4 1.9,4.3 4.3,4.3 2.4,0 4.3,-1.8 4.3,-4.3 0,-2.6 -1.9,-4.3 -4.3,-4.3 z m 0,6.8 c -1.3,0 -2.4,-1.1 -2.4,-2.6 0,-1.5 1.1,-2.6 2.4,-2.6 1.3,0 2.4,1 2.4,2.6 0,1.5 -1.1,2.6 -2.4,2.6 z m -11.1,-5.5 v 1.8 H 52 c -0.1,1 -0.5,1.8 -1,2.3 -0.6,0.6 -1.6,1.3 -3.3,1.3 -2.7,0 -4.7,-2.1 -4.7,-4.8 0,-2.7 2.1,-4.8 4.7,-4.8 1.4,0 2.5,0.6 3.3,1.3 l 1.3,-1.3 c -1.1,-1 -2.5,-1.8 -4.5,-1.8 -3.6,0 -6.7,3 -6.7,6.6 0,3.6 3.1,6.6 6.7,6.6 2,0 3.4,-0.6 4.6,-1.9 1.2,-1.2 1.6,-2.9 1.6,-4.2 0,-0.4 0,-0.8 -0.1,-1.1 z m 45.4,1.4 c -0.4,-1 -1.4,-2.7 -3.6,-2.7 -2.2,0 -4,1.7 -4,4.3 0,2.4 1.8,4.3 4.2,4.3 1.9,0 3.1,-1.2 3.5,-1.9 l -1.4,-1 c -0.5,0.7 -1.1,1.2 -2.1,1.2 -1,0 -1.6,-0.4 -2.1,-1.3 l 5.7,-2.4 z m -5.8,1.4 c 0,-1.6 1.3,-2.5 2.2,-2.5 0.7,0 1.4,0.4 1.6,0.9 z m -4.7,4.1 h 1.9 V -30 h -1.9 z m -3,-7.3 c -0.5,-0.5 -1.3,-1 -2.3,-1 -2.1,0 -4.1,1.9 -4.1,4.3 0,2.4 1.9,4.2 4.1,4.2 1,0 1.8,-0.5 2.2,-1 h 0.1 v 0.6 c 0,1.6 -0.9,2.5 -2.3,2.5 -1.1,0 -1.9,-0.8 -2.1,-1.5 l -1.6,0.7 c 0.5,1.1 1.7,2.5 3.8,2.5 2.2,0 4,-1.3 4,-4.4 v -7.6 h -1.8 z m -2.2,5.9 c -1.3,0 -2.4,-1.1 -2.4,-2.6 0,-1.5 1.1,-2.6 2.4,-2.6 1.3,0 2.3,1.1 2.3,2.6 0,1.5 -1,2.6 -2.3,2.6 z M 101.8,-30 h -4.5 v 12.5 h 1.9 v -4.7 h 2.6 c 2.1,0 4.1,-1.5 4.1,-3.9 0,-2.4 -2,-3.9 -4.1,-3.9 z m 0.1,6 h -2.7 v -4.3 h 2.7 c 1.4,0 2.2,1.2 2.2,2.1 -0.1,1.1 -0.9,2.2 -2.2,2.2 z m 11.5,-1.8 c -1.4,0 -2.8,0.6 -3.3,1.9 l 1.7,0.7 c 0.4,-0.7 1,-0.9 1.7,-0.9 1,0 1.9,0.6 2,1.6 v 0.1 c -0.3,-0.2 -1.1,-0.5 -1.9,-0.5 -1.8,0 -3.6,1 -3.6,2.8 0,1.7 1.5,2.8 3.1,2.8 1.3,0 1.9,-0.6 2.4,-1.2 h 0.1 v 1 h 1.8 v -4.8 c -0.2,-2.2 -1.9,-3.5 -4,-3.5 z m -0.2,6.9 c -0.6,0 -1.5,-0.3 -1.5,-1.1 0,-1 1.1,-1.3 2,-1.3 0.8,0 1.2,0.2 1.7,0.4 -0.2,1.2 -1.2,2 -2.2,2 z m 10.5,-6.6 -2.1,5.4 h -0.1 l -2.2,-5.4 h -2 l 3.3,7.6 -1.9,4.2 h 1.9 l 5.1,-11.8 z m -16.8,8 h 1.9 V -30 h -1.9 z"
+     id="path4" />
+  <g
+     id="g23"
+     transform="translate(0,-47.5)">
+    <linearGradient
+       id="SVGID_1_"
+       gradientUnits="userSpaceOnUse"
+       x1="21.799999"
+       y1="33.290001"
+       x2="5.0170002"
+       y2="16.507999"
+       gradientTransform="matrix(1,0,0,-1,0,42)">
+      <stop
+         offset="0"
+         stop-color="#00a0ff"
+         id="stop4" />
+      <stop
+         offset=".007"
+         stop-color="#00a1ff"
+         id="stop5" />
+      <stop
+         offset=".26"
+         stop-color="#00beff"
+         id="stop6" />
+      <stop
+         offset=".512"
+         stop-color="#00d2ff"
+         id="stop7" />
+      <stop
+         offset=".76"
+         stop-color="#00dfff"
+         id="stop8" />
+      <stop
+         offset="1"
+         stop-color="#00e3ff"
+         id="stop9" />
+    </linearGradient>
+    <path
+       class="st3"
+       d="M 10.4,7.5 C 10.1,7.8 10,8.3 10,8.9 V 31 c 0,0.6 0.2,1.1 0.5,1.4 L 10.6,32.5 23,20.1 v -0.2 z"
+       id="path9"
+       style="fill:url(#SVGID_1_)" />
+    <linearGradient
+       id="SVGID_2_"
+       gradientUnits="userSpaceOnUse"
+       x1="33.834"
+       y1="21.999001"
+       x2="9.6370001"
+       y2="21.999001"
+       gradientTransform="matrix(1,0,0,-1,0,42)">
+      <stop
+         offset="0"
+         stop-color="#ffe000"
+         id="stop10" />
+      <stop
+         offset=".409"
+         stop-color="#ffbd00"
+         id="stop11" />
+      <stop
+         offset=".775"
+         stop-color="orange"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#ff9c00"
+         id="stop13" />
+    </linearGradient>
+    <path
+       class="st4"
+       d="m 27,24.3 -4.1,-4.1 v -0.3 l 4.1,-4.1 0.1,0.1 4.9,2.8 c 1.4,0.8 1.4,2.1 0,2.9 z"
+       id="path13"
+       style="fill:url(#SVGID_2_)" />
+    <linearGradient
+       id="SVGID_3_"
+       gradientUnits="userSpaceOnUse"
+       x1="24.827"
+       y1="19.704"
+       x2="2.069"
+       y2="-3.0539999"
+       gradientTransform="matrix(1,0,0,-1,0,42)">
+      <stop
+         offset="0"
+         stop-color="#ff3a44"
+         id="stop14" />
+      <stop
+         offset="1"
+         stop-color="#c31162"
+         id="stop15" />
+    </linearGradient>
+    <path
+       class="st5"
+       d="M 27.1,24.2 22.9,20 10.4,32.5 c 0.5,0.5 1.2,0.5 2.1,0.1 l 14.6,-8.4"
+       id="path15"
+       style="fill:url(#SVGID_3_)" />
+    <linearGradient
+       id="SVGID_4_"
+       gradientUnits="userSpaceOnUse"
+       x1="7.2969999"
+       y1="41.824001"
+       x2="17.459999"
+       y2="31.660999"
+       gradientTransform="matrix(1,0,0,-1,0,42)">
+      <stop
+         offset="0"
+         stop-color="#32a071"
+         id="stop16" />
+      <stop
+         offset=".069"
+         stop-color="#2da771"
+         id="stop17" />
+      <stop
+         offset=".476"
+         stop-color="#15cf74"
+         id="stop18" />
+      <stop
+         offset=".801"
+         stop-color="#06e775"
+         id="stop19" />
+      <stop
+         offset="1"
+         stop-color="#00f076"
+         id="stop20" />
+    </linearGradient>
+    <path
+       class="st6"
+       d="M 27.1,15.8 12.5,7.5 C 11.6,7 10.9,7.1 10.4,7.6 L 22.9,20 Z"
+       id="path20"
+       style="fill:url(#SVGID_4_)" />
+    <path
+       class="st7"
+       d="m 27,24.1 -14.5,8.2 c -0.8,0.5 -1.5,0.4 -2,0 l -0.1,0.1 0.1,0.1 c 0.5,0.4 1.2,0.5 2,0 z"
+       id="path21" />
+    <path
+       class="st8"
+       d="M 10.4,32.3 C 10.1,32 10,31.5 10,30.9 V 31 c 0,0.6 0.2,1.1 0.5,1.4 v -0.1 z m 21.6,-11 -5,2.8 0.1,0.1 4.9,-2.8 c 0.7,-0.4 1,-0.9 1,-1.4 0,0.5 -0.4,0.9 -1,1.3 z"
+       id="path22" />
+    <path
+       class="st9"
+       d="M 12.5,7.6 32,18.7 c 0.6,0.4 1,0.8 1,1.3 0,-0.5 -0.3,-1 -1,-1.4 L 12.5,7.5 C 11.1,6.7 10,7.3 10,8.9 V 9 c 0,-1.5 1.1,-2.2 2.5,-1.4 z"
+       id="path23" />
+  </g>
+</svg>

langs/cs.json

@@ -7,7 +7,6 @@
         "download": "Stáhnout aplikaci",
         "downloadOnFDroid": "Stáhnout MapComplete na F-Droidu",
         "getOnObtanium": "Získat na Obtainiu",
-        "intro": "MapComplete je k dispozici jako aplikace pro Android k přímému stažení. Pracujeme na to, aby byla zveřejněna i v repozitáři F-Droid.",
         "legacyExplanation": "Kvůli restrikcím společnosti Google nelze zkompilovat identický balíček APK pro novější i starší verze systému Android.\n\n            Pokud instalace z F-Droidu, Google Play, Obtainia nebo instalace výše odkazované nejnovější verze ('latest') selže,\n            zkuste balíčky pro starší verze Androidu, které jsou k dispozici níže.",
         "legacyHeader": "Sestavení pro starší telefony se systémem Android",
         "noPlayServices": "Aplikace funguje bez Google Play Services",

langs/da.json

@@ -7,7 +7,6 @@
         "download": "Download appen",
         "downloadOnFDroid": "Download MapComplete på F-Droid",
         "getOnObtanium": "Hent på Obtainium",
-        "intro": "MapComplete er tilgængelig som Android-app som direkte download. Vi arbejder på også at udgive den på FDroid.",
         "noPlayServices": "Appen fungerer uden Google Play Services",
         "older": "Se ældre builds",
         "title": "MapComplete Android-app"

langs/de.json

@@ -5,7 +5,6 @@
     "app": {
         "back": "Zurück zu MapComplete",
         "download": "Lade die App runter",
-        "intro": "MapComplete gibt's als Android-App zum direkten Download. Wir arbeiten daran, die App auch auf FDroid zu veröffentlichen.",
         "noPlayServices": "Die App funktioniert ohne Google Play Services",
         "older": "Ältere Versionen ansehen",
         "title": "MapComplete Android-App"

langs/en.json

@@ -6,8 +6,9 @@
         "back": "Go back to MapComplete",
         "download": "Download the app",
         "downloadOnFDroid": "Download MapComplete on F-Droid",
+        "getOnGoogle": "Download MapComplete on Google Playstore",
         "getOnObtanium": "Get on Obtainium",
-        "intro": "MapComplete is available as Android App as direct download. We are working on publishing this in on FDroid too.",
+        "intro": "MapComplete is available as Android App on various app stores. Installing the app version makes it easier to access MapComplete and uses less internet. However, the web version has the same features.",
         "legacyExplanation": "Due to restrictions by Google, it is not possible to compile an identical APK for newer and older Android versions.\nIf installing via F-Droid, Google Play, Obtainium or installing 'latest' above failed, try a versions for older versions of android are available below.",
         "legacyHeader": "Builds for older Android phones",
         "noPlayServices": "The app works without Google Play Services",

langs/fr.json

@@ -7,7 +7,6 @@
         "download": "Télécharger l'application",
         "downloadOnFDroid": "Télécharger MapComplete sur F-Droid",
         "getOnObtanium": "Obtenir sur Obtainium",
-        "intro": "MapComplete est disponible en tant qu'application Android en téléchargement direct. Nous nous efforçons de publier également cette application sur FDroid.",
         "legacyExplanation": "En raison des restrictions imposées par Google, il n'est pas possible de compiler un APK identique pour les versions Android récentes et anciennes.\nSi l'installation via F-Droid, Google Play, Obtainium ou l'installation de la « dernière version » ci-dessus a échoué, essayez une des versions pour les anciennes versions d'Android disponibles ci-dessous.",
         "legacyHeader": "Versions pour les anciens téléphones Android",
         "noPlayServices": "L'application fonctionne sans Google Play Services",

langs/it.json

@@ -5,7 +5,6 @@
     "app": {
         "back": "Ritorna a MapComplete",
         "download": "Scarica l'app",
-        "intro": "MapComplete è disponibile come App Android in download diretto. Stiamo lavorando per pubblicarla anche su FDroid.",
         "noPlayServices": "L'app funziona senza Google Play Services",
         "older": "Vedi le vecchie versioni",
         "title": "MapComplete App per  Android"

langs/nl.json

@@ -6,7 +6,6 @@
         "back": "Ga terug naar MapComplete",
         "download": "Download de laatste versie",
         "downloadOnFDroid": "Download MapComplete op F-Droid",
-        "intro": "MapComplete is beschikbaar als Android App. Deze is binnenkort ook in F-Droid beschikbaar",
         "older": "Bekijk oudere versies",
         "title": "MapComplete Anrdoid App"
     },

langs/zh_Hant.json

@@ -7,7 +7,6 @@
         "download": "下載應用程式",
         "downloadOnFDroid": "在 F-Droid 下載 MapComplete",
         "getOnObtanium": "從 Obtainium 取得",
-        "intro": "MapComplete可以在Android App直接下載。我們也計畫在Fdroid發佈。",
         "legacyExplanation": "由於Google的限制，並無法為更新與更舊的Android編譯相同的APK\n            版本。\n\n            如果你透過F-Droid、Google Play、Obtainium或是安裝「最新」的版本失敗，\n            請為其他較舊Android版本使用其他版本。",
         "legacyHeader": "為較舊Android手機建構",
         "noPlayServices": "本應用無需 Google Play 服務即可運行",