diff --git a/app/build.gradle b/app/build.gradle index 83e69b03adac08f6f8f8e8f3ea92114690abaf18..4baea6f6f399504d013038cbbd05fe76de737f80 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.benoitharrault.ameixanonfree" minSdkVersion 16 targetSdkVersion 30 - versionCode 122 - versionName "1.60.0" + versionCode 123 + versionName "1.61.0" archivesBaseName = "$applicationId" + "_" + "$versionCode" } diff --git a/app/src/chromatic/res/drawable-hdpi/nonfree_radiofrance.png b/app/src/chromatic/res/drawable-hdpi/nonfree_radiofrance.png new file mode 100644 index 0000000000000000000000000000000000000000..2a6ae7fcdf2b2cd80b87319c92efa6dd2d921753 Binary files /dev/null and b/app/src/chromatic/res/drawable-hdpi/nonfree_radiofrance.png differ diff --git a/app/src/chromatic/res/drawable-mdpi/nonfree_radiofrance.png b/app/src/chromatic/res/drawable-mdpi/nonfree_radiofrance.png new file mode 100644 index 0000000000000000000000000000000000000000..015e35e05b977f92525b3be4b744f6060622ded8 Binary files /dev/null and b/app/src/chromatic/res/drawable-mdpi/nonfree_radiofrance.png differ diff --git a/app/src/chromatic/res/drawable-xhdpi/nonfree_radiofrance.png b/app/src/chromatic/res/drawable-xhdpi/nonfree_radiofrance.png new file mode 100644 index 0000000000000000000000000000000000000000..5811370244fcc493870384afd85d87bd630dbcc0 Binary files /dev/null and b/app/src/chromatic/res/drawable-xhdpi/nonfree_radiofrance.png differ diff --git a/app/src/chromatic/res/drawable-xxhdpi/nonfree_radiofrance.png b/app/src/chromatic/res/drawable-xxhdpi/nonfree_radiofrance.png new file mode 100644 index 0000000000000000000000000000000000000000..78e932f06f330dbae3c4cdcf1b51ada432c570a8 Binary files /dev/null and b/app/src/chromatic/res/drawable-xxhdpi/nonfree_radiofrance.png differ diff --git a/app/src/chromatic/res/drawable-xxxhdpi/nonfree_radiofrance.png b/app/src/chromatic/res/drawable-xxxhdpi/nonfree_radiofrance.png new file mode 100644 index 0000000000000000000000000000000000000000..cbbd31002b0a218e5e11f848089905978dd7e853 Binary files /dev/null and b/app/src/chromatic/res/drawable-xxxhdpi/nonfree_radiofrance.png differ diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml index 2845f9e5f974d0d6e6a5e61b367366ca990989af..f7b9e9eed007994c5358a7dd0a44e27fc1e00d55 100644 --- a/app/src/main/res/values/iconpack.xml +++ b/app/src/main/res/values/iconpack.xml @@ -745,6 +745,7 @@ <item>nonfree_pocketcasts</item> <item>nonfree_pocketoperatorforpixel</item> <item>nonfree_pr0gramm</item> + <item>nonfree_radiofrance</item> <item>nonfree_rteeco2mix</item> <item>nonfree_samsungcalendar</item> <item>nonfree_samsungkids</item> diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index 890c25c3d3cfdedf89ec790b9a370df2d3d6a660..789f8fd3f810d36e16150e324e1fb8e7ede61526 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -217,6 +217,9 @@ <item component="ComponentInfo{com.pr0gramm.app/com.pr0gramm.app.ui.MainActivity}" drawable="nonfree_pr0gramm" /> + <item + component="ComponentInfo{com.radiofrance.radio.radiofrance.android/com.radiofrance.radio.radiofrance.android.screen.splash.SplashActivity}" + drawable="nonfree_radiofrance" /> <item component="ComponentInfo{com.rte.eco2mix/com.rte.eco2mix.modestart.HomeActivity}" drawable="nonfree_rteeco2mix" /> diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml index bece23435fcd4a98f1fcba5a5ed2e347ba0f3847..6562a6765279fd8ddbcb81d5d26becc9fb1f9540 100644 --- a/app/src/main/res/xml/drawable.xml +++ b/app/src/main/res/xml/drawable.xml @@ -745,6 +745,7 @@ <item drawable="nonfree_pocketcasts" /> <item drawable="nonfree_pocketoperatorforpixel" /> <item drawable="nonfree_pr0gramm" /> + <item drawable="nonfree_radiofrance" /> <item drawable="nonfree_rteeco2mix" /> <item drawable="nonfree_samsungcalendar" /> <item drawable="nonfree_samsungkids" /> diff --git a/icons/chromatic/nonfree_radiofrance.svg b/icons/chromatic/nonfree_radiofrance.svg new file mode 100644 index 0000000000000000000000000000000000000000..6a4264bc16882910ebe44ec0e9d4ff44e391b618 --- /dev/null +++ b/icons/chromatic/nonfree_radiofrance.svg @@ -0,0 +1,82 @@ +<?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="#1a237e" 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="#9c27b0"/> + <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="#1a237e" opacity=".2"/> + </g> + <g transform="matrix(.39458 0 0 .39458 7.6872 7.0389)" fill="#fff"> + <path class="st0" d="m16.95 12.95c3.59 0 6.49 2.76 6.49 6.16 0 1.05-0.27 2.03-0.76 2.89h8.05c0.22-0.93 0.33-1.9 0.33-2.89 0-5.7-3.76-10.57-9.05-12.5v-6.05h-6.99v12.67c0.61-0.18 1.26-0.28 1.93-0.28z"/> + <path class="st0" d="m19.22 24.88c-0.71 0.25-1.47 0.39-2.27 0.39-3.59 0-6.49-2.76-6.49-6.16 0-0.95 0.23-1.85 0.63-2.65h-7.98c-0.18 0.86-0.28 1.74-0.28 2.65 0 7.39 6.32 13.39 14.11 13.39 0.77 0 1.53-0.06 2.27-0.17v-7.45z"/> + </g> +</svg>