Upgrade flutter framework and dependencies, update/clean code, improve layout

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

+Upgrade flutter framework and dependencies, update/clean code, improve layout

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

+Mise à jour du framework Flutter et de ses dépendances, améliorations de code et d'affichage

icons/build_application_icons.sh

@@ -9,8 +9,20 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 BASE_DIR="$(dirname "${CURRENT_DIR}")"
 
 SOURCE="${CURRENT_DIR}/icon.svg"
+SOURCE_FASTLANE="${CURRENT_DIR}/featureGraphic.svg"
+
 OPTIPNG_OPTIONS="-preserve -quiet -o7"
 
+if [ ! -f "${SOURCE}" ]; then
+  echo "Missing file: ${SOURCE}"
+  exit 1
+fi
+
+if [ ! -f "${SOURCE_FASTLANE}" ]; then
+  echo "Missing file: ${SOURCE_FASTLANE}"
+  exit 1
+fi
+
 # optimize svg
 cp ${SOURCE} ${SOURCE}.tmp
 scour \
@@ -19,6 +31,7 @@ scour \
     --enable-viewboxing \
     --enable-comment-stripping \
     --nindent=4 \
+    --quiet \
     -i ${SOURCE}.tmp \
     -o ${SOURCE}
 rm ${SOURCE}.tmp
