properly enforce round launcher icon

drawable_resources/logo.svg

@@ -1,7 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!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,-140,-128.064)">
-        <path d="M672.681,456.07C579.33,456.08 500.945,519.999 476.995,605.988C456.091,559.995 410.078,527.4 356.617,527.394C283.844,527.404 224.009,587.243 224,660.022C223.986,732.815 283.829,792.667 356.617,792.676C410.084,792.666 456.067,760.055 476.968,714.055C500.909,800.059 579.321,863.991 672.684,864C765.524,864.01 843.524,800.77 867.961,715.501C889.204,760.649 934.51,792.667 987.356,792.673C1060.16,792.686 1120.01,732.827 1120,660.019C1119.99,587.225 1060.14,527.379 987.356,527.391C934.507,527.401 889.176,559.409 867.934,604.563C843.497,519.297 765.524,456.058 672.684,456.064L672.681,456.07ZM672.681,533.926C742.787,533.926 798.79,589.913 798.796,660.025C798.796,730.145 742.796,786.156 672.681,786.15C602.575,786.14 546.587,730.136 546.593,660.025C546.603,589.922 602.584,533.935 672.681,533.926ZM356.602,605.25C387.314,605.25 411.366,629.309 411.369,660.022C411.369,690.741 387.319,714.817 356.602,714.82C325.884,714.82 301.83,690.741 301.836,660.022C301.836,629.309 325.892,605.253 356.602,605.25ZM987.356,605.25C1018.07,605.24 1042.15,629.302 1042.15,660.022C1042.16,690.75 1018.08,714.826 987.356,714.82C956.638,714.82 932.584,690.741 932.587,660.022C932.587,629.309 956.644,605.253 987.356,605.25Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-</svg>
+<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="100%"
+   height="100%"
+   viewBox="0 0 1064 1064"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"
+   id="svg5"
+   sodipodi:docname="logo.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata11"><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="defs9" /><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="namedview7"
+     showgrid="false"
+     inkscape:zoom="0.22180451"
+     inkscape:cx="532"
+     inkscape:cy="532"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5" /><g
+     id="path6"
+     transform="translate(-140,-136.064)"><path
+       d="M 672.681,456.07 C 579.33,456.08 500.945,519.999 476.995,605.988 456.091,559.995 410.078,527.4 356.617,527.394 283.844,527.404 224.009,587.243 224,660.022 c -0.014,72.793 59.829,132.645 132.617,132.654 53.467,-0.01 99.45,-32.621 120.351,-78.621 23.941,86.004 102.353,149.936 195.716,149.945 92.84,0.01 170.84,-63.23 195.277,-148.499 21.243,45.148 66.549,77.166 119.395,77.172 72.804,0.013 132.654,-59.846 132.644,-132.654 -0.01,-72.794 -59.86,-132.64 -132.644,-132.628 -52.849,0.01 -98.18,32.018 -119.422,77.172 -24.437,-85.266 -102.41,-148.505 -195.25,-148.499 z m 0,77.856 c 70.106,0 126.109,55.987 126.115,126.099 0,70.12 -56,126.131 -126.115,126.125 -70.106,-0.01 -126.094,-56.014 -126.088,-126.125 0.01,-70.103 55.991,-126.09 126.088,-126.099 z M 356.602,605.25 c 30.712,0 54.764,24.059 54.767,54.772 0,30.719 -24.05,54.795 -54.767,54.798 -30.718,0 -54.772,-24.079 -54.766,-54.798 0,-30.713 24.056,-54.769 54.766,-54.772 z m 630.754,0 c 30.714,-0.01 54.794,24.052 54.794,54.772 0.01,30.728 -24.07,54.804 -54.794,54.798 -30.718,0 -54.772,-24.079 -54.769,-54.798 0,-30.713 24.057,-54.769 54.769,-54.772 z"
+       style="fill:#ffffff;fill-rule:nonzero"
+       id="path2"
+       inkscape:connector-curvature="0" /></g></svg>

drawable_resources/logo_dev.svg

