From b52747972d77093f61cb19edec93a82f627cea24 Mon Sep 17 00:00:00 2001
From: Markus Wageringel <markus.wageringel+gh@gmail.com>
Date: Fri, 22 Jul 2022 18:26:30 +0200
Subject: [PATCH] change icon and add adaptive icon

This also fixes the scaling of the maskable web icons.
---
 .gitignore                        |  2 +
 Makefile                          | 16 ++++--
 assets/launcher_icon.svg          | 75 ++++++++++++++++---------
 assets/launcher_icon_adaptive.svg | 92 +++++++++++++++++++++++++++++++
 pubspec.yaml                      |  2 +
 web/manifest.json                 |  4 +-
 6 files changed, 158 insertions(+), 33 deletions(-)
 create mode 100644 assets/launcher_icon_adaptive.svg

diff --git a/.gitignore b/.gitignore
index 52c5622..b50b39b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@
 *.ico
 *.apk
 *.apk.sha1
+/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+/android/app/src/main/res/values/colors.xml
 
 # Miscellaneous
 *.class
diff --git a/Makefile b/Makefile
index 36296a7..d907b72 100644
--- a/Makefile
+++ b/Makefile
@@ -31,23 +31,31 @@ assets-web: fonts icons-web
 icons-android: android/app/src/main/res/mipmap-hdpi/ic_launcher.png
 assets/launcher_icon.png: assets/launcher_icon.svg
 	rsvg-convert --width=1024 --height=1024 --keep-aspect-ratio assets/launcher_icon.svg > $@
-android/app/src/main/res/mipmap-hdpi/ic_launcher.png: assets/launcher_icon.png
+assets/launcher_icon_adaptive.png: assets/launcher_icon_adaptive.svg
+	rsvg-convert --page-width=1024 --page-height=1024 --width=584 --height=584 --top=220 --left=220 --keep-aspect-ratio assets/launcher_icon_adaptive.svg > $@
+android/app/src/main/res/mipmap-hdpi/ic_launcher.png: assets/launcher_icon.png assets/launcher_icon_adaptive.png
 	$(FLUTTER) pub get
 	$(FLUTTER) pub run flutter_launcher_icons:main
 
 icons-web: website/favicon.ico web/favicon.ico web/icons/Icon-192.png web/icons/Icon-maskable-192.png web/icons/Icon-512.png web/icons/Icon-maskable-512.png
 web/favicon.ico website/favicon.ico: assets/launcher_icon.svg
 	magick -background none assets/launcher_icon.svg -define icon:auto-resize $@
-web/icons/Icon-192.png web/icons/Icon-maskable-192.png: assets/launcher_icon.svg
+web/icons/Icon-192.png: assets/launcher_icon.svg
 	mkdir -p web/icons/
 	rsvg-convert --width=192 --height=192 --keep-aspect-ratio assets/launcher_icon.svg > $@
-web/icons/Icon-512.png web/icons/Icon-maskable-512.png: assets/launcher_icon.svg
+web/icons/Icon-512.png: assets/launcher_icon.svg
 	mkdir -p web/icons/
 	rsvg-convert --width=512 --height=512 --keep-aspect-ratio assets/launcher_icon.svg > $@
