Просмотр исходного кода

fix positioning of Nc logo within icons

AndyScherzinger 7 лет назад
Родитель
Сommit
95f2b488f9
26 измененных файлов с 40 добавлено и 193 удалено
  1. 6 81
      drawable_resources/logo.svg
  2. 17 82
      drawable_resources/logo_dev.svg
  3. BIN
      src/main/ic_launcher-web.png
  4. 4 3
      src/main/res/drawable/ic_launcher_foreground.xml
  5. BIN
      src/main/res/mipmap-hdpi/ic_launcher.png
  6. BIN
      src/main/res/mipmap-hdpi/ic_launcher_round.png
  7. BIN
      src/main/res/mipmap-mdpi/ic_launcher.png
  8. BIN
      src/main/res/mipmap-mdpi/ic_launcher_round.png
  9. BIN
      src/main/res/mipmap-xhdpi/ic_launcher.png
  10. BIN
      src/main/res/mipmap-xhdpi/ic_launcher_round.png
  11. BIN
      src/main/res/mipmap-xxhdpi/ic_launcher.png
  12. BIN
      src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  13. BIN
      src/main/res/mipmap-xxxhdpi/ic_launcher.png
  14. BIN
      src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  15. BIN
      src/versionDev/ic_launcher-web.png
  16. 13 27
      src/versionDev/res/drawable/ic_launcher_foreground.xml
  17. BIN
      src/versionDev/res/mipmap-hdpi/ic_launcher.png
  18. BIN
      src/versionDev/res/mipmap-hdpi/ic_launcher_round.png
  19. BIN
      src/versionDev/res/mipmap-mdpi/ic_launcher.png
  20. BIN
      src/versionDev/res/mipmap-mdpi/ic_launcher_round.png
  21. BIN
      src/versionDev/res/mipmap-xhdpi/ic_launcher.png
  22. BIN
      src/versionDev/res/mipmap-xhdpi/ic_launcher_round.png
  23. BIN
      src/versionDev/res/mipmap-xxhdpi/ic_launcher.png
  24. BIN
      src/versionDev/res/mipmap-xxhdpi/ic_launcher_round.png
  25. BIN
      src/versionDev/res/mipmap-xxxhdpi/ic_launcher.png
  26. BIN
      src/versionDev/res/mipmap-xxxhdpi/ic_launcher_round.png

+ 6 - 81
drawable_resources/logo.svg

