Merge branch '34-add-a-nice-toggle-button-between-modes' into 'master'

Resolve "Add a nice toggle button between modes"

Closes #34

See merge request !35

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.1.11
-app.versionCode=32
+app.versionName=0.1.12
+app.versionCode=33

fastlane/metadata/android/en-US/changelogs/33.txt

+Improve toggle mode button (walk/report)

fastlane/metadata/android/fr-FR/changelogs/33.txt

+Amélioration du bouton de changement de mode (marcher/marquer)

icons/build_game_icons.sh

@@ -56,6 +56,10 @@ SKIN_IMAGES="
   tile_unknown
   button_mark_mine_on
   button_mark_mine_off
+  indicator_report_on
+  indicator_report_off
+  indicator_walk_on
+  indicator_walk_off
 "
 
 #######################################################

icons/skins/default/button_mark_mine_off.svg

 <?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x="-.0013123" y="-.0014381" width="93.668" height="93.679" ry="0" fill="#ea9c1f" stroke="#fff" stroke-width=".24146"/><path d="m62.564 39.496c-4.3118 1.5875-7.5974 2.7182-10.487 6.2927-2.5748 3.1852-6.2927 4.2894-10.487 2.1897v11.444h-2.0975v-28.316c0-0.5797 0.46905-1.0487 1.0487-1.0487s1.0487 0.46905 1.0487 1.0487c2.329 3.3859 6.3764 4.1356 10.487 4.195 6.2927 0.09216 10.487 4.195 10.487 4.195zm-18.878 13.913v2.1344c2.4744 0.50594 4.195 1.5793 4.195 2.8309 0 1.737-3.2876 3.1463-7.3413 3.1463s-7.3413-1.4093-7.3413-3.1463c0-1.2516 1.7206-2.3249 4.195-2.8309v-2.1343c-3.8099 0.65962-6.2927 2.5072-6.2927 4.9652 0 3.0869 3.8816 5.2437 9.4389 5.2437s9.4389-2.1569 9.4389-5.2437c0-2.458-2.4826-4.3055-6.2927-4.9652z" fill="#af0303" stroke="#730202" stroke-linejoin="round" stroke-width=".84528"/></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+    <switch transform="matrix(-.65646 0 0 .65646 79.689 14.015)" fill="#000000">
+        <g fill="#000">
+            <path d="m96.4 47.2-37.2-37.1c-1.5-1.5-4-1.5-5.5 0l-9.1 9.1c-1.5 1.5-1.5 4 0 5.5l14.9 14.9h-53c-2.2 0-3.9 1.8-3.9 3.9v12.9c0 2.2 1.8 3.9 3.9 3.9h53l-15 15c-1.5 1.5-1.5 4 0 5.5l9.1 9.1c1.5 1.5 4 1.5 5.5 0l37.1-37.1c1.7-1.6 1.7-4 0.2-5.6z" fill="#000"/>
+        </g>
+    </switch>
+</svg>

icons/skins/default/button_mark_mine_on.svg

 <?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x="-.0013123" y="-.0014381" width="93.668" height="93.679" ry="0" fill="#ea9c1f" stroke="#fff" stroke-width=".24146"/><path d="m84.054 29.467c-10.202 3.7561-17.976 6.4314-24.814 14.889-6.0921 7.5364-14.889 10.149-24.814 5.1809v27.078h-4.9628v-66.998c0-1.3716 1.1098-2.4814 2.4814-2.4814s2.4814 1.1098 2.4814 2.4814c5.5105 8.0113 15.087 9.7852 24.814 9.9257 14.889 0.21806 24.814 9.9257 24.814 9.9257zm-44.666 32.918v5.0502c5.8546 1.1971 9.9257 3.7367 9.9257 6.698 0 4.1099-7.7786 7.4443-17.37 7.4443-9.5913 0-17.37-3.3346-17.37-7.4444 0-2.9613 4.0711-5.5009 9.9257-6.698v-5.05c-9.0146 1.5607-14.889 5.9322-14.889 11.748 0 7.3038 9.1842 12.407 22.333 12.407s22.333-5.1034 22.333-12.407c0-5.8158-5.874-10.187-14.889-11.748z" fill="#af0303" stroke="#730202" stroke-linejoin="round" stroke-width="2"/></svg>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+    <switch transform="matrix(.65646 0 0 .65646 13.976 14.015)" fill="#000000">
