Merge branch '160-add-eco-watt-non-free-app-icon' into 'master'

Resolve "Add "eco watt" non free app icon"

Closes #160

See merge request !199

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.benoitharrault.ameixanonfree"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 137
-        versionName "1.71.2"
+        versionCode 138
+        versionName "1.72.0"
         archivesBaseName = "$applicationId" + "_" + "$versionCode"
     }
 

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

@@ -711,6 +711,7 @@
         <item>nonfree_creditdunord</item>
         <item>nonfree_creditdunord_epaiement</item>
         <item>nonfree_ecoledirecte</item>
+        <item>nonfree_ecowatt</item>
         <item>nonfree_elyze</item>
         <item>nonfree_famileo</item>
         <item>nonfree_fdj</item>

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

@@ -151,6 +151,9 @@
     <item
         component="ComponentInfo{com.ecoledirecte.edmobile/com.ecoledirecte.edmobile.MainActivity}"
         drawable="nonfree_ecoledirecte" />
+    <item
+        component="ComponentInfo{com.rte.ecowatt/fr.busin.ecowatt.MainActivity}"
+        drawable="nonfree_ecowatt" />
     <item
         component="ComponentInfo{com.lesengages.elyze/host.exp.exponent.MainActivity}"
         drawable="nonfree_elyze" />

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

@@ -711,6 +711,7 @@
     <item drawable="nonfree_creditdunord" />
     <item drawable="nonfree_creditdunord_epaiement" />
     <item drawable="nonfree_ecoledirecte" />
+    <item drawable="nonfree_ecowatt" />
     <item drawable="nonfree_elyze" />
     <item drawable="nonfree_famileo" />
     <item drawable="nonfree_fdj" />

icons/chromatic/nonfree_ecowatt.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="#263238" 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="#4caf50"/><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="#263238" opacity=".2"/></g><path d="m9.0298 14.449 2.1502 5.3525 2.1735-7.1134 2.2622 7.1877 4.1012-11.004" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.071"/></svg>