use adaptive launcher icon and notification icon for quicksy

Daniel Gultsch created

Change summary

art/quicksy.svg                                                          | 371 
art/quicksy_launcher.svg                                                 |   1 
art/quicksy_mono.svg                                                     | 176 
art/render.rb                                                            |   4 
src/conversations/new_launcher-web.png                                   |   0 
src/conversations/res/drawable-hdpi/ic_notification.png                  |   0 
src/conversations/res/drawable-mdpi/ic_notification.png                  |   0 
src/conversations/res/drawable-xhdpi/ic_notification.png                 |   0 
src/conversations/res/drawable-xxhdpi/ic_notification.png                |   0 
src/conversations/res/drawable-xxxhdpi/ic_notification.png               |   0 
src/conversations/res/drawable/ic_launcher_foreground.xml                |  24 
src/conversations/res/mipmap-anydpi-v26/new_launcher.xml                 |   0 
src/conversations/res/mipmap-anydpi-v26/new_launcher_round.xml           |   0 
src/conversations/res/mipmap-hdpi/new_launcher.png                       |   0 
src/conversations/res/mipmap-hdpi/new_launcher_round.png                 |   0 
src/conversations/res/mipmap-mdpi/new_launcher.png                       |   0 
src/conversations/res/mipmap-mdpi/new_launcher_round.png                 |   0 
src/conversations/res/mipmap-xhdpi/new_launcher.png                      |   0 
src/conversations/res/mipmap-xhdpi/new_launcher_round.png                |   0 
src/conversations/res/mipmap-xxhdpi/new_launcher.png                     |   0 
src/conversations/res/mipmap-xxhdpi/new_launcher_round.png               |   0 
src/conversations/res/mipmap-xxxhdpi/new_launcher.png                    |   0 
src/conversations/res/mipmap-xxxhdpi/new_launcher_round.png              |   0 
src/main/new_launcher-web.png                                            |   0 
src/main/res/drawable-hdpi/date_bubble_grey.9.png                        |   0 
src/main/res/drawable-hdpi/date_bubble_white.9.png                       |   0 
src/main/res/drawable-hdpi/message_bubble_received.9.png                 |   0 
src/main/res/drawable-hdpi/message_bubble_received_dark.9.png            |   0 
src/main/res/drawable-hdpi/message_bubble_received_grey.9.png            |   0 
src/main/res/drawable-hdpi/message_bubble_received_warning.9.png         |   0 
src/main/res/drawable-hdpi/message_bubble_received_white.9.png           |   0 
src/main/res/drawable-hdpi/message_bubble_sent.9.png                     |   0 
src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png                |   0 
src/main/res/drawable-mdpi/date_bubble_grey.9.png                        |   0 
src/main/res/drawable-mdpi/date_bubble_white.9.png                       |   0 
src/main/res/drawable-mdpi/message_bubble_received.9.png                 |   0 
src/main/res/drawable-mdpi/message_bubble_received_dark.9.png            |   0 
src/main/res/drawable-mdpi/message_bubble_received_grey.9.png            |   0 
src/main/res/drawable-mdpi/message_bubble_received_warning.9.png         |   0 
src/main/res/drawable-mdpi/message_bubble_received_white.9.png           |   0 
src/main/res/drawable-mdpi/message_bubble_sent.9.png                     |   0 
src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png                |   0 
src/main/res/drawable-xhdpi/date_bubble_grey.9.png                       |   0 
src/main/res/drawable-xhdpi/date_bubble_white.9.png                      |   0 
src/main/res/drawable-xhdpi/message_bubble_received.9.png                |   0 
src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png           |   0 
src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png           |   0 
src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png        |   0 
src/main/res/drawable-xhdpi/message_bubble_received_white.9.png          |   0 
src/main/res/drawable-xhdpi/message_bubble_sent.9.png                    |   0 
src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png               |   0 
src/main/res/drawable-xxhdpi/date_bubble_grey.9.png                      |   0 
src/main/res/drawable-xxhdpi/date_bubble_white.9.png                     |   0 
src/main/res/drawable-xxhdpi/message_bubble_received.9.png               |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png          |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png          |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png       |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png         |   0 
src/main/res/drawable-xxhdpi/message_bubble_sent.9.png                   |   0 
src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png              |   0 
src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png                     |   0 
src/main/res/drawable-xxxhdpi/date_bubble_white.9.png                    |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received.9.png              |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png         |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png         |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png      |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png        |   0 
src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png                  |   0 
src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png             |   0 
src/main/res/mipmap-hdpi/ic_launcher_background.png                      |   0 
src/main/res/mipmap-mdpi/ic_launcher_background.png                      |   0 
src/main/res/mipmap-mdpi/new_launcher.png                                |   0 
src/main/res/mipmap-mdpi/new_launcher_round.png                          |   0 
src/main/res/mipmap-xhdpi/ic_launcher_background.png                     |   0 
src/main/res/mipmap-xhdpi/new_launcher.png                               |   0 
src/main/res/mipmap-xhdpi/new_launcher_round.png                         |   0 
src/main/res/mipmap-xxhdpi/ic_launcher_background.png                    |   0 
src/main/res/mipmap-xxhdpi/new_launcher.png                              |   0 
src/main/res/mipmap-xxhdpi/new_launcher_round.png                        |   0 
src/main/res/mipmap-xxxhdpi/ic_launcher_background.png                   |   0 
src/main/res/mipmap-xxxhdpi/new_launcher.png                             |   0 
src/main/res/mipmap-xxxhdpi/new_launcher_round.png                       |   0 
src/quicksy/AndroidManifest.xml                                          |   2 
src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java |   3 
src/quicksy/new_launcher-web.png                                         |   0 
src/quicksy/res/drawable-hdpi/ic_notification.png                        |   0 
src/quicksy/res/drawable-hdpi/launcher.png                               |   0 
src/quicksy/res/drawable-hdpi/main_logo.png                              |   0 
src/quicksy/res/drawable-hdpi/splash_logo.png                            |   0 
src/quicksy/res/drawable-mdpi/ic_notification.png                        |   0 
src/quicksy/res/drawable-mdpi/launcher.png                               |   0 
src/quicksy/res/drawable-mdpi/main_logo.png                              |   0 
src/quicksy/res/drawable-mdpi/splash_logo.png                            |   0 
src/quicksy/res/drawable-xhdpi/ic_notification.png                       |   0 
src/quicksy/res/drawable-xhdpi/launcher.png                              |   0 
src/quicksy/res/drawable-xhdpi/main_logo.png                             |   0 
src/quicksy/res/drawable-xhdpi/splash_logo.png                           |   0 
src/quicksy/res/drawable-xxhdpi/ic_notification.png                      |   0 
src/quicksy/res/drawable-xxhdpi/launcher.png                             |   0 
src/quicksy/res/drawable-xxhdpi/main_logo.png                            |   0 
src/quicksy/res/drawable-xxhdpi/splash_logo.png                          |   0 
src/quicksy/res/drawable-xxxhdpi/ic_notification.png                     |   0 
src/quicksy/res/drawable-xxxhdpi/launcher.png                            |   0 
src/quicksy/res/drawable-xxxhdpi/main_logo.png                           |   0 
src/quicksy/res/drawable-xxxhdpi/splash_logo.png                         |   0 
src/quicksy/res/drawable/ic_launcher_foreground.xml                      |   8 
src/quicksy/res/mipmap-anydpi-v26/new_launcher.xml                       |   5 
src/quicksy/res/mipmap-anydpi-v26/new_launcher_round.xml                 |   5 
src/quicksy/res/mipmap-hdpi/new_launcher.png                             |   0 
src/quicksy/res/mipmap-hdpi/new_launcher_round.png                       |   0 
src/quicksy/res/mipmap-mdpi/new_launcher.png                             |   0 
src/quicksy/res/mipmap-mdpi/new_launcher_round.png                       |   0 
src/quicksy/res/mipmap-xhdpi/new_launcher.png                            |   0 
src/quicksy/res/mipmap-xhdpi/new_launcher_round.png                      |   0 
src/quicksy/res/mipmap-xxhdpi/new_launcher.png                           |   0 
src/quicksy/res/mipmap-xxhdpi/new_launcher_round.png                     |   0 
src/quicksy/res/mipmap-xxxhdpi/new_launcher.png                          |   0 
src/quicksy/res/mipmap-xxxhdpi/new_launcher_round.png                    |   0 
118 files changed, 463 insertions(+), 136 deletions(-)

