Merge branch '22-fix-images' into 'master'

Resolve "Fix images"

Closes #22

See merge request !20

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) {

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"