From 5d377aa668afeea456320df5936affc2be03fe65 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Sat, 7 May 2022 19:46:33 +0200
Subject: [PATCH] Move images to subfolders

---
 .../denshi_jisho_background_overlay.png       | Bin
 assets/images/links/compart.svg               | 122 ++++++++++++++++++
 assets/images/{ => links}/dbpedia.png         | Bin
 assets/images/{ => links}/wikipedia.svg       |   0
 .../common/denshi_jisho_background.dart       |   2 +-
 .../search_results_body/parts/links.dart      |   4 +-
 pubspec.yaml                                  |   6 +-
 7 files changed, 129 insertions(+), 5 deletions(-)
 rename assets/images/{ => components}/denshi_jisho_background_overlay.png (100%)
 create mode 100644 assets/images/links/compart.svg
 rename assets/images/{ => links}/dbpedia.png (100%)
 rename assets/images/{ => links}/wikipedia.svg (100%)

diff --git a/assets/images/denshi_jisho_background_overlay.png b/assets/images/components/denshi_jisho_background_overlay.png
similarity index 100%
rename from assets/images/denshi_jisho_background_overlay.png
rename to assets/images/components/denshi_jisho_background_overlay.png
diff --git a/assets/images/links/compart.svg b/assets/images/links/compart.svg
new file mode 100644
index 0000000..fbc25bd
--- /dev/null
+++ b/assets/images/links/compart.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<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"
+   id="svg2443"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   width="228.14874"
+   height="60.237499"
+   xml:space="preserve"
+   sodipodi:docname="Compart Logo.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
+     id="metadata2448"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs2446"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2450" /><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2458"><path
+         d="M 0,682.495 L 594.96,682.495 L 594.96,48.244 L 0,48.244 L 0,682.495 z"
+         id="path2460" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2470"><path
+         d="M 0,841.945 L 594.96,841.945 L 594.96,0.055 L 0,0.055 L 0,841.945 z"
+         id="path2472" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2496"><path
+         d="M 0,841.945 L 594.96,841.945 L 594.96,0.055 L 0,0.055 L 0,841.945 z"
+         id="path2498" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2512"><path
+         d="M 0,841.945 L 594.96,841.945 L 594.96,0.055 L 0,0.055 L 0,841.945 z"
+         id="path2514" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2532"><path
+         d="M 563.399,34.611 L 584.608,34.611 L 584.608,13.402 L 563.399,13.402 L 563.399,34.611 z"
+         id="path2534" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2554"><path
+         d="M 0,841.945 L 594.96,841.945 L 594.96,0.055 L 0,0.055 L 0,841.945 z"
+         id="path2556" /></clipPath></defs><sodipodi:namedview
+     inkscape:window-height="974"
+     inkscape:window-width="1280"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="235.03328"
+     inkscape:cy="66.25"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="g2510" /><g
+     id="g2452"
+     inkscape:groupmode="layer"
+     inkscape:label="Format-Nr-6-2006-03"
+     transform="matrix(1.25,0,0,-1.25,-226.22766,443.03353)"><g
+       id="g2508"
+       transform="translate(-231.45887,306.18182)"><g
+         id="g2510"
+         clip-path="url(#clipPath2512)"><path
+           d="M 574.003,46.057 L 603.942,46.057 L 603.942,2.245 L 574.003,2.245 L 574.003,46.057 z"
+           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path2520" /><path
+           d="M 552.796,48.245 L 603.942,48.245 L 603.942,45.215 L 552.796,45.215 L 552.796,48.245 z"
+           style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path2522" /><path
+           d="M 552.796,2.798 L 603.942,2.798 L 603.942,-8.486 L 552.796,-8.486 L 552.796,2.798 z"
+           style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path2524" /></g></g><path
+       d="M 331.94013,340.79282 L 353.14913,340.79282 L 353.14913,319.58382 L 331.94013,319.58382 L 331.94013,340.79282 z"
+       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path2526" /><g
+       id="g2528"
+       transform="translate(-231.45887,306.18182)"><g
+         id="g2530"
+         clip-path="url(#clipPath2532)"><path
+           d="M 574.003,35.651 L 586.674,35.651 L 586.674,11.401 L 574.003,11.401 L 574.003,35.651 z"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path2536" /></g></g><path
+       d="M 202.82513,335.47782 C 201.67913,336.11382 200.34213,336.43182 199.00613,336.43182 C 193.88213,336.43182 189.87213,332.80382 189.87213,327.55282 C 189.87213,322.62082 193.91413,319.02482 198.75113,319.02482 C 200.15113,319.02482 201.55213,319.31082 202.82513,319.94782 L 202.82513,324.84782 C 202.06113,324.14782 200.94713,323.73482 199.92913,323.73482 C 197.54213,323.73482 195.85513,325.38882 195.85513,327.74382 C 195.85513,330.00382 197.60613,331.72182 199.83313,331.72182 C 200.94713,331.72182 201.96513,331.21282 202.82513,330.57682 L 202.82513,335.47782"
+       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path2538" /><path
+       d="M 213.68613,336.43182 C 208.43513,336.43182 203.85213,333.28182 203.85213,327.71282 C 203.85213,322.14282 208.46713,319.02482 213.68613,319.02482 C 218.93713,319.02482 223.51913,322.17482 223.51913,327.71282 C 223.51913,333.28182 218.93713,336.43182 213.68613,336.43182 z M 213.68613,331.40382 C 216.04113,331.40382 217.40913,329.71682 217.40913,327.71282 C 217.40913,325.64382 216.04113,324.05282 213.68613,324.05282 C 211.33113,324.05282 209.96313,325.64382 209.96313,327.71282 C 209.96313,329.71682 211.33113,331.40382 213.68613,331.40382"
+       style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path2540" /><path
+       d="M 230.92713,335.89082 L 225.13513,335.89082 L 225.13513,319.56582 L 230.92713,319.56582 L 230.92713,327.36282 C 230.92713,329.17582 230.92713,331.94482 233.50513,331.94482 C 236.08213,331.94482 236.08213,329.17582 236.08213,327.36282 L 236.08213,319.56582 L 241.87413,319.56582 L 241.87413,327.36282 C 241.87413,329.30382 241.97013,331.81782 244.64313,331.81782 C 247.09313,331.81782 247.03013,329.04882 247.03013,327.36282 L 247.03013,319.56582 L 252.82213,319.56582 L 252.82213,329.97182 C 252.82213,333.72682 251.39013,336.43182 247.25313,336.43182 C 245.02513,336.43182 242.82913,335.34982 241.71513,333.31382 C 240.53813,335.47782 238.50113,336.43182 236.14613,336.43182 C 234.04613,336.43182 232.35913,335.66882 230.99113,333.85482 L 230.92713,333.85482 L 230.92713,335.89082"
+       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path2542" /><path
+       d="M 260.98013,335.89082 L 255.18813,335.89082 L 255.18813,311.41882 L 260.98013,311.41882 L 260.98013,321.12482 C 262.22113,319.69282 264.16213,319.02482 266.04013,319.02482 C 270.87713,319.02482 274.21913,322.97082 274.21913,327.68082 C 274.21913,332.35882 270.84513,336.43182 265.97613,336.43182 C 264.06713,336.43182 262.09413,335.66882 261.04413,334.04582 L 260.98013,334.04582 L 260.98013,335.89082 z M 264.51213,331.40382 C 266.86713,331.40382 268.23613,329.71682 268.23613,327.71282 C 268.23613,325.64382 266.86713,324.05282 264.51213,324.05282 C 262.15713,324.05282 260.78913,325.64382 260.78913,327.71282 C 260.78913,329.71682 262.15713,331.40382 264.51213,331.40382"
+       style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path2544" /><path
+       d="M 285.26213,331.40382 C 287.61713,331.40382 288.98513,329.71682 288.98513,327.71282 C 288.98513,325.64382 287.61713,324.05282 285.26213,324.05282 C 282.90713,324.05282 281.53913,325.64382 281.53913,327.71282 C 281.53913,329.71682 282.90713,331.40382 285.26213,331.40382 z M 294.58613,335.89082 L 288.79413,335.89082 L 288.79413,334.29982 C 287.58513,335.73182 285.61213,336.43182 283.73413,336.43182 C 278.89713,336.43182 275.55613,332.42282 275.55613,327.74382 C 275.55613,323.06582 278.96113,319.02482 283.79813,319.02482 C 285.70713,319.02482 287.71213,319.75682 288.73113,321.37982 L 288.79413,321.37982 L 288.79413,319.56582 L 294.58613,319.56582 L 294.58613,335.89082"
+       style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path2546" /><path
+       d="M 302.59613,335.89082 L 296.80413,335.89082 L 296.80413,319.56582 L 302.59613,319.56582 L 302.59613,326.15282 C 302.59613,328.95382 303.39213,331.08582 306.60613,331.08582 C 307.49713,331.08582 308.26113,330.98982 309.05613,330.54482 L 309.05613,336.11382 L 307.94313,336.11382 C 305.68313,336.11382 303.77313,335.22282 302.66013,333.21782 L 302.59613,333.21782 L 302.59613,335.89082"
+       style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path2548" /><g
+       id="g2550"><g
+         id="g2552"
+         clip-path="url(#clipPath2554)"><path
+           d="M 318.04513,331.11782 L 321.32313,331.11782 L 321.32313,335.89082 L 318.04513,335.89082 L 318.04513,340.79182 L 312.25313,340.79182 L 312.25313,335.89082 L 310.37513,335.89082 L 310.37513,331.11782 L 312.25313,331.11782 L 312.25313,319.56582 L 318.04513,319.56582 L 318.04513,331.11782"
+           style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+           id="path2558" /></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/dbpedia.png b/assets/images/links/dbpedia.png
similarity index 100%
rename from assets/images/dbpedia.png
rename to assets/images/links/dbpedia.png
diff --git a/assets/images/wikipedia.svg b/assets/images/links/wikipedia.svg
similarity index 100%
rename from assets/images/wikipedia.svg
rename to assets/images/links/wikipedia.svg
diff --git a/lib/components/common/denshi_jisho_background.dart b/lib/components/common/denshi_jisho_background.dart
index 68c100e..b38684e 100644
--- a/lib/components/common/denshi_jisho_background.dart
+++ b/lib/components/common/denshi_jisho_background.dart
@@ -17,7 +17,7 @@ class DenshiJishoBackground extends StatelessWidget {
           left: 100,
           bottom: 30,
           child: Image.asset(
-            'assets/images/denshi_jisho_background_overlay.png',
+            'assets/images/components/denshi_jisho_background_overlay.png',
           ),
         ),
         child,