Detailed changes

art/quicksy.svg 🔗 

@@ -9,18 +9,42 @@
    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"
-   width="56.24334mm"
-   height="56.24334mm"
-   viewBox="0 0 56.24334 56.243339"
+   width="20.68mm"
+   height="20.68mm"
+   viewBox="0 0 20.680001 20.680001"
    version="1.1"
    id="svg14750"
    inkscape:version="0.92.2 2405546, 2018-03-11"
    sodipodi:docname="quicksy.svg"
-   inkscape:export-filename="/home/daniel/quicksy.png"
-   inkscape:export-xdpi="231.22382"
-   inkscape:export-ydpi="231.22382">
+   inkscape:export-filename="/home/smagnan/Work/osp/osp.cloud/osp.work.quicksy/package-quicksy/quicksy.png"
+   inkscape:export-xdpi="175"
+   inkscape:export-ydpi="175">
   <defs
      id="defs14744">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect963"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect937"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect893"
+       is_visible="true" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect998"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect890"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect852"
+       is_visible="true" />
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath6910-2">
@@ -93,6 +117,78 @@
          d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
          style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6898-8-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6900-9-1"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6886-7-2">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6888-5-8"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6882-4-9">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6884-7-3"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6906-8-6">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6908-0-8"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6910-2-0">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6912-1-2"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6890-4-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6892-8-0"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6894-1-5">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6896-2-1"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6902-3-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6904-6-0"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -101,22 +197,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="-104.30661"
