Merge dev into main (#66)

vareversat · May 10, 2023 · 3641771 · 3641771
2 parents ef16d22 + 6f6957f
commit 3641771
Show file tree

Hide file tree

Showing 86 changed files with 3,062 additions and 2,110 deletions.
diff --git a/.github/workflows/fastlane.action.yaml b/.github/workflows/fastlane.action.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: 'Generate changelog'
         run: ./.github/scripts/generate_changelog.sh
       - name: 'Setup Ruby'
-        uses: ruby/setup-ruby@v1.146.0
+        uses: ruby/setup-ruby@v1.148.0
         with:
           ruby-version: '3.0'
           bundler-cache: true

diff --git a/.github/workflows/flutter.analyze-test.action.yaml b/.github/workflows/flutter.analyze-test.action.yaml
@@ -25,7 +25,7 @@ jobs:
         with:
           flutter-version: ${{ inputs.flutter_version }}
       - name: 'Flutter analyze'
-        run: flutter analyze
+        run: flutter analyze lib
   format:
     name: 'Format'
     runs-on: ubuntu-latest
@@ -38,6 +38,24 @@ jobs:
           flutter-version: ${{ inputs.flutter_version }}
       - name: 'Flutter format'
         run: dart format lib --set-exit-if-changed
+  code-metrics:
+    name: 'Code metrics'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout source code'
+        uses: actions/checkout@v3
+      - name: 'Setup flutter action'
+        uses: subosito/[email protected]
+        with:
+          flutter-version: ${{ inputs.flutter_version }}
+      - name: 'Get dependencies'
+        run: flutter pub get
+      - name: '[Global] Code metrics'
+        run: flutter pub run dart_code_metrics:metrics analyze --fatal-style --fatal-warnings --fatal-performance --reporter=github lib
+      - name: '[Unused files] Code metrics'
+        run: flutter pub run dart_code_metrics:metrics check-unused-files lib
+      - name: '[Unused code] Code metrics'
+        run: flutter pub run dart_code_metrics:metrics check-unused-code lib
   test:
     name: 'Test'
     runs-on: ubuntu-latest

diff --git a/.github/workflows/flutter.build.action.yaml b/.github/workflows/flutter.build.action.yaml
@@ -1,99 +1,99 @@
-name: Flutter - Build
-
-on:
-  workflow_call:
-    inputs:
-      flutter_version:
-        description: 'The Flutter used (ex: 2.5.1)'
-        required: true
-        type: string
-      android_output:
-        description: 'Android build file type output (apk or abb)'
-        required: true
-        type: string
-    secrets:
-      passphrase:
-        description: 'The passphrase to decrypt the configuration'
-        required: true
-
-
-jobs:
-  build_android:
-    name: 'Android (${{ inputs.android_output }})'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout source code'
-        uses: actions/[email protected]
-        with:
-          fetch-depth: 0
-      - name: 'Decrypt secret configuration'
-        run: ./.github/scripts/decrypt_secret.sh
-        env:
-          PASSPHRASE: ${{ secrets.passphrase }}
-      - name: 'Check secret configuration'
-        run: ./.github/scripts/check_secrets_decryption.sh
-      - name: 'Set up JAVA'
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '11.x'
-      - name: 'Setup Flutter'
-        uses: subosito/[email protected]
-        with:
-          flutter-version: ${{ inputs.flutter_version }}
-      - name: 'Build Android APK'
-        if: ${{ inputs.android_output == 'apk' }}
-        # Build APK version of the app
-        run: flutter build apk --split-per-abi
-      - name: 'Save APK'
-        if: ${{ inputs.android_output == 'apk' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'apk-build'
-          path: build/app/outputs/apk/release/app-arm64-v8a-release.apk
-      - name: 'Generate build number'
-        if: ${{ inputs.android_output == 'aab' }}
-        # Build App Bundle version of the app
-        run: |
-          BUILD_NUMBER=$(git rev-list --all --count)
-          echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
-          echo "This build is tagged as $BUILD_NUMBER on $GITHUB_REF"
-      - name: 'Build Android App Bundle'
-        if: ${{ inputs.android_output == 'aab' }}
-        run: flutter build appbundle --dart-define=FLAVOR=prod --build-number="$BUILD_NUMBER"
-        env:
-          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
-      - name: 'Save AAB'
-        if: ${{ inputs.android_output == 'aab' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'aab-build'
-          path: build/app/outputs/bundle/release/app-release.aab
-  build_ios:
-    name: 'iOS'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout source code'
-        uses: actions/checkout@v3
-      - name: 'Decrypt secret configuration'
-        run: ./.github/scripts/decrypt_secret.sh
-        env:
-          PASSPHRASE: ${{ secrets.passphrase }}
-      - name: 'Check secret configuration'
-        run: ./.github/scripts/check_secrets_decryption.sh
-      - name: '🥺'
-        run: echo 'WIP'
-  build_web:
-    name: 'WEB'
-    runs-on: ubuntu-latest
-    steps:
-      - name: 'Checkout source code'
-        uses: actions/checkout@v3
-      - name: 'Decrypt secret configuration'
-        run: ./.github/scripts/decrypt_secret.sh
-        env:
-          PASSPHRASE: ${{ secrets.passphrase }}
-      - name: 'Check secret configuration'
-        run: ./.github/scripts/check_secrets_decryption.sh
-      - name: '🥺'
+name: Flutter - Build
+
+on:
+  workflow_call:
+    inputs:
+      flutter_version:
+        description: 'The Flutter used (ex: 2.5.1)'
+        required: true
+        type: string
+      android_output:
+        description: 'Android build file type output (apk or abb)'
+        required: true
+        type: string
+    secrets:
+      passphrase:
+        description: 'The passphrase to decrypt the configuration'
+        required: true
+
+
+jobs:
+  build_android:
+    name: 'Android (${{ inputs.android_output }})'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout source code'
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+      - name: 'Decrypt secret configuration'
+        run: ./.github/scripts/decrypt_secret.sh
+        env:
+          PASSPHRASE: ${{ secrets.passphrase }}
+      - name: 'Check secret configuration'
+        run: ./.github/scripts/check_secrets_decryption.sh
+      - name: 'Set up JAVA'
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11.x'
+      - name: 'Setup Flutter'
+        uses: subosito/[email protected]
+        with:
+          flutter-version: ${{ inputs.flutter_version }}
+      - name: 'Build Android APK'
+        if: ${{ inputs.android_output == 'apk' }}
+        # Build APK version of the app
+        run: flutter build apk --split-per-abi
+      - name: 'Save APK'
+        if: ${{ inputs.android_output == 'apk' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: 'apk-build'
+          path: build/app/outputs/apk/release/app-arm64-v8a-release.apk
+      - name: 'Generate build number'
+        if: ${{ inputs.android_output == 'aab' }}
+        # Build App Bundle version of the app
+        run: |
+          BUILD_NUMBER=$(git rev-list --all --count)
+          echo "BUILD_NUMBER=$BUILD_NUMBER" >> $GITHUB_ENV
+          echo "This build is tagged as $BUILD_NUMBER on $GITHUB_REF"
+      - name: 'Build Android App Bundle'
+        if: ${{ inputs.android_output == 'aab' }}
+        run: flutter build appbundle --build-number="$BUILD_NUMBER"
+        env:
+          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
+      - name: 'Save AAB'
+        if: ${{ inputs.android_output == 'aab' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: 'aab-build'
+          path: build/app/outputs/bundle/release/app-release.aab
+  build_ios:
+    name: 'iOS'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout source code'
+        uses: actions/checkout@v3
+      - name: 'Decrypt secret configuration'
+        run: ./.github/scripts/decrypt_secret.sh
+        env:
+          PASSPHRASE: ${{ secrets.passphrase }}
+      - name: 'Check secret configuration'
+        run: ./.github/scripts/check_secrets_decryption.sh
+      - name: '🥺'
+        run: echo 'WIP'
+  build_web:
+    name: 'WEB'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout source code'
+        uses: actions/checkout@v3
+      - name: 'Decrypt secret configuration'
+        run: ./.github/scripts/decrypt_secret.sh
+        env:
+          PASSPHRASE: ${{ secrets.passphrase }}
+      - name: 'Check secret configuration'
+        run: ./.github/scripts/check_secrets_decryption.sh
+      - name: '🥺'
         run: echo 'WIP'
diff --git a/CHANGELOG_en.md b/CHANGELOG_en.md
@@ -1,3 +1,20 @@
+# **v1.6.1** :
+
+- *Fix*:
+  - The SnackBar warning of activation of notifications on slots is now correctly in place
+- *Interface*:
+  - Adding a padding to display the last item in the closures list
+  - Only one ad is now displayed
+***
+# **v1.6.0** :
+
+- *Features*:
+  - It is now possible to add two favorite slots to be notified only of impacting events
+- *Interface*:
+  - Revised list of closures to make it easier to read.
+  - Highlighting impacting events with an orange border.
+  - Adding a message if notifications are disabled
+***
 # **v1.4.0** :
 
 - *Features*:

diff --git a/CHANGELOG_es.md b/CHANGELOG_es.md
@@ -1,3 +1,20 @@
+# **v1.6.1** :
+
+- *Fix*:
+  - El snackbar de advertencia de la activación de las notificaciones en las ranuras está ahora correctamente en su lugar
+- *Interfaz*:
+  - Añadir un relleno para mostrar el último elemento de la lista de cierres
+  - Ahora solo se muestra un anuncio
+***
+# **v1.6.0** :
+
+- *Funcionalidades*:
+  - Ahora es posible añadir dos franjas horarias favoritas para ser notificado solo de los eventos impactantes
+- *Interfaz*:
+  - Reordenar la lista de cierres para que sea más fácil de leer.
+  - Resalta eventos impactantes con un borde naranja.
+  - Añadido un mensaje si las notificaciones están desactivadas
+***
 # **v1.4.0** :
 
 - *Características*:

diff --git a/CHANGELOG_fr.md b/CHANGELOG_fr.md
@@ -1,3 +1,20 @@
+# **v1.6.1** :
+
+- *Fix*:
+  - La SnackBar d'avertissement de l'activation des notifications sur les créneaux est maintenant correctement en place
+- *Interface*:
+  - Ajout d'un padding pour afficher le dernier élément de la liste des fermetures
+  - Seulement une seule publicité est maintenant affichée
+***
+# **v1.6.0** :
+
+- *Fonctionnalités*:
+  - Il est maintenant possible d'ajouter deux créneaux favoris pour n'être averti que des évènements impactant
+- *Interface*:
+  - Remaniement de la liste des fermetures afin de la rendre plus facile à lire.
+  - Mise en valeur d'événements impactants grâce à une bordure orange.
+  - Ajout d'un message si les notifications sont désactivées
+***
 # **v1.4.0** :
 
 - *Fonctionnalités*:

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -3,7 +3,34 @@ include: package:flutter_lints/flutter.yaml
 linter:
   rules:
     prefer_single_quotes: true
-    use_build_context_synchronously: false
 
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+analyzer:
+  plugins:
+    - dart_code_metrics
+
+dart_code_metrics:
+  metrics:
+    cyclomatic-complexity: 20
+    number-of-parameters: 5
+    maximum-nesting-level: 5
+  metrics-exclude:
+    - test/**
+  rules:
+    - avoid-dynamic
+    - avoid-passing-async-when-sync-expected
+    - avoid-redundant-async
+    - avoid-unnecessary-type-assertions
+    - avoid-unnecessary-type-casts
+    - avoid-unrelated-type-assertions
+    - avoid-nested-conditional-expressions:
+        acceptable-level: 2
+    - newline-before-return
+    - no-boolean-literal-compare
+    - no-empty-block
+    - prefer-trailing-comma
+    - prefer-conditional-expressions:
+        ignore-nested: true
+    - no-equal-then-else
+    - prefer-moving-to-variable:
+        allowed-duplicated-chains: 3
+    - prefer-match-file-name
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
 
     <queries>

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.8.20'
+    ext.kotlin_version = '1.8.21'
     repositories {
         google()
         mavenCentral()

diff --git a/lib/app_theme.dart b/lib/app_theme.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
-class AppThemes {
+class AppTheme {
   static final lightTheme = ThemeData.light(
     useMaterial3: true,
   ).copyWith(