@@ -28,6 +41,8 @@ function build_icon() {
   ICON_SIZE="$1"
   TARGET="$2"
 
+  echo "Building ${TARGET}"
+
   TARGET_PNG="${TARGET}.png"
 
   inkscape \
@@ -39,6 +54,36 @@ function build_icon() {
   optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
 }
 
+# build fastlane image
+function build_fastlane_image() {
+  WIDTH="$1"
+  HEIGHT="$2"
+  TARGET="$3"
+
+  echo "Building ${TARGET}"
+
+  cp ${SOURCE_FASTLANE} ${SOURCE_FASTLANE}.tmp
+  scour \
+      --remove-descriptive-elements \
+      --enable-id-stripping \
+      --enable-viewboxing \
+      --enable-comment-stripping \
+      --nindent=4 \
+      --quiet \
+      -i ${SOURCE_FASTLANE}.tmp \
+      -o ${SOURCE_FASTLANE}
+  rm ${SOURCE_FASTLANE}.tmp
+
+  TARGET_PNG="${TARGET}.png"
+
+  inkscape \
+      --export-width=${WIDTH} \
+      --export-height=${HEIGHT} \
+      --export-filename=${TARGET_PNG} \
+      ${SOURCE_FASTLANE}
+
+  optipng ${OPTIPNG_OPTIONS} ${TARGET_PNG}
+}
 
 build_icon  72 ${BASE_DIR}/android/app/src/main/res/mipmap-hdpi/ic_launcher
 build_icon  48 ${BASE_DIR}/android/app/src/main/res/mipmap-mdpi/ic_launcher
@@ -46,3 +91,5 @@ build_icon  96 ${BASE_DIR}/android/app/src/main/res/mipmap-xhdpi/ic_launcher
 build_icon 144 ${BASE_DIR}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher
 build_icon 192 ${BASE_DIR}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher
 build_icon 512 ${BASE_DIR}/fastlane/metadata/android/en-US/images/icon
+
+build_fastlane_image 1024 500 ${BASE_DIR}/fastlane/metadata/android/en-US/images/featureGraphic

icons/build_game_icons.sh

@@ -7,8 +7,55 @@ command -v optipng >/dev/null 2>&1 || { echo >&2 "I require optipng but it's not
 
 CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 BASE_DIR="$(dirname "${CURRENT_DIR}")"
+ASSETS_DIR="${BASE_DIR}/assets"
 
 OPTIPNG_OPTIONS="-preserve -quiet -o7"
+ICON_SIZE=192
+
+#######################################################
+
+# Game images
+AVAILABLE_GAME_IMAGES="
+  button_back
+  button_start
+  game_fail
+  game_win
+"
+
+# Settings images
+AVAILABLES_GAME_SETTINGS="
+  level:easy,medium,hard,nightmare
+  size:10x10,15x15,20x20
+"
+
+# Skins
+AVAILABLE_SKINS="
+  default
+"
+
+# Images per skin
+SKIN_IMAGES="
+  empty
+  tile_0
+  tile_1
+  tile_2
+  tile_3
+  tile_4
+  tile_5
+  tile_6
+  tile_7
+  tile_8
+  tile_flag_ko
+  tile_flag_ok
+  tile_flag
+  tile_mine_not_found
+  tile_mine
+  tile_unknown
+  button_mark_mine_on
+  button_mark_mine_off
+"
+
+#######################################################
 
 # optimize svg
 function optimize_svg() {
@@ -21,6 +68,7 @@ function optimize_svg() {
       --enable-viewboxing \
       --enable-comment-stripping \
       --nindent=4 \
+      --quiet \
       -i ${SOURCE}.tmp \
       -o ${SOURCE}
   rm ${SOURCE}.tmp
@@ -28,10 +76,16 @@ function optimize_svg() {
 
 # build icons
 function build_icon() {
-  ICON_SIZE=192
   SOURCE="$1"
   TARGET="$2"
 
+  echo "Building ${TARGET}"
+
+  if [ ! -f "${SOURCE}" ]; then
+    echo "Missing file: ${SOURCE}"
+    exit 1
+  fi
+
   optimize_svg "${SOURCE}"
 
   inkscape \
@@ -43,46 +97,56 @@ function build_icon() {
   optipng ${OPTIPNG_OPTIONS} ${TARGET}
 }
 
-function build_icons_for_skin() {
-  SKIN_CODE="$1"
-
-  build_icon_for_skin ${SKIN_CODE} button_mark_mine_on
-  build_icon_for_skin ${SKIN_CODE} button_mark_mine_off
-
-  build_icon_for_skin ${SKIN_CODE} tile_mine
-  build_icon_for_skin ${SKIN_CODE} tile_mine_not_found
+function build_settings_icons() {
+  INPUT_STRING="$1"
 
-  build_icon_for_skin ${SKIN_CODE} tile_flag
-  build_icon_for_skin ${SKIN_CODE} tile_flag_ok
-  build_icon_for_skin ${SKIN_CODE} tile_flag_ko
+  SETTING_NAME="$(echo "${INPUT_STRING}" | cut -d":" -f1)"
+  SETTING_VALUES="$(echo "${INPUT_STRING}" | cut -d":" -f2 | tr "," " ")"
 
-  build_icon_for_skin ${SKIN_CODE} tile_unknown
-  for VALUE in {0..8};
+  for SETTING_VALUE in ${SETTING_VALUES}
   do
-    build_icon_for_skin ${SKIN_CODE} tile_${VALUE}
+    SETTING_CODE="${SETTING_NAME}_${SETTING_VALUE}"
+    build_icon ${CURRENT_DIR}/${SETTING_CODE}.svg ${ASSETS_DIR}/icons/${SETTING_CODE}.png
   done
 }
 
 function build_icon_for_skin() {
   SKIN_CODE="$1"
-  IMAGE_CODE="$2"
 
-  build_icon ${CURRENT_DIR}/skins/${SKIN_CODE}/${IMAGE_CODE}.svg ${BASE_DIR}/assets/skins/${SKIN_CODE}_${IMAGE_CODE}.png
+  # skin main image
+  build_icon ${CURRENT_DIR}/skin_${SKIN_CODE}.svg ${ASSETS_DIR}/icons/skin_${SKIN_CODE}.png
+
+  # skin images
+  for SKIN_IMAGE in ${SKIN_IMAGES}
+  do
+    build_icon ${CURRENT_DIR}/skins/${SKIN_CODE}/${SKIN_IMAGE}.svg ${ASSETS_DIR}/skins/${SKIN_CODE}_${SKIN_IMAGE}.png
+  done
 }
 
-# Game icons
-build_icon ${CURRENT_DIR}/button_back.svg ${BASE_DIR}/assets/icons/button_back.png
-build_icon ${CURRENT_DIR}/button_start.svg ${BASE_DIR}/assets/icons/button_start.png
-build_icon ${CURRENT_DIR}/difficulty_easy.svg ${BASE_DIR}/assets/icons/difficulty_easy.png
-build_icon ${CURRENT_DIR}/difficulty_medium.svg ${BASE_DIR}/assets/icons/difficulty_medium.png
-build_icon ${CURRENT_DIR}/difficulty_hard.svg ${BASE_DIR}/assets/icons/difficulty_hard.png
-build_icon ${CURRENT_DIR}/difficulty_nightmare.svg ${BASE_DIR}/assets/icons/difficulty_nightmare.png
-build_icon ${CURRENT_DIR}/game_fail.svg ${BASE_DIR}/assets/icons/game_fail.png
-build_icon ${CURRENT_DIR}/game_win.svg ${BASE_DIR}/assets/icons/game_win.png
-build_icon ${CURRENT_DIR}/size_10x10.svg ${BASE_DIR}/assets/icons/size_10x10.png
-build_icon ${CURRENT_DIR}/size_15x15.svg ${BASE_DIR}/assets/icons/size_15x15.png
-build_icon ${CURRENT_DIR}/size_20x20.svg ${BASE_DIR}/assets/icons/size_20x20.png
-build_icon ${CURRENT_DIR}/skins/empty.svg ${BASE_DIR}/assets/skins/empty.png
+#######################################################
 
-# Skins
-build_icons_for_skin "default"
+# Create output folders
+mkdir -p ${ASSETS_DIR}/icons
+mkdir -p ${ASSETS_DIR}/skins
+
+# Delete existing generated images
+find ${ASSETS_DIR}/icons -type f -name "*.png" -delete
+find ${ASSETS_DIR}/skins -type f -name "*.png" -delete
+
+# build game images
+for GAME_IMAGE in ${AVAILABLE_GAME_IMAGES}
+do
+  build_icon ${CURRENT_DIR}/${GAME_IMAGE}.svg ${ASSETS_DIR}/icons/${GAME_IMAGE}.png
+done
+
+# build settings images
+for GAME_SETTING in ${AVAILABLES_GAME_SETTINGS}
+do
+  build_settings_icons "${GAME_SETTING}"
+done
+
+# build skins images
+for SKIN in ${AVAILABLE_SKINS}
+do
+  build_icon_for_skin "${SKIN}"
+done

icons/featureGraphic.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 100 100" version="1.1" viewBox="0 0 1024 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><rect width="1024" height="500" rx="0" ry="0" fill="#977cff"/></svg>