+web/icons/Icon-maskable-192.png: assets/launcher_icon_adaptive.svg
+	mkdir -p web/icons/
+	rsvg-convert --page-width=192 --page-height=192 --width=150 --height=150 --top=21 --left=21 --keep-aspect-ratio -b '#536dfeff' assets/launcher_icon_adaptive.svg > $@
+web/icons/Icon-maskable-512.png: assets/launcher_icon_adaptive.svg
+	mkdir -p web/icons/
+	rsvg-convert --page-width=512 --page-height=512 --width=400 --height=400 --top=56 --left=56 --keep-aspect-ratio -b '#536dfeff' assets/launcher_icon_adaptive.svg > $@
 icons-clean:
 	rm -f android/app/src/main/res/mipmap-*/ic_launcher.png
 	rm -f website/favicon.ico web/favicon.ico web/icons/*.png
-	rm -f assets/launcher_icon.png
+	rm -f assets/launcher_icon.png assets/launcher_icon_adaptive.png
 
 # fonts are downloaded and bundled into the app
 fonts: fonts/NotoSansMath-Regular.ttf
diff --git a/assets/launcher_icon.svg b/assets/launcher_icon.svg
index 7397272..5510bb0 100644
--- a/assets/launcher_icon.svg
+++ b/assets/launcher_icon.svg
@@ -7,10 +7,11 @@
    viewBox="0 0 60.235294 60.235294"
    version="1.1"
    id="svg1791"
-   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
    sodipodi:docname="launcher_icon.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <sodipodi:namedview
@@ -24,48 +25,68 @@
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="mm"
      showgrid="false"
-     inkscape:zoom="0.70710678"
-     inkscape:cx="523.96612"
-     inkscape:cy="548.00776"
+     inkscape:zoom="0.35355339"
+     inkscape:cx="41.012193"
+     inkscape:cy="482.24683"
      inkscape:window-width="1918"
      inkscape:window-height="1078"
      inkscape:window-x="1280"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
+     inkscape:current-layer="layer3" />
   <defs
      id="defs1788">
-    <rect
-       x="170.52023"
-       y="338.1077"
-       width="88.363831"
-       height="161.03641"
-       id="rect1481" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1370">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.2;"
+         offset="0"
+         id="stop1366" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop1368" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1370"
+       id="linearGradient1372"
+       x1="543.60138"
+       y1="552.97473"
+       x2="547.29724"
+       y2="577.31006"
+       gradientUnits="userSpaceOnUse" />
   </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Background"
+     style="display:inline">
+    <rect
+       style="display:inline;fill:#13141a;fill-opacity:1;fill-rule:evenodd;stroke-width:1.05111"
+       id="rect1061"
+       width="60.235294"
+       height="60.235294"
+       x="0"
+       y="1.110223e-16"
+       rx="20.588236"
+       ry="20.588236" />
+  </g>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-504.87587,-532.57763)">
     <path
-       style="fill:#3f51b5;fill-opacity:1;stroke-width:0.285539"
-       d="m 509.01706,581.42615 20.13468,-38.489 8.68432,14.67487 4.08111,-7.04632 18.78881,30.82224 z"
        id="path63"
-       sodipodi:nodetypes="cccccc" />
-    <text
-       xml:space="preserve"
-       transform="matrix(0.31140734,0,0,0.32847661,468.13014,431.92563)"
-       id="text1479"
-       style="font-size:128px;white-space:pre;shape-inside:url(#rect1481);shape-padding:0.241668;display:inline;fill:#f2f2f2;fill-opacity:1"><tspan
-         x="170.76172"
-         y="454.72856"
-         id="tspan965"><tspan
-           style="font-family:'Libertinus Math';-inkscape-font-specification:'Libertinus Math'"
-           id="tspan963">≡</tspan></tspan></text>
+       style="fill:#536dfe;fill-opacity:1;fill-rule:evenodd;stroke-width:0.285539"
+       d="m 528.86287,535.68072 -19.71379,42.5658 51.68888,-0.0382 -19.0253,-35.53374 -4.17353,8.30178 z m 1.1324,14.7102 6.98504,11.16235 4.05343,-8.28159 9.77124,18.26745 -30.97297,-0.16891 z"
+       sodipodi:nodetypes="cccccccccccc" />
     <path
-       style="fill:#000000;fill-opacity:0.12;stroke-width:0.0634825"
-       d="m 537.8353,557.6165 -12.8523,23.79778 26.95684,-0.02 z"
+       style="fill:url(#linearGradient1372);fill-opacity:1;stroke-width:0.0634825"
+       d="m 537.6394,550.97482 4.17358,-8.30111 19.02389,35.53378 -6.46355,0.002 -13.33961,-24.93835 -1.04147,2.14955 z"
        id="path2039"
-       sodipodi:nodetypes="cccc" />
+       sodipodi:nodetypes="ccccccc" />
   </g>
 </svg>
diff --git a/assets/launcher_icon_adaptive.svg b/assets/launcher_icon_adaptive.svg
new file mode 100644
index 0000000..fbe47db
--- /dev/null
+++ b/assets/launcher_icon_adaptive.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1024"
+   height="1024"
+   viewBox="0 0 60.235294 60.235294"
+   version="1.1"
+   id="svg1791"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="launcher_icon_adaptive.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1793"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.35355339"
+     inkscape:cx="41.012193"
+     inkscape:cy="482.24683"
+     inkscape:window-width="1918"
+     inkscape:window-height="1078"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3" />
+  <defs
+     id="defs1788">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1370">
+      <stop
+         style="stop-color:#8c9eff;stop-opacity:0.2;"
+         offset="0"
+         id="stop1366" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop1368" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1370"
+       id="linearGradient1372"
+       x1="543.60138"
+       y1="552.97473"
+       x2="547.29724"
+       y2="577.31006"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Background"
+     style="display:none">
+    <rect
+       style="display:inline;fill:#13141a;fill-opacity:1;fill-rule:evenodd;stroke-width:1.05111"
+       id="rect1061"
+       width="60.235294"
+       height="60.235294"
+       x="0"
+       y="1.110223e-16"
+       rx="20.588236"
+       ry="20.588236" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-504.87587,-532.57763)">
+    <path
+       id="path63"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:0.285539"
+       d="m 528.86287,535.68072 -19.71379,42.5658 51.68888,-0.0382 -19.0253,-35.53374 -4.17353,8.30178 z m 1.1324,14.7102 6.98504,11.16235 4.05343,-8.28159 9.77124,18.26745 -30.97297,-0.16891 z"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       style="fill:url(#linearGradient1372);fill-opacity:1;stroke-width:0.0634825"
+       d="m 537.6394,550.97482 4.17358,-8.30111 19.02389,35.53378 -6.46355,0.002 -13.33961,-24.93835 -1.04147,2.14955 z"
+       id="path2039"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/pubspec.yaml b/pubspec.yaml
index 510c7df..c23043f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -107,3 +107,5 @@ flutter_icons:
   android: true
   ios: false
   image_path: assets/launcher_icon.png
+  adaptive_icon_foreground: assets/launcher_icon_adaptive.png
+  adaptive_icon_background: "#536dfe"
diff --git a/web/manifest.json b/web/manifest.json
index 20a155d..31d3e31 100644
--- a/web/manifest.json
+++ b/web/manifest.json
@@ -3,8 +3,8 @@
     "short_name": "everest",
     "start_url": ".",
     "display": "standalone",
-    "background_color": "#0175C2",
-    "theme_color": "#0175C2",
+    "background_color": "#536dfe",
+    "theme_color": "#536dfe",
     "description": "A mathematical puzzle game.",
     "orientation": "portrait-primary",
     "prefer_related_applications": false,