Merge branch '135-add-wikiloc-non-free-app-icon' into 'master'

Resolve "Add "wikiloc" non free app icon"

Closes #135

See merge request !175

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.benoitharrault.ameixanonfree"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 115
-        versionName "1.57.1"
+        versionCode 116
+        versionName "1.58.0"
         archivesBaseName = "$applicationId" + "_" + "$versionCode"
     }
 

app/src/main/res/values/iconpack.xml

@@ -764,6 +764,7 @@
         <item>nonfree_vinted</item>
         <item>nonfree_waze</item>
         <item>nonfree_whatsapp</item>
+        <item>nonfree_wikiloc</item>
         <item>nonfree_youtube</item>
         <item>nonfree_ytmusic</item>
         <item>nonocross</item>

app/src/main/res/xml/appfilter.xml

@@ -268,6 +268,9 @@
     <item
         component="ComponentInfo{com.whatsapp/com.whatsapp.Main}"
         drawable="nonfree_whatsapp" />
+    <item
+        component="ComponentInfo{com.wikiloc.wikilocandroid/com.wikiloc.wikilocandroid.view.activities.SplashActivity}"
+        drawable="nonfree_wikiloc" />
 
     <!-- end of non free icons -->
 

app/src/main/res/xml/drawable.xml

@@ -764,6 +764,7 @@
     <item drawable="nonfree_vinted" />
     <item drawable="nonfree_waze" />
     <item drawable="nonfree_whatsapp" />
+    <item drawable="nonfree_wikiloc" />
     <item drawable="nonfree_youtube" />
     <item drawable="nonfree_ytmusic" />
     <item drawable="nonocross" />

icons/chromatic/nonfree_wikiloc.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 28.747 28.747" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><defs><filter id="filter6206-7" x="-.072" y="-.072" width="1.144" height="1.144" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="0.658125"/></filter></defs><g transform="translate(0 -1093.8)"><path transform="matrix(1.0781 0 0 1.0641 -.093733 2.7509)" d="m4.4177 1028.2v1.6051h-1.6052v18.192h1.6052v2.1402h18.192v-2.1402h2.1402v-18.192h-2.1402v-1.6051z" fill="#bf360c" filter="url(#filter6206-7)" opacity=".2"/><rect x="2.9987" y="1096.8" width="22.749" height="22.749" rx="1.1973" ry="1.1974" fill="#ff9800"/><g transform="translate(-22.32 1056.5)"><path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/><g transform="matrix(.33601 0 0 .33601 1.5296 73.043)"><path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/></g><g transform="matrix(.37187 0 0 .37187 38.802 63.239)"><path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/><g transform="matrix(2.6891 0 0 2.6891 -82.906 -48.45)"><path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/></g></g></g><path d="m4.1958 1096.8c-0.66332 0-1.1979 0.5346-1.1979 1.1979v0.3334c0-0.6634 0.53459-1.1979 1.1979-1.1979h20.354c0.66332 0 1.1979 0.5345 1.1979 1.1979v-0.3334c0-0.6633-0.5346-1.1979-1.1979-1.1979z" fill="#fff" opacity=".2"/><rect x="128" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="128" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="128" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="128" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="128" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="213.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="213.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="213.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="213.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="213.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="298.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="298.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="298.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="298.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="298.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="170.67" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="170.67" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="170.67" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="170.67" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="170.67" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="256" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="256" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="256" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="256" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="256" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="128" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="213.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="298.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="170.67" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="256" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="341.33" y="589.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="341.33" y="631.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="341.33" y="717.19" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="341.33" y="546.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="341.33" y="674.52" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="341.33" y="759.85" width="42.667" height="42.667" fill="none" stroke-width="1.0667"/><rect x="160" y="578.52" width="192" height="192" fill="none" stroke-width="1.0667"/><g transform="matrix(.37344 0 0 .37344 4.7333 1097.4)"><path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/></g><g transform="matrix(.36471 0 0 .36471 5.1356 1097.4)"><path d="m0 0h51.2v51.2h-51.2z" fill="none" stroke-width="1.0667"/></g><g transform="matrix(.41585 0 0 .41585 84.325 1055.9)"><g transform="matrix(.062269 0 0 .062269 -28.238 185.29)"><g transform="matrix(38.618 0 0 38.618 14724 -13542)"><g transform="matrix(.71436 0 0 .71436 -400.52 188.34)"><path d="m1293.2-120.67c-181.75 0.2763-511.18 0.13525-699.05 0.13998-2.3216 10.413-3.593 21.251-3.593 32.384v114c207.65 0.73695 494.72 0.38136 706.23 0.3733v-114.37c0-11.18-1.2522-22.07-3.593-32.523zm-458.69 295.56c-78.385-4e-3 -158.85 0.17892-243.95 0.55995v138.63c286.34-0.39317 421.73-0.13827 706.23-0.32664v-137.75c-163.2-0.53005-311.22-1.1113-462.28-1.1199z" opacity="0" stroke-width="1.4932"/></g></g></g></g><path d="m24.549 1119.5c0.66325 0 1.1979-0.5346 1.1979-1.1979v-0.3333c0 0.6632-0.53461 1.1978-1.1979 1.1978h-20.354c-0.66325 0-1.1979-0.5346-1.1979-1.1978v0.3333c0 0.6633 0.53461 1.1979 1.1979 1.1979z" fill="#bf360c" opacity=".2"/></g><path transform="matrix(.29602 0 0 .29602 6.7952 6.7952)" d="m25.586 1.3648c-13.298 0-24.043 10.778-24.043 24.063 0 7.1131 3.0998 13.482 8.0033 17.887-1.0213-2.2426-2.949-6.0691-1.8804-12.793 0.56694-3.5677 2.4215-6.8059 4.5064-9.3427s4.3959-4.3734 5.8986-5.1596c1.2221-0.63938 3.4799-1.5305 5.6742-2.56s4.3236-2.207 5.2651-3.3715c1.3255-1.6391 2.0801-2.6304 2.4544-3.7146 0.36636-1.061 0.37293-2.2344 0.19134-4.2029-1.9422-0.5051-3.9693-0.80495-6.0701-0.80495zm12.813 3.7146c1.0856 5.1216-8.4e-4 8.8984-1.7682 11.434-0.90525 1.2988-1.6707 2.0542-2.6854 2.8899-1.0147 0.83574-2.2766 1.749-4.1963 3.3649-3.8338 3.2273-7.412 7.5802-7.1258 14.232 0.28308 6.579 2.2831 8.8785 5.054 12.378 12.316-1.0615 21.978-11.371 21.978-23.95 0-8.5739-4.499-16.088-11.256-20.348z" fill="#fff" stroke-width="1.0667"/></svg>