@@ -1,18 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!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="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>
-    <g id="path6" transform="matrix(1,0,0,1,-140,-128.064)">
-        <path d="M672.681,456.07C579.33,456.08 500.945,519.999 476.995,605.988C456.091,559.995 410.078,527.4 356.617,527.394C283.844,527.404 224.009,587.243 224,660.022C223.986,732.815 283.829,792.667 356.617,792.676C410.084,792.666 456.067,760.055 476.968,714.055C500.909,800.059 579.321,863.991 672.684,864C765.524,864.01 843.524,800.77 867.961,715.501C889.204,760.649 934.51,792.667 987.356,792.673C1060.16,792.686 1120.01,732.827 1120,660.019C1119.99,587.225 1060.14,527.379 987.356,527.391C934.507,527.401 889.176,559.409 867.934,604.563C843.497,519.297 765.524,456.058 672.684,456.064L672.681,456.07ZM672.681,533.926C742.787,533.926 798.79,589.913 798.796,660.025C798.796,730.145 742.796,786.156 672.681,786.15C602.575,786.14 546.587,730.136 546.593,660.025C546.603,589.922 602.584,533.935 672.681,533.926ZM356.602,605.25C387.314,605.25 411.366,629.309 411.369,660.022C411.369,690.741 387.319,714.817 356.602,714.82C325.884,714.82 301.83,690.741 301.836,660.022C301.836,629.309 325.892,605.253 356.602,605.25ZM987.356,605.25C1018.07,605.24 1042.15,629.302 1042.15,660.022C1042.16,690.75 1018.08,714.826 987.356,714.82C956.638,714.82 932.584,690.741 932.587,660.022C932.587,629.309 956.644,605.253 987.356,605.25Z" style="fill:white;fill-rule:nonzero;"/>
-    </g>
-</svg>
+<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="100%"
+   height="100%"
+   viewBox="0 0 1064 1064"
+   version="1.1"
+   xml:space="preserve"
+   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"
+   id="svg15"
+   sodipodi:docname="logo_dev.svg"
+   inkscape:version="0.92.1 r15371"><metadata
+     id="metadata21"><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="defs19" /><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="namedview17"
+     showgrid="false"
+     inkscape:zoom="0.22180451"
+     inkscape:cx="532"
+     inkscape:cy="532"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15" /><g
+     id="text4136"
+     transform="translate(0,-8)"><g
+       id="path4491"
+       transform="translate(4,-14)"><path
+         d="m 478.87,880.641 c 0,21.211 -5.889,37.441 -17.666,48.691 -11.777,11.191 -28.74,16.787 -50.889,16.787 H 374.368 V 817.623 h 39.727 c 20.449,0 36.357,5.508 47.724,16.523 11.368,11.016 17.051,26.514 17.051,46.495 z m -22.148,0.703 c 0,-30.762 -14.385,-46.143 -43.155,-46.143 h -18.193 v 93.252 h 14.941 c 30.938,0 46.407,-15.703 46.407,-47.109 z"
+         style="fill:#ffffff;fill-rule:nonzero"
+         id="path2"
+         inkscape:connector-curvature="0" /></g><g
+       id="path4493"
+       transform="translate(4,-14)"><path
+         d="m 546.81,947.877 c -15.118,0 -26.954,-4.395 -35.508,-13.184 -8.496,-8.847 -12.744,-21.006 -12.744,-36.474 0,-15.879 3.955,-28.36 11.865,-37.442 7.91,-9.082 18.779,-13.623 32.607,-13.623 12.832,0 22.969,3.897 30.41,11.69 7.442,7.793 11.163,18.515 11.163,32.168 v 11.162 h -64.776 c 0.293,9.433 2.842,16.699 7.647,21.797 4.804,5.039 11.572,7.558 20.302,7.558 5.743,0 11.075,-0.527 15.996,-1.582 4.981,-1.113 10.313,-2.929 15.997,-5.449 v 16.787 c -5.04,2.402 -10.137,4.102 -15.293,5.098 -5.157,0.996 -11.045,1.494 -17.666,1.494 z m -3.78,-85.078 c -6.562,0 -11.836,2.08 -15.82,6.24 -3.926,4.16 -6.27,10.225 -7.031,18.193 H 564.3 c -0.117,-8.027 -2.051,-14.091 -5.801,-18.193 -3.75,-4.16 -8.906,-6.24 -15.469,-6.24 z"
+         style="fill:#ffffff;fill-rule:nonzero"
+         id="path5"
+         inkscape:connector-curvature="0" /></g><g
+       id="path4495"
+       transform="translate(4,-14)"><path
+         d="m 630.218,946.119 -36.914,-97.207 h 21.797 l 19.775,56.514 c 3.398,9.492 5.449,17.168 6.152,23.027 h 0.703 c 0.528,-4.219 2.579,-11.894 6.153,-23.027 l 19.775,-56.514 h 21.973 l -37.09,97.207 z"
+         style="fill:#ffffff;fill-rule:nonzero"
+         id="path8"
+         inkscape:connector-curvature="0" /></g></g><g
+     id="path6"
+     transform="translate(-140,-136.064)"><path
+       d="M 672.681,456.07 C 579.33,456.08 500.945,519.999 476.995,605.988 456.091,559.995 410.078,527.4 356.617,527.394 283.844,527.404 224.009,587.243 224,660.022 c -0.014,72.793 59.829,132.645 132.617,132.654 53.467,-0.01 99.45,-32.621 120.351,-78.621 23.941,86.004 102.353,149.936 195.716,149.945 92.84,0.01 170.84,-63.23 195.277,-148.499 21.243,45.148 66.549,77.166 119.395,77.172 72.804,0.013 132.654,-59.846 132.644,-132.654 -0.01,-72.794 -59.86,-132.64 -132.644,-132.628 -52.849,0.01 -98.18,32.018 -119.422,77.172 -24.437,-85.266 -102.41,-148.505 -195.25,-148.499 z m 0,77.856 c 70.106,0 126.109,55.987 126.115,126.099 0,70.12 -56,126.131 -126.115,126.125 -70.106,-0.01 -126.094,-56.014 -126.088,-126.125 0.01,-70.103 55.991,-126.09 126.088,-126.099 z M 356.602,605.25 c 30.712,0 54.764,24.059 54.767,54.772 0,30.719 -24.05,54.795 -54.767,54.798 -30.718,0 -54.772,-24.079 -54.766,-54.798 0,-30.713 24.056,-54.769 54.766,-54.772 z m 630.754,0 c 30.714,-0.01 54.794,24.052 54.794,54.772 0.01,30.728 -24.07,54.804 -54.794,54.798 -30.718,0 -54.772,-24.079 -54.769,-54.798 0,-30.713 24.057,-54.769 54.769,-54.772 z"
+       style="fill:#ffffff;fill-rule:nonzero"
+       id="path12"
+       inkscape:connector-curvature="0" /></g></svg>