diff --git a/lib/components/search/search_results_body/parts/links.dart b/lib/components/search/search_results_body/parts/links.dart
index 2ae0f58..9502c9a 100644
--- a/lib/components/search/search_results_body/parts/links.dart
+++ b/lib/components/search/search_results_body/parts/links.dart
@@ -24,7 +24,7 @@ Widget _wiki({
             margin: EdgeInsets.fromLTRB(0, 0, 10, isJapanese ? 12 : 10),
             child: IconButton(
               onPressed: () => open_webpage(link),
-              icon: SvgPicture.asset('assets/images/wikipedia.svg'),
+              icon: SvgPicture.asset('assets/images/links/wikipedia.svg'),
             ),
           ),
           Container(
@@ -51,7 +51,7 @@ Widget _dbpedia(String link) => Container(
       child: IconButton(
         onPressed: () => open_webpage(link),
         icon: Image.asset(
-          'assets/images/dbpedia.png',
+          'assets/images/links/dbpedia.png',
         ),
       ),
     );
diff --git a/pubspec.yaml b/pubspec.yaml
index 0309083..96fe905 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,11 +45,13 @@ flutter_icons:
 
 flutter:
   uses-material-design: true
-  
+
   assets:
     - assets/
     - assets/fonts/
     - assets/images/
+    - assets/images/components/
+    - assets/images/links/
     - assets/images/logo/
     - assets/licenses/
 
@@ -61,7 +63,7 @@ flutter:
 
     - family: Noto Sans CJK
       fonts:
-        - asset: assets/fonts/NotoSansCJK-Regular.ttc 
+        - asset: assets/fonts/NotoSansCJK-Regular.ttc
 
     - family: Noto Serif CJK
       fonts: