diff --git a/app/build.gradle b/app/build.gradle index 5632b3a68648a943e12f5604a55066da069b95fe..731c51d5dd8480abb842e103aa805b52424ebf9a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.benoitharrault.ameixanonfree" minSdkVersion 16 targetSdkVersion 30 - versionCode 111 - versionName "1.54.0" + versionCode 112 + versionName "1.55.0" archivesBaseName = "$applicationId" + "_" + "$versionCode" } diff --git a/app/src/chromatic/res/drawable-hdpi/nonfree_uber.png b/app/src/chromatic/res/drawable-hdpi/nonfree_uber.png new file mode 100644 index 0000000000000000000000000000000000000000..d10b0394a6bb2eab35fbdfb4160475c112eefdcd Binary files /dev/null and b/app/src/chromatic/res/drawable-hdpi/nonfree_uber.png differ diff --git a/app/src/chromatic/res/drawable-mdpi/nonfree_uber.png b/app/src/chromatic/res/drawable-mdpi/nonfree_uber.png new file mode 100644 index 0000000000000000000000000000000000000000..97363c118f1ffb53186257370937efb90dfe17fb Binary files /dev/null and b/app/src/chromatic/res/drawable-mdpi/nonfree_uber.png differ diff --git a/app/src/chromatic/res/drawable-xhdpi/nonfree_uber.png b/app/src/chromatic/res/drawable-xhdpi/nonfree_uber.png new file mode 100644 index 0000000000000000000000000000000000000000..5e0f2be32de9f30b0dde71ef08e44a39d086f86f Binary files /dev/null and b/app/src/chromatic/res/drawable-xhdpi/nonfree_uber.png differ diff --git a/app/src/chromatic/res/drawable-xxhdpi/nonfree_uber.png b/app/src/chromatic/res/drawable-xxhdpi/nonfree_uber.png new file mode 100644 index 0000000000000000000000000000000000000000..77ef83fb4dee2985a9ea877a6041003effbf668c Binary files /dev/null and b/app/src/chromatic/res/drawable-xxhdpi/nonfree_uber.png differ diff --git a/app/src/chromatic/res/drawable-xxxhdpi/nonfree_uber.png b/app/src/chromatic/res/drawable-xxxhdpi/nonfree_uber.png new file mode 100644 index 0000000000000000000000000000000000000000..61ef514d7cbba846360eb8df53b8ef4f6d15c921 Binary files /dev/null and b/app/src/chromatic/res/drawable-xxxhdpi/nonfree_uber.png differ diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml index e129683cc5e4707bf4a940ec605ea4a80063fa0d..42e48b045eaa54bc894e9d554ee48c7664470096 100644 --- a/app/src/main/res/values/iconpack.xml +++ b/app/src/main/res/values/iconpack.xml @@ -758,6 +758,7 @@ <item>nonfree_toogoodtogo</item> <item>nonfree_twitch</item> <item>nonfree_twitter</item> + <item>nonfree_uber</item> <item>nonfree_vinted</item> <item>nonfree_waze</item> <item>nonfree_whatsapp</item> diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index 9ab12347b5167c24904af9054e31f0ae0f988cb2..ee3eff73f6265b8f05f66c233457a54c733ce1f1 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -250,6 +250,9 @@ <item component="ComponentInfo{com.twitter.android/com.twitter.android.StartActivity}" drawable="nonfree_twitter" /> + <item + component="ComponentInfo{com.ubercab/com.ubercab.presidio.app.core.root.RootActivity}" + drawable="nonfree_uber" /> <item component="ComponentInfo{fr.vinted/com.vinted.activities.MDActivity}" drawable="nonfree_vinted" /> diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml index 06985b1295136374f2a9cc51d811ff07d242c553..f88e4c6ec8f844363417e5a018bd15881138942a 100644 --- a/app/src/main/res/xml/drawable.xml +++ b/app/src/main/res/xml/drawable.xml @@ -758,6 +758,7 @@ <item drawable="nonfree_toogoodtogo" /> <item drawable="nonfree_twitch" /> <item drawable="nonfree_twitter" /> + <item drawable="nonfree_uber" /> <item drawable="nonfree_vinted" /> <item drawable="nonfree_waze" /> <item drawable="nonfree_whatsapp" /> diff --git a/icons/chromatic/nonfree_uber.svg b/icons/chromatic/nonfree_uber.svg new file mode 100644 index 0000000000000000000000000000000000000000..3543ceb54af899bb4d39a1a281db64ca9c239a83 --- /dev/null +++ b/icons/chromatic/nonfree_uber.svg @@ -0,0 +1,84 @@ +<?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="#212121" 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="#9e9e9e"/> + <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="#212121" opacity=".2"/> + </g> + <g transform="matrix(.37905 0 0 .37905 8.2687 15.777)" fill="#fff" aria-label="uber"> + <path d="m10.886 6.434v-3.0469q-2.4219 3.5156-6.582 3.5156-1.8359 0-3.4375-0.70312-1.582-0.70312-2.3633-1.7578-0.76172-1.0742-1.0742-2.6172-0.21484-1.0352-0.21484-3.2812v-12.852h3.5156v11.504q0 2.7539 0.21484 3.7109 0.33203 1.3867 1.4063 2.1875 1.0742 0.78125 2.6562 0.78125t2.9688-0.80078q1.3867-0.82031 1.9531-2.207 0.58594-1.4062 0.58594-4.0625v-11.113h3.5156v20.742z"/> + <path d="m15.973 6.434h-1.3047v-11.453h1.4062v4.0859q0.89062-1.1172 2.2734-1.1172 0.76562 0 1.4453 0.3125 0.6875 0.30469 1.125 0.86719 0.44531 0.55469 0.69531 1.3438 0.25 0.78906 0.25 1.6875 0 2.1328-1.0547 3.2969t-2.5312 1.1641q-1.4688 0-2.3047-1.2266zm-0.01563-4.2109q0 1.4922 0.40625 2.1562 0.66406 1.0859 1.7969 1.0859 0.92188 0 1.5938-0.79688 0.67188-0.80469 0.67188-2.3906 0-1.625-0.64844-2.3984-0.64062-0.77344-1.5547-0.77344-0.92188 0-1.5938 0.80469-0.67188 0.79688-0.67188 2.3125z"/> + <path d="m28.474 3.7621 1.4531 0.17969q-0.34375 1.2734-1.2734 1.9766-0.92969 0.70312-2.375 0.70312-1.8203 0-2.8906-1.1172-1.0625-1.125-1.0625-3.1484 0-2.0937 1.0781-3.25t2.7969-1.1563q1.6641 0 2.7188 1.1328t1.0547 3.1875q0 0.125-0.0078 0.375h-6.1875q0.07813 1.3672 0.77344 2.0938 0.69531 0.72656 1.7344 0.72656 0.77344 0 1.3203-0.40625t0.86719-1.2969zm-4.6172-2.2734h4.6328q-0.09375-1.0469-0.53125-1.5703-0.67188-0.8125-1.7422-0.8125-0.96875 0-1.6328 0.64844-0.65625 0.64844-0.72656 1.7344z"/> + <path d="m30.488 6.434v-8.2969h1.2656v1.2578q0.48438-0.88281 0.89062-1.1641 0.41406-0.28125 0.90625-0.28125 0.71094 0 1.4453 0.45312l-0.48438 1.3047q-0.51562-0.30469-1.0312-0.30469-0.46094 0-0.82812 0.28125-0.36719 0.27344-0.52344 0.76562-0.23438 0.75-0.23438 1.6406v4.3438z"/> + </g> +</svg>