src/gplay/AndroidManifest.xml

@@ -22,8 +22,7 @@
 
     <application
         android:name=".MainApp"
-        android:icon="@mipmap/ic_launcher_round"
-		android:roundIcon="@mipmap/ic_launcher_round"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:fullBackupContent="@xml/backup_config"
         android:theme="@style/Theme.ownCloud.Toolbar"

src/main/AndroidManifest.xml

@@ -57,8 +57,7 @@
 
     <application
         android:name=".MainApp"
-        android:icon="@mipmap/ic_launcher_round"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:fullBackupContent="@xml/backup_config"
         android:theme="@style/Theme.ownCloud.Toolbar"

src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,21 +1,3 @@
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Andy Scherzinger
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="108dp"
         android:height="108dp"
@@ -24,9 +6,8 @@
     <group android:translateX="286.46155"
             android:translateY="286.46155">
         <path
-            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:pathData="M532.7,320C439.3,320 360.9,383.9 337,469.9 316.1,423.9 270.1,391.3 216.6,391.3 143.8,391.3 84,451.2 84,524c-0,72.8 59.8,132.6 132.6,132.7 53.5,-0 99.4,-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.2 72.8,0 132.7,-59.8 132.6,-132.7 -0,-72.8 -59.9,-132.6 -132.6,-132.6 -52.8,0 -98.2,32 -119.4,77.2 -24.4,-85.3 -102.4,-148.5 -195.3,-148.5zM532.7,397.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,469.2c30.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,469.2c30.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:fillType="nonZero"
             android:fillColor="#ffffff"/>
     </group>
 </vector>