+        <g fill="#000">
+            <path d="m96.4 47.2-37.2-37.1c-1.5-1.5-4-1.5-5.5 0l-9.1 9.1c-1.5 1.5-1.5 4 0 5.5l14.9 14.9h-53c-2.2 0-3.9 1.8-3.9 3.9v12.9c0 2.2 1.8 3.9 3.9 3.9h53l-15 15c-1.5 1.5-1.5 4 0 5.5l9.1 9.1c1.5 1.5 4 1.5 5.5 0l37.1-37.1c1.7-1.6 1.7-4 0.2-5.6z" fill="#000"/>
+        </g>
+    </switch>
+</svg>

icons/skins/default/indicator_report_off.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x="-.0013123" y="-.0014381" width="93.668" height="93.679" ry="0" fill="#9f9f9f" stroke="#fff" stroke-width=".24146"/><path d="m63.009 39.288c-4.4337 1.6324-7.8123 2.7951-10.784 6.4707-2.6476 3.2753-6.4707 4.4107-10.784 2.2516v11.768h-2.1568v-29.117c0-0.5961 0.48232-1.0784 1.0784-1.0784s1.0784 0.48232 1.0784 1.0784c2.3949 3.4817 6.5567 4.2526 10.784 4.3136 6.4707 0.09477 10.784 4.3136 10.784 4.3136zm-19.412 14.306v2.1948c2.5444 0.52025 4.3136 1.624 4.3136 2.911 0 1.7861-3.3806 3.2353-7.5489 3.2353-4.1683 0-7.5489-1.4492-7.5489-3.2353 0-1.287 1.7693-2.3907 4.3136-2.911v-2.1947c-3.9177 0.67828-6.4707 2.5781-6.4707 5.1056 0 3.1742 3.9914 5.392 9.7059 5.392 5.7145 0 9.7059-2.2179 9.7059-5.392 0-2.5275-2.5528-4.4273-6.4707-5.1056z" fill="#af0303" stroke="#730202" stroke-linejoin="round" stroke-width=".86919"/></svg>

icons/skins/default/indicator_report_on.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x="-.0013123" y="-.0014381" width="93.668" height="93.679" ry="0" fill="#ea9c1f" stroke="#fff" stroke-width=".24146"/><path d="m78.682 31.974c-8.7296 3.214-15.381 5.5032-21.232 12.74-5.2129 6.4487-12.74 8.6842-21.232 4.4332v23.169h-4.2465v-57.328c0-1.1736 0.94963-2.1232 2.1232-2.1232 1.1735 0 2.1232 0.94963 2.1232 2.1232 4.7153 6.855 12.91 8.3728 21.232 8.4931 12.74 0.18659 21.232 8.4931 21.232 8.4931zm-38.22 28.168v4.3213c5.0096 1.0243 8.4931 3.1974 8.4931 5.7314 0 3.5167-6.656 6.3699-14.863 6.3699-8.207 0-14.863-2.8532-14.863-6.3699 0-2.534 3.4834-4.707 8.4931-5.7314v-4.3211c-7.7135 1.3355-12.74 5.076-12.74 10.052 0 6.2497 7.8586 10.616 19.11 10.616s19.11-4.3668 19.11-10.616c0-4.9764-5.0262-8.7168-12.74-10.052z" fill="#af0303" stroke="#730202" stroke-linejoin="round" stroke-width="1.7113"/></svg>

icons/skins/default/indicator_walk_off.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x="-.0013123" y="-.0014381" width="93.668" height="93.679" ry="0" fill="#9e9e9e" stroke="#fff" stroke-width=".24146"/><g transform="matrix(-.1153 0 0 .1153 66.052 27.65)" fill="#5002b1" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="#1c014e" stroke-width="11.668"><path class="fil0" d="m236 19 67 91-196 140h-55c1-17 9-33 29-40 17-6 27-15 39-29l20 20c7 7 18-4 11-12l-22-21c4-6 6-12 8-19l26 26c7 7 18-4 11-12l-32-32c2-8 2-16 3-25l27 28c8 7 19-4 12-12l-39-38c0-8-1-15-1-23zm-175 265c-18 4-17 13 4 16 19 3 50 3 70 0 21-3 22-11 4-15l3-2 3-3 6-4 30-21 132-96s9-13 7-21c-1-3-4-9-8-15l-197 142-5 1-56 1c1 5 4 13 7 17zm-14-3c-62 7-36 35 53 33 126-2 81-33 70-28 14 4 21 11-11 18-47 10-119 4-137-6-16-10 27-17 25-17zm87 8c16 2 17 3 0 6-19 3-49 3-68 0-16-2-16-3-1-6 2 2 4 4 6 5l58-2z" fill="#5002b1" stroke="#1c014e" stroke-width="11.668"/></g></svg>

