From 2afc32362dfbef5cf5e5bf3efb8f9836fca50288 Mon Sep 17 00:00:00 2001
From: jld3103 <jld3103yt@gmail.com>
Date: Thu, 7 Sep 2023 17:28:22 +0200
Subject: [PATCH] refactor(tool,neon,app): Precompile all SVGs

Signed-off-by: jld3103 <jld3103yt@gmail.com>
---
 packages/app/assets/logo.svg                  |   1 -
 packages/app/assets/logo.svg.vec              | Bin 0 -> 644 bytes
 packages/app/lib/branding.dart                |  12 +--
 packages/app/pubspec.lock                     |   4 +-
 packages/app/pubspec.yaml                     |   2 +-
 packages/neon/neon/assets/logo_nextcloud.svg  |  77 ------------------
 .../neon/neon/assets/logo_nextcloud.svg.vec   | Bin 0 -> 3687 bytes
 .../lib/src/models/app_implementation.dart    |  16 ++--
 .../neon/lib/src/widgets/nextcloud_logo.dart  |  10 ++-
 packages/neon/neon_files/assets/app.svg       |   1 -
 packages/neon/neon_files/assets/app.svg.vec   | Bin 0 -> 208 bytes
 packages/neon/neon_files/pubspec.yaml         |   1 +
 packages/neon/neon_news/assets/app.svg        |   4 -
 packages/neon/neon_news/assets/app.svg.vec    | Bin 0 -> 628 bytes
 packages/neon/neon_news/pubspec.yaml          |   1 +
 packages/neon/neon_notes/assets/app.svg       |   1 -
 packages/neon/neon_notes/assets/app.svg.vec   | Bin 0 -> 180 bytes
 packages/neon/neon_notes/pubspec.yaml         |   1 +
 .../neon/neon_notifications/assets/app.svg    |   1 -
 .../neon_notifications/assets/app.svg.vec     | Bin 0 -> 296 bytes
 packages/neon/neon_notifications/pubspec.yaml |   1 +
 tool/generate-assets.sh                       |  23 +++++-
 tool/generate-neon.sh                         |  63 ++++++++++++++
 23 files changed, 111 insertions(+), 108 deletions(-)
 delete mode 120000 packages/app/assets/logo.svg
 create mode 100644 packages/app/assets/logo.svg.vec
 delete mode 100644 packages/neon/neon/assets/logo_nextcloud.svg
 create mode 100644 packages/neon/neon/assets/logo_nextcloud.svg.vec
 delete mode 100644 packages/neon/neon_files/assets/app.svg
 create mode 100644 packages/neon/neon_files/assets/app.svg.vec
 delete mode 100644 packages/neon/neon_news/assets/app.svg
 create mode 100644 packages/neon/neon_news/assets/app.svg.vec
 delete mode 100644 packages/neon/neon_notes/assets/app.svg
 create mode 100644 packages/neon/neon_notes/assets/app.svg.vec
 delete mode 100644 packages/neon/neon_notifications/assets/app.svg
 create mode 100644 packages/neon/neon_notifications/assets/app.svg.vec
 create mode 100755 tool/generate-neon.sh