-     inkscape:cy="87.246329"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="24.499812"
+     inkscape:cy="6.9964144"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g14606"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1916"
-     inkscape:window-height="504"
+     inkscape:window-width="3836"
+     inkscape:window-height="1561"
      inkscape:window-x="1920"
-     inkscape:window-y="1072"
+     inkscape:window-y="18"
      inkscape:window-maximized="0"
-     units="mm" />
+     showguides="true"
+     inkscape:guide-bbox="true"
+     borderlayer="false"
+     inkscape:pagecheckerboard="true">
+    <sodipodi:guide
+       position="51.630255,101.26165"
+       orientation="0,1"
+       id="guide949"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
   <metadata
      id="metadata14747">
     <rdf:RDF>
@@ -125,7 +230,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -133,125 +238,129 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-69.668634,-48.140243)">
+     transform="translate(-94.210196,-206.61407)">
     <g
        style="display:inline"
        id="g14606"
-       transform="matrix(0.28222223,0,0,0.28222223,-477.88455,-301.93764)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path3415"
-         d="m 2039.9944,1240.4334 a 95.889395,95.889395 0 0 0 -95.8886,95.8887 95.889395,95.889395 0 0 0 95.8886,95.8906 95.889395,95.889395 0 0 0 42.7051,-10.0781 l 0.127,0.014 40.7929,15.832 c 3.2548,1.2632 7.5363,3.047 10.4551,0.2735 2.8333,-2.6923 2.1681,-5.4222 1.1875,-9.4121 l -11.3476,-46.168 v -0.01 0.01 a 95.889395,95.889395 0 0 0 11.9707,-46.3516 95.889395,95.889395 0 0 0 -95.8907,-95.8886 z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="csccscc"
-         inkscape:connector-curvature="0"
-         id="path3417"
-         d="m 145.16406,11.183594 -5.13232,9.649402 c -0.77924,1.465076 -0.65974,2.41396 0.66876,3.18097 9.66686,5.488467 18.12303,12.874168 24.86104,21.711122 1.05534,1.616079 2.08054,1.713076 3.67763,0.571565 L 178.04883,40 C 169.45271,27.990203 158.19857,18.128379 145.16406,11.183594 Z"
-         clip-path="url(#clipPath6910-2)"
-         style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="csccccccc"
-         inkscape:connector-curvature="0"
-         id="path3419"
-         d="m 193.80469,75.615234 -9.62713,2.062751 c -2.66266,0.570512 -3.40763,1.172953 -2.90593,3.917433 0.85823,4.714633 1.30424,9.497137 1.33189,14.293254 -0.028,5.578758 -0.62194,11.137108 -1.77093,16.589918 -0.86591,3.23162 0.13682,3.77092 3.16149,4.58138 l 8.98639,2.30136 c 1.98177,-7.66828 3.00584,-15.55255 3.04883,-23.472658 -0.0187,-6.817681 -0.76446,-13.613926 -2.22461,-20.273438 z"
-         clip-path="url(#clipPath6906-8)"
-         style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="sccsccs"
-         inkscape:connector-curvature="0"
-         id="path3421"
-         d="m 14.264281,102.76512 -10.2076406,0.87943 c 1.2093798,14.83154 5.8540346,29.17808 13.5664056,41.90429 l 8.544301,-5.23239 c 2.394983,-1.46665 1.895406,-3.37834 0.986202,-5.04513 -5.118253,-9.40257 -8.359018,-19.71635 -9.536202,-30.36553 0,-2.09418 -1.881577,-2.26744 -3.353066,-2.14067 z"
-         clip-path="url(#clipPath6902-3)"
-         style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="sccsccs"
-         inkscape:connector-curvature="0"
-         id="path3423"
-         d="m 51.504371,166.60235 -5.82273,8.50898 c 12.710503,8.71282 27.333669,14.23394 42.630859,16.0957 l 1.220329,-9.90843 c 0.355066,-2.88295 -1.085712,-3.52946 -3.332252,-3.90256 -10.402329,-1.73697 -20.373956,-5.45322 -29.373754,-10.94516 -1.647505,-1.06744 -3.639993,-2.30718 -5.322452,0.15147 z"
-         clip-path="url(#clipPath6898-8)"
-         style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="ccsccsc"
-         inkscape:connector-curvature="0"
-         id="path3425"
-         d="M 32.208984,27.683594 C 21.779177,38.079001 13.883707,50.736882 9.1347656,64.675781 L 19.33617,68.090365 c 1.658147,0.55501 2.832564,-0.120955 3.374272,-1.591979 3.777598,-10.021698 9.470788,-19.210103 16.759132,-27.052307 1.561136,-1.561136 1.567283,-2.960058 0.447507,-4.076606 z"
-         clip-path="url(#clipPath6894-1)"
-         style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="cssccccsssc"
-         inkscape:connector-curvature="0"
-         id="path3427"
-         d="m 138.72416,168.48439 c -4.17634,2.25458 -8.55959,4.09055 -13.0504,5.63418 -1.00363,0.34498 -1.20742,1.18222 -0.8682,2.27372 l 3.44056,11.0706 c 4.92985,-1.53124 9.72799,-3.45808 14.34766,-5.76172 l 0.12695,0.0137 14.0293,5.44532 4.12174,-10.20577 c 0.7548,-1.86894 -0.0184,-2.7016 -1.59462,-3.31324 l -14.72114,-5.71251 c -1.86679,-0.7244 -3.68834,-0.60144 -5.83185,0.55572 z"
-         clip-path="url(#clipPath6886-7)"
-         style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         transform="translate(1940.1058,1240.4337)"
-         sodipodi:nodetypes="cssccc"
-         inkscape:connector-curvature="0"
-         id="path3429"
-         d="m 186.53125,152.80469 -10.6386,2.70888 c -0.78879,0.20085 -1.67397,1.02386 -1.35494,2.33801 l 9.75918,40.15428 c 8.56713,5.97538 15.30408,3.06731 11.01563,-9.47266 z"
-         clip-path="url(#clipPath6882-4)"
-         style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <circle
-         r="10.470775"
-         style="opacity:1;fill:#f5f5f5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355759"
-         id="circle3431"
-         cx="2041.2632"
-         cy="1331.7938" />
-      <circle
-         r="10.470775"
-         style="opacity:1;fill:#f5f5f5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355759"
-         id="circle3433"
-         cx="2087.3342"
-         cy="1331.7938" />
-      <path
-         id="path3435"
-         d="m 2051.6642,1331.8339 a 10.470775,10.470775 0 0 1 -10.4708,10.4708 10.470775,10.470775 0 0 1 -10.4708,-10.4708 10.470775,10.470775 0 0 1 10.4708,-10.4707 10.470775,10.470775 0 0 1 10.4708,10.4707 z"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355759"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cczc"
-         inkscape:connector-curvature="0"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355768"
-         d="m 2074.7172,1383.7461 c -15.8797,12.0914 -43.2556,14.948 -67.5659,-1.6895 27.0396,19.0303 0.8971,-35.2887 34.0999,-35.0406 33.2028,0.2482 5.5198,57.4893 33.466,36.7301 z"
-         id="path3437" />
-      <path
-         inkscape:connector-curvature="0"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355759"
-         d="m 2097.6945,1331.834 a 10.470775,10.470775 0 0 1 -10.4708,10.4707 10.470775,10.470775 0 0 1 -10.4708,-10.4707 10.470775,10.470775 0 0 1 10.4708,-10.4708 10.470775,10.470775 0 0 1 10.4708,10.4708 z"
-         id="path3439" />
-      <path
-         id="path3441"
-         d="m 2109.4287,1358.1944 c -11.5384,-0.2986 -27.64,38.1534 -27.0507,3.8825 0,-9.3535 6.3899,-16.936 14.272,-16.936 4.597,0 13.2011,1.7994 12.7787,13.0535 z"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355762"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsc" />
-      <path
-         id="path3443"
-         d="m 1984.8779,1331.834 a 10.470775,10.470775 0 0 0 10.4708,10.4707 10.470775,10.470775 0 0 0 10.4708,-10.4707 10.470775,10.470775 0 0 0 -10.4708,-10.4708 10.470775,10.470775 0 0 0 -10.4708,10.4708 z"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355759"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="ccsc"
-         inkscape:connector-curvature="0"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.38355762"
-         d="m 1971.0018,1355.3574 c 15.2031,1.4783 27.0563,38.8786 29.1926,6.7197 0,-9.3537 -6.1191,-16.9362 -13.6673,-16.9362 -7.5483,0 -11.0905,1.2852 -15.5253,10.2165 z"
-         id="path3445" />
-      <path
-         transform="translate(1939.7548,1240.4502)"
-         sodipodi:nodetypes="ccsccscc"
-         inkscape:connector-curvature="0"
-         id="path3447"
-         d="M 99.888672,-0.25 C 87.701045,-0.2239408 75.630114,2.1252837 64.322266,6.671875 l 3.530435,8.74898 c 1.063314,2.635062 1.616754,3.526314 4.973913,2.352259 8.692057,-3.031338 17.839027,-4.588849 27.062058,-4.599286 5.555828,0 6.486278,0.350026 6.780788,-3.4460223 l 0.74851,-9.64772758 C 104.9135,-0.12857239 102.40179,-0.23868346 99.888672,-0.25 Z"
-         clip-path="url(#clipPath6890-4)"
-         style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       transform="matrix(0.28222223,0,0,0.28222223,-479.00124,-301.93764)">
+      <g
+         id="g925"
+         transform="translate(1.2646334,0.03223108)">
+        <g
+           style="stroke-width:2.7252984"
+           transform="matrix(0.3669323,0,0,0.3669323,1317.8763,1202.38)"
+           id="g980">
+          <path
+             style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.90119457;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 2039.9944,1634.1834 a 95.889395,95.889395 0 0 0 -95.8886,95.8887 95.889395,95.889395 0 0 0 95.8886,95.8906 95.889395,95.889395 0 0 0 42.7051,-10.0781 l 0.127,0.014 40.7929,15.832 c 3.2548,1.2632 7.5363,3.047 10.4551,0.2735 2.8333,-2.6923 2.1681,-5.4222 1.1875,-9.4121 l -11.3476,-46.168 v -0.01 0.01 a 95.889395,95.889395 0 0 0 11.9707,-46.3516 95.889395,95.889395 0 0 0 -95.8907,-95.8886 z"
+             id="path964"
+             inkscape:connector-curvature="0" />
+          <path
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             d="m 2052.7212,1719.2884 a 11.53697,11.53697 0 0 1 -11.537,11.537 11.53697,11.53697 0 0 1 -11.537,-11.537 11.53697,11.53697 0 0 1 11.537,-11.5369 11.53697,11.53697 0 0 1 11.537,11.5369 z"
+             id="path984" />
+          <path
+             id="path986"
+             d="m 2103.4386,1719.2885 a 11.53697,11.53697 0 0 1 -11.537,11.5369 11.53697,11.53697 0 0 1 -11.537,-11.5369 11.53697,11.53697 0 0 1 11.537,-11.537 11.53697,11.53697 0 0 1 11.537,11.537 z"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccsc"
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             d="m 2116.3676,1755.8129 c -12.7133,-0.329 -30.4545,38.6902 -29.8052,0.9297 0,-10.306 7.0406,-18.6606 15.7253,-18.6606 5.0651,0 14.5453,5.3309 14.0799,17.7309 z"
+             id="path988" />
+          <path
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             d="m 1979.1343,1719.2885 a 11.53697,11.53697 0 0 0 11.537,11.5369 11.53697,11.53697 0 0 0 11.537,-11.5369 11.53697,11.53697 0 0 0 -11.537,-11.537 11.53697,11.53697 0 0 0 -11.537,11.537 z"
+             id="path990" />
+          <path
+             inkscape:original-d="m 2078.1216,1783.9664 c -8.7484,6.6613 -24.7952,13.3613 -37.8714,14.0385 -13.0762,0.6772 -23.1816,-4.6682 -36.5745,-13.8341 14.8965,10.484 19.8658,4.8954 20.9617,-7.412 0.5479,-6.1535 -1.1267,-25.0806 -0.2829,-28.2596 0.8437,-3.179 7.7475,-7.5824 16.8934,-7.5141 9.1459,0.068 15.9436,5.0338 16.6438,8.0452 0.7002,3.0115 -1.1553,21.0416 -0.7571,27.5128 0.7964,12.9425 5.5911,18.8599 20.987,7.4233 z"
+             inkscape:path-effect="#path-effect998"
+             sodipodi:nodetypes="cscsssssc"
+             inkscape:connector-curvature="0"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530907"
+             d="m 2078.1216,1783.9664 c -10.3552,9.0701 -24.1062,14.1675 -37.8714,14.0385 -13.3074,-0.1247 -26.5157,-5.1207 -36.5745,-13.8341 3.5313,2.5325 8.318,3.2125 12.415,1.7639 4.0969,-1.4487 7.3922,-4.9865 8.5467,-9.1759 0.6367,-2.3105 0.6496,-4.7548 0.375,-7.1357 -0.2746,-2.3808 -0.8297,-4.7188 -1.3173,-7.0653 -0.4876,-2.3465 -0.91,-4.7222 -0.9131,-7.1188 -0,-2.3967 0.4318,-4.832 1.5725,-6.9398 1.5437,-2.8524 4.3008,-4.9253 7.329,-6.087 3.0281,-1.1617 6.3215,-1.4775 9.5644,-1.4271 3.2431,0.05 6.5253,0.4683 9.5154,1.7251 2.9901,1.2569 5.68,3.418 7.1284,6.3201 1.0414,2.0866 1.4036,4.4624 1.3534,6.7939 -0.05,2.3314 -0.4967,4.6354 -1.0019,6.912 -0.5053,2.2766 -1.0719,4.5449 -1.3688,6.8579 -0.297,2.313 -0.3181,4.6899 0.2602,6.949 1.0858,4.2417 4.3854,7.8502 8.5132,9.3103 4.1278,1.46 8.9625,0.7286 12.4738,-1.887 z"
+             id="path996" />
+          <path
+             id="path1002"
+             d="m 1966.202,1755.8129 c 12.7133,-0.329 30.4544,38.6902 29.8051,0.9297 0,-10.306 -7.0405,-18.6606 -15.7252,-18.6606 -5.0651,0 -14.5453,5.3309 -14.0799,17.7309 z"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.04530895"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsc" />
+        </g>
+        <g
+           style="stroke-width:0.84566534"
+           transform="matrix(1.1825009,0,0,1.1825009,-382.86422,-389.99169)"
+           id="g904">
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6910-2-0)"
+             d="m 145.16406,11.183594 -5.13232,9.649402 c -0.77924,1.465076 -0.65974,2.41396 0.66876,3.18097 9.66686,5.488467 18.12303,12.874168 24.86104,21.711122 1.05534,1.616079 2.08054,1.713076 3.67763,0.571565 L 178.04883,40 C 169.45271,27.990203 158.19857,18.128379 145.16406,11.183594 Z"
+             id="path966"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csccscc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6906-8-6)"
+             d="m 193.80469,75.615234 -9.62713,2.062751 c -2.66266,0.570512 -3.40763,1.172953 -2.90593,3.917433 0.85823,4.714633 1.30424,9.497137 1.33189,14.293254 -0.028,5.578758 -0.62194,11.137108 -1.77093,16.589918 -0.86591,3.23162 0.13682,3.77092 3.16149,4.58138 l 8.98639,2.30136 c 1.98177,-7.66828 3.00584,-15.55255 3.04883,-23.472658 -0.0187,-6.817681 -0.76446,-13.613926 -2.22461,-20.273438 z"
+             id="path968"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="csccccccc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6902-3-1)"
+             d="m 14.264281,102.76512 -10.2076406,0.87943 c 1.2093798,14.83154 5.8540346,29.17808 13.5664056,41.90429 l 8.544301,-5.23239 c 2.394983,-1.46665 1.895406,-3.37834 0.986202,-5.04513 -5.118253,-9.40257 -8.359018,-19.71635 -9.536202,-30.36553 0,-2.09418 -1.881577,-2.26744 -3.353066,-2.14067 z"
+             id="path970"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sccsccs"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6898-8-8)"
+             d="m 51.504371,166.60235 -5.82273,8.50898 c 12.710503,8.71282 27.333669,14.23394 42.630859,16.0957 l 1.220329,-9.90843 c 0.355066,-2.88295 -1.085712,-3.52946 -3.332252,-3.90256 -10.402329,-1.73697 -20.373956,-5.45322 -29.373754,-10.94516 -1.647505,-1.06744 -3.639993,-2.30718 -5.322452,0.15147 z"
+             id="path972"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sccsccs"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6894-1-5)"
+             d="M 32.208984,27.683594 C 21.779177,38.079001 13.883707,50.736882 9.1347656,64.675781 L 19.33617,68.090365 c 1.658147,0.55501 2.832564,-0.120955 3.374272,-1.591979 3.777598,-10.021698 9.470788,-19.210103 16.759132,-27.052307 1.561136,-1.561136 1.567283,-2.960058 0.447507,-4.076606 z"
+             id="path974"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccsc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6886-7-2)"
+             d="m 138.72416,168.48439 c -4.17634,2.25458 -8.55959,4.09055 -13.0504,5.63418 -1.00363,0.34498 -1.20742,1.18222 -0.8682,2.27372 l 3.44056,11.0706 c 4.92985,-1.53124 9.72799,-3.45808 14.34766,-5.76172 l 0.12695,0.0137 14.0293,5.44532 4.12174,-10.20577 c 0.7548,-1.86894 -0.0184,-2.7016 -1.59462,-3.31324 l -14.72114,-5.71251 c -1.86679,-0.7244 -3.68834,-0.60144 -5.83185,0.55572 z"
+             id="path976"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cssccccsssc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6882-4-9)"
+             d="m 186.53125,152.80469 -10.6386,2.70888 c -0.78879,0.20085 -1.67397,1.02386 -1.35494,2.33801 l 9.75918,40.15428 c 8.56713,5.97538 15.30408,3.06731 11.01563,-9.47266 z"
+             id="path978"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cssccc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.1832,1853.6283)" />
+          <path
+             style="display:inline;opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.72006631px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             clip-path="url(#clipPath6890-4-1)"
+             d="M 99.888672,-0.25 C 87.701045,-0.2239408 75.630114,2.1252837 64.322266,6.671875 l 3.530435,8.74898 c 1.063314,2.635062 1.616754,3.526314 4.973913,2.352259 8.692057,-3.031338 17.839027,-4.588849 27.062058,-4.599286 5.555828,0 6.486278,0.350026 6.780788,-3.4460223 l 0.74851,-9.64772758 C 104.9135,-0.12857239 102.40179,-0.23868346 99.888672,-0.25 Z"
+             id="path994"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccscc"
+             transform="matrix(0.3108988,0,0,0.3108988,2040.0741,1853.6334)" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>

art/quicksy_mono.svg 🔗 

@@ -0,0 +1,181 @@
+<?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"
+   width="21.637424mm"
+   height="21.637424mm"
+   viewBox="0 0 21.637424 21.637426"
+   version="1.1"
+   id="svg14750"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="quicksy_mono.svg"
+   inkscape:export-filename="/home/smagnan/Work/osp/osp.cloud/osp.work.quicksy/package-quicksy/quicksy-adaptative.png"
+   inkscape:export-xdpi="175"
+   inkscape:export-ydpi="175">
+  <defs
+     id="defs14744">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect963"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect937"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect893"
+       is_visible="true" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect998"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect890"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect852"
+       is_visible="true" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6910-2">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6912-1"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6906-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6908-0"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6902-3">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6904-6"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6898-8">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6900-9"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6894-1">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6896-2"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6886-7">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6888-5"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6882-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6884-7"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6890-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path6892-8"
+         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 v -0.008 l 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
+         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="-19.000081"
+     inkscape:cy="39.577553"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g14606"
+     showgrid="false"
+     fit-margin-top="0.5"
+     fit-margin-left="0.87888"
+     fit-margin-right="0.87888"
+     fit-margin-bottom="0.5"
+     inkscape:window-width="1916"
+     inkscape:window-height="1561"
+     inkscape:window-x="3840"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     units="mm"
+     inkscape:pagecheckerboard="true">
+    <sodipodi:guide
+       position="-11.854979,103.32866"
+       orientation="0,1"
+       id="guide949"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata14747">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-157.69546,-207.72366)">
+    <g
+       style="display:inline"
+       id="g14606"
+       transform="matrix(0.28222223,0,0,0.28222223,-479.00124,-301.93764)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path982"

art/render.rb 🔗 

@@ -11,7 +11,6 @@ resolutions = {
 	}
 
 images = {
-	'quicksy_launcher.svg' => ['quicksy/launcher', 48],
 	'main_logo.svg' => ['conversations/main_logo', 200],
     'quicksy_main_logo.svg' => ['quicksy/main_logo', 200],
     'splash_logo.svg' => ['conversations/splash_logo', 144],
@@ -24,7 +23,8 @@ images = {
 	'play_gif_white.svg' => ['play_gif_white', 128],
     'play_video_black.svg' => ['play_video_black', 128],
     'play_gif_black.svg' => ['play_gif_black', 128],
-	'conversations_mono.svg' => ['ic_notification', 24],
+	'conversations_mono.svg' => ['conversations/ic_notification', 24],
+    'quicksy_mono.svg' => ['quicksy/ic_notification', 24],
 	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
 	'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
 	'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],

src/conversations/res/drawable/ic_launcher_foreground.xml 🔗 

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:aapt="http://schemas.android.com/aapt"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="1146.7721"
+        android:viewportHeight="1146.7721">
+    <group android:translateX="322.69516"
+            android:translateY="317.38605">
+      <path
+          android:pathData="M253.219,17.719C126.144,17.719 22.469,118.884 22.469,243.75C22.469,368.616 126.138,469.844 253.219,469.844C292.739,469.844 323.216,461.736 358,449.094L468.469,493.625A14.556,14.562 0,0 0,488.063 476.625L458.125,355.656C477.356,321.886 483.938,283.416 483.938,243.75C483.938,118.887 380.293,17.719 253.219,17.719zM143.844,222C157.651,222 168.844,233.193 168.844,247C168.844,260.807 157.651,272 143.844,272C130.037,272 118.844,260.807 118.844,247C118.844,233.193 130.037,222 143.844,222zM253.563,222C267.37,222 278.563,233.193 278.563,247C278.563,260.807 267.37,272 253.563,272C239.755,272 228.563,260.807 228.563,247C228.563,233.193 239.755,222 253.563,222zM363.563,222C377.37,222 388.563,233.193 388.563,247C388.563,260.807 377.37,272 363.563,272C349.755,272 338.563,260.807 338.563,247C338.563,233.193 349.755,222 363.563,222z"
+          android:fillColor="#ffffff"
+          android:strokeColor="#00000000"
+          android:fillAlpha="1"/>
+      <path
+          android:pathData="M478.641,484.856 L447.361,358.245c19.89,-31.998 26.743,-69.572 26.743,-109.762 0,-116.817 -96.799,-211.484 -216.184,-211.484 -119.384,0 -216.184,94.667 -216.184,211.484 0,116.817 96.799,211.554 216.184,211.554 39.636,0 68.588,-8.142 105.194,-21.761z"
+          android:strokeAlpha="0"
+          android:strokeLineJoin="round"
+          android:strokeWidth="23.55835724"
+          android:fillColor="#00000000"
+          android:strokeColor="#000000"
+          android:fillAlpha="0"
+          android:strokeLineCap="butt"/>
+    </group>
+</vector>

src/quicksy/AndroidManifest.xml 🔗 

@@ -4,7 +4,7 @@
     package="eu.siacs.conversations">
 
     <application
-        android:icon="@drawable/launcher"
+        android:icon="@mipmap/new_launcher"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:icon">
         <activity

src/quicksy/java/eu/siacs/conversations/ui/EnterPhoneNumberActivity.java 🔗 

@@ -24,6 +24,7 @@ import eu.siacs.conversations.services.QuickConversationsService;
 import eu.siacs.conversations.ui.drawable.TextDrawable;
 import eu.siacs.conversations.ui.util.ApiDialogHelper;
 import eu.siacs.conversations.utils.AccountUtils;
+import eu.siacs.conversations.utils.LocationProvider;
 import eu.siacs.conversations.utils.PhoneNumberUtilWrapper;
 import io.michaelrocks.libphonenumber.android.NumberParseException;
 import io.michaelrocks.libphonenumber.android.PhoneNumberUtil;
@@ -94,7 +95,7 @@ public class EnterPhoneNumberActivity extends XmppActivity implements QuickConve
         if (region != null) {
             this.region = region;
         } else {
-            this.region = PhoneNumberUtilWrapper.getUserCountry(this);
+            this.region = LocationProvider.getUserCountry(this);
         }
 
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_enter_number);

src/quicksy/res/drawable/ic_launcher_foreground.xml 🔗 

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="49.41353"
+        android:viewportHeight="49.413532">
+    <group android:translateX="13.888052"
+            android:translateY="13.888054">
+      <path

src/quicksy/res/mipmap-anydpi-v26/new_launcher.xml 🔗 

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

src/quicksy/res/mipmap-anydpi-v26/new_launcher_round.xml 🔗 

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>