@@ -1,82 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   height="1064"
-   width="1064"
-   version="1.1"
-   y="0px"
-   x="0px"
-   viewBox="0 0 1064 1063.9999"
-   id="svg2"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="logo.svg"
-   inkscape:export-filename="/tmp/ic_launcher.png"
-   inkscape:export-xdpi="16.24"
-   inkscape:export-ydpi="16.24"><metadata
-     id="metadata12"><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><defs
-     id="defs10"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3350"><rect
-         style="opacity:1;fill:#0082c9;fill-opacity:1;stroke:none;stroke-width:5.56599998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3352"
-         width="1064"
-         height="1064"
-         x="-20"
-         y="-20.000061"
-         rx="84"
-         ry="84" /></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="1005"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="0.32"
-     inkscape:cx="-858.31131"
-     inkscape:cy="664.87545"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1" /><path
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#ffffff;color-rendering:auto;image-rendering:auto;shape-rendering:auto;enable-background:accumulate"
-     d="m 532.68096,316.07009 c -93.35126,0.009 -171.73632,63.92879 -195.6864,149.91791 -20.90398,-45.99328 -66.91627,-78.5879 -120.3776,-78.59385 -72.77312,0.008 -132.608,59.84889 -132.61696,132.62749 -0.0144,72.79356 59.82891,132.64544 132.61696,132.6544 53.46731,-0.007 99.45003,-32.62151 120.35072,-78.62074 23.94141,86.00403 102.35306,149.9358 195.71626,149.9448 92.84054,0.01 170.84032,-63.22992 195.27726,-148.4992 21.2426,45.14803 66.5489,77.16618 119.395,77.17216 C 920.1591,652.68596 980.0119,592.82717 980,520.01866 979.99,447.22512 920.1442,387.3792 847.3562,387.39114 794.5071,387.39714 749.1755,419.40935 727.9343,464.5633 703.49738,379.297 625.52448,316.05812 532.68394,316.0641 Z m 0,77.85612 c 70.10602,-0.005 126.10902,55.98698 126.11498,126.09843 0.004,70.12039 -56,126.13127 -126.11498,126.12532 -70.10602,-0.007 -126.09408,-56.01389 -126.0881,-126.12532 0.007,-70.10249 55.99104,-126.08947 126.0881,-126.09843 z m -316.07893,71.32407 c 30.71189,0.004 54.76352,24.05843 54.7665,54.77136 0.005,30.71894 -24.04983,54.79529 -54.7665,54.79827 -30.71787,-0.004 -54.77248,-24.07933 -54.76651,-54.79827 0.004,-30.71293 24.05641,-54.76839 54.76651,-54.77136 z m 630.75417,0 c 30.7178,-0.005 54.7904,24.05155 54.7933,54.77136 0.01,30.7279 -24.0695,54.80425 -54.7933,54.79827 -30.7179,-0.004 -54.7725,-24.07933 -54.7695,-54.79827 0,-30.71293 24.0573,-54.76839 54.7695,-54.77136 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/tmp/icon.png"
-     inkscape:export-xdpi="3"
-     inkscape:export-ydpi="3" /><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Dev"
-     style="display:none"><text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="357.40527"
-       y="946.11914"
-       id="text4136"><tspan
-         sodipodi:role="line"
-         id="tspan4138"
-         x="357.40527"
-         y="946.11914"
-         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:180px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#ffffff;fill-opacity:1">Dev</tspan></text>
-</g></svg>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1064 1064" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g id="path6" transform="matrix(1,0,0,1,0,11.9359)">
+        <path d="M532.681,316.07C439.33,316.079 360.945,379.999 336.995,465.988C316.091,419.995 270.078,387.4 216.617,387.394C143.844,387.402 84.009,447.243 84,520.022C83.986,592.815 143.829,652.667 216.617,652.676C270.084,652.669 316.067,620.055 336.968,574.055C360.909,660.059 439.321,723.991 532.684,724C625.524,724.01 703.524,660.77 727.961,575.501C749.204,620.649 794.51,652.667 847.356,652.673C920.159,652.686 980.012,592.827 980,520.019C979.99,447.225 920.144,387.379 847.356,387.391C794.507,387.397 749.176,419.409 727.934,464.563C703.497,379.297 625.524,316.058 532.684,316.064L532.681,316.07ZM532.681,393.926C602.787,393.921 658.79,449.913 658.796,520.025C658.8,590.145 602.796,646.156 532.681,646.15C462.575,646.143 406.587,590.136 406.593,520.025C406.6,449.922 462.584,393.935 532.681,393.926ZM216.602,465.25C247.314,465.254 271.366,489.309 271.369,520.022C271.374,550.741 247.319,574.817 216.602,574.82C185.884,574.816 161.83,550.741 161.836,520.022C161.84,489.309 185.892,465.253 216.602,465.25ZM847.356,465.25C878.074,465.245 902.147,489.302 902.15,520.022C902.16,550.75 878.08,574.826 847.356,574.82C816.638,574.816 792.584,550.741 792.587,520.022C792.587,489.309 816.644,465.253 847.356,465.25Z" style="fill:white;fill-rule:nonzero;"/>
+    </g>
+</svg>

+ 17 - 82
drawable_resources/logo_dev.svg

@@ -1,83 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   height="1064"
-   width="1064"
-   version="1.1"
-   y="0px"
-   x="0px"
-   viewBox="0 0 1064 1063.9999"
-   id="svg2"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="logo_dev.svg"
-   inkscape:export-filename="/tmp/ic_launcher.png"
-   inkscape:export-xdpi="16.24"
-   inkscape:export-ydpi="16.24"><metadata
-     id="metadata12"><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><defs
-     id="defs10"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3350"><rect
-         style="opacity:1;fill:#0082c9;fill-opacity:1;stroke:none;stroke-width:5.56599998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3352"
-         width="1064"
-         height="1064"
-         x="-20"
-         y="-20.000061"
-         rx="84"
-         ry="84" /></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="1005"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="0.32"
-     inkscape:cx="-240.48716"
-     inkscape:cy="664.87545"
-     inkscape:current-layer="layer1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1" /><path
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#ffffff;color-rendering:auto;image-rendering:auto;shape-rendering:auto;enable-background:accumulate"
-     d="m 532.68096,316.07009 c -93.35126,0.009 -171.73632,63.92879 -195.6864,149.91791 -20.90398,-45.99328 -66.91627,-78.5879 -120.3776,-78.59385 -72.77312,0.008 -132.608,59.84889 -132.61696,132.62749 -0.0144,72.79356 59.82891,132.64544 132.61696,132.6544 53.46731,-0.007 99.45003,-32.62151 120.35072,-78.62074 23.94141,86.00403 102.35306,149.9358 195.71626,149.9448 92.84054,0.01 170.84032,-63.22992 195.27726,-148.4992 21.2426,45.14803 66.5489,77.16618 119.395,77.17216 C 920.1591,652.68596 980.0119,592.82717 980,520.01866 979.99,447.22512 920.1442,387.3792 847.3562,387.39114 794.5071,387.39714 749.1755,419.40935 727.9343,464.5633 703.49738,379.297 625.52448,316.05812 532.68394,316.0641 Z m 0,77.85612 c 70.10602,-0.005 126.10902,55.98698 126.11498,126.09843 0.004,70.12039 -56,126.13127 -126.11498,126.12532 -70.10602,-0.007 -126.09408,-56.01389 -126.0881,-126.12532 0.007,-70.10249 55.99104,-126.08947 126.0881,-126.09843 z m -316.07893,71.32407 c 30.71189,0.004 54.76352,24.05843 54.7665,54.77136 0.005,30.71894 -24.04983,54.79529 -54.7665,54.79827 -30.71787,-0.004 -54.77248,-24.07933 -54.76651,-54.79827 0.004,-30.71293 24.05641,-54.76839 54.76651,-54.77136 z m 630.75417,0 c 30.7178,-0.005 54.7904,24.05155 54.7933,54.77136 0.01,30.7279 -24.0695,54.80425 -54.7933,54.79827 -30.7179,-0.004 -54.7725,-24.07933 -54.7695,-54.79827 0,-30.71293 24.0573,-54.76839 54.7695,-54.77136 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     inkscape:export-filename="/tmp/icon.png"
-     inkscape:export-xdpi="3"
-     inkscape:export-ydpi="3" /><g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Dev"><g
-       aria-label="Dev"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:Helvetica;-inkscape-font-specification:Helvetica;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="text4136"><path
-         d="m 478.87012,880.64062 q 0,31.81641 -17.66602,48.69141 -17.66601,16.78711 -50.88867,16.78711 H 374.36816 V 817.62305 h 39.72657 q 30.67382,0 47.72461,16.52343 17.05078,16.52344 17.05078,46.49414 z m -22.14844,0.70313 q 0,-46.14258 -43.1543,-46.14258 h -18.19336 v 93.25195 h 14.94141 q 46.40625,0 46.40625,-47.10937 z"
-         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:180px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#ffffff;fill-opacity:1"
-         id="path4491" /><path
-         d="m 546.80957,947.87695 q -22.67578,0 -35.50781,-13.18359 -12.74414,-13.27149 -12.74414,-36.47461 0,-23.81836 11.86523,-37.44141 11.86524,-13.62304 32.60742,-13.62304 19.24805,0 30.41016,11.68945 11.16211,11.68945 11.16211,32.16797 v 11.16211 h -64.77539 q 0.43945,14.15039 7.64648,21.79687 7.20703,7.5586 20.30274,7.5586 8.61328,0 15.99609,-1.58203 7.4707,-1.66993 15.99609,-5.44922 v 16.78711 q -7.55859,3.60351 -15.29296,5.09765 -7.73438,1.49414 -17.66602,1.49414 z m -3.7793,-85.07812 q -9.84375,0 -15.82031,6.24023 -5.88867,6.24024 -7.03125,18.19336 h 44.12109 q -0.17578,-12.04101 -5.80078,-18.19336 -5.625,-6.24023 -15.46875,-6.24023 z"
-         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:180px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#ffffff;fill-opacity:1"
-         id="path4493" /><path
-         d="m 630.21777,946.11914 -36.91406,-97.20703 h 21.79688 l 19.77539,56.51367 q 5.09765,14.23828 6.15234,23.02734 h 0.70313 q 0.79101,-6.32812 6.15234,-23.02734 l 19.77539,-56.51367 h 21.97266 l -37.08985,97.20703 z"
-         style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:180px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#ffffff;fill-opacity:1"
-         id="path4495" /></g></g></svg>
-		 
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1064 1064" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g id="path6" transform="matrix(1,0,0,1,0,11.9359)">
+        <path d="M532.681,316.07C439.33,316.079 360.945,379.999 336.995,465.988C316.091,419.995 270.078,387.4 216.617,387.394C143.844,387.402 84.009,447.243 84,520.022C83.986,592.815 143.829,652.667 216.617,652.676C270.084,652.669 316.067,620.055 336.968,574.055C360.909,660.059 439.321,723.991 532.684,724C625.524,724.01 703.524,660.77 727.961,575.501C749.204,620.649 794.51,652.667 847.356,652.673C920.159,652.686 980.012,592.827 980,520.019C979.99,447.225 920.144,387.379 847.356,387.391C794.507,387.397 749.176,419.409 727.934,464.563C703.497,379.297 625.524,316.058 532.684,316.064L532.681,316.07ZM532.681,393.926C602.787,393.921 658.79,449.913 658.796,520.025C658.8,590.145 602.796,646.156 532.681,646.15C462.575,646.143 406.587,590.136 406.593,520.025C406.6,449.922 462.584,393.935 532.681,393.926ZM216.602,465.25C247.314,465.254 271.366,489.309 271.369,520.022C271.374,550.741 247.319,574.817 216.602,574.82C185.884,574.816 161.83,550.741 161.836,520.022C161.84,489.309 185.892,465.253 216.602,465.25ZM847.356,465.25C878.074,465.245 902.147,489.302 902.15,520.022C902.16,550.75 878.08,574.826 847.356,574.82C816.638,574.816 792.584,550.741 792.587,520.022C792.587,489.309 816.644,465.253 847.356,465.25Z" style="fill:white;fill-rule:nonzero;"/>
+    </g>
+    <g id="text4136">
+        <g id="path4491" transform="matrix(1,0,0,1,4,-14)">
+            <path d="M478.87,880.641C478.87,901.852 472.981,918.082 461.204,929.332C449.427,940.523 432.464,946.119 410.315,946.119L374.368,946.119L374.368,817.623L414.095,817.623C434.544,817.623 450.452,823.131 461.819,834.146C473.187,845.162 478.87,860.66 478.87,880.641ZM456.722,881.344C456.722,850.582 442.337,835.201 413.567,835.201L395.374,835.201L395.374,928.453L410.315,928.453C441.253,928.453 456.722,912.75 456.722,881.344Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g id="path4493" transform="matrix(1,0,0,1,4,-14)">
+            <path d="M546.81,947.877C531.692,947.877 519.856,943.482 511.302,934.693C502.806,925.846 498.558,913.687 498.558,898.219C498.558,882.34 502.513,869.859 510.423,860.777C518.333,851.695 529.202,847.154 543.03,847.154C555.862,847.154 565.999,851.051 573.44,858.844C580.882,866.637 584.603,877.359 584.603,891.012L584.603,902.174L519.827,902.174C520.12,911.607 522.669,918.873 527.474,923.971C532.278,929.01 539.046,931.529 547.776,931.529C553.519,931.529 558.851,931.002 563.772,929.947C568.753,928.834 574.085,927.018 579.769,924.498L579.769,941.285C574.729,943.687 569.632,945.387 564.476,946.383C559.319,947.379 553.431,947.877 546.81,947.877ZM543.03,862.799C536.468,862.799 531.194,864.879 527.21,869.039C523.284,873.199 520.94,879.264 520.179,887.232L564.3,887.232C564.183,879.205 562.249,873.141 558.499,869.039C554.749,864.879 549.593,862.799 543.03,862.799Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+        <g id="path4495" transform="matrix(1,0,0,1,4,-14)">
+            <path d="M630.218,946.119L593.304,848.912L615.101,848.912L634.876,905.426C638.274,914.918 640.325,922.594 641.028,928.453L641.731,928.453C642.259,924.234 644.31,916.559 647.884,905.426L667.659,848.912L689.632,848.912L652.542,946.119L630.218,946.119Z" style="fill:white;fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>

BIN
src/main/ic_launcher-web.png


+ 4 - 3
src/main/res/drawable/ic_launcher_foreground.xml

@@ -20,11 +20,12 @@
         android:width="108dp"
         android:width="108dp"
         android:height="108dp"
         android:height="108dp"
         android:viewportWidth="1636.9231"
         android:viewportWidth="1636.9231"
-        android:viewportHeight="1636.923">
+        android:viewportHeight="1636.9231">
     <group android:translateX="286.46155"
     <group android:translateX="286.46155"
-            android:translateY="286.46152">
+            android:translateY="286.46155">
         <path
         <path
-            android:pathData="m532.7,316.1c-93.4,0 -171.7,63.9 -195.7,149.9 -20.9,-46 -66.9,-78.6 -120.4,-78.6 -72.8,0 -132.6,59.8 -132.6,132.6 -0,72.8 59.8,132.6 132.6,132.7 53.5,-0 99.5,-32.6 120.4,-78.6 23.9,86 102.4,149.9 195.7,149.9 92.8,0 170.8,-63.2 195.3,-148.5 21.2,45.1 66.5,77.2 119.4,77.2C920.2,652.7 980,592.8 980,520 980,447.2 920.1,387.4 847.4,387.4 794.5,387.4 749.2,419.4 727.9,464.6 703.5,379.3 625.5,316.1 532.7,316.1ZM532.7,393.9c70.1,-0 126.1,56 126.1,126.1 0,70.1 -56,126.1 -126.1,126.1 -70.1,-0 -126.1,-56 -126.1,-126.1 0,-70.1 56,-126.1 126.1,-126.1zM216.6,465.3c30.7,0 54.8,24.1 54.8,54.8 0,30.7 -24,54.8 -54.8,54.8 -30.7,-0 -54.8,-24.1 -54.8,-54.8 0,-30.7 24.1,-54.8 54.8,-54.8zM847.4,465.3c30.7,-0 54.8,24.1 54.8,54.8 0,30.7 -24.1,54.8 -54.8,54.8 -30.7,-0 -54.8,-24.1 -54.8,-54.8 0,-30.7 24.1,-54.8 54.8,-54.8z"
+            android:pathData="M532.7,328C439.3,328 360.9,391.9 337,477.9C316.1,431.9 270.1,399.3 216.6,399.3C143.8,399.3 84,459.2 84,532C84,604.8 143.8,664.6 216.6,664.6C270.1,664.6 316.1,632 337,586C360.9,672 439.3,735.9 532.7,735.9C625.5,735.9 703.5,672.7 728,587.4C749.2,632.6 794.5,664.6 847.4,664.6C920.2,664.6 980,604.8 980,532C980,459.2 920.1,399.3 847.4,399.3C794.5,399.3 749.2,431.3 727.9,476.5C703.5,391.2 625.5,328 532.7,328L532.7,328ZM532.7,405.9C602.8,405.9 658.8,461.8 658.8,532C658.8,602.1 602.8,658.1 532.7,658.1C462.6,658.1 406.6,602.1 406.6,532C406.6,461.9 462.6,405.9 532.7,405.9ZM216.6,477.2C247.3,477.2 271.4,501.2 271.4,532C271.4,562.7 247.3,586.8 216.6,586.8C185.9,586.8 161.8,562.7 161.8,532C161.8,501.2 185.9,477.2 216.6,477.2ZM847.4,477.2C878.1,477.2 902.1,501.2 902.2,532C902.2,562.7 878.1,586.8 847.4,586.8C816.6,586.8 792.6,562.7 792.6,532C792.6,501.2 816.6,477.2 847.4,477.2Z"
+            android:fillType="nonZero"
             android:fillColor="#ffffff"/>
             android:fillColor="#ffffff"/>
     </group>
     </group>
 </vector>
 </vector>

BIN
src/main/res/mipmap-hdpi/ic_launcher.png


BIN
src/main/res/mipmap-hdpi/ic_launcher_round.png


BIN
src/main/res/mipmap-mdpi/ic_launcher.png


BIN
src/main/res/mipmap-mdpi/ic_launcher_round.png


BIN
src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
src/main/res/mipmap-xhdpi/ic_launcher_round.png


BIN
src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
src/main/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
src/main/res/mipmap-xxxhdpi/ic_launcher_round.png


BIN
src/versionDev/ic_launcher-web.png


+ 13 - 27
src/versionDev/res/drawable/ic_launcher_foreground.xml

@@ -20,39 +20,25 @@
         android:width="108dp"
         android:width="108dp"
         android:height="108dp"
         android:height="108dp"
         android:viewportWidth="1636.9231"
         android:viewportWidth="1636.9231"
-        android:viewportHeight="1636.923">
+        android:viewportHeight="1636.9231">
     <group android:translateX="286.46155"
     <group android:translateX="286.46155"
-            android:translateY="286.46152">
+            android:translateY="286.46155">
         <path
         <path
-            android:pathData="m532.7,316.1c-93.4,0 -171.7,63.9 -195.7,149.9 -20.9,-46 -66.9,-78.6 -120.4,-78.6 -72.8,0 -132.6,59.8 -132.6,132.6 -0,72.8 59.8,132.6 132.6,132.7 53.5,-0 99.5,-32.6 120.4,-78.6 23.9,86 102.4,149.9 195.7,149.9 92.8,0 170.8,-63.2 195.3,-148.5 21.2,45.1 66.5,77.2 119.4,77.2C920.2,652.7 980,592.8 980,520 980,447.2 920.1,387.4 847.4,387.4 794.5,387.4 749.2,419.4 727.9,464.6 703.5,379.3 625.5,316.1 532.7,316.1ZM532.7,393.9c70.1,-0 126.1,56 126.1,126.1 0,70.1 -56,126.1 -126.1,126.1 -70.1,-0 -126.1,-56 -126.1,-126.1 0,-70.1 56,-126.1 126.1,-126.1zM216.6,465.3c30.7,0 54.8,24.1 54.8,54.8 0,30.7 -24,54.8 -54.8,54.8 -30.7,-0 -54.8,-24.1 -54.8,-54.8 0,-30.7 24.1,-54.8 54.8,-54.8zM847.4,465.3c30.7,-0 54.8,24.1 54.8,54.8 0,30.7 -24.1,54.8 -54.8,54.8 -30.7,-0 -54.8,-24.1 -54.8,-54.8 0,-30.7 24.1,-54.8 54.8,-54.8z"
+            android:pathData="M532.7,328C439.3,328 360.9,391.9 337,477.9C316.1,431.9 270.1,399.3 216.6,399.3C143.8,399.3 84,459.2 84,532C84,604.8 143.8,664.6 216.6,664.6C270.1,664.6 316.1,632 337,586C360.9,672 439.3,735.9 532.7,735.9C625.5,735.9 703.5,672.7 728,587.4C749.2,632.6 794.5,664.6 847.4,664.6C920.2,664.6 980,604.8 980,532C980,459.2 920.1,399.3 847.4,399.3C794.5,399.3 749.2,431.3 727.9,476.5C703.5,391.2 625.5,328 532.7,328L532.7,328ZM532.7,405.9C602.8,405.9 658.8,461.8 658.8,532C658.8,602.1 602.8,658.1 532.7,658.1C462.6,658.1 406.6,602.1 406.6,532C406.6,461.9 462.6,405.9 532.7,405.9ZM216.6,477.2C247.3,477.2 271.4,501.2 271.4,532C271.4,562.7 247.3,586.8 216.6,586.8C185.9,586.8 161.8,562.7 161.8,532C161.8,501.2 185.9,477.2 216.6,477.2ZM847.4,477.2C878.1,477.2 902.1,501.2 902.2,532C902.2,562.7 878.1,586.8 847.4,586.8C816.6,586.8 792.6,562.7 792.6,532C792.6,501.2 816.6,477.2 847.4,477.2Z"
+            android:fillType="nonZero"
             android:fillColor="#ffffff"/>
             android:fillColor="#ffffff"/>
         <path
         <path
-            android:pathData="m478.9,880.6q0,31.8 -17.7,48.7 -17.7,16.8 -50.9,16.8L374.4,946.1L374.4,817.6h39.7q30.7,0 47.7,16.5 17.1,16.5 17.1,46.5zM456.7,881.3q0,-46.1 -43.2,-46.1h-18.2v93.3h14.9q46.4,0 46.4,-47.1z"
-            android:strokeLineCap="butt"
-            android:fillAlpha="1"
-            android:strokeColor="#00000000"
-            android:fillColor="#ffffff"
-            android:strokeWidth="1"
-            android:strokeLineJoin="miter"
-            android:strokeAlpha="1"/>
+            android:pathData="M482.9,866.6C482.9,887.9 477,904.1 465.2,915.3C453.4,926.5 436.5,932.1 414.3,932.1L378.4,932.1L378.4,803.6L418.1,803.6C438.5,803.6 454.5,809.1 465.8,820.1C477.2,831.2 482.9,846.7 482.9,866.6ZM460.7,867.3C460.7,836.6 446.3,821.2 417.6,821.2L399.4,821.2L399.4,914.5L414.3,914.5C445.3,914.5 460.7,898.8 460.7,867.3Z"
+            android:fillType="nonZero"
+            android:fillColor="#ffffff"/>
         <path
         <path
-            android:pathData="m546.8,947.9q-22.7,0 -35.5,-13.2 -12.7,-13.3 -12.7,-36.5 0,-23.8 11.9,-37.4 11.9,-13.6 32.6,-13.6 19.2,0 30.4,11.7 11.2,11.7 11.2,32.2v11.2h-64.8q0.4,14.2 7.6,21.8 7.2,7.6 20.3,7.6 8.6,0 16,-1.6 7.5,-1.7 16,-5.4v16.8q-7.6,3.6 -15.3,5.1 -7.7,1.5 -17.7,1.5zM543,862.8q-9.8,0 -15.8,6.2 -5.9,6.2 -7,18.2h44.1q-0.2,-12 -5.8,-18.2 -5.6,-6.2 -15.5,-6.2z"
-            android:strokeLineCap="butt"
-            android:fillAlpha="1"
-            android:strokeColor="#00000000"
-            android:fillColor="#ffffff"
-            android:strokeWidth="1"
-            android:strokeLineJoin="miter"
-            android:strokeAlpha="1"/>
+            android:pathData="M550.8,933.9C535.7,933.9 523.9,929.5 515.3,920.7C506.8,911.8 502.6,899.7 502.6,884.2C502.6,868.3 506.5,855.9 514.4,846.8C522.3,837.7 533.2,833.2 547,833.2C559.9,833.2 570,837.1 577.4,844.8C584.9,852.6 588.6,863.4 588.6,877L588.6,888.2L523.8,888.2C524.1,897.6 526.7,904.9 531.5,910C536.3,915 543,917.5 551.8,917.5C557.5,917.5 562.9,917 567.8,915.9C572.8,914.8 578.1,913 583.8,910.5L583.8,927.3C578.7,929.7 573.6,931.4 568.5,932.4C563.3,933.4 557.4,933.9 550.8,933.9ZM547,848.8C540.5,848.8 535.2,850.9 531.2,855C527.3,859.2 524.9,865.3 524.2,873.2L568.3,873.2C568.2,865.2 566.2,859.1 562.5,855C558.7,850.9 553.6,848.8 547,848.8Z"
+            android:fillType="nonZero"
+            android:fillColor="#ffffff"/>
         <path
         <path
-            android:pathData="m630.2,946.1 l-36.9,-97.2h21.8l19.8,56.5q5.1,14.2 6.2,23h0.7q0.8,-6.3 6.2,-23l19.8,-56.5h22l-37.1,97.2z"
-            android:strokeLineCap="butt"
-            android:fillAlpha="1"
-            android:strokeColor="#00000000"
-            android:fillColor="#ffffff"
-            android:strokeWidth="1"
-            android:strokeLineJoin="miter"
-            android:strokeAlpha="1"/>
+            android:pathData="M634.2,932.1L597.3,834.9L619.1,834.9L638.9,891.4C642.3,900.9 644.3,908.6 645,914.5L645.7,914.5C646.3,910.2 648.3,902.6 651.9,891.4L671.7,834.9L693.6,834.9L656.5,932.1L634.2,932.1Z"
+            android:fillType="nonZero"
+            android:fillColor="#ffffff"/>
     </group>
     </group>
 </vector>
 </vector>
 
 

BIN
src/versionDev/res/mipmap-hdpi/ic_launcher.png


BIN
src/versionDev/res/mipmap-hdpi/ic_launcher_round.png


BIN
src/versionDev/res/mipmap-mdpi/ic_launcher.png


BIN
src/versionDev/res/mipmap-mdpi/ic_launcher_round.png


BIN
src/versionDev/res/mipmap-xhdpi/ic_launcher.png


BIN
src/versionDev/res/mipmap-xhdpi/ic_launcher_round.png


BIN
src/versionDev/res/mipmap-xxhdpi/ic_launcher.png


BIN
src/versionDev/res/mipmap-xxhdpi/ic_launcher_round.png


BIN
src/versionDev/res/mipmap-xxxhdpi/ic_launcher.png


BIN
src/versionDev/res/mipmap-xxxhdpi/ic_launcher_round.png