diff --git a/packages/app/assets/logo.svg b/packages/app/assets/logo.svg
deleted file mode 120000
index 4228c635..00000000
--- a/packages/app/assets/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../../assets/logo.svg
\ No newline at end of file
diff --git a/packages/app/assets/logo.svg.vec b/packages/app/assets/logo.svg.vec
new file mode 100644
index 0000000000000000000000000000000000000000..081aa56640df9cc579d5409c2750b92495ea5962
GIT binary patch
literal 644
zcmZWnF-SsD6ul}aNkfENkwHrah43V3kltNNYDuA{KUl-xqNJg+rG}3o#V2Xd$_SL8
z#X<@k!?w`I1h-G4Zc#J@cJKRqmp(ksd*|Qx&N=tJjp<`>g#ezB$LQ?tXU_xB>x}@w
z3=MF*+-?_tG_mnN1N4K3C(AqFqF_mYq%`YK@_X`1p%5RE`Jmy$R%s6}3K@L)I>c`L
zL?OVr;x#jmLTq7Wu}F@R3N>>LnNQS)X}yVo$^`AxP}koj&tulBEN_R<tQVzSb0)3y
zAf}>eh3tiSUH7WGnAM&K2-Cjyyjh=9Jb+|9$y%xCl6213^(<-qNTYK^|GB1&MrRe9
zjS6|$SIAkI*UTJc$tx5hqcU>VkmjSgMZNeXA8!f)9whVZx!D*ZFIno@xI!ljXJy~)
zg>%|oG}1jK4ZA0HKQ1w7?2wlmh3tiSA?{UOH(n)wD|AkkvMngy$--KR+HL=Q?kQ*G
z%uY`Z0#oFFfV_JZI``{u3E3(|FzV09gTNSC>Bs&$q%BjH9A#f7&1<^b2zk5fuZ_++
LhR5i!&|CWh?V{%D

literal 0
HcmV?d00001

diff --git a/packages/app/lib/branding.dart b/packages/app/lib/branding.dart
index 13382f2f..0a13a7cd 100644
--- a/packages/app/lib/branding.dart
+++ b/packages/app/lib/branding.dart
@@ -1,19 +1,21 @@
 import 'dart:ui';
 
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:neon/theme.dart';
+import 'package:vector_graphics/vector_graphics.dart';
 
-final neonTheme = NeonTheme(
+const neonTheme = NeonTheme(
   branding: branding,
   colorScheme: colorScheme,
 );
 
-final branding = Branding(
+const branding = Branding(
   name: 'Nextcloud Neon',
-  logo: SvgPicture.asset(
-    'assets/logo.svg',
+  logo: VectorGraphic(
     width: 100,
     height: 100,
+    loader: AssetBytesLoader(
+      'assets/logo.svg.vec',
+    ),
   ),
   legalese: 'Copyright © 2023, provokateurin\nUnder GPLv3 license',
 );
diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock
index 9a9d68c7..bb604b6c 100644
--- a/packages/app/pubspec.lock
+++ b/packages/app/pubspec.lock
@@ -367,7 +367,7 @@ packages:
     source: hosted
     version: "2.0.16"
   flutter_svg:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_svg
       sha256: "8c5d68a82add3ca76d792f058b186a0599414f279f00ece4830b9b231b570338"
@@ -1232,7 +1232,7 @@ packages:
     source: hosted
     version: "3.0.7"
   vector_graphics:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: vector_graphics
       sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f"
diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml
index 6de39d11..14bfa9d1 100644
--- a/packages/app/pubspec.yaml
+++ b/packages/app/pubspec.yaml
@@ -9,7 +9,6 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_svg: ^2.0.7
   neon:
     git:
       url: https://github.com/nextcloud/neon
@@ -30,6 +29,7 @@ dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon/neon_notifications
+  vector_graphics: ^1.1.7
 
 dev_dependencies:
   flutter_material_design_icons: ^1.1.7296
diff --git a/packages/neon/neon/assets/logo_nextcloud.svg b/packages/neon/neon/assets/logo_nextcloud.svg
deleted file mode 100644
index 7910fc00..00000000
--- a/packages/neon/neon/assets/logo_nextcloud.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 132.6422 93.377481"
-   enable-background="new 0 0 196.6 72"
-   xml:space="preserve"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="nextcloud-logo-inverted.svg"
-   width="141.485"
-   height="99.602654"
-   inkscape:export-filename="nextcloud-logo-inverted.png"
-   inkscape:export-xdpi="299.75104"
-   inkscape:export-ydpi="299.75104"><metadata
-     id="metadata20"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs18"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8812"><circle
-         id="circle8814"
-         cx="95.669289"
-         cy="95.669296"
-         r="79.724197"
-         style="fill:#00080d;fill-opacity:1;stroke-width:1" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1046"
-     id="namedview16"
-     showgrid="false"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="41.308994"
-     inkscape:cy="33.920203"
-     inkscape:current-layer="Layer_1"
-     fit-margin-top="10"
-     fit-margin-left="10"
-     fit-margin-right="10"
-     fit-margin-bottom="10"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     units="px"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-page="true" /><path
-     inkscape:connector-curvature="0"
-     id="path1052"
-     d="m 66.407896,9.375 c -11.805271,0 -21.811217,8.003196 -24.912392,18.846621 -2.695245,-5.751517 -8.535934,-9.780938 -15.263394,-9.780938 -9.25185,0 -16.85711,7.605263 -16.85711,16.857108 0,9.251833 7.60526,16.860567 16.85711,16.860567 6.72746,0 12.568149,-4.031885 15.263395,-9.784412 3.101175,10.84425 13.10712,18.850106 24.912391,18.850106 11.717964,0 21.67289,-7.885111 24.853382,-18.607048 2.745036,5.621934 8.513436,9.541354 15.145342,9.541354 9.25185,0 16.86057,-7.608734 16.86057,-16.860567 0,-9.251845 -7.60872,-16.857108 -16.86057,-16.857108 -6.631906,0 -12.400306,3.916965 -15.145342,9.537891 C 88.080786,17.257475 78.12586,9.375 66.407896,9.375 Z m 0,9.895518 c 8.911648,0 16.030748,7.115653 16.030748,16.027273 0,8.911605 -7.1191,16.030737 -16.030748,16.030737 -8.911593,0 -16.027247,-7.119132 -16.027247,-16.030737 0,-8.91162 7.115653,-16.027271 16.027247,-16.027273 z M 26.23211,28.336202 c 3.90438,0 6.96505,3.057188 6.96505,6.961589 0,3.904386 -3.06067,6.965049 -6.96505,6.965049 -3.90439,0 -6.96161,-3.060663 -6.96161,-6.965049 0,-3.904401 3.05722,-6.961589 6.96161,-6.961589 z m 80.17451,0 c 3.90442,0 6.96506,3.057188 6.96506,6.961589 0,3.904386 -3.06066,6.965049 -6.96506,6.965049 -3.90436,0 -6.961576,-3.060663 -6.961576,-6.965049 0,-3.904401 3.057226,-6.961589 6.961576,-6.961589 z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0082c9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.56590033;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     inkscape:export-filename="Nextcloud Hub logo variants.png"
-     inkscape:export-xdpi="300"
-     inkscape:export-ydpi="300" /><path
-     style="fill:#0082c9;fill-opacity:1;stroke-width:0.47038522"
-     d="m 21.235693,69.043756 c -0.32926,0 -0.47147,0.187936 -0.47147,0.517242 V 83.20368 c 0,0.32927 0.14221,0.51495 0.47147,0.51495 h 0.37763 c 0.32927,0 0.51494,-0.18568 0.51494,-0.51495 V 71.874833 l 7.4473,11.557727 c 0.0324,0.0505 0.0677,0.0842 0.10299,0.12123 0.0106,0.0125 0.0179,0.0256 0.0298,0.0366 0.0317,0.0289 0.0665,0.044 0.10065,0.0618 0.019,0.01 0.0338,0.0247 0.055,0.032 0.0148,0.005 0.0304,0.002 0.0458,0.006 0.0525,0.0135 0.10618,0.0275 0.16936,0.0275 h 0.37534 c 0.32926,0 0.47146,-0.18567 0.47146,-0.51495 V 69.560768 c 0,-0.329305 -0.1422,-0.517241 -0.47146,-0.517241 h -0.37534 c -0.32929,0 -0.51724,0.187936 -0.51724,0.517241 V 80.89011 l -7.4473,-11.557716 c -0.0254,-0.03939 -0.0561,-0.06339 -0.0847,-0.0939 -0.086,-0.121611 -0.2222,-0.194545 -0.41654,-0.194545 z m 89.420157,0.187676 c -0.32926,0 -0.18767,0.187956 -0.18767,0.517241 v 4.657417 c 0,0.47037 0.0456,0.79872 0.0456,0.79872 h -0.0456 c 0,0 -0.89419,-2.06893 -3.38722,-2.06893 -2.72821,0 -4.65771,2.16372 -4.56357,5.36231 0,3.19862 1.74024,5.41041 4.51551,5.41041 2.68118,0 3.5749,-2.16508 3.5749,-2.16508 h 0.048 c 0,0 -0.0939,0.28283 -0.0939,0.65913 v 0.79874 c 0,0.32926 0.18796,0.47148 0.51726,0.47148 h 0.32955 c 0.32927,0 0.46917,-0.18798 0.46917,-0.51724 V 69.748673 c 0,-0.329285 -0.51754,-0.517241 -0.84681,-0.517241 z m -36.549859,0.0481 c -0.329276,0 -0.13961,0.187976 -0.13961,0.517241 V 81.32017 c 0,2.25783 1.503766,2.54039 2.350463,2.54039 0.376301,0 0.517217,-0.18796 0.517217,-0.51721 v -0.32958 c 0,-0.32926 -0.188212,-0.46918 -0.423394,-0.46918 -0.470405,-0.047 -1.080249,-0.18887 -1.080249,-1.50594 V 69.79677 c 0,-0.329266 -0.517531,-0.517241 -0.846807,-0.517241 z M 57.220266,70.50169 c -0.32927,0 -0.517238,0.187975 -0.517238,0.51724 v 2.44659 1.17638 5.31423 c 0,2.44599 1.365105,3.81064 3.622946,3.81064 0.42334,0 0.563011,-0.13993 0.563011,-0.46918 v -0.2838 c 0,-0.37629 -0.139671,-0.47024 -0.563011,-0.51724 -0.799652,-0.047 -2.258905,-0.32912 -2.258905,-2.72809 v -5.17464 h 2.117009 c 0.329268,0 0.517238,-0.1399 0.517238,-0.46918 v -0.1419 c 0,-0.32926 -0.18797,-0.51722 -0.517238,-0.51722 h -2.117009 v -2.44659 c 0,-0.329265 -0.139909,-0.51724 -0.469177,-0.51724 z m -18.734963,2.63427 c -2.82229,0 -5.08192,2.02359 -5.12888,5.41037 0,3.19859 2.35289,5.40809 5.41039,5.40809 1.646328,0 2.86852,-0.70495 3.432986,-1.12831 0.23526,-0.18814 0.283014,-0.42392 0.141896,-0.65912 l -0.141896,-0.23346 c -0.141115,-0.28223 -0.374612,-0.33005 -0.656846,-0.14188 -0.470383,0.37629 -1.413295,0.94064 -2.730371,0.94064 -2.116709,0 -3.951319,-1.50604 -3.998279,-4.14019 h 7.479331 c 0.282247,0 0.517238,-0.23501 0.517238,-0.51725 0,-2.9634 -1.550291,-4.93889 -4.325569,-4.93889 z m 29.223883,0 c -3.057482,0 -5.409203,2.25755 -5.456161,5.45614 0,3.1986 2.352896,5.41039 5.410387,5.41039 1.881541,0 3.151307,-0.89493 3.668718,-1.31828 0.235262,-0.2352 0.280729,-0.42265 0.139619,-0.7049 L 71.33213,81.79165 c -0.188136,-0.28225 -0.376902,-0.33005 -0.659131,-0.14191 -0.470383,0.42334 -1.457552,1.08255 -2.915751,1.08255 -2.257826,0 -4.046348,-1.69419 -4.046348,-4.14019 0,-2.49302 1.788522,-4.18596 4.046348,-4.18596 1.223008,0 2.115816,0.61137 2.58618,0.94065 0.282241,0.18807 0.516748,0.18838 0.704913,-0.0938 l 0.1419,-0.23572 c 0.235271,-0.28224 0.187125,-0.51677 -0.0481,-0.7049 -0.517422,-0.42337 -1.645515,-1.17638 -3.432986,-1.17638 z m 15.899301,0 c -3.010451,0 -5.456156,2.30482 -5.456156,5.36231 0,3.10451 2.445705,5.45615 5.456156,5.45615 3.010478,0 5.456168,-2.35164 5.456168,-5.45615 0,-3.05749 -2.44569,-5.36231 -5.456168,-5.36231 z m -30.429991,0.15793 c -0.11518,0.0184 -0.226037,0.0959 -0.331857,0.22197 l -1.904164,2.26805 -1.423546,1.69818 -2.158205,-2.57015 -1.169505,-1.39608 c -0.105876,-0.12611 -0.225795,-0.19525 -0.350163,-0.20597 -0.124354,-0.01 -0.253796,0.0361 -0.379919,0.14189 l -0.288371,0.24258 c -0.252223,0.21167 -0.23901,0.44583 -0.02745,0.69807 l 1.904166,2.26803 1.579172,1.88357 -2.311543,2.75326 c -0.0024,0.002 -0.0035,0.005 -0.0046,0.006 l -1.167215,1.38923 c -0.211653,0.25223 -0.188132,0.51842 0.06408,0.73009 l 0.288368,0.2403 c 0.252239,0.21164 0.481813,0.15841 0.693465,-0.0939 l 1.901876,-2.26806 1.425834,-1.69818 2.158204,2.57244 c 10e-4,0.002 0.0035,0.004 0.0046,0.005 l 1.164928,1.3915 c 0.211652,0.25223 0.477834,0.27337 0.730081,0.0617 l 0.288371,-0.2403 c 0.252237,-0.21165 0.239134,-0.44581 0.02746,-0.69805 l -1.904161,-2.27034 -1.579177,-1.88129 2.311546,-2.75554 c 0.0024,-0.002 0.0035,-0.004 0.0046,-0.006 l 1.167214,-1.38921 c 0.211651,-0.25224 0.188132,-0.51844 -0.06408,-0.73009 l -0.288371,-0.2403 c -0.126112,-0.10587 -0.246408,-0.14655 -0.361607,-0.12815 z m 38.662308,0.0779 c -0.32928,0 -0.47148,0.18796 -0.47148,0.51723 v 6.06722 c 0,2.6812 1.9757,3.99829 4.42169,3.99829 2.446,0 4.421696,-1.31709 4.421696,-3.99829 v -6.06723 c 0.047,-0.32926 -0.13991,-0.51723 -0.469176,-0.51723 h -0.37763 c -0.32927,0 -0.51724,0.18797 -0.51724,0.51723 v 5.69189 c 0,1.59931 -1.035,3.05766 -3.05765,3.05766 -1.9756,0 -3.05763,-1.45835 -3.05763,-3.05766 v -5.69189 c 0,-0.32926 -0.18797,-0.51723 -0.51726,-0.51723 z m -53.403561,0.94063 c 1.505226,0 2.82161,1.08155 2.915753,3.24531 h -6.490633 c 0.32927,-2.11674 1.83447,-3.24531 3.57488,-3.24531 z m 45.171244,0.0939 c 2.210809,0 3.998303,1.74023 3.998303,4.09214 0,2.44598 -1.787494,4.23401 -3.998303,4.23401 -2.210781,0 -3.999385,-1.83505 -4.046332,-4.23401 0,-2.30488 1.835551,-4.09214 4.046332,-4.09214 z m 23.566303,0 c 2.21082,0 3.29339,2.02346 3.29339,4.1402 0,2.9634 -1.60102,4.18595 -3.34144,4.18595 -1.92856,0 -3.24413,-1.6459 -3.29108,-4.18595 0,-2.63415 1.50465,-4.1402 3.33913,-4.1402 z"
-     id="path1174"
-     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/packages/neon/neon/assets/logo_nextcloud.svg.vec b/packages/neon/neon/assets/logo_nextcloud.svg.vec
new file mode 100644
index 0000000000000000000000000000000000000000..af812c8245d7a1c2d98864f8cfcae4e08f127845
GIT binary patch
literal 3687
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
A)Bpeg

literal 0
HcmV?d00001

diff --git a/packages/neon/neon/lib/src/models/app_implementation.dart b/packages/neon/neon/lib/src/models/app_implementation.dart
index 5051d0e6..7b0c628d 100644
--- a/packages/neon/neon/lib/src/models/app_implementation.dart
+++ b/packages/neon/neon/lib/src/models/app_implementation.dart
@@ -1,6 +1,5 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:meta/meta.dart';
 import 'package:neon/l10n/localizations.dart';
@@ -12,6 +11,7 @@ import 'package:neon/src/settings/models/storage.dart';
 import 'package:neon/src/widgets/drawer_destination.dart';
 import 'package:provider/provider.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:vector_graphics/vector_graphics.dart';
 
 @immutable
 abstract class AppImplementation<T extends Bloc, R extends NextcloudAppOptions> {
@@ -95,13 +95,15 @@ abstract class AppImplementation<T extends Bloc, R extends NextcloudAppOptions>
     final Color? color,
   }) =>
       Builder(
-        builder: (final context) => SizedBox.fromSize(
-          size: size,
-          child: SvgPicture.asset(
-            'assets/app.svg',
-            package: 'neon_$id',
-            colorFilter: ColorFilter.mode(color ?? Theme.of(context).colorScheme.primary, BlendMode.srcIn),
+        builder: (final context) => VectorGraphic(
+          width: size.width,
+          height: size.height,
+          colorFilter: ColorFilter.mode(color ?? Theme.of(context).colorScheme.primary, BlendMode.srcIn),
+          loader: AssetBytesLoader(
+            'assets/app.svg.vec',
+            packageName: 'neon_$id',
           ),
+          semanticsLabel: AppLocalizations.of(context).nextcloudLogo,
         ),
       );
 
diff --git a/packages/neon/neon/lib/src/widgets/nextcloud_logo.dart b/packages/neon/neon/lib/src/widgets/nextcloud_logo.dart
index bd11a90f..c6324ca3 100644
--- a/packages/neon/neon/lib/src/widgets/nextcloud_logo.dart
+++ b/packages/neon/neon/lib/src/widgets/nextcloud_logo.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:neon/l10n/localizations.dart';
+import 'package:vector_graphics/vector_graphics.dart';
 
 class NextcloudLogo extends StatelessWidget {
   const NextcloudLogo({
@@ -8,11 +8,13 @@ class NextcloudLogo extends StatelessWidget {
   });
 
   @override
-  Widget build(final BuildContext context) => SvgPicture.asset(
-        'assets/logo_nextcloud.svg',
-        package: 'neon',
+  Widget build(final BuildContext context) => VectorGraphic(
         width: 100,
         height: 100,
+        loader: const AssetBytesLoader(
+          'assets/logo_nextcloud.svg.vec',
+          packageName: 'neon',
+        ),
         semanticsLabel: AppLocalizations.of(context).nextcloudLogo,
       );
 }
diff --git a/packages/neon/neon_files/assets/app.svg b/packages/neon/neon_files/assets/app.svg
deleted file mode 100644
index 7f84d1de..00000000
--- a/packages/neon/neon_files/assets/app.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" id="mdi-folder" viewBox="0 0 24 24"><path d="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" fill="#f37736" /></svg>
\ No newline at end of file
diff --git a/packages/neon/neon_files/assets/app.svg.vec b/packages/neon/neon_files/assets/app.svg.vec
new file mode 100644
index 0000000000000000000000000000000000000000..51f4d00dd885b98968e705e3c47707d32d7e5790
GIT binary patch
literal 208
zcmYe&?O<TkWMDYp2*NUE<)8mEGcf%BFU`Qfzyrh#j7(6-$gBq9GbjL6HaNiW;jb1@
zHiN^%syRS50}vm8(i4Dc85}gP&2Ze~X9*Nr0M!ekAz1U;3MhMnBS;+s!v-J*=>yRW
iVESRz9fz}LK<Yr|g7krC2Pmxoq#GOz<bbMy?gjvVXE4<O

