diff --git a/app/build.gradle b/app/build.gradle index 68d785c4a009f22a6a9e26e773af325cd7e8d13c..a695215053c64f3f9fd1a5402bd1e029888c0dda 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.benoitharrault.ameixanonfree" minSdkVersion 16 targetSdkVersion 30 - versionCode 191 - versionName "1.105.0" + versionCode 192 + versionName "1.106.0" archivesBaseName = "$applicationId" + "_" + "$versionCode" } diff --git a/app/src/chromatic/res/drawable-hdpi/nonfree_duolingo.png b/app/src/chromatic/res/drawable-hdpi/nonfree_duolingo.png new file mode 100644 index 0000000000000000000000000000000000000000..2009764b746d43c60bfdfca0aa9e9adca5b2ff13 Binary files /dev/null and b/app/src/chromatic/res/drawable-hdpi/nonfree_duolingo.png differ diff --git a/app/src/chromatic/res/drawable-mdpi/nonfree_duolingo.png b/app/src/chromatic/res/drawable-mdpi/nonfree_duolingo.png new file mode 100644 index 0000000000000000000000000000000000000000..0def5836fc25ef1fd9b7d7791e2a43d9aafc3bda Binary files /dev/null and b/app/src/chromatic/res/drawable-mdpi/nonfree_duolingo.png differ diff --git a/app/src/chromatic/res/drawable-xhdpi/nonfree_duolingo.png b/app/src/chromatic/res/drawable-xhdpi/nonfree_duolingo.png new file mode 100644 index 0000000000000000000000000000000000000000..ad0191b1df6639199c65bdb7952391e9d1386235 Binary files /dev/null and b/app/src/chromatic/res/drawable-xhdpi/nonfree_duolingo.png differ diff --git a/app/src/chromatic/res/drawable-xxhdpi/nonfree_duolingo.png b/app/src/chromatic/res/drawable-xxhdpi/nonfree_duolingo.png new file mode 100644 index 0000000000000000000000000000000000000000..eaa1ae7b4210f1b4d0a4cee0360ee05be14aac08 Binary files /dev/null and b/app/src/chromatic/res/drawable-xxhdpi/nonfree_duolingo.png differ diff --git a/app/src/chromatic/res/drawable-xxxhdpi/nonfree_duolingo.png b/app/src/chromatic/res/drawable-xxxhdpi/nonfree_duolingo.png new file mode 100644 index 0000000000000000000000000000000000000000..8598c9107b0ba856829d8a8a029aafff58a3cd19 Binary files /dev/null and b/app/src/chromatic/res/drawable-xxxhdpi/nonfree_duolingo.png differ diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml index 75a726e3313338bb99964fd3493bd02f41ec901e..0e9841372d7a52f464f02bcd35f8290715553a2b 100644 --- a/app/src/main/res/values/iconpack.xml +++ b/app/src/main/res/values/iconpack.xml @@ -739,6 +739,7 @@ <item>nonfree_creditdunord_epaiement</item> <item>nonfree_deezer</item> <item>nonfree_doctolib</item> + <item>nonfree_duolingo</item> <item>nonfree_ecoledirecte</item> <item>nonfree_ecowatt</item> <item>nonfree_elyze</item> diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index 44cd473c839a1ae14683f6521f8580a8dddc4aec..5a5e1ec866e9bf07396a88d8968952635f66e91d 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -190,6 +190,9 @@ <item component="ComponentInfo{fr.doctolib.www/fr.doctolib.www.MainActivity}" drawable="nonfree_doctolib" /> + <item + component="ComponentInfo{com.duolingo/com.duolingo.app.LoginActivity}" + drawable="nonfree_duolingo" /> <item component="ComponentInfo{com.ecoledirecte.edmobile/com.ecoledirecte.edmobile.MainActivity}" drawable="nonfree_ecoledirecte" /> diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml index 19e6e7962f5b4ce147ad0a49ffd74896ddae5c3c..44b8e7958af3ee289788e12c41d45c5a895457f5 100644 --- a/app/src/main/res/xml/drawable.xml +++ b/app/src/main/res/xml/drawable.xml @@ -739,6 +739,7 @@ <item drawable="nonfree_creditdunord_epaiement" /> <item drawable="nonfree_deezer" /> <item drawable="nonfree_doctolib" /> + <item drawable="nonfree_duolingo" /> <item drawable="nonfree_ecoledirecte" /> <item drawable="nonfree_ecowatt" /> <item drawable="nonfree_elyze" /> diff --git a/icons/chromatic/nonfree_duolingo.svg b/icons/chromatic/nonfree_duolingo.svg new file mode 100644 index 0000000000000000000000000000000000000000..1dd64aa5457c4ddc42271b0dc39c52d6f0e0bbb0 --- /dev/null +++ b/icons/chromatic/nonfree_duolingo.svg @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg version="1.1" viewBox="0 0 28.747 28.747" 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="#8bc34a"/> + <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> + <g stroke="#fff"> + <path class="cls-1" d="m10.548 18.708a0.51729 0.51729 0 0 1 0.73135-0.02676l0.59667 0.55832a0.51819 0.51819 0 0 1-0.70548 0.75543l-0.59667-0.55654a0.51908 0.51908 0 0 1-0.02586-0.73045zm7.6818 0a0.51729 0.51729 0 0 0-0.73135-0.02676l-0.59667 0.55743a0.51819 0.51819 0 0 0 0.70548 0.75899l0.59667-0.55654a0.51908 0.51908 0 0 0 0.02586-0.73313z" fill="#fff" fill-rule="evenodd" stroke-width=".089189"/> + <path d="m20.375 11.709-1.988 0.4941v-1.6946a1.3485 1.3485 0 0 0-1.873-1.2433q-1.534 0.65108-2.1093 0.65108t-2.1405-0.66178a1.3485 1.3485 0 0 0-1.873 1.2424v1.7124l-2.0192-0.50035a0.47359 0.47359 0 0 0-0.58775 0.49232 3.6228 3.6228 0 0 0 2.6757 3.2295 4.001 4.001 0 0 0 7.8584-0.0089 3.6237 3.6237 0 0 0 2.6435-3.2206 0.47359 0.47359 0 0 0-0.58686-0.49232z" fill="none" stroke-miterlimit="10" stroke-width="1.0703px"/> + <rect x="12.083" y="11.757" width="1.0355" height="1.6553" rx=".51819" fill="#fff" stroke-width=".089189"/> + <rect x="15.629" y="11.757" width="1.0355" height="1.6553" rx=".51819" fill="#fff" stroke-width=".089189"/> + <path d="m13.612 13.724a0.8027 0.8027 0 0 1 0.81429-0.63056 0.79199 0.79199 0 0 1 0.77148 0.63056v0.02765c0 0.02319-0.0071 0.03211-0.02854 0.02943l-0.74205 0.13468h-0.0437l-0.74294-0.13289c-0.02051 0-0.02854-0.0071-0.02854-0.02943z" fill="#fff" stroke-width=".089189"/> + <path class="cls-1" d="m14.411 14.078h-0.0437l-0.53513-0.09543v0.04905a0.57437 0.57437 0 0 0 1.1487 0v-0.0544z" fill="#fff" fill-rule="evenodd" stroke-width=".089189"/> + </g> +</svg>