Fix and unify namings & fix Makefiles

Makefile

@@ -9,7 +9,7 @@ help:
 	@echo "  or something else"
 	@echo "   with this script"
 
--include makefiles/*.mk
+-include automation/makefile/*.mk
 
 version:
 	@flutter --version

makefiles/format.mk → automation/makefile/format.mk

@@ -10,7 +10,7 @@ prepare: pub-get gen-build-delete icon splash
 
 icon: pub-get
 	@echo "* Generating app icons *"
-	@flutter pub run flutter_launcher_icons:main -f flutter_icons.yaml
+	@flutter pub run flutter_launcher_icons:main -f flutter_launcher_icons.yaml
 
 google-localizations:
 	@echo "* Getting dependencies for google localizer *"

makefiles/generator.mk → automation/makefile/generator.mk

@@ -2,11 +2,11 @@
 
 gen-build: pub-get
 	@echo "* Running build runner *"
-	@time timeout 300 flutter pub run build_runner build
+	@time flutter pub run build_runner build
 
 gen-build-delete: pub-get
 	@echo "* Running build runner with deletion of conflicting outputs *"
-	@time timeout 300 flutter pub run build_runner build --delete-conflicting-outputs
+	@time flutter pub run build_runner build --delete-conflicting-outputs
 
 gen-clean:
 	@echo "* Cleaning build runner *"

makefiles/platform.mk → automation/makefile/platform.mk

@@ -1,10 +1,10 @@
 ifeq ($(OS),Windows_NT)
-	include makefiles/platform/win.mk
+	include automation/makefile/platform/win.mk
 else
     _detected_OS := $(shell uname -s)
     ifeq ($(_detected_OS),Linux)
-		include makefiles/platform/nix.mk
+		include automation/makefile/platform/nix.mk
     else ifeq ($(_detected_OS),Darwin)
-		include makefiles/platform/mac.mk
+		include automation/makefile/platform/mac.mk
     endif
 endif

makefiles/platform/mac.mk → automation/makefile/platform/mac.mk

@@ -15,7 +15,7 @@ simulator:
 
 ios-deep-clean:
 	@echo "* Performing a deep clean for iOS *"
-	@grind clean-project
+	@grind clean-ios
 	@make pub-get
 	@make install-pods
 

makefiles/pub.mk → automation/makefile/pub.mk

@@ -8,16 +8,16 @@ clean:
 
 pub-get:
 	@echo "* Getting latest dependencies *"
-	@timeout 60 flutter pub get
+	@flutter pub get
 
 pub-upgrade:
 	@echo "* Upgrading dependencies *"
-	@timeout 60 flutter pub upgrade
+	@flutter pub upgrade
 
 pub-upgrade-major:
 	@echo "* Upgrading dependencies --major-versions *"
-	@timeout 60 flutter pub upgrade --major-versions
+	@flutter pub upgrade --major-versions
 
 pub-outdated: pub-upgrade
 	@echo "* Checking for outdated dependencies *"
-	@timeout 120 flutter pub outdated
+	@flutter pub outdated

makefiles/test.mk → automation/makefile/test.mk

@@ -2,7 +2,7 @@
 
 # Run tests
 test:
-	@time timeout 300 flutter test --concurrency=6 --dart-define=environment=testing --coverage test/
+	@time flutter test --concurrency=6 --dart-define=environment=testing --coverage test/
 
 # Run tests and generate coverage report
 coverage: test
@@ -53,9 +53,9 @@ test-docker:
 				&& apk update && apk --no-cache add lcov \
 				&& export PUB_CACHE="/var/tmp/.pub_cache" \
 				&& flutter config --no-analytics --no-color \
-				&& time timeout 60 flutter pub get --suppress-analytics --verbose >> /app/build/.docker.txt 2>&1 \
-				&& time timeout 300 flutter pub run build_runner build --delete-conflicting-outputs --release --verbose >> /app/build/.docker.txt 2>&1 \
-				&& time timeout 300 flutter test --concurrency=6 --dart-define=environment=testing --coverage test/ >> /app/build/.docker.txt 2>&1 \
+				&& time flutter pub get --suppress-analytics --verbose >> /app/build/.docker.txt 2>&1 \
+				&& time flutter pub run build_runner build --delete-conflicting-outputs --release --verbose >> /app/build/.docker.txt 2>&1 \
+				&& time flutter test --concurrency=6 --dart-define=environment=testing --coverage test/ >> /app/build/.docker.txt 2>&1 \
 				&& lcov --summary coverage/lcov.info \
 				&& genhtml -o coverage coverage/lcov.info \
 				&& date >> /app/build/.docker.txt 2>&1 \

build.yaml

@@ -2,7 +2,7 @@ targets:
   $default:
     sources:
       - $package$
-      - assets/**
+      - asset/**
       - lib/**
       - test/**
       - pubspec.yaml

flutter_icons.yaml → flutter_launcher_icons.yaml

@@ -1,5 +1,5 @@
 flutter_icons:
   android: "launcher_icon"
   ios: true
-  image_path: "assets/icon/icon.png"
+  image_path: "asset/icon/icon.png"
   remove_alpha_ios: true

flutter_native_splash.yaml

@@ -12,21 +12,21 @@ flutter_native_splash:
   # splash screen to a png image.  This is useful for gradients. The image will be stretch to the
   # size of the app. Only one parameter can be used, color and background_image cannot both be set.
   color: "#623B99"
-  #background_image: "assets/background.png"
+  #background_image: "asset/background.png"
 
   # Optional parameters are listed below.  To enable a parameter, uncomment the line by removing
   # the leading # character.
 
   # The image parameter allows you to specify an image used in the splash screen.  It must be a
   # png file and should be sized for 4x pixel density.
-  #image: assets/splash.png
+  #image: asset/splash.png
 
   # This property allows you to specify an image used as branding in the splash screen. It must be
   # a png file. Currently, it is only supported for Android and iOS.
-  #branding: assets/dart.png
+  #branding: asset/dart.png
 
   # Specify your branding image for dark mode.
-  #branding_dark: assets/dart_dark.png
+  #branding_dark: asset/dart_dark.png
 
   # To position the branding image at the bottom of the screen you can use bottom, bottomRight,
   # and bottomLeft. The default values is bottom if not specified or specified something else.
@@ -41,8 +41,8 @@ flutter_native_splash:
   # background_image_dark must be specified.  color_dark and background_image_dark cannot both be
   # set.
   #color_dark: "#042a49"
-  #background_image_dark: "assets/dark-background.png"
-  #image_dark: assets/splash-invert.png
+  #background_image_dark: "asset/dark-background.png"
+  #image_dark: asset/splash-invert.png
 
   # The android, ios and web parameters can be used to disable generating a splash screen on a given
   # platform.

pubspec.yaml

@@ -93,10 +93,10 @@ dev_dependencies:
   #build_test: ^2.1.5
 
 flutter_gen:
-  output: lib/src/core/resources
+  output: lib/src/core/resource
 
 flutter:
   uses-material-design: true
   generate: true
   assets:
-    - assets/images/
+    - asset/image/