literal 0
HcmV?d00001

diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml
index bf4dce86..4a3a0465 100644
--- a/packages/neon/neon_files/pubspec.yaml
+++ b/packages/neon/neon_files/pubspec.yaml
@@ -39,6 +39,7 @@ dev_dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_lints
+  vector_graphics_compiler: ^1.1.7
 
 flutter:
   uses-material-design: true
diff --git a/packages/neon/neon_news/assets/app.svg b/packages/neon/neon_news/assets/app.svg
deleted file mode 100644
index c27cae23..00000000
--- a/packages/neon/neon_news/assets/app.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" viewBox="0 0 32 32">
- <path d="m3 2c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h26c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-26zm0 8c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h18c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-18zm0 8c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h24c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-24zm0 8c-0.554 0-1 0.446-1 1v2c0 0.554 0.446 1 1 1h12c0.554 0 1-0.446 1-1v-2c0-0.554-0.446-1-1-1h-12z" fill="#f37736"/>
-</svg>
diff --git a/packages/neon/neon_news/assets/app.svg.vec b/packages/neon/neon_news/assets/app.svg.vec
new file mode 100644
index 0000000000000000000000000000000000000000..b63e37c1516f150544208775011602d187c07329
GIT binary patch
literal 628
zcmaKqtxf|`5QR_aW6+QW0|>$@^j^XPAW@`2p&A^>$|jf+%t|DpqF5A<u%re7$;t}E
zCOp70-`rV&X*RRp&fas*-2J&eo@;O<>5Lkk-u-q%sq1#FJ+#u!ARoi+S97!~OHStx
zBj^9?ye2*S+SS`@=-#bo4Q>*wraw-pP3U0uL9}gRM%F2OkhPv;*GOaYsQlPJa7sn+
z!g=z28M=w}_~DDyBvsR;Q(7f-P{IcbC%IY29DI<Ro{Pv|*nO2Zk55ji3gVGH%QAFi
z<A<MCE6e|KN=?jatj7n*X%e|v#~gf+oSt>$*LI(Mtesga(`~%xo#yY?h9BNqwe}9~
gozl!^@r`Cy_#iW9wvTn_n1c_pk2)25Hrf8IKeLXB-~a#s

literal 0
HcmV?d00001

diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml
index 288afaf7..330cb2b9 100644
--- a/packages/neon/neon_news/pubspec.yaml
+++ b/packages/neon/neon_news/pubspec.yaml
@@ -31,6 +31,7 @@ dev_dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_lints
+  vector_graphics_compiler: ^1.1.7
 
 flutter:
   uses-material-design: true
diff --git a/packages/neon/neon_notes/assets/app.svg b/packages/neon/neon_notes/assets/app.svg
deleted file mode 100644
index a7a15434..00000000
--- a/packages/neon/neon_notes/assets/app.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h24v24h-24z" fill="none"/><path d="m3 17.25v3.75h3.75l11.06-11.06-3.75-3.75zm17.71-10.21c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75z" fill="#f37736"/></svg>
\ No newline at end of file
diff --git a/packages/neon/neon_notes/assets/app.svg.vec b/packages/neon/neon_notes/assets/app.svg.vec
new file mode 100644
index 0000000000000000000000000000000000000000..d9dd7244e73697daf37778b11c5dd580f8d4d30a
GIT binary patch
literal 180
zcmYe&?O<TkWMDYp2*NUE<)8mEGcf%BFU`Qfzzf6-j6lH5z{JP|q~t&XAmHG@z|aNM
z0iss`=^J4BVO5`_EtkCG;jamf)gs3nMAj{JT<8AK;p~|ej%UwY0n^tP9{`Jg)7av0
z`0FIcnEoIKuIv4dvu0WX<-5SN$hvm0c(q88BiHrC4z^s=9a~@XIvRlO|NkEV$yq!Z

literal 0
HcmV?d00001

diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml
index 0fbee667..09fc269e 100644
--- a/packages/neon/neon_notes/pubspec.yaml
+++ b/packages/neon/neon_notes/pubspec.yaml
@@ -31,6 +31,7 @@ dev_dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_lints
+  vector_graphics_compiler: ^1.1.7
 
 flutter:
   uses-material-design: true
diff --git a/packages/neon/neon_notifications/assets/app.svg b/packages/neon/neon_notifications/assets/app.svg
deleted file mode 100644
index 51507f36..00000000
--- a/packages/neon/neon_notifications/assets/app.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M14 12.33V13H2v-.67L3.33 11V7a4.66 4.66 0 0 1 3.34-4.47v-.2A1.33 1.33 0 0 1 8 1a1.33 1.33 0 0 1 1.33 1.33v.2A4.66 4.66 0 0 1 12.67 7v4L14 12.33m-4.67 1.34A1.33 1.33 0 0 1 8 15a1.33 1.33 0 0 1-1.33-1.33" fill="#f37736"/></svg>
\ No newline at end of file
diff --git a/packages/neon/neon_notifications/assets/app.svg.vec b/packages/neon/neon_notifications/assets/app.svg.vec
new file mode 100644
index 0000000000000000000000000000000000000000..5bf968343113ba903cab8bdd7f9387a1fbed415a
GIT binary patch
literal 296
zcmYe&?O<TkWMF7;1YsGo^3VU785sWmmu6sK5CmcdMi5|PWC9{aMg}G(E07=vBsi{f
zcLnN70O9~3W^jPfAn_e?p+LR?lz!k)E)nYR^x0g8DLm60cE-9pEGf9^(E3^tOz)5r
z1=AuHXY5zjy#VTKum_q4a*_R-1KePGox7+bNFGG*1gZzoApP5ZnmB^Yd$iNb5oCVQ
z4lkhk2T<Ao$cDHRq&{dz6wuA0j{hps93kcw0OdjU6gWccEpP<63nUMsLFx_UfGU9D
F0RX=uSsVZW

literal 0
HcmV?d00001

diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/neon/neon_notifications/pubspec.yaml
index 09ece783..486b9df9 100644
--- a/packages/neon/neon_notifications/pubspec.yaml
+++ b/packages/neon/neon_notifications/pubspec.yaml
@@ -25,6 +25,7 @@ dev_dependencies:
     git:
       url: https://github.com/nextcloud/neon
       path: packages/neon_lints
+  vector_graphics_compiler: ^1.1.7
 
 flutter:
   uses-material-design: true
diff --git a/tool/generate-assets.sh b/tool/generate-assets.sh
index 6a8ebd28..07d72075 100755
--- a/tool/generate-assets.sh
+++ b/tool/generate-assets.sh
@@ -41,6 +41,11 @@ function export_mipmap_icon_all() {
     wait
 }
 
+function precompile_assets() {
+  fvm dart run vector_graphics_compiler --input-dir assets/
+  find assets/ -name "*.svg" -exec rm {} \;
+}
+
 wget https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/cable-data.svg -O assets/logo.svg
 sed -i "s/<path /<path fill=\"$color\" /g" assets/logo.svg
 
@@ -60,8 +65,7 @@ done
 
 (
   cd packages/neon/neon
-  fvm dart run vector_graphics_compiler --input-dir assets/icons/server
-  rm -rf assets/icons/server/*.svg
+  precompile_assets
 )
 
 copy_app_svg files external/nextcloud-server/apps/files
@@ -72,6 +76,8 @@ copy_app_svg notifications external/nextcloud-notifications
 (
   cd packages/app
 
+  cp ../../assets/logo.svg assets/logo.svg
+
   # Splash screens
   inkscape assets/logo.svg -o img/splash_icon.png -w 768 -h 768 # 768px at xxxhdpi is 192dp
   convert -size 1152x1152 xc:none img/splash_icon.png -gravity center -composite img/splash_icon_android_12.png # 1152px at xxxhdpi is 288dp
@@ -79,10 +85,19 @@ copy_app_svg notifications external/nextcloud-notifications
 
   # Android launcher icons
   export_mipmap_icon_all "assets/logo.svg" "ic_launcher" &
-  for id in files news notes notifications; do
-    export_mipmap_icon_all "../neon/neon_$id/assets/app.svg" "app_$id" &
+  for path in ../neon/neon_*; do
+    export_mipmap_icon_all "$path/assets/app.svg" "app_$(basename "$path" | sed "s/^neon_//")" &
   done
   wait
 
   fvm dart run flutter_native_splash:create
+
+  precompile_assets
 )
+
+for path in packages/neon/neon_*; do
+  (
+    cd "$path"
+    precompile_assets
+  )
+done
diff --git a/tool/generate-neon.sh b/tool/generate-neon.sh
new file mode 100755
index 00000000..07f435f9
--- /dev/null
+++ b/tool/generate-neon.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+set -euxo pipefail
+cd "$(dirname "$0")/.."
+
+color="#f37736"
+
+function precompile_assets() {
+  fvm dart run vector_graphics_compiler --input-dir assets/
+  find assets/ -name "*.svg" -exec rm {} \;
+}
+
+function copy_app_svg() {
+  id="$1"
+  path="$2"
+  target="packages/neon/neon_$id/assets/app.svg"
+  if [ -f "$path/img/app.svg" ]; then
+    cp "$path/img/app.svg" "$target"
+  elif [ -f "$path/img/$id.svg" ]; then
+    cp "$path/img/$id.svg" "$target"
+  else
+    echo "Can not find icon for $id in $path"
+    exit 1
+  fi
+  sed -i "s/fill=\"#[^\"]*\"/fill=\"$color\"/g" "$target"
+  (
+    cd "packages/neon/neon_$id"
+    precompile_assets
+  )
+}
+
+rm -rf /tmp/nextcloud-neon
+mkdir -p /tmp/nextcloud-neon
+
+copy_app_svg files external/nextcloud-server/apps/files
+copy_app_svg news external/nextcloud-news
+copy_app_svg notes external/nextcloud-notes
+copy_app_svg notifications external/nextcloud-notifications
+
+icons_dir="packages/neon/neon/assets/icons/server/"
+rm -rf "$icons_dir"
+mkdir -p "$icons_dir"
+
+shopt -s extglob
+for file in external/nextcloud-server/{core/img/*,apps/*/img}/!(app|app-dark).svg; do
+  name="$(basename "$file" | sed "s/.svg$//" | sed "s/-dark$//" | sed "s/-white$//").svg"
+  if ! grep "<image " "$file"; then
+    cp -u "$file" "$icons_dir/$name"
+  fi
+done
+
+(
+  cd packages/neon/neon
+
+  # Nextcloud logo
+  wget https://raw.githubusercontent.com/nextcloud/promo/master/nextcloud-logo-inverted.svg -O assets/logo_nextcloud.svg
+
+  precompile_assets
+
+  melos run generate:neon:build_runner
+  melos run generate:neon:l10n
+)
+
+melos run format