diff --git a/android/gradle.properties b/android/gradle.properties
index 957c40bc42f3a742d2266dc3a403ad014458ba3f..777ac2de0980e935649cf32bd85097eaf789185a 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=0.0.15
-app.versionCode=15
+app.versionName=0.0.16
+app.versionCode=16
diff --git a/assets/images/01882a463c31c41c27b439e16c818d6c.png b/assets/images/01882a463c31c41c27b439e16c818d6c.png
index 7d1785dd73efd64f08e9ccedbb8aa7f037b60885..b8c459ea2bd818483c423251d067647de9de8c1c 100644
Binary files a/assets/images/01882a463c31c41c27b439e16c818d6c.png and b/assets/images/01882a463c31c41c27b439e16c818d6c.png differ
diff --git a/assets/images/0b6033777c69239b27f1a69f4ae8e5a0.png b/assets/images/0b6033777c69239b27f1a69f4ae8e5a0.png
index 5a4895d333f671bdd5845ddf7a9c9f190965d24c..3fa907734840e75bb0a777485c80534f46cf25de 100644
Binary files a/assets/images/0b6033777c69239b27f1a69f4ae8e5a0.png and b/assets/images/0b6033777c69239b27f1a69f4ae8e5a0.png differ
diff --git a/assets/images/176bb4ff17fa780ceacd24ca6968e069.png b/assets/images/176bb4ff17fa780ceacd24ca6968e069.png
index 0a1e5e66bb73cbce7a90b34df975e868c9cc0562..decf1896a20959db1b3fb6fa5273626aff791c84 100644
Binary files a/assets/images/176bb4ff17fa780ceacd24ca6968e069.png and b/assets/images/176bb4ff17fa780ceacd24ca6968e069.png differ
diff --git a/assets/images/2715266767abd39230f31dc3aedec5a2.png b/assets/images/2715266767abd39230f31dc3aedec5a2.png
index 8660859311fe61f0909f8b29b9216c3613f72ca7..3ab6940d0312ab52a851c3800d921d0ee61fbc19 100644
Binary files a/assets/images/2715266767abd39230f31dc3aedec5a2.png and b/assets/images/2715266767abd39230f31dc3aedec5a2.png differ
diff --git a/assets/images/2b0264e0dfdc83f433f62122fdc2c5ce.png b/assets/images/2b0264e0dfdc83f433f62122fdc2c5ce.png
index 996e8d94503693dbf5ab79d75dd504986a6f0dea..2f7851721513cc3eb55ecb810a0a39125cd82cc2 100644
Binary files a/assets/images/2b0264e0dfdc83f433f62122fdc2c5ce.png and b/assets/images/2b0264e0dfdc83f433f62122fdc2c5ce.png differ
diff --git a/assets/images/2f322012dc62be0d82ae5a12fe76a419.png b/assets/images/2f322012dc62be0d82ae5a12fe76a419.png
index efc2ec288b2a0c1b773edf699894f9beb1dffbea..bba4d6b919c2a2bcca10dac968bc56e79a0bee9c 100644
Binary files a/assets/images/2f322012dc62be0d82ae5a12fe76a419.png and b/assets/images/2f322012dc62be0d82ae5a12fe76a419.png differ
diff --git a/assets/images/3269a13c40b96adb237747cdbf9dc352.png b/assets/images/3269a13c40b96adb237747cdbf9dc352.png
index 6a58b79e9ddf9ad37d54a9c03d9bd0bd0b7ef7fc..ef16889d6375df8ba057dceb4fac0f65ec04b326 100644
Binary files a/assets/images/3269a13c40b96adb237747cdbf9dc352.png and b/assets/images/3269a13c40b96adb237747cdbf9dc352.png differ
diff --git a/assets/images/3cb41c8a1fd652283d3101c8af163178.png b/assets/images/3cb41c8a1fd652283d3101c8af163178.png
index 364b2d29c04da170c33f51a05b6689969eaeccf1..63fbae1094e7c4a5091e59774c5acd15347ca425 100644
Binary files a/assets/images/3cb41c8a1fd652283d3101c8af163178.png and b/assets/images/3cb41c8a1fd652283d3101c8af163178.png differ
diff --git a/assets/images/3cfd5546033cc75e5adbde352bb3ea4b.png b/assets/images/3cfd5546033cc75e5adbde352bb3ea4b.png
index 3555bf8d492987738334e44b01a528bdfa50f490..d68943028c2573f91e71b5019349844e04f3e2c0 100644
Binary files a/assets/images/3cfd5546033cc75e5adbde352bb3ea4b.png and b/assets/images/3cfd5546033cc75e5adbde352bb3ea4b.png differ
diff --git a/assets/images/3eee7c575d34574b05eeb36f17ada425.png b/assets/images/3eee7c575d34574b05eeb36f17ada425.png
index a463fce4d8391ff30aab4fca5ce1e160a7397427..8867d4562c08f347c74514bec4981f47993cd170 100644
Binary files a/assets/images/3eee7c575d34574b05eeb36f17ada425.png and b/assets/images/3eee7c575d34574b05eeb36f17ada425.png differ
diff --git a/assets/images/3f778650014debd49917afe1e4c669c8.png b/assets/images/3f778650014debd49917afe1e4c669c8.png
index 24a0e7b0ce77c335abae025c14022b3631a05ddf..770dfdce72f3a67034f84e82c9b502e8f9f0bcd8 100644
Binary files a/assets/images/3f778650014debd49917afe1e4c669c8.png and b/assets/images/3f778650014debd49917afe1e4c669c8.png differ
diff --git a/assets/images/41cd4b039bf58089fdca88eb509f02ae.png b/assets/images/41cd4b039bf58089fdca88eb509f02ae.png
index f7c7663107c0305e26f9f8128157bb2b7f6f4c42..99cac6b176258f2d0fd70262d27d43828178614f 100644
Binary files a/assets/images/41cd4b039bf58089fdca88eb509f02ae.png and b/assets/images/41cd4b039bf58089fdca88eb509f02ae.png differ
diff --git a/assets/images/4860b95025d8a5e41205fc60ad0a10e3.png b/assets/images/4860b95025d8a5e41205fc60ad0a10e3.png
index fbe200f594bc8c4f7c8ca972fb5a2439a4255b9f..537b83b35fa4d602428e66e494d62155301a5314 100644
Binary files a/assets/images/4860b95025d8a5e41205fc60ad0a10e3.png and b/assets/images/4860b95025d8a5e41205fc60ad0a10e3.png differ
diff --git a/assets/images/4d4cfc485ed98a136bb15b4e59885932.png b/assets/images/4d4cfc485ed98a136bb15b4e59885932.png
index 0e771064988e69b88ac3995fd195d7a03d43e03c..bd4f049a987a39f391c8b422c0f277df2251ee04 100644
Binary files a/assets/images/4d4cfc485ed98a136bb15b4e59885932.png and b/assets/images/4d4cfc485ed98a136bb15b4e59885932.png differ
diff --git a/assets/images/50ffb244928fa2ee2423898362290568.png b/assets/images/50ffb244928fa2ee2423898362290568.png
index 7f247611df6ad73903dc07fc6433d222ae300f3b..1f1f1b162e8e412f9c5290942514e691255c0ad8 100644
Binary files a/assets/images/50ffb244928fa2ee2423898362290568.png and b/assets/images/50ffb244928fa2ee2423898362290568.png differ
diff --git a/assets/images/525ef313dcfc134ed63125a6b2dc2d45.png b/assets/images/525ef313dcfc134ed63125a6b2dc2d45.png
index 6bfd24759cf9e64429142d5d8780941da80bf62a..81b7a5ff5b18c1f9b57cd525f544a0d427a989ef 100644
Binary files a/assets/images/525ef313dcfc134ed63125a6b2dc2d45.png and b/assets/images/525ef313dcfc134ed63125a6b2dc2d45.png differ
diff --git a/assets/images/59fba0db06556293580de7ba5330ad49.png b/assets/images/59fba0db06556293580de7ba5330ad49.png
index cf926ca745e528f63bba14595acd454a63b2d483..7b9fa346dacd5f2e664c0109973d64df8467cc41 100644
Binary files a/assets/images/59fba0db06556293580de7ba5330ad49.png and b/assets/images/59fba0db06556293580de7ba5330ad49.png differ
diff --git a/assets/images/5e2dd574a70a0d2dc573b2199ed8c746.png b/assets/images/5e2dd574a70a0d2dc573b2199ed8c746.png
index 0fdff102774274798c48a98ba200c9c98f6efcc4..7d3d342c1d6a3770d433e443aeba463a33f6a77d 100644
Binary files a/assets/images/5e2dd574a70a0d2dc573b2199ed8c746.png and b/assets/images/5e2dd574a70a0d2dc573b2199ed8c746.png differ
diff --git a/assets/images/5e5f9a0a8b3dd0bfd2f47ae98ec5dbac.png b/assets/images/5e5f9a0a8b3dd0bfd2f47ae98ec5dbac.png
index d71a11c164bc3e73d57b35bcde9d87d22faa37e9..e5a6642fb798044acd14c4bd94996472d48e2530 100644
Binary files a/assets/images/5e5f9a0a8b3dd0bfd2f47ae98ec5dbac.png and b/assets/images/5e5f9a0a8b3dd0bfd2f47ae98ec5dbac.png differ
diff --git a/assets/images/61f957831ae29d16fd9f9d1bd5e1108e.png b/assets/images/61f957831ae29d16fd9f9d1bd5e1108e.png
index 30e7d0aa03724c48d222dae95caaf6738b320b00..42b9e631217b6de1c0fbe5d30fe893f78e99004b 100644
Binary files a/assets/images/61f957831ae29d16fd9f9d1bd5e1108e.png and b/assets/images/61f957831ae29d16fd9f9d1bd5e1108e.png differ
diff --git a/assets/images/6230e89eeec906d71055ddcdddd4b10a.png b/assets/images/6230e89eeec906d71055ddcdddd4b10a.png
index 281797ced09ba14cc6c8dc203f80494c26f12482..9a22d9124eca6e13de1f856de60cac04949f39bc 100644
Binary files a/assets/images/6230e89eeec906d71055ddcdddd4b10a.png and b/assets/images/6230e89eeec906d71055ddcdddd4b10a.png differ
diff --git a/assets/images/69be9405fd985a1fbcbc81ea73295deb.png b/assets/images/69be9405fd985a1fbcbc81ea73295deb.png
index 0e1ddd7ed17c3d4f88a87c2b6f5e9c64844b6e94..5bc0c1ad88feaf7c8c74e4160726257622af038e 100644
Binary files a/assets/images/69be9405fd985a1fbcbc81ea73295deb.png and b/assets/images/69be9405fd985a1fbcbc81ea73295deb.png differ
diff --git a/assets/images/6d90d40d4e01accf90e74f84444cd7cc.png b/assets/images/6d90d40d4e01accf90e74f84444cd7cc.png
index cfdfee3f647dceed0756d367ac71aee1375e902e..c1cdb4f1dba1fe336cf5f92d870a20f7a9d632f3 100644
Binary files a/assets/images/6d90d40d4e01accf90e74f84444cd7cc.png and b/assets/images/6d90d40d4e01accf90e74f84444cd7cc.png differ
diff --git a/assets/images/9512a6948b3f4df8bd315d99ddc4f632.png b/assets/images/9512a6948b3f4df8bd315d99ddc4f632.png
index 8fca012df8c9ca4b628473bf5a40e04c4232e713..75026c212b018f806b0062e6354634b6464778e0 100644
Binary files a/assets/images/9512a6948b3f4df8bd315d99ddc4f632.png and b/assets/images/9512a6948b3f4df8bd315d99ddc4f632.png differ
diff --git a/assets/images/9ce4da1ed6679a03068942102e8227a8.png b/assets/images/9ce4da1ed6679a03068942102e8227a8.png
index e8a616ee107a1f43050af8583b2ae8fab2abe7c5..1c6ae477087cc4505dd180f4ec21549d70a52621 100644
Binary files a/assets/images/9ce4da1ed6679a03068942102e8227a8.png and b/assets/images/9ce4da1ed6679a03068942102e8227a8.png differ
diff --git a/assets/images/a770090c788f9e02f4bd5fc3b988f00e.png b/assets/images/a770090c788f9e02f4bd5fc3b988f00e.png
index fcc52c7eef9630c3bc4e383d8423d27158f03ac6..6f90b6c183eba6aff0be890dff134f6c82a54340 100644
Binary files a/assets/images/a770090c788f9e02f4bd5fc3b988f00e.png and b/assets/images/a770090c788f9e02f4bd5fc3b988f00e.png differ
diff --git a/assets/images/b0f3a0498db5898d680c0975a5eb91c2.png b/assets/images/b0f3a0498db5898d680c0975a5eb91c2.png
index c4ac76a090bc8b5b122a9f3de6bf4243e64b6c26..b906c3cf7d1763dae49a6e3b356f44d35f4e7a43 100644
Binary files a/assets/images/b0f3a0498db5898d680c0975a5eb91c2.png and b/assets/images/b0f3a0498db5898d680c0975a5eb91c2.png differ
diff --git a/assets/images/b94b03336c3bb1bb020ab101b81ade1d.png b/assets/images/b94b03336c3bb1bb020ab101b81ade1d.png
index f802a61bae297be7bf28a6cf0e6336739c0bd522..d6057c1583d2003b028a4eee0ebfb5c48e419a52 100644
Binary files a/assets/images/b94b03336c3bb1bb020ab101b81ade1d.png and b/assets/images/b94b03336c3bb1bb020ab101b81ade1d.png differ
diff --git a/assets/images/bd34b42fcd92099b348c537e4f089652.png b/assets/images/bd34b42fcd92099b348c537e4f089652.png
index 1096471dd74acb9a5566ef893738a44678afb2b1..b762139ca8680e1adb69df1869a6753f0ef391e3 100644
Binary files a/assets/images/bd34b42fcd92099b348c537e4f089652.png and b/assets/images/bd34b42fcd92099b348c537e4f089652.png differ
diff --git a/assets/images/c1857547d6c219a883cab7a3b9f7d5d6.png b/assets/images/c1857547d6c219a883cab7a3b9f7d5d6.png
index 548de18e0a6a8f336a5c07a53ae6e93df4a0c0ef..3f1ee67bafb744c071cc16df6565409f82e89aab 100644
Binary files a/assets/images/c1857547d6c219a883cab7a3b9f7d5d6.png and b/assets/images/c1857547d6c219a883cab7a3b9f7d5d6.png differ
diff --git a/assets/images/c8f8b9734ace9be430ccd16e0f1b4aa4.png b/assets/images/c8f8b9734ace9be430ccd16e0f1b4aa4.png
index 217780865ec3eff897fe013d4ff537f42a5ad220..babcd4c9a6b56d41408a08341a4a9a7f686ad8d6 100644
Binary files a/assets/images/c8f8b9734ace9be430ccd16e0f1b4aa4.png and b/assets/images/c8f8b9734ace9be430ccd16e0f1b4aa4.png differ
diff --git a/assets/images/d370d2eeb6bb1445fdfbeb48734a3c43.png b/assets/images/d370d2eeb6bb1445fdfbeb48734a3c43.png
index 5110afe92b282a49a8f1747e73d1533c431da7ae..c5e1f8ed121af3d5f0c67dd58f24f45046e2a2b2 100644
Binary files a/assets/images/d370d2eeb6bb1445fdfbeb48734a3c43.png and b/assets/images/d370d2eeb6bb1445fdfbeb48734a3c43.png differ
diff --git a/assets/images/d476505cf1c1eb67d88e39751ea125bb.png b/assets/images/d476505cf1c1eb67d88e39751ea125bb.png
index 01e835c52eb0387c6615aaa11c8e0364e7525ac7..fb9bdb12ab5d4bfcd816084c6818c295696949fc 100644
Binary files a/assets/images/d476505cf1c1eb67d88e39751ea125bb.png and b/assets/images/d476505cf1c1eb67d88e39751ea125bb.png differ
diff --git a/assets/images/db4ae886aed6e54fb47dc5b81d04cfa7.png b/assets/images/db4ae886aed6e54fb47dc5b81d04cfa7.png
index 9fc844c3692ec5d13ab748d273fc2b392b842636..8fed8c9fcfb3919c2238596290b5e3d543e1d5d6 100644
Binary files a/assets/images/db4ae886aed6e54fb47dc5b81d04cfa7.png and b/assets/images/db4ae886aed6e54fb47dc5b81d04cfa7.png differ
diff --git a/assets/images/fbe93b88bdb22bd80ad1cb6b211355c3.png b/assets/images/fbe93b88bdb22bd80ad1cb6b211355c3.png
index 617b04d148efb8a9a4001ed353b7e3d993fcdbf2..de8a83e17a92888a8f12e27cde02f37640206dd3 100644
Binary files a/assets/images/fbe93b88bdb22bd80ad1cb6b211355c3.png and b/assets/images/fbe93b88bdb22bd80ad1cb6b211355c3.png differ
diff --git a/assets/images/fd8cc9ee56f7b0d1d598723385fabbb3.png b/assets/images/fd8cc9ee56f7b0d1d598723385fabbb3.png
index 3d6ce3c6b5d5c44cc1c5a480dd34f68e0860ac55..761ef538d761dafd492196d08a35c6aa75fb98bf 100644
Binary files a/assets/images/fd8cc9ee56f7b0d1d598723385fabbb3.png and b/assets/images/fd8cc9ee56f7b0d1d598723385fabbb3.png differ
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index d55a6f3eeb6654216e946ff0932732495c11aa0b..f20d4451cec8c7f57df556c875d66a8bf38d9ba1 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -14,6 +14,7 @@ class Home extends StatelessWidget {
static const String id = 'home';
double _tipImageSize = 100;
+ int _selectImageColumnsCount = 2;
Future<void> resetGame(Data myProvider) async {
myProvider.updateImage = '';
@@ -51,10 +52,10 @@ class Home extends StatelessWidget {
child: FlatButton(
child: Container(
decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(8),
+ borderRadius: BorderRadius.circular(4),
border: Border.all(
color: Colors.blue[200],
- width: 8,
+ width: 4,
),
),
margin: EdgeInsets.all(2),
@@ -77,26 +78,22 @@ class Home extends StatelessWidget {
List images = myProvider.images;
return Container(
- padding: EdgeInsets.all(5),
+ padding: EdgeInsets.all(2),
child: ListView(
children: [
Table(
defaultColumnWidth: IntrinsicColumnWidth(),
children: [
- for (var imageIndex = 0; imageIndex < images.length; imageIndex+=2)
+ for (var imageIndex = 0; imageIndex < images.length; imageIndex += _selectImageColumnsCount)
TableRow(
children: [
- Column(
- children: [
- _buildImageSelectorItem(myProvider, images[imageIndex], size, tileImageSize)
- ]
- ),
- Column(
- children: [
- if (imageIndex+1 < images.length)
- _buildImageSelectorItem(myProvider, images[imageIndex+1], size, tileImageSize)
- ]
- ),
+ for (var columnIndex = 0; columnIndex < _selectImageColumnsCount; columnIndex++)
+ Column(
+ children: [
+ if (imageIndex + columnIndex < images.length)
+ _buildImageSelectorItem(myProvider, images[imageIndex + columnIndex], size, tileImageSize)
+ ]
+ ),
]
),
],
@@ -291,7 +288,7 @@ class Home extends StatelessWidget {
var content;
- double _selectorImageSize = MediaQuery.of(context).size.width / 3;
+ double _selectorImageSize = (MediaQuery.of(context).size.width - 140) / _selectImageColumnsCount;
double _tileImageSize = (MediaQuery.of(context).size.width - 70) / _myProvider.tilesCount;
if (_myProvider.shuffling) {
diff --git a/scripts/01_optimize_images.sh b/scripts/01_optimize_images.sh
index 7ff136f08722594a079d910accb77baa77562d5a..2c2b9e3e7f98568dbd79c7309454b85ca53353f7 100755
--- a/scripts/01_optimize_images.sh
+++ b/scripts/01_optimize_images.sh
@@ -10,7 +10,7 @@ IMAGES_RAW_FOLDER="${IMAGES_CACHE_FOLDER}/01_raw_images"
IMAGES_OPTIMIZED_FOLDER="${IMAGES_CACHE_FOLDER}/02_optimized_images"
RESIZE_OPTION="640x640"
-CROP_PARAMETERS="-auto-orient -trim +repage -gravity center -background white -extent ${RESIZE_OPTION}^"
+CROP_PARAMETERS="-auto-orient +repage -gravity center -background white -extent ${RESIZE_OPTION}^"
CONVERT_OPTIONS="-alpha off +dither -colors 256 -depth 4"
OPTIPNG_OPTIONS="-preserve -quiet -o7"