diff --git a/app/build.gradle b/app/build.gradle index 4a48de357423b9d25b8dca510c700990e6039593..477c4cee126d0e09169aa31540eb7fcab7c17493 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.benoitharrault.ameixanonfree" minSdkVersion 16 targetSdkVersion 30 - versionCode 198 - versionName "1.110.0" + versionCode 199 + versionName "1.111.0" archivesBaseName = "$applicationId" + "_" + "$versionCode" } diff --git a/app/src/chromatic/res/drawable-hdpi/broccoli.png b/app/src/chromatic/res/drawable-hdpi/broccoli.png new file mode 100644 index 0000000000000000000000000000000000000000..4a164d9eabeabcf67ffa220f0a3fce724fcd1585 Binary files /dev/null and b/app/src/chromatic/res/drawable-hdpi/broccoli.png differ diff --git a/app/src/chromatic/res/drawable-mdpi/broccoli.png b/app/src/chromatic/res/drawable-mdpi/broccoli.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0710a2ed1bbcc3f49a8fda796fe247e4848866 Binary files /dev/null and b/app/src/chromatic/res/drawable-mdpi/broccoli.png differ diff --git a/app/src/chromatic/res/drawable-xhdpi/broccoli.png b/app/src/chromatic/res/drawable-xhdpi/broccoli.png new file mode 100644 index 0000000000000000000000000000000000000000..2e5c42f5cf23ca3c1c9203467ddb4acaa5adfede Binary files /dev/null and b/app/src/chromatic/res/drawable-xhdpi/broccoli.png differ diff --git a/app/src/chromatic/res/drawable-xxhdpi/broccoli.png b/app/src/chromatic/res/drawable-xxhdpi/broccoli.png new file mode 100644 index 0000000000000000000000000000000000000000..e09dafb3814b24c2089dc61c5c706278748fcb0d Binary files /dev/null and b/app/src/chromatic/res/drawable-xxhdpi/broccoli.png differ diff --git a/app/src/chromatic/res/drawable-xxxhdpi/broccoli.png b/app/src/chromatic/res/drawable-xxxhdpi/broccoli.png new file mode 100644 index 0000000000000000000000000000000000000000..a6ad454c54db9568e859cf4ca4a646dcc66b713f Binary files /dev/null and b/app/src/chromatic/res/drawable-xxxhdpi/broccoli.png differ diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml index 0befea72a28e1beb9a82774d4f32e121a58b43ec..5e3406dbeef72e88368d873fb45004ef30425ed6 100644 --- a/app/src/main/res/values/iconpack.xml +++ b/app/src/main/res/values/iconpack.xml @@ -127,6 +127,7 @@ <item>brave</item> <item>briar</item> <item>broadcast</item> + <item>broccoli</item> <item>bromite</item> <item>bronylivewallpaper</item> <item>brouter</item> diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index df336b18997647a37b44b6983cbf7cc41028491e..779e80e8f577ce8603484b69e664b48720e0eba3 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -943,6 +943,9 @@ <item component="ComponentInfo{nl.frankkie.bronylivewallpaper/nl.frankkie.bronylivewallpaper.MyPreferencesActivity}" drawable="bronylivewallpaper" /> + <item + component="ComponentInfo{com.flauschcode.broccoli/com.flauschcode.broccoli.MainActivity}" + drawable="broccoli" /> <item component="ComponentInfo{btools.routingapp/btools.routingapp.BRouterActivity}" drawable="brouter" /> diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml index ebd48319d302a28d4a00b8817edc27d9759450b0..7bad9a6e545b22829698e547beaaf8b2ba6d6cf8 100644 --- a/app/src/main/res/xml/drawable.xml +++ b/app/src/main/res/xml/drawable.xml @@ -127,6 +127,7 @@ <item drawable="brave" /> <item drawable="briar" /> <item drawable="broadcast" /> + <item drawable="broccoli" /> <item drawable="bromite" /> <item drawable="bronylivewallpaper" /> <item drawable="brouter" /> diff --git a/icons/chromatic/broccoli.svg b/icons/chromatic/broccoli.svg new file mode 100644 index 0000000000000000000000000000000000000000..c66d568ac1dcc241abb2c96f00da842358f0fbb8 --- /dev/null +++ b/icons/chromatic/broccoli.svg @@ -0,0 +1,2 @@ +<?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="m13.485 21.183c-4.58e-4 -0.19566 0.02588-0.75176 0.05856-1.2358 0.0675-0.99995 0.07533-1.8694 0.01957-2.172-0.05261-0.28545-0.15456-0.66746-0.21988-0.82385-0.03011-0.07209-0.0555-0.13949-0.05643-0.14979-9.16e-4 -0.01028-0.02029-0.05243-0.04301-0.09362s-0.04474-0.09528-0.04894-0.12017c-0.01404-0.08369-0.4704-0.88852-0.64313-1.1343-0.09408-0.13388-0.30292-0.41549-0.46409-0.62582-0.16118-0.21032-0.29305-0.40284-0.29305-0.42782 0-0.02564-0.03668-0.01107-0.08425 0.03353-0.11907 0.11155-0.4752 0.27026-0.60853 0.27118-0.06179 4.24e-4 -0.19507 0.02586-0.29617 0.05653-0.21047 0.06384-0.59261 0.07375-0.69668 0.01799-0.03875-0.02074-0.1557-0.04583-0.25989-0.05574-0.3287-0.0313-0.8907-0.36471-1.1794-0.69966-0.26388-0.30621-0.4701-0.75857-0.4701-1.0312 0-0.07007-0.012654-0.11958-0.028096-0.11003-0.015422 0.0095-0.024616-0.19963-0.020385-0.46488 0.00712-0.44246 0.017399-0.50631 0.12409-0.7735 0.15669-0.39212 0.29679-0.60144 0.57957-0.86597 0.21767-0.20362 0.70395-0.49252 0.82902-0.49252 0.033929 0 0.052712-0.05044 0.055816-0.14979 0.00257-0.08239 0.00811-0.16243 0.012259-0.17787 0.00415-0.015422 0.021116-0.11234 0.037764-0.21532 0.073097-0.45196 0.40883-0.88181 0.86825-1.1117 0.34149-0.17085 0.74944-0.21493 1.1673-0.12615 0.15066 0.032011 0.28127 0.058209 0.29022 0.058209 0.0089 0 0.01621-0.03986 0.01621-0.088598 0-0.14635 0.2551-0.60998 0.43414-0.78901 0.09259-0.092592 0.3052-0.23705 0.47524-0.32291l0.30768-0.15535 0.61348 0.017597c0.45617 0.016411 0.38945 0.069632 0.63318 0.13884 0.14455 0.066632 0.31679 0.17682 0.38273 0.24485l0.1199 0.12369 0.23007-0.10884c0.21442-0.10143 0.26064-0.10881 0.67944-0.10843 0.65883 5.991e-4 1.0696 0.13862 1.2496 0.41991 0.04316 0.067442 0.13753 0.19844 0.20968 0.29112 0.16243 0.20863 0.27694 0.50227 0.30662 0.78614l0.0226 0.21626 0.32279 0.017597c0.53053 0.028946 0.94064 0.24149 1.249 0.64731 0.21782 0.28667 0.30032 0.53792 0.31939 0.97275 0.01384 0.31588 0.0038 0.40964-0.06396 0.59916-0.04423 0.12358-0.08802 0.24996-0.09736 0.28086-0.01167 0.03846 0.04506 0.08504 0.17961 0.14766 0.22915 0.10665 0.53161 0.39485 0.67964 0.64758 0.29106 0.49694 0.27912 1.2395-0.02839 1.7643-0.1322 0.22558-0.43443 0.48898-0.71155 0.62014-0.65751 0.31119-1.4053 0.19094-1.9133-0.30768-0.10896-0.10695-0.20493-0.21683-0.21328-0.24421-0.01107-0.03608-0.09218-0.0087-0.29504 0.09983-0.15392 0.08227-0.35149 0.17053-0.43902 0.19614-0.08753 0.02558-0.15914 0.0586-0.15914 0.07335 0 0.01483-0.09056 0.15112-0.20125 0.30302-0.44277 0.60766-0.75323 1.2776-0.90024 1.9426-0.03415 0.15448-0.07927 0.35845-0.10024 0.45329-0.06279 0.2837-0.03885 1.2547 0.08195 3.3239 0.02209 0.37826 0.02608 0.70137 0.0089 0.71804-0.0172 0.01661-0.48066 0.03579-1.0299 0.04249l-0.99868 0.01226zm1.1343-5.1292c0.15444-0.39897 0.5978-1.2448 0.68109-1.2994 0.08814-0.05775 0.08706-0.05886-0.18256-0.18791-0.5094-0.24383-0.89386-0.62615-1.1039-1.0977-0.05046-0.11327-0.09672-0.21112-0.10285-0.21742-0.0061-0.0063-0.1123 0.01483-0.23599 0.04682-0.24912 0.06456-0.74763 0.07723-0.9341 0.02375-0.1175-0.03369-0.1231-0.02978-0.2338 0.16371-0.06238 0.10902-0.11341 0.21486-0.11341 0.23519s0.0969 0.10102 0.21532 0.17933c0.11843 0.0783 0.34009 0.26185 0.49258 0.40786 0.35529 0.34022 0.99178 1.1931 1.2197 1.6343 0.09732 0.18843 0.18957 0.32824 0.20504 0.31071 0.01542-0.0176 0.05726-0.10718 0.09289-0.19925z" fill="#fff" stroke-width=".037448"/></svg>