diff --git a/app/build.gradle b/app/build.gradle index b2f5efd145ac2132030bfd5b8c33396e8b563fe1..09de447a3e58b866f7cbaf5caf105954c6f14c5a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.benoitharrault.ameixanonfree" minSdkVersion 16 targetSdkVersion 30 - versionCode 165 - versionName "1.90.0" + versionCode 166 + versionName "1.90.1" archivesBaseName = "$applicationId" + "_" + "$versionCode" } diff --git a/app/src/chromatic/res/drawable-hdpi/solitaire2.png b/app/src/chromatic/res/drawable-hdpi/solitaire2.png new file mode 100644 index 0000000000000000000000000000000000000000..e06408205830beb6b8e5c86f52a01b8e20644f53 Binary files /dev/null and b/app/src/chromatic/res/drawable-hdpi/solitaire2.png differ diff --git a/app/src/chromatic/res/drawable-mdpi/solitaire2.png b/app/src/chromatic/res/drawable-mdpi/solitaire2.png new file mode 100644 index 0000000000000000000000000000000000000000..b54ec718c3d74369a3b9863d698f9348cff22fcb Binary files /dev/null and b/app/src/chromatic/res/drawable-mdpi/solitaire2.png differ diff --git a/app/src/chromatic/res/drawable-xhdpi/solitaire2.png b/app/src/chromatic/res/drawable-xhdpi/solitaire2.png new file mode 100644 index 0000000000000000000000000000000000000000..2129702d44bd65a022ec7a59ff5e187453d59c8a Binary files /dev/null and b/app/src/chromatic/res/drawable-xhdpi/solitaire2.png differ diff --git a/app/src/chromatic/res/drawable-xxhdpi/solitaire2.png b/app/src/chromatic/res/drawable-xxhdpi/solitaire2.png new file mode 100644 index 0000000000000000000000000000000000000000..12a2adfad532918958782914cc20f2cc24e6909e Binary files /dev/null and b/app/src/chromatic/res/drawable-xxhdpi/solitaire2.png differ diff --git a/app/src/chromatic/res/drawable-xxxhdpi/solitaire2.png b/app/src/chromatic/res/drawable-xxxhdpi/solitaire2.png new file mode 100644 index 0000000000000000000000000000000000000000..0ce12a293f8bf4c6eaf3550de76c4f6758d78e03 Binary files /dev/null and b/app/src/chromatic/res/drawable-xxxhdpi/solitaire2.png differ diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml index 7c43245d5d0c3f8eacb6a0ef4dea2b30af9948bc..808eee249c7f25949e00975b5fb8f9a70311c4c2 100644 --- a/app/src/main/res/values/iconpack.xml +++ b/app/src/main/res/values/iconpack.xml @@ -1201,6 +1201,7 @@ <item>snoopsnitch</item> <item>sokoban</item> <item>solitaire</item> + <item>solitaire2</item> <item>solitairecg</item> <item>sortgame</item> <item>soundmanager</item> diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml index 00ccbbb46f10eb0fa47500cf2b320373e49c377a..a377846927687d3fffd564c4256f9e60672e0cb1 100644 --- a/app/src/main/res/xml/appfilter.xml +++ b/app/src/main/res/xml/appfilter.xml @@ -8388,7 +8388,7 @@ drawable="snake" /> <item component="ComponentInfo{org.benoitharrault.solitaire/org.benoitharrault.solitaire.MainActivity}" - drawable="solitaire" /> + drawable="solitaire2" /> <item component="ComponentInfo{org.benoitharrault.sortgame/org.benoitharrault.sortgame.MainActivity}" drawable="sortgame" /> diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml index f011dd2b5c976fa713ee5cc15c8b5f9c14468b68..2ef1c171d8470098cc07cb4ca33777ff7f47626a 100644 --- a/app/src/main/res/xml/drawable.xml +++ b/app/src/main/res/xml/drawable.xml @@ -1201,6 +1201,7 @@ <item drawable="snoopsnitch" /> <item drawable="sokoban" /> <item drawable="solitaire" /> + <item drawable="solitaire2" /> <item drawable="solitairecg" /> <item drawable="sortgame" /> <item drawable="soundmanager" /> diff --git a/icons/chromatic/solitaire2.svg b/icons/chromatic/solitaire2.svg new file mode 100644 index 0000000000000000000000000000000000000000..f215ae5833909c330705d8c78cdadef35a4ca975 --- /dev/null +++ b/icons/chromatic/solitaire2.svg @@ -0,0 +1,112 @@ +<?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="-.072001" 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="#3f51b5"/> + <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(1.3242 0 0 1.3242 -4.6596 -4.6595)" fill="#fffffe" stroke="#fffffd" stroke-linecap="round" stroke-linejoin="round" stroke-width=".66394"> + <circle cx="12.798" cy="9.5202" r=".32"/> + <circle cx="14.373" cy="9.5202" r=".32"/> + <circle cx="15.949" cy="9.5202" r=".32"/> + <circle cx="12.798" cy="11.138" r=".32"/> + <circle cx="14.373" cy="11.138" r=".32"/> + <circle cx="15.949" cy="11.138" r=".32"/> + <circle cx="9.6473" cy="12.755" r=".32"/> + <circle cx="19.1" cy="12.755" r=".32"/> + <circle cx="11.223" cy="12.755" r=".32"/> + <circle cx="12.798" cy="12.755" r=".32"/> + <circle cx="14.373" cy="12.755" r=".32"/> + <circle cx="15.949" cy="12.755" r=".32"/> + <circle cx="17.524" cy="12.755" r=".32"/> + <circle cx="9.6473" cy="14.373" r=".32"/> + <circle cx="19.1" cy="14.373" r=".32"/> + <circle cx="11.223" cy="14.373" r=".32"/> + <circle cx="12.798" cy="14.373" r=".32"/> + <circle cx="15.949" cy="14.373" r=".32"/> + <circle cx="17.524" cy="14.373" r=".32"/> + <circle cx="9.6473" cy="15.991" r=".32"/> + <circle cx="19.1" cy="15.991" r=".32"/> + <circle cx="11.223" cy="15.991" r=".32"/> + <circle cx="12.798" cy="15.991" r=".32"/> + <circle cx="14.373" cy="15.991" r=".32"/> + <circle cx="15.949" cy="15.991" r=".32"/> + <circle cx="17.524" cy="15.991" r=".32"/> + <circle cx="12.798" cy="17.609" r=".32"/> + <circle cx="14.373" cy="17.609" r=".32"/> + <circle cx="15.949" cy="17.609" r=".32"/> + <circle cx="12.798" cy="19.226" r=".32"/> + <circle cx="14.373" cy="19.226" r=".32"/> + <circle cx="15.949" cy="19.226" r=".32"/> + </g> +</svg>