icons/skins/default/indicator_walk_on.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 93.665 93.676" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect x="-.0013123" y="-.0014381" width="93.668" height="93.679" ry="0" fill="#ea9c1f" stroke="#fff" stroke-width=".24146"/><g transform="matrix(-.2362 0 0 .2362 86.205 7.6013)" fill="#5002b1" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" stroke="#1c014e" stroke-width="11.668"><path class="fil0" d="m236 19 67 91-196 140h-55c1-17 9-33 29-40 17-6 27-15 39-29l20 20c7 7 18-4 11-12l-22-21c4-6 6-12 8-19l26 26c7 7 18-4 11-12l-32-32c2-8 2-16 3-25l27 28c8 7 19-4 12-12l-39-38c0-8-1-15-1-23zm-175 265c-18 4-17 13 4 16 19 3 50 3 70 0 21-3 22-11 4-15l3-2 3-3 6-4 30-21 132-96s9-13 7-21c-1-3-4-9-8-15l-197 142-5 1-56 1c1 5 4 13 7 17zm-14-3c-62 7-36 35 53 33 126-2 81-33 70-28 14 4 21 11-11 18-47 10-119 4-137-6-16-10 27-17 25-17zm87 8c16 2 17 3 0 6-19 3-49 3-68 0-16-2-16-3-1-6 2 2 4 4 6 5l58-2z" fill="#5002b1" stroke="#1c014e" stroke-width="11.668"/></g></svg>

lib/layout/board.dart

@@ -46,6 +46,42 @@ class Board {
     );
   }
 
+  static TextButton buildWalkIndicator(Data myProvider) {
+    String reportModeSuffix = myProvider.reportMode ? 'off' : 'on';
+
+    return TextButton(
+      child: Container(
+        child: Image(
+          image: AssetImage('assets/skins/' +
+              myProvider.parameterSkin +
+              '_indicator_walk_' +
+              reportModeSuffix +
+              '.png'),
+          fit: BoxFit.fill,
+        ),
+      ),
+      onPressed: () => myProvider.updateReportMode(false),
+    );
+  }
+
+  static TextButton buildReportIndicator(Data myProvider) {
+    String reportModeSuffix = myProvider.reportMode ? 'on' : 'off';
+
+    return TextButton(
+      child: Container(
+        child: Image(
+          image: AssetImage('assets/skins/' +
+              myProvider.parameterSkin +
+              '_indicator_report_' +
+              reportModeSuffix +
+              '.png'),
+          fit: BoxFit.fill,
+        ),
+      ),
+      onPressed: () => myProvider.updateReportMode(true),
+    );
+  }
+
   static TextButton buildToggleFlagModeButton(Data myProvider) {
     String reportModeSuffix = myProvider.reportMode ? 'on' : 'off';
 
@@ -76,9 +112,9 @@ class Board {
         TableRow(
           children: [
             TableCell(child: paddingBlock),
-            TableCell(child: paddingBlock),
+            TableCell(child: buildWalkIndicator(myProvider)),
             TableCell(child: buildToggleFlagModeButton(myProvider)),
-            TableCell(child: paddingBlock),
+            TableCell(child: buildReportIndicator(myProvider)),
             TableCell(child: paddingBlock),
           ],
         ),

lib/screens/home.dart

@@ -39,6 +39,10 @@ class _HomeState extends State<Home> {
     List skinImages = [
       'button_mark_mine_off',
       'button_mark_mine_on',
+      'indicator_report_on',
+      'indicator_report_off',
+      'indicator_walk_on',
+      'indicator_walk_off',
       'tile_flag_ko',
       'tile_flag_ok',
       'tile_flag',