-

src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Andy Scherzinger
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
 <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>
+</adaptive-icon>

src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Andy Scherzinger
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-<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/versionDev/res/drawable/ic_launcher_foreground.xml

@@ -1,21 +1,3 @@
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Andy Scherzinger
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="108dp"
         android:height="108dp"
@@ -24,21 +6,20 @@
     <group android:translateX="286.46155"
             android:translateY="286.46155">
         <path
-            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:pathData="m482.9,858.6c0,21.2 -5.9,37.4 -17.7,48.7 -11.8,11.2 -28.7,16.8 -50.9,16.8L378.4,924.1L378.4,795.6h39.7c20.4,0 36.4,5.5 47.7,16.5 11.4,11 17.1,26.5 17.1,46.5zM460.7,859.3c0,-30.8 -14.4,-46.1 -43.2,-46.1h-18.2v93.3h14.9c30.9,0 46.4,-15.7 46.4,-47.1z"
             android:fillType="nonZero"
             android:fillColor="#ffffff"/>
         <path
-            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:pathData="m550.8,925.9c-15.1,0 -27,-4.4 -35.5,-13.2 -8.5,-8.8 -12.7,-21 -12.7,-36.5 0,-15.9 4,-28.4 11.9,-37.4 7.9,-9.1 18.8,-13.6 32.6,-13.6 12.8,0 23,3.9 30.4,11.7 7.4,7.8 11.2,18.5 11.2,32.2v11.2h-64.8c0.3,9.4 2.8,16.7 7.6,21.8 4.8,5 11.6,7.6 20.3,7.6 5.7,0 11.1,-0.5 16,-1.6 5,-1.1 10.3,-2.9 16,-5.4v16.8c-5,2.4 -10.1,4.1 -15.3,5.1 -5.2,1 -11,1.5 -17.7,1.5zM547,840.8c-6.6,0 -11.8,2.1 -15.8,6.2 -3.9,4.2 -6.3,10.2 -7,18.2L568.3,865.2c-0.1,-8 -2.1,-14.1 -5.8,-18.2 -3.8,-4.2 -8.9,-6.2 -15.5,-6.2z"
             android:fillType="nonZero"
             android:fillColor="#ffffff"/>
         <path
-            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:pathData="m634.2,924.1 l-36.9,-97.2h21.8l19.8,56.5c3.4,9.5 5.4,17.2 6.2,23h0.7c0.5,-4.2 2.6,-11.9 6.2,-23l19.8,-56.5h22l-37.1,97.2z"
             android:fillType="nonZero"
             android:fillColor="#ffffff"/>
         <path
-            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:pathData="M532.7,320C439.3,320 360.9,383.9 337,469.9 316.1,423.9 270.1,391.3 216.6,391.3 143.8,391.3 84,451.2 84,524c-0,72.8 59.8,132.6 132.6,132.7 53.5,-0 99.4,-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.2 72.8,0 132.7,-59.8 132.6,-132.7 -0,-72.8 -59.9,-132.6 -132.6,-132.6 -52.8,0 -98.2,32 -119.4,77.2 -24.4,-85.3 -102.4,-148.5 -195.3,-148.5zM532.7,397.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,469.2c30.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,469.2c30.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:fillType="nonZero"
             android:fillColor="#ffffff"/>
     </group>
 </vector>
-

src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Andy Scherzinger
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
 <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>
+</adaptive-icon>

src/versionDev/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,23 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  Nextcloud Android client application
-
-  Copyright (C) 2017 Andy Scherzinger
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-
-  You should have received a copy of the GNU Affero General Public
-  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
 <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>
+</adaptive-icon>