From 8ec6eb46d2576c8071af1fbe524164644984565c Mon Sep 17 00:00:00 2001
From: Markus Wageringel <markus.wageringel+gh@gmail.com>
Date: Fri, 22 Jul 2022 19:45:07 +0200
Subject: [PATCH] compatibility with older rsvg-convert

The `--page-width` paramater is only supported since rsvg-convert
version 2.52. For the time being, we avoid it and, instead, add copies
of the launcher icon SVG file with different viewports.
---
 Makefile                          | 10 ++--
 assets/launcher_icon_adaptive.svg |  2 +-
 assets/launcher_icon_alt.svg      | 92 +++++++++++++++++++++++++++++++
 assets/launcher_icon_maskable.svg | 92 +++++++++++++++++++++++++++++++
 4 files changed, 190 insertions(+), 6 deletions(-)
 create mode 100644 assets/launcher_icon_alt.svg
 create mode 100644 assets/launcher_icon_maskable.svg

diff --git a/Makefile b/Makefile
index d907b72..3b6517e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ 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 > $@
 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 > $@
+	rsvg-convert --width=1024 --height=1024 --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
@@ -46,12 +46,12 @@ web/icons/Icon-192.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
+web/icons/Icon-maskable-192.png: assets/launcher_icon_maskable.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
+	rsvg-convert --width=192 --height=192 --keep-aspect-ratio -b '#536dfeff' assets/launcher_icon_maskable.svg > $@
+web/icons/Icon-maskable-512.png: assets/launcher_icon_maskable.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 > $@
+	rsvg-convert --width=512 --height=512 --keep-aspect-ratio -b '#536dfeff' assets/launcher_icon_maskable.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
diff --git a/assets/launcher_icon_adaptive.svg b/assets/launcher_icon_adaptive.svg
index fbe47db..5aa445b 100644
--- a/assets/launcher_icon_adaptive.svg
+++ b/assets/launcher_icon_adaptive.svg
@@ -4,7 +4,7 @@
 <svg
    width="1024"
    height="1024"
-   viewBox="0 0 60.235294 60.235294"
+   viewBox="-22.691267 -22.691267 105.618 105.618"
    version="1.1"
    id="svg1791"
    inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
diff --git a/assets/launcher_icon_alt.svg b/assets/launcher_icon_alt.svg
new file mode 100644
index 0000000..f9c7a1f
--- /dev/null
+++ b/assets/launcher_icon_alt.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_alt.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/assets/launcher_icon_maskable.svg b/assets/launcher_icon_maskable.svg
new file mode 100644
index 0000000..38d1cba
--- /dev/null
+++ b/assets/launcher_icon_maskable.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="-8.4329 -8.4329 77.101 77.101"
+   version="1.1"
+   id="svg1791"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="launcher_icon_maskable.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>