diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 88ba52e..f7dd3d1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -22,7 +22,7 @@ Describe how you expected the application to work.
 
 ## Actual Behavior
 <!--
-Describe how the API really works
+Describe how the application really works
 You can provide a screenshot to help us
 BEWARE: HIDE ANY SENSITIVE DATA FROM YOUR SCREENSHOT
 THIS APPLICATION CAN SEND SENSITIVE DATA AND THIS ISSUE IS PUBLIC
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..7f23a23
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore(deps)"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore(deps)"
diff --git a/.github/workflows/00-main.yml b/.github/workflows/00-main.yml
new file mode 100644
index 0000000..1c6bd01
--- /dev/null
+++ b/.github/workflows/00-main.yml
@@ -0,0 +1,124 @@
+name: main-workflow
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}
+
+jobs:
+  test:
+    uses: ./.github/workflows/01-analyze-test.yml
+
+  parse-screenshot:
+    uses: ./.github/workflows/01-parse-screenshot.yml
+    with:
+      # Set to empty string to always take screenshots
+      screenshot-text: "SCREENSHOT"
+
+  conventional-release:
+    needs:
+      - test
+    uses: ./.github/workflows/02-conventional-release.yml
+    secrets: inherit
+
+  build-android:
+    # set if false to disable android branch of build
+    if: ${{ needs.conventional-release.outputs.new_release_published == 'true' }}
+    needs:
+    - parse-screenshot
+    - conventional-release
+    uses: ./.github/workflows/03-build-android.yml
+    with:
+      screenshot: ${{ needs.parse-screenshot.outputs.contains_screenshot }}
+      apk: "true"
+    secrets: inherit
+
+  build-ios:
+    # set if false to disable iOS branch of build
+    if: ${{ needs.conventional-release.outputs.new_release_published == 'true' }}
+    needs:
+      - parse-screenshot
+      - conventional-release
+    uses: ./.github/workflows/03-build-ios.yml
+    with:
+      screenshot: ${{ needs.parse-screenshot.outputs.contains_screenshot }}
+      ipa: "true"
+    secrets: inherit
+
+  integration-screenshot-android:
+    if: ${{ needs.parse-screenshot.outputs.contains_screenshot == 'true' }}
+    needs:
+      - parse-screenshot
+      - build-android
+    uses: ./.github/workflows/10-take-screenshot-android.yml
+    with:
+      api_level: 34
+      model: "['pixel_6']"
+
+  integration-screenshot-ios:
+    if: ${{ needs.parse-screenshot.outputs.contains_screenshot == 'true' }}
+    needs:
+      - parse-screenshot
+      - build-ios
+    uses: ./.github/workflows/10-take-screenshot-ios.yml
+    with:
+      model: "['iPhone 16 Pro Max', 'iPad Pro 13-inch (M4)']"
+
+  integration-screenshot-commit-android:
+    needs:
+      - integration-screenshot-android
+    uses: ./.github/workflows/11-commit-screenshot-android.yml
+    with:
+      locale: "['fr-FR']"
+    secrets: inherit
+
+  integration-screenshot-commit-ios:
+    needs:
+      - integration-screenshot-ios
+    uses: ./.github/workflows/11-commit-screenshot-ios.yml
+    with:
+      locale: "['fr-FR']"
+    secrets: inherit
+
+  upload-android:
+    if: ${{ needs.parse-screenshot.outputs.contains_screenshot == 'false' }}
+    needs:
+      - build-android
+      - conventional-release
+    uses: ./.github/workflows/04-upload-android.yml
+    with:
+      new_release: ${{ needs.conventional-release.outputs.new_release }}
+      new_release_notes: ${{ needs.conventional-release.outputs.new_release_notes }}
+    secrets: inherit
+
+  upload-ios:
+    if: ${{ needs.parse-screenshot.outputs.contains_screenshot == 'false' }}
+    needs:
+      - parse-screenshot
+      - build-ios
+      - conventional-release
+    uses: ./.github/workflows/04-upload-ios.yml
+    with:
+      new_release: ${{ needs.conventional-release.outputs.new_release }}
+      new_release_notes: ${{ needs.conventional-release.outputs.new_release_notes }}
+    secrets: inherit
+
+  upload-android-with-screenshots:
+    needs:
+    - integration-screenshot-commit-android
+    uses: ./.github/workflows/04-upload-android.yml
+    with:
+      new_release: ${{ needs.conventional-release.outputs.new_release }}
+      new_release_notes: ${{ needs.conventional-release.outputs.new_release_notes }}
+    secrets: inherit
+
+  upload-ios-with-screenshots:
+    needs:
+      - integration-screenshot-commit-ios
+    uses: ./.github/workflows/04-upload-ios.yml
+    with:
+      new_release: ${{ needs.conventional-release.outputs.new_release }}
+      new_release_notes: ${{ needs.conventional-release.outputs.new_release_notes }}
+    secrets: inherit
diff --git a/.github/workflows/01-analyze-test.yml b/.github/workflows/01-analyze-test.yml
new file mode 100644
index 0000000..298f98f
--- /dev/null
+++ b/.github/workflows/01-analyze-test.yml
@@ -0,0 +1,21 @@
+name: test-analyze
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+      - run: flutter pub get
+      - run: flutter analyze --no-pub #--no-fatal-infos
+      - run: flutter test
diff --git a/.github/workflows/01-parse-screenshot.yml b/.github/workflows/01-parse-screenshot.yml
new file mode 100644
index 0000000..51efdbf
--- /dev/null
+++ b/.github/workflows/01-parse-screenshot.yml
@@ -0,0 +1,39 @@
+name: parse-screenshot
+
+on:
+  workflow_call:
+    inputs:
+      screenshot-text:
+        description: 'Text to search for in commit message'
+        required: true
+        type: string
+    outputs:
+      contains_screenshot:
+        description: 'If commit message contains screenshot keyword'
+        value: ${{ jobs.check_commit_message.outputs.contains_screenshot }}
+
+jobs:
+  check_commit_message:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Check Commit Message for '${{ inputs.screenshot-text }}'
+        id: check_commit
+        run: |
+          COMMIT_MESSAGE=$(git log --format=%B -n 1 ${{ github.sha }})
+          if [[ $COMMIT_MESSAGE == *"${{ inputs.screenshot-text }}"* ]]; then
+            echo "Contains Screenshot: true"
+            echo "contains_screenshot=true" >> $GITHUB_OUTPUT
+          else
+            echo "Contains Screenshot: false"
+            echo "contains_screenshot=false" >> $GITHUB_OUTPUT
+          fi
+        shell: bash
+
+    outputs:
+      contains_screenshot: ${{ steps.check_commit.outputs.contains_screenshot }}
diff --git a/.github/workflows/02-conventional-release.yml b/.github/workflows/02-conventional-release.yml
new file mode 100644
index 0000000..72d33b4
--- /dev/null
+++ b/.github/workflows/02-conventional-release.yml
@@ -0,0 +1,41 @@
+name: conventional-release
+on:
+  workflow_call:
+    secrets:
+      GH_TOKEN:
+        required: true
+
+    outputs:
+      new_release_published:
+        description: 'If a new release was published'
+        value: ${{ jobs.conventional-release.outputs.new_release_published }}
+      new_release_version:
+        description: 'The new release version'
+        value: ${{ jobs.conventional-release.outputs.new_release_version }}
+      new_release_notes:
+        description: 'The release notes for the new release'
+        value: ${{ jobs.conventional-release.outputs.new_release_notes }}
+
+jobs:
+  conventional-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          token: ${{ secrets.GH_TOKEN }}
+          fetch-tags: true
+
+      - name: Semantic Release
+        uses: codfish/semantic-release-action@v5
+        id: semantic
+        with:
+          additional-packages: |
+            ['@semantic-release/changelog', '@semantic-release/exec', '@semantic-release/git']
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+
+    outputs:
+      new_release_published: ${{ steps.semantic.outputs.new_release_published }}
+      new_release_version: ${{ steps.semantic.outputs.new_release_version }}
+      new_release_notes: ${{ steps.semantic.outputs.new_release_notes }}
diff --git a/.github/workflows/03-build-android.yml b/.github/workflows/03-build-android.yml
new file mode 100644
index 0000000..42fdbd7
--- /dev/null
+++ b/.github/workflows/03-build-android.yml
@@ -0,0 +1,98 @@
+name: build-android
+on:
+  workflow_call:
+    inputs:
+      screenshot:
+        type: string
+        required: true
+      apk:
+        description: 'Run APK build'
+        type: string
+        required: true
+  workflow_dispatch:
+    inputs:
+      screenshot:
+        description: 'Run screenshot build'
+        type: choice
+        options:  ['true', 'false']
+        required: true
+      apk:
+        description: 'Run APK build'
+        type: choice
+        options:  ['true', 'false']
+        required: true
+
+jobs:
+  build-android:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: android
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Configure Keystore
+        run: |
+          echo "$PLAY_STORE_UPLOAD_KEY" | base64 --decode > app/upload-keystore.jks
+          echo "storeFile=upload-keystore.jks" >> key.properties
+          echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> key.properties
+          echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> key.properties
+          echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> key.properties
+        env:
+          PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
+          KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
+
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Setup Fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+          working-directory: android
+
+      - run: bundle install
+
+      - run: bundle exec fastlane versioning
+        env:
+          PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
+
+      - name: Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+      - run: flutter build apk --debug --target=integration_test/screenshot_test.dart
+        if: ${{ inputs.screenshot == 'true' }}
+
+      - name: Archive integration test apk
+        if: ${{ inputs.screenshot == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: app-debug.apk
+          path: build/app/outputs/flutter-apk/app-debug.apk
+          if-no-files-found: error
+          retention-days: 3
+
+      # Build android Release
+
+      - run: flutter build appbundle --build-number ${{ env.ANDROID_VERSION_CODE }} --build-name ${{ env.ANDROID_VERSION_NAME }} --target lib/main.dart
+        if: ${{ inputs.apk == 'true' }}
+
+      - name: Archive appbundle
+        if: ${{ inputs.apk == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: app-release.aab
+          path: build/app/outputs/bundle/release/app-release.aab
+          if-no-files-found: error
+          retention-days: 3
\ No newline at end of file
diff --git a/.github/workflows/03-build-ios.yml b/.github/workflows/03-build-ios.yml
new file mode 100644
index 0000000..0b9e7e3
--- /dev/null
+++ b/.github/workflows/03-build-ios.yml
@@ -0,0 +1,87 @@
+name: build-ios
+on:
+  workflow_call:
+    inputs:
+      screenshot:
+        type: string
+        required: true
+      ipa:
+        description: 'Run IPA build'
+        type: string
+        required: true
+  workflow_dispatch:
+    inputs:
+      screenshot:
+        description: 'Run screenshot build'
+        type: choice
+        options:  ['true', 'false']
+        required: true
+      ipa:
+        description: 'Run IPA build'
+        type: choice
+        options:  ['true', 'false']
+        required: true
+
+
+jobs:
+  build-ios:
+    runs-on: macos-latest
+    timeout-minutes: 20
+    defaults:
+      run:
+        working-directory: ios
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - run: 'echo "$API_KEY" > AuthKey.p8'
+        shell: bash
+        env:
+          API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
+
+      - run: bundle install
+
+      - run: bundle exec fastlane versioning
+        env:
+          FLUT_APP_IOS_ISSUER_ID: ${{ vars.FLUT_APP_IOS_ISSUER_ID }}
+          FLUT_APP_IOS_KEY_ID: ${{ vars.FLUT_APP_IOS_KEY_ID }}
+
+      - name: Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+      - run: flutter build ios --simulator --target=integration_test/screenshot_test.dart
+        if: ${{ inputs.screenshot == 'true' }}
+
+      - name: Archive integration ipa
+        if: ${{ inputs.screenshot == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: app-simulator-build
+          path: build/ios/iphonesimulator/Runner.app
+          if-no-files-found: error
+          retention-days: 3
+
+      # Build ios Release
+      - run: flutter build ios --release --config-only --no-codesign --target=lib/main.dart
+        if: ${{ inputs.ipa == 'true' }}
+
+      - run: bundle exec fastlane build
+        if: ${{ inputs.ipa == 'true' }}
+        env:
+          MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.FLUT_IOS_CERTIFICATES_GH_TOKEN }}
+          MATCH_PASSWORD: ${{ secrets.FLUT_IOS_CERTIFICATES_PASSPHRASE }}
+          FLUT_APP_IOS_ISSUER_ID: ${{ vars.FLUT_APP_IOS_ISSUER_ID }}
+          FLUT_APP_IOS_KEY_ID: ${{ vars.FLUT_APP_IOS_KEY_ID }}
+
+      - name: Archive ipa
+        if: ${{ inputs.ipa == 'true' }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: Runner.ipa
+          path: ios/Runner.ipa
+          if-no-files-found: error
+          retention-days: 3
\ No newline at end of file
diff --git a/.github/workflows/04-upload-android.yml b/.github/workflows/04-upload-android.yml
new file mode 100644
index 0000000..f1491ad
--- /dev/null
+++ b/.github/workflows/04-upload-android.yml
@@ -0,0 +1,49 @@
+name: upload-release-android
+on:
+  workflow_call:
+    inputs:
+      new_release:
+        required: true
+        type: string
+        description: "The new release version number"
+      new_release_notes:
+        required: true
+        type: string
+        description: "The release notes for the new release"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    defaults:
+      run:
+        working-directory: android
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Download app
+        uses: actions/download-artifact@v8
+        with:
+          name: app-release.aab
+          path: build/app/outputs/bundle/release/
+
+      # Setup Ruby, Bundler, and Gemfile dependencies
+      - name: Setup Fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: true
+          working-directory: android
+      - run: bundle install
+
+      - run: bundle exec fastlane versioning
+        env:
+          PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
+
+      - run: echo "${{ inputs.new_release_notes }}" > ./fastlane/metadata/android/fr-FR/changelogs/${{ env.ANDROID_VERSION_CODE }}.txt
+
+      - run: bundle exec fastlane internal
+        env:
+          PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
diff --git a/.github/workflows/04-upload-ios.yml b/.github/workflows/04-upload-ios.yml
new file mode 100644
index 0000000..6ac9bc7
--- /dev/null
+++ b/.github/workflows/04-upload-ios.yml
@@ -0,0 +1,47 @@
+name: upload-release-ios
+on:
+  workflow_call:
+    inputs:
+      new_release:
+        required: true
+        type: string
+        description: "The new release version number"
+      new_release_notes:
+        required: true
+        type: string
+        description: "The release notes for the new release"
+
+jobs:
+  build:
+    runs-on: macos-latest
+    timeout-minutes: 10
+    defaults:
+      run:
+        working-directory: ios
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Download app
+        uses: actions/download-artifact@v8
+        with:
+          name: Runner.ipa
+          path: ios/
+
+      - run: 'echo "$API_KEY" > AuthKey.p8'
+        shell: bash
+        env:
+          API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
+
+      - run: bundle install
+
+      - run: bundle exec fastlane upload_testflight
+        env:
+          RELEASE_NOTES: ${{ inputs.new_release_notes }}
+          FLUT_APP_IOS_ISSUER_ID: ${{ vars.FLUT_APP_IOS_ISSUER_ID }}
+          FLUT_APP_IOS_KEY_ID: ${{ vars.FLUT_APP_IOS_KEY_ID }}
+      - run: bundle exec fastlane upload_metadata_app_store
+        env:
+          FLUT_APP_IOS_ISSUER_ID: ${{ vars.FLUT_APP_IOS_ISSUER_ID }}
+          FLUT_APP_IOS_KEY_ID: ${{ vars.FLUT_APP_IOS_KEY_ID }}
diff --git a/.github/workflows/10-take-screenshot-android.yml b/.github/workflows/10-take-screenshot-android.yml
new file mode 100644
index 0000000..65574bc
--- /dev/null
+++ b/.github/workflows/10-take-screenshot-android.yml
@@ -0,0 +1,99 @@
+name: integration-screenshot-android
+on:
+  workflow_call:
+    inputs:
+      api_level:
+        description: 'Android API level'
+        required: true
+        type: number
+      model:
+        description: 'Android device model id'
+        required: true
+        type: string
+
+jobs:
+  take-screenshot-android:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      API_LEVEL: ${{ inputs.api_level }}
+      CORES: 3
+    strategy:
+      matrix:
+        model: ${{ fromJson(inputs.model) }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v6
+
+      - name: Gradle cache
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Download app
+        uses: actions/download-artifact@v8
+        with:
+          name: app-debug.apk
+
+      - name: Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+
+      - name: AVD cache
+        uses: actions/cache@v5
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ env.API_LEVEL }}
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | \
+            sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: create AVD
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.API_LEVEL }}
+          profile: ${{ matrix.model }}
+          target: google_apis
+          arch: x86_64
+          cores: ${{ env.CORES }}
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: avdmanager list device
+
+      - name: run tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ env.API_LEVEL }}
+          profile: ${{ matrix.model }}
+          target: google_apis
+          arch: x86_64
+          cores: ${{ env.CORES }}
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: "flutter drive --driver=test_driver/screenshot_test.dart --use-application-binary=app-debug.apk"
+
+      - name: Append model name to all files in screenshots folder
+        run: |
+          for file in screenshots/*; do
+            filename=$(basename "$file")
+            mv "$file" "screenshots/${{ matrix.model }}-$filename"
+          done
+
+      - name: Archive screenshots
+        uses: actions/upload-artifact@v7
+        with:
+          name: android-screenshot-${{ matrix.model }}
+          path: screenshots
+          if-no-files-found: error
+          retention-days: 7
diff --git a/.github/workflows/10-take-screenshot-ios.yml b/.github/workflows/10-take-screenshot-ios.yml
new file mode 100644
index 0000000..75856be
--- /dev/null
+++ b/.github/workflows/10-take-screenshot-ios.yml
@@ -0,0 +1,54 @@
+name: integration-screenshot-ios
+on:
+  workflow_call:
+    inputs:
+      model:
+        required: true
+        type: string
+
+jobs:
+  take-screenshot-ios:
+    runs-on: macos-latest
+    timeout-minutes: 15
+    strategy:
+      matrix:
+        model: ${{ fromJson(inputs.model) }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download app
+        uses: actions/download-artifact@v8
+        with:
+          name: app-simulator-build
+          path: build/ios/iphonesimulator/Runner.app
+
+      - name: Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
+          cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+      - uses: futureware-tech/simulator-action@v5
+        with:
+          model: ${{ matrix.model }}
+      - run: >-
+          flutter drive
+          --driver=test_driver/screenshot_test.dart
+          --use-application-binary=build/ios/iphonesimulator/Runner.app
+
+      - name: Append model name to all files in screenshots folder
+        run: |
+          for file in screenshots/*; do
+            filename=$(basename "$file")
+            mv "$file" "screenshots/${{ matrix.model }}-$filename"
+          done
+
+      - name: Archive screenshots
+        uses: actions/upload-artifact@v7
+        with:
+          name: ios-screenshot-${{ matrix.model }}
+          path: screenshots
+          if-no-files-found: error
+          retention-days: 7
diff --git a/.github/workflows/11-commit-screenshot-android.yml b/.github/workflows/11-commit-screenshot-android.yml
new file mode 100644
index 0000000..93aec1d
--- /dev/null
+++ b/.github/workflows/11-commit-screenshot-android.yml
@@ -0,0 +1,46 @@
+name: integration-screenshot-commit-android
+on:
+  workflow_call:
+    inputs:
+      locale:
+        required: true
+        type: string
+
+jobs:
+  commit-screenshots:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        locale: ${{ fromJson(inputs.locale) }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GH_TOKEN }}
+
+      - uses: actions/download-artifact@v8
+        with:
+          path: screenshots
+
+      - name: Move android screenshots
+        run: |
+          mkdir -p android/fastlane/metadata/android/${{ matrix.locale }}/images/phoneScreenshots
+          cp ./screenshots/android*/* android/fastlane/metadata/android/${{ matrix.locale }}/images/phoneScreenshots
+
+      - name: Check for changes in android/fastlane/metadata/android/${{ matrix.locale }}/images/phoneScreenshots
+        id: git-diff
+        run: |
+          [ -n "$(git status --porcelain 'android/fastlane/metadata/android/${{ matrix.locale }}/images/phoneScreenshots')" ] \
+            && (echo "Changes exist in android screenshots" && echo changes=true >> $GITHUB_OUTPUT)
+        continue-on-error: true
+
+      - name: Commit screenshots
+        if: steps.git-diff.outputs.changes == 'true'
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "action@github.com"
+          git config pull.rebase true 
+          git add android/fastlane/metadata/android/${{ matrix.locale }}/images/phoneScreenshots
+          git commit -m "chore: Update screenshots android" -m  "[skip ci]"
+          git pull && git push
diff --git a/.github/workflows/11-commit-screenshot-ios.yml b/.github/workflows/11-commit-screenshot-ios.yml
new file mode 100644
index 0000000..2547bf1
--- /dev/null
+++ b/.github/workflows/11-commit-screenshot-ios.yml
@@ -0,0 +1,46 @@
+name: integration-screenshot-commit-ios
+on:
+  workflow_call:
+    inputs:
+      locale:
+        required: true
+        type: string
+
+jobs:
+  commit-screenshots:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    strategy:
+      matrix:
+        locale: ${{ fromJson(inputs.locale) }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GH_TOKEN }}
+
+      - uses: actions/download-artifact@v8
+        with:
+          path: screenshots
+
+      - name: Move ios screenshots
+        run: |
+          mkdir -p ios/fastlane/screenshots/${{ matrix.locale }}
+          cp ./screenshots/ios*/* ios/fastlane/screenshots/${{ matrix.locale }}
+
+      - name: Check for changes in ios/fastlane/screenshots/${{ matrix.locale }}
+        id: git-diff
+        run: |
+          [ -n "$(git status --porcelain 'ios/fastlane/screenshots/${{ matrix.locale }}')" ] \
+            && (echo "Changes exist in ios screenshots" && echo changes=true >> $GITHUB_OUTPUT)
+        continue-on-error: true
+
+      - name: Commit screenshots
+        if: steps.git-diff.outputs.changes == 'true'
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "action@github.com"
+          git config pull.rebase true 
+          git add ios/fastlane/screenshots/${{ matrix.locale }}
+          git commit -m "chore: Update screenshots iOS" -m  "[skip ci]"
+          git pull && git push
diff --git a/.gitignore b/.gitignore
index 57c37cc..a9ee4e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -116,6 +116,7 @@ local.properties
 **/ios/Flutter/flutter_export_environment.sh
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
+**/ios/fastlane/AuthKey.p8
 
 # macOS
 **/Flutter/ephemeral/
diff --git a/.releaserc b/.releaserc
new file mode 100644
index 0000000..5429a12
--- /dev/null
+++ b/.releaserc
@@ -0,0 +1,22 @@
+{
+    "branches": [
+        "main",
+        {
+            name: "dev",
+            prerelease: true
+        }
+    ],
+    "plugins": [
+        "@semantic-release/commit-analyzer",
+        "@semantic-release/release-notes-generator",
+        "@semantic-release/changelog",
+        ["@semantic-release/exec", {
+            "prepareCmd": "FOLDER_PATH=android/fastlane/metadata/android/fr-FR/changelogs && mkdir -p $FOLDER_PATH && echo \"${nextRelease.notes}\" > $FOLDER_PATH/${nextRelease.version}.txt && git add $FOLDER_PATH/${nextRelease.version}.txt && sed -i \"s/^version: .*/version: ${nextRelease.version}/g\" pubspec.yaml"
+        }],
+        ["@semantic-release/git", {
+            "assets": ["CHANGELOG.md", "pubspec.yaml", "android/fastlane/metadata/android/fr-FR/changelogs/${nextRelease.version}/default.txt"],
+            "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        }],
+        "@semantic-release/github"
+    ]
+}
\ No newline at end of file
diff --git a/android/Gemfile b/android/Gemfile
new file mode 100644
index 0000000..664f2e9
--- /dev/null
+++ b/android/Gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "abbrev"
+gem "ostruct"
+gem "fastlane"
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 16b01cc..61bae3b 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index aa73c64..31f59c6 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 2cca9d1..f81dbb8 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 7950d5e..379ae83 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index d0799e2..aaf0c69 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/fastlane/Appfile b/android/fastlane/Appfile
new file mode 100644
index 0000000..7f7a6d9
--- /dev/null
+++ b/android/fastlane/Appfile
@@ -0,0 +1 @@
+package_name("fr.isenengineering.flut")
\ No newline at end of file
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
new file mode 100644
index 0000000..58e94c8
--- /dev/null
+++ b/android/fastlane/Fastfile
@@ -0,0 +1,83 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+default_platform(:android)
+
+platform :android do
+
+    before_all do |lane, options|
+        setup_ci if ENV['CI']
+    end
+
+    lane :versioning do
+        json_key = ENV['PLAY_STORE_CONFIG_JSON'] ? ENV['PLAY_STORE_CONFIG_JSON'] : File.read("../key.json")
+        previous_build_number = google_play_track_version_codes(
+          track: "internal",
+          json_key_data: json_key,
+        )[0]
+        current_build_number = previous_build_number + 1
+
+        tag = last_git_tag(pattern: "v[0-9].*")
+
+        version_name = tag[1..-1]
+        version_code = current_build_number.to_s
+        UI.message("Version name: #{version_name}")
+        UI.message("Version code: #{version_code}")
+
+        ENV["ANDROID_VERSION_NAME"] = version_name
+        ENV["ANDROID_VERSION_CODE"] = version_code
+
+        sh("echo \"ANDROID_VERSION_NAME=#{version_name}\" >> $GITHUB_ENV") if ENV['CI']
+        sh("echo \"ANDROID_VERSION_CODE=#{version_code}\" >> $GITHUB_ENV") if ENV['CI']
+    end
+
+
+    desc "Deploy a new version to the Google Play internal track"
+    lane :internal do
+        json_key = ENV['PLAY_STORE_CONFIG_JSON'] ? ENV['PLAY_STORE_CONFIG_JSON'] : File.read("../key.json")
+        # If this stage fails check if there is an existing version with the same version code
+        # If so, delete it from the Google Play Console or manually increment the version code to a latter value
+        upload_to_play_store(
+            skip_upload_apk: true,
+            track: "internal",
+            aab: "../build/app/outputs/bundle/release/app-release.aab",
+            json_key_data: json_key,
+            release_status: "completed",
+            timeout: 600,
+            sync_image_upload: true,
+        )
+
+        branch_name = ENV['GITHUB_REF_NAME'] ? ENV['GITHUB_REF_NAME'] : "out-of-ci"
+        if branch_name == "main" || branch_name == "beta"
+            track_promote_channel = branch_name == "main" ? "production" : "beta"
+            # Promote the internal track to the right channel
+            upload_to_play_store(
+                track: "internal",
+                track_promote_to: track_promote_channel,
+                json_key_data: json_key,
+                skip_upload_apk: true,
+                skip_upload_aab: true,
+                skip_upload_metadata: true,
+                skip_upload_changelogs: true,
+                skip_upload_images: true,
+                skip_upload_screenshots: true
+            )
+        end
+    end
+
+    lane :build do
+        UI.message("Version name: #{ENV["ANDROID_VERSION_NAME"]}")
+        UI.message("Version code: #{ENV["ANDROID_VERSION_CODE"]}")
+        flutter = ENV['FLUTTER']
+        sh("flutter", "build", "appbundle",  "--build-number", ENV["ANDROID_VERSION_CODE"].to_s, "--build-name", ENV["ANDROID_VERSION_NAME"], "--target", "lib/main.dart")
+    end
+end
\ No newline at end of file
diff --git a/android/fastlane/README.md b/android/fastlane/README.md
new file mode 100644
index 0000000..e4332e1
--- /dev/null
+++ b/android/fastlane/README.md
@@ -0,0 +1,48 @@
+fastlane documentation
+----
+
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```sh
+xcode-select --install
+```
+
+For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
+
+# Available Actions
+
+## Android
+
+### android versioning
+
+```sh
+[bundle exec] fastlane android versioning
+```
+
+
+
+### android internal
+
+```sh
+[bundle exec] fastlane android internal
+```
+
+Deploy a new version to the Google Play internal track
+
+### android build
+
+```sh
+[bundle exec] fastlane android build
+```
+
+
+
+----
+
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+
+More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
+
+The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/android/fastlane/metadata/android/fr-FR/changelogs/dont-remove b/android/fastlane/metadata/android/fr-FR/changelogs/dont-remove
new file mode 100644
index 0000000..e69de29
diff --git a/android/fastlane/metadata/android/fr-FR/full_description.txt b/android/fastlane/metadata/android/fr-FR/full_description.txt
new file mode 100644
index 0000000..4b11bce
--- /dev/null
+++ b/android/fastlane/metadata/android/fr-FR/full_description.txt
@@ -0,0 +1,7 @@
+Flut, le nouvel ENT de l'ISEN Méditerranée !
+Retrouve ton planning, tes notes et tes absences dans une seule application moderne !
+
+Projet issu de la Nuit de l'ISEN, Flut est un ENT alternatif non-officiel pour les étudiants de l'ISEN Méditerranée créé par les associations étudiantes ISEN Engineering et ISEN Repair.
+
+Pour toutes réclamations, envoyez un mail à support@isenengineering.fr
+Pour participer au développement de l'application, rejoignez le projet GitHub : https://github.com/JacksonKyoshi/ENT-ISEN-FLUT
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/fr-FR/images/featureGraphic.png b/android/fastlane/metadata/android/fr-FR/images/featureGraphic.png
new file mode 100644
index 0000000..95b78d8
Binary files /dev/null and b/android/fastlane/metadata/android/fr-FR/images/featureGraphic.png differ
diff --git a/android/fastlane/metadata/android/fr-FR/images/icon.png b/android/fastlane/metadata/android/fr-FR/images/icon.png
new file mode 100644
index 0000000..e15a915
Binary files /dev/null and b/android/fastlane/metadata/android/fr-FR/images/icon.png differ
diff --git a/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-0-home.png b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-0-home.png
new file mode 100644
index 0000000..bb2717a
Binary files /dev/null and b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-0-home.png differ
diff --git a/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-1-planning.png b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-1-planning.png
new file mode 100644
index 0000000..b16b0b4
Binary files /dev/null and b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-1-planning.png differ
diff --git a/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-2-notes.png b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-2-notes.png
new file mode 100644
index 0000000..4165c83
Binary files /dev/null and b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-2-notes.png differ
diff --git a/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-3-absences.png b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-3-absences.png
new file mode 100644
index 0000000..6e8944c
Binary files /dev/null and b/android/fastlane/metadata/android/fr-FR/images/phoneScreenshots/pixel_6-3-absences.png differ
diff --git a/android/fastlane/metadata/android/fr-FR/short_description.txt b/android/fastlane/metadata/android/fr-FR/short_description.txt
new file mode 100644
index 0000000..e3fc3f3
--- /dev/null
+++ b/android/fastlane/metadata/android/fr-FR/short_description.txt
@@ -0,0 +1 @@
+ENT alternatif non-officiel de l'ISEN Méditerranée
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/fr-FR/title.txt b/android/fastlane/metadata/android/fr-FR/title.txt
new file mode 100644
index 0000000..a10d051
--- /dev/null
+++ b/android/fastlane/metadata/android/fr-FR/title.txt
@@ -0,0 +1 @@
+Flut - ENT ISEN
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/fr-FR/video.txt b/android/fastlane/metadata/android/fr-FR/video.txt
new file mode 100644
index 0000000..e69de29
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index df97d72..37f853b 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/settings.gradle b/android/settings.gradle
index d6f8819..c91cb5e 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -23,7 +23,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version '8.8.1' apply false
+    id "com.android.application" version '8.13.0' apply false
 }
 
 include ":app"
diff --git a/integration_test/screenshot_test.dart b/integration_test/screenshot_test.dart
new file mode 100644
index 0000000..1b4c857
--- /dev/null
+++ b/integration_test/screenshot_test.dart
@@ -0,0 +1,76 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flut/main.dart';
+import 'package:flut/services/token_service.dart';
+import 'package:flut/services/user_service.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  group('Screenshot tests', () {
+    setUpAll(() {
+      TokenManager.getInstance().setToken('FAKETOKEN');
+      UserManager.getInstance().setUsername('ronald.weasley');
+      return Future(() async {
+        WidgetsApp.debugAllowBannerOverride = false; // Hide the debug banner
+        if (Platform.isAndroid) {
+          await binding.convertFlutterSurfaceToImage();
+        }
+      });
+    });
+
+    testWidgets('render home', (tester) async {
+      await testRenderHome(tester, binding);
+    });
+
+    testWidgets('render planning', (tester) async {
+      await testRenderPlanning(tester, binding);
+    });
+
+    testWidgets('render notes', (tester) async {
+      await testRenderNotes(tester, binding);
+    });
+
+    testWidgets('render absences', (tester) async {
+      await testRenderAbsences(tester, binding);
+    });
+  });
+}
+
+Future<void> testRenderHome(
+    WidgetTester tester, IntegrationTestWidgetsFlutterBinding binding) async {
+  await tester.pumpWidget(MyApp(initialPage: 0));
+  await tester.pumpAndSettle();
+  await Future.delayed(const Duration(seconds: 1));
+  await tester.pumpAndSettle();
+  await binding.takeScreenshot('0-home');
+}
+
+Future<void> testRenderPlanning(
+    WidgetTester tester, IntegrationTestWidgetsFlutterBinding binding) async {
+  await tester.pumpWidget(MyApp(initialPage: 1));
+  await tester.pumpAndSettle();
+  await Future.delayed(const Duration(seconds: 1));
+  await tester.pumpAndSettle();
+  await binding.takeScreenshot('1-planning');
+}
+
+Future<void> testRenderNotes(
+    WidgetTester tester, IntegrationTestWidgetsFlutterBinding binding) async {
+  await tester.pumpWidget(MyApp(initialPage: 2));
+  await tester.pumpAndSettle();
+  await Future.delayed(const Duration(seconds: 1));
+  await tester.pumpAndSettle();
+  await binding.takeScreenshot('2-notes');
+}
+
+Future<void> testRenderAbsences(
+    WidgetTester tester, IntegrationTestWidgetsFlutterBinding binding) async {
+  await tester.pumpWidget(MyApp(initialPage: 3));
+  await tester.pumpAndSettle();
+  await Future.delayed(const Duration(seconds: 1));
+  await tester.pumpAndSettle();
+  await binding.takeScreenshot('3-absences');
+}
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
index 592ceee..ec97fc6 100644
--- a/ios/Flutter/Debug.xcconfig
+++ b/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
index 592ceee..c4855bf 100644
--- a/ios/Flutter/Release.xcconfig
+++ b/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Gemfile b/ios/Gemfile
new file mode 100644
index 0000000..c52b75d
--- /dev/null
+++ b/ios/Gemfile
@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "abbrev"
+gem "ostruct"
+gem "pry"
+gem "cocoapods"
+gem "fastlane"
\ No newline at end of file
diff --git a/ios/Podfile b/ios/Podfile
new file mode 100644
index 0000000..808b151
--- /dev/null
+++ b/ios/Podfile
@@ -0,0 +1,49 @@
+# Uncomment this line to define a global platform for your project
+platform :ios, '13.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
+      config.build_settings['CODE_SIGNING_REQUIRED'] = "NO"
+      config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
+    end
+  end
+end
\ No newline at end of file
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 2d10304..1afbd9f 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -8,12 +8,14 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		27D25A55512524A61193EDA0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE52761F95A9205883E563D3 /* Pods_Runner.framework */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
+		A99CA49C23B3E3B56E550173 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E98B6904887B28F9394213 /* Pods_RunnerTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -40,12 +42,18 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		00452E6603E357FB1EAC36AB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		21E98B6904887B28F9394213 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7DE40410D2B211C152CA1C9A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		89D6FCE416C8175BF418DA9C /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -53,8 +61,10 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
-		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		BE52761F95A9205883E563D3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		D12523B76CB1656CEA478F6C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		D5E3C5579C18365E351C6DD9 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		E2680133B705253899091519 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -62,12 +72,38 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				27D25A55512524A61193EDA0 /* Pods_Runner.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		F54A58222480AC5158D3676B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A99CA49C23B3E3B56E550173 /* Pods_RunnerTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXGroup;
+			children = (
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
+			);
+			path = RunnerTests;
+			sourceTree = "<group>";
+		};
+		88B1823A7F5A13A126416BC3 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				BE52761F95A9205883E563D3 /* Pods_Runner.framework */,
+				21E98B6904887B28F9394213 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -79,14 +115,6 @@
 			name = Flutter;
 			sourceTree = "<group>";
 		};
-		331C8082294A63A400263BE5 /* RunnerTests */ = {
-			isa = PBXGroup;
-			children = (
-				331C807B294A618700263BE5 /* RunnerTests.swift */,
-			);
-			path = RunnerTests;
-			sourceTree = "<group>";
-		};
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
@@ -94,6 +122,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				9B699CA9CACD230806481E92 /* Pods */,
+				88B1823A7F5A13A126416BC3 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -121,6 +151,20 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		9B699CA9CACD230806481E92 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				E2680133B705253899091519 /* Pods-Runner.debug.xcconfig */,
+				D5E3C5579C18365E351C6DD9 /* Pods-Runner.release.xcconfig */,
+				00452E6603E357FB1EAC36AB /* Pods-Runner.profile.xcconfig */,
+				7DE40410D2B211C152CA1C9A /* Pods-RunnerTests.debug.xcconfig */,
+				89D6FCE416C8175BF418DA9C /* Pods-RunnerTests.release.xcconfig */,
+				D12523B76CB1656CEA478F6C /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -128,9 +172,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
+				C082347D7B76B1498662B35C /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
-				331C807E294A63A400263BE5 /* Frameworks */,
 				331C807F294A63A400263BE5 /* Resources */,
+				F54A58222480AC5158D3676B /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -146,12 +191,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				1A52B86032F74A9A2DA70913 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				5627AB121A20F2AC45361C5A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -223,6 +270,28 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		1A52B86032F74A9A2DA70913 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -239,6 +308,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		5627AB121A20F2AC45361C5A /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -254,6 +340,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		C082347D7B76B1498662B35C /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -377,7 +485,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */;
+			baseConfigurationReference = 7DE40410D2B211C152CA1C9A /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -395,7 +503,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */;
+			baseConfigurationReference = 89D6FCE416C8175BF418DA9C /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -411,7 +519,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */;
+			baseConfigurationReference = D12523B76CB1656CEA478F6C /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata
index 1d526a1..21a3cc1 100644
--- a/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fa..d0d98aa 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index 3bb8bbe..b675a0d 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 5b84e2e..4ce63da 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index ae7b699..80c7c9b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index c74a5d7..f0e9388 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index d2bd0df..fdb949a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index 8efb2b3..7454780 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 1ca117c..6f2e505 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index ae7b699..80c7c9b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 6fd32c1..bf9d494 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 12fbbc7..52aba24 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
index 5713b70..f1ccb33 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
index 51a5326..66502d0 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
index 0714020..9c6939a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
index 0d92ae9..ea91814 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 12fbbc7..52aba24 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index c9f37c2..9912aa9 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
index 16b01cc..e112b3f 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
index 7950d5e..313e25b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 0933435..672a7c0 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index d80c2ae..04708af 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index b952d11..76d91f8 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/fastlane/Appfile b/ios/fastlane/Appfile
new file mode 100644
index 0000000..c46f2d0
--- /dev/null
+++ b/ios/fastlane/Appfile
@@ -0,0 +1,4 @@
+app_identifier("fr.isenengineering.flut") # The bundle identifier of your app
+apple_id("flut-app@isenengineering.fr") # Your Apple email address
+itc_team_id("127719760") # App Store Connect Team ID
+team_id("GH578HKJW8") # Developer Portal Team ID
\ No newline at end of file
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
new file mode 100644
index 0000000..06f46cf
--- /dev/null
+++ b/ios/fastlane/Fastfile
@@ -0,0 +1,99 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:ios)
+
+platform :ios do
+
+  # Change this to match your app's key and issuer
+  before_all do |lane, options|
+    app_store_connect_api_key(
+      key_id: ENV['FLUT_APP_IOS_KEY_ID'],
+      issuer_id: ENV['FLUT_APP_IOS_ISSUER_ID'],
+      key_filepath: './AuthKey.p8'
+    )
+    setup_ci if ENV['CI']
+  end
+
+  lane :versioning do
+    tag = last_git_tag(pattern: 'v[0-9].*')
+    increment_version_number(
+    version_number: tag[1..-1] # Set a specific version number
+    )
+    increment_build_number(
+      build_number: latest_testflight_build_number + 1,
+      xcodeproj: 'Runner.xcodeproj'
+    )
+  end
+
+  lane :build do
+    git_basic_auth = ENV['MATCH_GIT_BASIC_AUTHORIZATION']
+    match(type: 'appstore', readonly: is_ci, git_basic_authorization: git_basic_auth)
+    update_code_signing_settings(
+        use_automatic_signing: false,
+        path: "Runner.xcodeproj"
+    )
+
+    app_id = "fr.isenengineering.flut"
+    profile_id = "match AppStore fr.isenengineering.flut"
+    settings_to_override = {
+        :BUNDLE_IDENTIFIER => app_id,
+        :PROVISIONING_PROFILE_SPECIFIER => profile_id,
+        :DEVELOPMENT_TEAM => "GH578HKJW8"
+    }
+    build_ios_app(
+        export_method: 'app-store',
+        xcargs: settings_to_override,
+        codesigning_identity: "iPhone Distribution",
+        sdk: "iphoneos",
+        export_options: {
+            provisioningProfiles: {
+                app_id => profile_id
+            }
+        }
+    )
+  end
+
+  lane :upload_testflight do
+    release_notes = ENV['RELEASE_NOTES']
+    upload_to_testflight(
+      ipa: 'Runner.ipa',
+      ## You can set this to true and remove the changelog if you want to save build processing time but not have change notes.
+      skip_waiting_for_build_processing: false,
+      #      distribute_external: true,
+      # groups: ['external_testers],
+      reject_build_waiting_for_review: true,
+      wait_processing_interval: 15,
+      # notify_external_testers: true,
+      changelog: release_notes,
+      )
+  end
+
+  lane :upload_metadata_app_store do
+    upload_to_app_store(
+        overwrite_screenshots: true,
+        force: true,
+        skip_binary_upload: true,
+        precheck_include_in_app_purchases: false,
+    )
+  end
+
+  lane :register do
+    register_devices(devices_file: './fastlane/devices.txt')
+    match(type: 'appstore', readonly: false)
+    match(type: 'development', force_for_new_devices: true, readonly: false)
+  end
+
+end
diff --git a/ios/fastlane/Matchfile b/ios/fastlane/Matchfile
new file mode 100644
index 0000000..78b39ff
--- /dev/null
+++ b/ios/fastlane/Matchfile
@@ -0,0 +1,13 @@
+git_url("https://github.com/IsenEngineering/flut-app-certificate.git")
+
+storage_mode("git")
+
+type("appstore") # The default type, can be: appstore, adhoc, enterprise or development
+
+app_identifier("fr.isenengineering.flut")
+username("flut-app@isenengineering.fr") # Your Apple Developer Portal username
+
+# For all available options run `fastlane match --help`
+# Remove the # in the beginning of the line to enable the other options
+
+# The docs are available on https://docs.fastlane.tools/actions/match
diff --git a/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-0-home.png b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-0-home.png
new file mode 100644
index 0000000..ebda732
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-0-home.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-1-planning.png b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-1-planning.png
new file mode 100644
index 0000000..23eed9a
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-1-planning.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-2-notes.png b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-2-notes.png
new file mode 100644
index 0000000..75df11a
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-2-notes.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-3-absences.png b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-3-absences.png
new file mode 100644
index 0000000..8b165c2
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPad Pro 13-inch (M4)-3-absences.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-0-home.png b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-0-home.png
new file mode 100644
index 0000000..79899c1
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-0-home.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-1-planning.png b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-1-planning.png
new file mode 100644
index 0000000..d88427b
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-1-planning.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-2-notes.png b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-2-notes.png
new file mode 100644
index 0000000..9d21fb4
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-2-notes.png differ
diff --git a/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-3-absences.png b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-3-absences.png
new file mode 100644
index 0000000..5ef26fd
Binary files /dev/null and b/ios/fastlane/screenshots/fr-FR/iPhone 16 Pro Max-3-absences.png differ
diff --git a/lib/main.dart b/lib/main.dart
index 41e2409..7c0ef6f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,11 +1,9 @@
 import 'package:flut/main_handler.dart';
-import 'package:flut/services/token_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:provider/provider.dart';
 import 'services/calendar_service.dart';
-import 'screens/home_screen.dart';
 import 'screens/login_screen.dart';
 
 
@@ -14,6 +12,10 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
+  const MyApp({super.key, this.initialPage = 0});
+
+  final int initialPage;
+
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
@@ -57,9 +59,8 @@ class MyApp extends StatelessWidget {
           )
 
         ),
-        home: MainHandler(),
+        home: MainHandler(initialPage: initialPage),
       ),
     );
   }
-
 }
\ No newline at end of file
diff --git a/lib/main_handler.dart b/lib/main_handler.dart
index 5ff0b3a..f438925 100644
--- a/lib/main_handler.dart
+++ b/lib/main_handler.dart
@@ -6,17 +6,20 @@ import 'package:flut/screens/settings_screen.dart';
 import 'package:flutter/material.dart';
 
 class MainHandler extends StatefulWidget {
-  const MainHandler({super.key});
+  const MainHandler({super.key, this.initialPage = 0});
+
+  final int initialPage;
 
   @override
-  _MainHandlerState createState() => _MainHandlerState();
+  MainHandlerState createState() => MainHandlerState();
 }
 
-class _MainHandlerState extends State<MainHandler> {
-  final _pageController = PageController();
+class MainHandlerState extends State<MainHandler> {
+  late final PageController _pageController;
 
-  int _selectedPage = 0;
-  int _previousSelectedPage = 0;
+  late int _selectedPage;
+  // TODO: return button on Android should go back to previous selected page
+  // int _previousSelectedPage = 0;
   final List<Widget> _screensList = const <Widget>[
     HomeScreen(),
     CalendarScreen(),
@@ -24,10 +27,17 @@ class _MainHandlerState extends State<MainHandler> {
     AbsenceView()
   ];
 
+  @override
+  void initState() {
+    super.initState();
+    _selectedPage = widget.initialPage;
+    _pageController = PageController(initialPage: widget.initialPage);
+  }
+
   void _onItemTap(int itemIndex) {
     setState(() {
         if (_selectedPage != itemIndex) {
-          _previousSelectedPage = _selectedPage;
+          // _previousSelectedPage = _selectedPage;
           _selectedPage = itemIndex;
         }
     });
@@ -36,7 +46,7 @@ class _MainHandlerState extends State<MainHandler> {
 
   void _onPageChanged(int itemIndex) {
     setState(() {
-      _previousSelectedPage = _selectedPage;
+      // _previousSelectedPage = _selectedPage;
       _selectedPage = itemIndex;
     });
   }
diff --git a/lib/screens/absences/absence_screen.dart b/lib/screens/absences/absence_screen.dart
index 5335e7a..2695e89 100644
--- a/lib/screens/absences/absence_screen.dart
+++ b/lib/screens/absences/absence_screen.dart
@@ -9,13 +9,13 @@ import 'absence_list.dart';
 import '../../services/cache.dart';
 
 class AbsenceView extends StatefulWidget {
-  const AbsenceView({Key? key}) : super(key: key);
+  const AbsenceView({super.key});
 
   @override
-  _AbsenceViewState createState() => _AbsenceViewState();
+  AbsenceViewState createState() => AbsenceViewState();
 }
 
-class _AbsenceViewState extends State<AbsenceView> {
+class AbsenceViewState extends State<AbsenceView> {
   final ApiService apiService = ApiService('https://api-ent.isenengineering.fr');
   final String token = TokenManager.getInstance().getToken();
 
diff --git a/lib/screens/calendar_screen.dart b/lib/screens/calendar_screen.dart
index e71f17e..c795eeb 100644
--- a/lib/screens/calendar_screen.dart
+++ b/lib/screens/calendar_screen.dart
@@ -8,19 +8,21 @@ import '../services/cache.dart';
 import '../services/token_service.dart';
 import '../widgets/day_view.dart';
 import '../widgets/event_detail.dart';
-import '../widgets/week_view.dart';
 import '../model/calendar_event.dart';
 
 class CalendarScreen extends StatefulWidget {
-  const CalendarScreen({Key? key}) : super(key: key);
+  final ApiService? apiService;
+  final String? token;
+
+  const CalendarScreen({super.key, this.apiService, this.token});
 
   @override
-  _CalendarScreenState createState() => _CalendarScreenState();
+  CalendarScreenState createState() => CalendarScreenState();
 }
 
-class _CalendarScreenState extends State<CalendarScreen> {
-  final ApiService apiService = ApiService('https://api-ent.isenengineering.fr');
-  final String token = TokenManager.getInstance().getToken();
+class CalendarScreenState extends State<CalendarScreen> {
+  late final ApiService apiService;
+  late final String token;
 
   DateTime selectedDay = DateTime.now();
   CalendarEvent? selectedEvent; // Now CalendarEvent should be recognized
@@ -32,6 +34,10 @@ class _CalendarScreenState extends State<CalendarScreen> {
   @override
   void initState() {
     super.initState();
+
+    apiService = widget.apiService ?? ApiService('https://api-ent.isenengineering.fr');
+    token = widget.token ?? TokenManager.getInstance().getToken();
+
     selectedDay = DateTime.now(); // Set selectedDay to the current day
     if (selectedDay.weekday == DateTime.sunday) {
       selectedDay = selectedDay.add(const Duration(days: 1));
@@ -298,7 +304,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
                     child: TextButton(
                       onPressed: onSelectDay,
                       child: Text(
-                      "${DateFormat("E dd MMM yyyy", "fr-FR").format(selectedDay)}",
+                      DateFormat("E dd MMM yyyy", "fr-FR").format(selectedDay),
                       textAlign: TextAlign.center,
                       style: Theme.of(context).textTheme.bodyLarge
                       )
diff --git a/lib/screens/feedback_forms_screen.dart b/lib/screens/feedback_forms_screen.dart
index 27e4b82..14ec66b 100644
--- a/lib/screens/feedback_forms_screen.dart
+++ b/lib/screens/feedback_forms_screen.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
 enum FeedbackFormOption{
-  BUG,
-  FEATURE
+  bug,
+  feature
 }
 
 class FeedbackFormsScreen extends StatelessWidget {
@@ -13,14 +13,14 @@ class FeedbackFormsScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     switch(formOption) {
-      case FeedbackFormOption.BUG:
+      case FeedbackFormOption.bug:
         return Scaffold(
           appBar: AppBar(
             title: const Text('Rapport de bug'),
           ),
           body: const Center(child: Text("Coming soon"))
         );
-      case FeedbackFormOption.FEATURE:
+      case FeedbackFormOption.feature:
         return Scaffold(
           appBar: AppBar(
             title: const Text('Demande de fonctionnalité'),
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 66a6783..8ee2192 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -3,7 +3,7 @@ import 'package:flut/widgets/absences_caroussel.dart';
 import 'package:flut/widgets/next_events.dart';
 import 'package:flutter/material.dart';
 import '../model/notation.dart';
-import '../services/User_service.dart';
+import '../services/user_service.dart';
 import '../services/api_service.dart';
 import '../services/token_service.dart';
 import 'dart:async';
@@ -14,10 +14,10 @@ class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
 
   @override
-  _HomeScreenState createState() => _HomeScreenState();
+  HomeScreenState createState() => HomeScreenState();
 }
 
-class _HomeScreenState extends State<HomeScreen> {
+class HomeScreenState extends State<HomeScreen> {
   final ApiService apiService =
       ApiService('https://api-ent.isenengineering.fr');
   final String token = TokenManager.getInstance().getToken();
diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dart
index 4c446c4..6f44092 100644
--- a/lib/screens/login_screen.dart
+++ b/lib/screens/login_screen.dart
@@ -2,11 +2,9 @@ import 'package:flut/screens/mentions_legales_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
-import 'dart:io';
-import 'package:path_provider/path_provider.dart';
 
 import '../main.dart';
-import '../services/User_service.dart';
+import '../services/user_service.dart';
 import '../services/token_service.dart';
 import '../services/cache.dart';
 
@@ -15,6 +13,8 @@ void main() async {
 }
 
 class LoginApp extends StatelessWidget {
+  const LoginApp({super.key});
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
@@ -32,11 +32,13 @@ class LoginApp extends StatelessWidget {
 }
 
 class LoginScreen extends StatefulWidget {
+  const LoginScreen({super.key});
+
   @override
-  _LoginPageState createState() => _LoginPageState();
+  LoginPageState createState() => LoginPageState();
 }
 
-class _LoginPageState extends State<LoginScreen> {
+class LoginPageState extends State<LoginScreen> {
 
   bool _isPasswordHidden = true;
   bool _remindOfMe = false;
@@ -160,10 +162,12 @@ class _LoginPageState extends State<LoginScreen> {
         Map<String, dynamic> jsonMap = json.decode(content);
         String username = jsonMap['username'];
         String password = jsonMap['password'];
+        if (mounted) {
+          fetchJson(username, password, context, _usernameController, _passwordController, _remindOfMe);
+        }
         setState(() {
           _remindOfMe = true; // Cocher automatiquement si des infos sont dans le cache
         });
-        fetchJson(username, password, context, _usernameController, _passwordController, _remindOfMe);
       }
     });
   }
@@ -171,138 +175,131 @@ class _LoginPageState extends State<LoginScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Container(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: <Widget>[
-            const Text(
-              "Flut\nENT ISEN",
-              textAlign: TextAlign.center,
-              style: TextStyle(
-                fontSize: 36,
-              ),
+      body: Column(
+        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: <Widget>[
+          const Text(
+            "Flut\nENT ISEN",
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: 36,
+            ),
+          ),
+          Padding(
+            padding: EdgeInsets.only(
+              left: MediaQuery.of(context).size.width / 16,
+              right: MediaQuery.of(context).size.width / 16,
             ),
-            Container(
-              // form container
-              child: Padding(
-                padding: EdgeInsets.only(
-                  left: MediaQuery.of(context).size.width / 16,
-                  right: MediaQuery.of(context).size.width / 16,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                TextFormField(
+                  controller: _usernameController,
+                  autocorrect: false,
+                  focusNode: _usernameFocusNode,
+                  decoration: const InputDecoration(
+                    prefixIcon: Icon(Icons.person, size: 48),
+                    labelText: "Identifiant",
+                    labelStyle: TextStyle(color: Colors.grey),
+                    floatingLabelStyle: TextStyle(color: Colors.purple, fontSize: 20),
+                    hintText: "prenom.nom",
+                    hintStyle: TextStyle(color: Colors.grey, fontSize: 16),
+                    enabledBorder: UnderlineInputBorder(
+                      borderSide: BorderSide(
+                        color: Colors.purple,
+                      ),
+                    ),
+                  ),
+                ),
+                SizedBox(height: MediaQuery.of(context).size.height / 128),
+                TextFormField(
+                  controller: _passwordController,
+                  obscureText: _isPasswordHidden,
+                  obscuringCharacter: "●",
+                  autocorrect: false,
+                  focusNode: _passwordFocusNode,
+                  decoration: InputDecoration(
+                    prefixIcon: Icon(Icons.lock, size: 48),
+                    suffixIcon: IconButton(
+                      icon: Icon(
+                        _isPasswordHidden ? Icons.visibility : Icons.visibility_off,
+                        size: 28,
+                      ),
+                      onPressed: () {
+                        setState(() {
+                          _isPasswordHidden = !_isPasswordHidden;
+                        });
+                      },
+                    ),
+                    labelText: "Mot de passe",
+                    labelStyle: TextStyle(color: Colors.grey),
+                    floatingLabelStyle: TextStyle(color: Colors.purple, fontSize: 20),
+                    hintText: "●●●●●●",
+                    hintStyle: const TextStyle(color: Colors.grey, fontSize: 16),
+                    enabledBorder: const UnderlineInputBorder(
+                      borderSide: BorderSide(
+                        color: Colors.purple,
+                      ),
+                    ),
+                  ),
                 ),
-                child: Column(
+                SizedBox(height: MediaQuery.of(context).size.height / 128),
+                Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: <Widget>[
-                    TextFormField(
-                      controller: _usernameController,
-                      autocorrect: false,
-                      focusNode: _usernameFocusNode,
-                      decoration: const InputDecoration(
-                        prefixIcon: Icon(Icons.person, size: 48),
-                        labelText: "Identifiant",
-                        labelStyle: TextStyle(color: Colors.grey),
-                        floatingLabelStyle: TextStyle(color: Colors.purple, fontSize: 20),
-                        hintText: "prenom.nom",
-                        hintStyle: TextStyle(color: Colors.grey, fontSize: 16),
-                        enabledBorder: UnderlineInputBorder(
-                          borderSide: BorderSide(
+                  children: [
+                    Row(
+                      children: [
+                        const Text(
+                          "Se souvenir de moi",
+                          style: TextStyle(
                             color: Colors.purple,
+                            fontSize: 16,
                           ),
                         ),
-                      ),
-                    ),
-                    SizedBox(height: MediaQuery.of(context).size.height / 128),
-                    TextFormField(
-                      controller: _passwordController,
-                      obscureText: _isPasswordHidden,
-                      obscuringCharacter: "●",
-                      autocorrect: false,
-                      focusNode: _passwordFocusNode,
-                      decoration: InputDecoration(
-                        prefixIcon: Icon(Icons.lock, size: 48),
-                        suffixIcon: IconButton(
-                          icon: Icon(
-                            _isPasswordHidden ? Icons.visibility : Icons.visibility_off,
-                            size: 28,
-                          ),
-                          onPressed: () {
+                        Checkbox(
+                          value: _remindOfMe,
+                          activeColor: Colors.purple,
+                          onChanged: (changedState) {
                             setState(() {
-                              _isPasswordHidden = !_isPasswordHidden;
+                              _remindOfMe = changedState!;
                             });
                           },
                         ),
-                        labelText: "Mot de passe",
-                        labelStyle: TextStyle(color: Colors.grey),
-                        floatingLabelStyle: TextStyle(color: Colors.purple, fontSize: 20),
-                        hintText: "●●●●●●",
-                        hintStyle: const TextStyle(color: Colors.grey, fontSize: 16),
-                        enabledBorder: const UnderlineInputBorder(
-                          borderSide: BorderSide(
-                            color: Colors.purple,
-                          ),
-                        ),
-                      ),
+                      ],
                     ),
-                    SizedBox(height: MediaQuery.of(context).size.height / 128),
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Container(
-                          child: Row(
-                            children: [
-                              const Text(
-                                "Se souvenir de moi",
-                                style: TextStyle(
-                                  color: Colors.purple,
-                                  fontSize: 16,
-                                ),
-                              ),
-                              Checkbox(
-                                value: _remindOfMe,
-                                activeColor: Colors.purple,
-                                onChanged: (changedState) {
-                                  setState(() {
-                                    _remindOfMe = changedState!;
-                                  });
-                                },
-                              ),
-                            ],
-                          ),
-                        ),
-                        ElevatedButton(
-                          onPressed: () async {
-                            String username = _usernameController.text;
-                            String password = _passwordController.text;
+                    ElevatedButton(
+                      onPressed: () {
+                        String username = _usernameController.text;
+                        String password = _passwordController.text;
 
-                            if (_remindOfMe) {
-                              final Map<String, String> data = {
-                                'username': username,
-                                'password': password,
-                              };
-                              final jsonData = json.encode(data);
-                              await writeToCache('login.cache', jsonData);
-                            } else {
-                              deleteCacheFile('login.cache');
-                            }
+                        if (_remindOfMe) {
+                          final Map<String, String> data = {
+                            'username': username,
+                            'password': password,
+                          };
+                          final jsonData = json.encode(data);
+                          writeToCache('login.cache', jsonData);
+                        } else {
+                          deleteCacheFile('login.cache');
+                        }
 
-                            fetchJson(username, password, context, _usernameController, _passwordController, _remindOfMe);
-                          },
-                          child: Text(
-                            "Se connecter",
-                            style: TextStyle(
-                              fontSize: 16,
-                            ),
-                          ),
+                        fetchJson(username, password, context, _usernameController, _passwordController, _remindOfMe);
+                      },
+                      child: Text(
+                        "Se connecter",
+                        style: TextStyle(
+                          fontSize: 16,
                         ),
-                      ],
+                      ),
                     ),
                   ],
                 ),
-              ),
+              ],
             ),
-            SizedBox(height: MediaQuery.of(context).size.height / 64),
-          ],
-        ),
+          ),
+          SizedBox(height: MediaQuery.of(context).size.height / 64),
+        ],
       ),
       bottomSheet: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
diff --git a/lib/screens/notes/note_detail.dart b/lib/screens/notes/note_detail.dart
index 56132f6..3ab2015 100644
--- a/lib/screens/notes/note_detail.dart
+++ b/lib/screens/notes/note_detail.dart
@@ -6,12 +6,13 @@ import '../../services/token_service.dart';
 class NoteDetail extends StatelessWidget {
   final String code;
 
-  NoteDetail({required this.code});
+  const NoteDetail({super.key, required this.code});
 
   @override
   Widget build(BuildContext context) {
     final ApiService apiService =
         ApiService('https://api-ent.isenengineering.fr');
+    final navigator = Navigator.of(context);
 
     return FutureBuilder<NotationClass>(
       future: _fetchNotationClass(code, apiService),
@@ -28,8 +29,7 @@ class NoteDetail extends StatelessWidget {
           // Une fois les données récupérées, afficher la feuille modale
           WidgetsBinding.instance.addPostFrameCallback((_) {
             _showNotationModal(context, snapshot.data!).then((_) {
-              Navigator.pop(
-                  context); // Fermer la page une fois la modale fermée
+              navigator.pop(); // Fermer la page une fois la modale fermée
             });
           });
 
@@ -84,7 +84,7 @@ class NoteDetail extends StatelessWidget {
                 ),
               ),
               SizedBox(height: 10),
-              Container(
+              SizedBox(
                 width: double.infinity,
                 height: 100,
                 child: Text(
diff --git a/lib/screens/notes/note_screen.dart b/lib/screens/notes/note_screen.dart
index 30f481b..ad2f609 100644
--- a/lib/screens/notes/note_screen.dart
+++ b/lib/screens/notes/note_screen.dart
@@ -6,18 +6,17 @@ import '../../model/notation.dart';
 import '../../services/api_service.dart';
 import '../../services/cache.dart';
 import '../../services/token_service.dart';
-import '../../widgets/hamburger_menu.dart';
 import 'note_detail.dart'; // Importer la nouvelle classe
 import 'package:auto_size_text/auto_size_text.dart';
 
 class NotesScreen extends StatefulWidget {
-  const NotesScreen({Key? key}) : super(key: key);
+  const NotesScreen({super.key});
 
   @override
-  _NotesScreenState createState() => _NotesScreenState();
+  NotesScreenState createState() => NotesScreenState();
 }
 
-class _NotesScreenState extends State<NotesScreen> {
+class NotesScreenState extends State<NotesScreen> {
   final ApiService apiService = ApiService('https://api-ent.isenengineering.fr');
   final String token = TokenManager.getInstance().getToken();
 
@@ -31,13 +30,13 @@ class _NotesScreenState extends State<NotesScreen> {
 
     _notationsFuture = apiService.fetchNotations(token);
   }
-
-  void _updateCache() async {
+  // TODO: redo cache management
+  /* void _updateCache() async {
     List<Notation> notations = await apiService.fetchNotations(token);
 
     String jsonString = jsonEncode(notations.map((e) => e.toJSON()).toList());
     await writeToCache(cacheFileName, jsonString);
-  }
+  } */
 
   Future<List<Notation>> _retrieveDataFromCache() async {
     String? cacheValue = await readFromCache(cacheFileName);
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 23aaa9e..b4edb66 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:flut/screens/feedback_forms_screen.dart';
 import 'package:flut/services/cache.dart';
 import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
@@ -20,7 +19,8 @@ class SettingsScreen extends StatelessWidget {
             TextButton(
               child: Text("Ok"),
               onPressed: () {
-                Navigator.of(context).pop(); // Ferme le premier dialogue
+                final navigator = Navigator.of(context);
+                navigator.pop(); // Ferme le premier dialogue
 
                 // Vide le cache
                 readFromCache('login.cache').then((content) {
@@ -29,8 +29,7 @@ class SettingsScreen extends StatelessWidget {
                   }
 
                   // Retour à la page d'accueil après avoir vidé le cache
-                  Navigator.popUntil(
-                    context,
+                  navigator.popUntil(
                     ModalRoute.withName('/'), // Retour à la homepage
                   );
                 });
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index 5fc031c..bb64a85 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -1,5 +1,4 @@
 // services/api_service.dart
-import 'package:flutter/cupertino.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
 
diff --git a/lib/services/cache.dart b/lib/services/cache.dart
index 849928f..74e2954 100644
--- a/lib/services/cache.dart
+++ b/lib/services/cache.dart
@@ -1,15 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
-import 'dart:convert';
 import 'dart:io';
 import 'package:path_provider/path_provider.dart';
 
-import '../main.dart';
-import '../services/User_service.dart';
-import '../services/token_service.dart';
 
-import 'package:path_provider/path_provider.dart';
-import 'dart:io';
 
 
 Future<String> getCacheFilePath(String fileName) async {
diff --git a/lib/services/calendar_service.dart b/lib/services/calendar_service.dart
index 4c761e8..95453ac 100644
--- a/lib/services/calendar_service.dart
+++ b/lib/services/calendar_service.dart
@@ -6,7 +6,7 @@ class CalendarEventProvider with ChangeNotifier {
 
   List<CalendarEvent>? get events => _events;
 
-  fetchEvents(String login) async {
+  void fetchEvents(String login) async {
     _events = await IcsParser.parse(login);
     notifyListeners();
   }
diff --git a/lib/services/ics_parser.dart b/lib/services/ics_parser.dart
index 9b64016..851bae4 100644
--- a/lib/services/ics_parser.dart
+++ b/lib/services/ics_parser.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'package:flutter/services.dart' show rootBundle;
 import 'package:icalendar_parser/icalendar_parser.dart';
 import 'package:http/http.dart' as http;
 
@@ -54,8 +53,8 @@ class CalendarEvent {
     return CalendarEvent(
       summary: summary,
       description: description,
-      start: start != null ? start.toDateTime() : null,
-      end: end != null ? end.toDateTime() : null,
+      start: start.toDateTime(),
+      end: end.toDateTime(),
       location: null, // location is not present in the JSON
       url: null, // url is not present in the JSON
       attendees: null, // attendees is not present in the JSON
diff --git a/lib/services/token_service.dart b/lib/services/token_service.dart
index 67583f0..44b97ae 100644
--- a/lib/services/token_service.dart
+++ b/lib/services/token_service.dart
@@ -1,7 +1,7 @@
 
 //Classe qui va gérer le token
 class TokenManager {
-  static TokenManager _instance = TokenManager._internal();
+  static final TokenManager _instance = TokenManager._internal();
   late String _token;
   TokenManager._internal();
 
diff --git a/lib/services/User_service.dart b/lib/services/user_service.dart
similarity index 82%
rename from lib/services/User_service.dart
rename to lib/services/user_service.dart
index 257efd9..022f253 100644
--- a/lib/services/User_service.dart
+++ b/lib/services/user_service.dart
@@ -1,7 +1,7 @@
 
 //Classe qui va gérer le username
 class UserManager {
-  static UserManager _instance = UserManager._internal();
+  static final UserManager _instance = UserManager._internal();
   late String _username;
   UserManager._internal();
 
diff --git a/lib/widgets/absences_caroussel.dart b/lib/widgets/absences_caroussel.dart
index cd00df8..d78a6bb 100644
--- a/lib/widgets/absences_caroussel.dart
+++ b/lib/widgets/absences_caroussel.dart
@@ -80,7 +80,7 @@ class AbsencesCaroussel extends StatelessWidget {
               borderRadius: BorderRadius.circular(10.0),
               boxShadow: [
                 BoxShadow(
-                  color: Colors.grey.withOpacity(0.5),
+                  color: Colors.grey.withValues(alpha: 0.5),
                   spreadRadius: 2,
                   blurRadius: 5,
                   offset: const Offset(0, 3),
diff --git a/lib/widgets/custom_card_list.dart b/lib/widgets/custom_card_list.dart
index ec0e97d..8c6ac05 100644
--- a/lib/widgets/custom_card_list.dart
+++ b/lib/widgets/custom_card_list.dart
@@ -1,5 +1,3 @@
-import 'package:auto_size_text/auto_size_text.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class CustomCardList extends StatelessWidget {
@@ -41,7 +39,7 @@ class CustomCardList extends StatelessWidget {
             borderRadius: BorderRadius.circular(8.0),
             boxShadow: [
               BoxShadow(
-                color: Colors.grey.withOpacity(0.5),
+                color: Colors.grey.withValues(alpha: 0.5),
                 spreadRadius: 2,
                 blurRadius: 5,
                 offset: Offset(0, 3),
diff --git a/lib/widgets/day_view.dart b/lib/widgets/day_view.dart
index 438fd65..563751c 100644
--- a/lib/widgets/day_view.dart
+++ b/lib/widgets/day_view.dart
@@ -9,7 +9,7 @@ class DayView extends StatelessWidget {
       events; // This should be a list of events for the selected day
   final Future<void> Function() onRefresh;
 
-  DayView({
+  const DayView({super.key, 
     required this.date,
     required this.onEventSelected,
     required this.events,
@@ -44,7 +44,7 @@ class DayView extends StatelessWidget {
         child: Column(
           children: events.map((event) {
             List<String> eventDescriptions = event.title.split(" - ");
-            return Container(
+            return SizedBox(
               height: MediaQuery.of(context).size.height / 5,
               child: Card(
                 child: ListTile(
diff --git a/lib/widgets/event_detail.dart b/lib/widgets/event_detail.dart
index 59da0ac..3f1ba3d 100644
--- a/lib/widgets/event_detail.dart
+++ b/lib/widgets/event_detail.dart
@@ -9,14 +9,14 @@ import '../services/token_service.dart';
 class EventDetailMenu extends StatefulWidget {
   final CalendarEventDetails eventDetails;
 
-  const EventDetailMenu({ Key? key, required this.eventDetails }): super(key: key);
+  const EventDetailMenu({ super.key, required this.eventDetails });
 
   @override
-  _EventDetailMenuState createState() => _EventDetailMenuState();
+  EventDetailMenuState createState() => EventDetailMenuState();
 
 }
 
-class _EventDetailMenuState extends State<EventDetailMenu> with TickerProviderStateMixin {
+class EventDetailMenuState extends State<EventDetailMenu> with TickerProviderStateMixin {
   late final TabController _tabController;
 
   late List<Widget> _screensList = [];
@@ -91,13 +91,13 @@ class _EventDetailMenuState extends State<EventDetailMenu> with TickerProviderSt
 class EventDetailView extends StatefulWidget {
   final CalendarEvent event;
 
-  const EventDetailView ({ Key? key, required this.event }): super(key: key);
+  const EventDetailView ({ super.key, required this.event });
 
   @override
-  _EventDetailState createState() => _EventDetailState();
+  EventDetailState createState() => EventDetailState();
 }
 
-class _EventDetailState extends State<EventDetailView> {
+class EventDetailState extends State<EventDetailView> {
   final ApiService apiService = ApiService('https://api-ent.isenengineering.fr');
   final String token = TokenManager.getInstance().getToken();
 
diff --git a/lib/widgets/hamburger_menu.dart b/lib/widgets/hamburger_menu.dart
deleted file mode 100644
index 00b4e06..0000000
--- a/lib/widgets/hamburger_menu.dart
+++ /dev/null
@@ -1,132 +0,0 @@
-import 'package:flut/screens/home_screen.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-import '../screens/calendar_screen.dart';
-import '../screens/absences/absence_screen.dart';
-import '../screens/notes/note_screen.dart';
-
-class HamburgerMenu extends StatelessWidget {
-  const HamburgerMenu({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Drawer(
-      child: ListView(
-        children: [
-          Container(
-            height: 200, // specify the height
-            width: 300, // specify the width
-            child: DrawerHeader(
-              decoration: const BoxDecoration(
-                color: Colors.red,
-              ),
-              child: Column(
-                children: [
-                  const Text(
-                    'ENT ISEN Toulon',
-                    style: TextStyle(
-                      color: Colors.white,
-                      fontSize: 24,
-                    ),
-                  ),
-                  Container(
-                    child: Image.asset('lib/assets/ISEN-YNCREA-Mediterranee-White.png', fit: BoxFit.cover),
-                  ),
-                ],
-              ),
-            ),
-          ),
-          ListTile(
-            leading: SvgPicture.asset(
-              'lib/assets/SVG/house-solid.svg',
-              height: 24,
-              width: 24,
-              color: Colors.black,
-            ),
-            title: const Text('Accueil'),
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => HomeScreen()),
-              );
-            },
-          ),
-          ListTile(
-            leading: SvgPicture.asset(
-              'lib/assets/SVG/graduation-cap-solid.svg',
-              height: 24,
-              width: 24,
-              color: Colors.black,
-            ),
-            title: const Text('Notes'),
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => NotesScreen()),
-              );
-            },
-          ),
-          ListTile(
-            leading: SvgPicture.asset(
-              'lib/assets/SVG/calendar-days-solid.svg',
-              height: 24,
-              width: 24,
-              color: Colors.black,
-            ),
-            title: const Text('Emploi du temps'),
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => CalendarScreen()),
-              );
-            },
-          ),
-          ListTile(
-            leading: SvgPicture.asset(
-              'lib/assets/SVG/user-large-slash-solid.svg',
-              height: 24,
-              width: 24,
-              color: Colors.black,
-            ),
-            title: const Text('Absences'),
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (context) => AbsenceView()),
-              );
-            },
-          ),
-          ListTile(
-            leading: SvgPicture.asset(
-              'lib/assets/SVG/book-solid.svg',
-              height: 24,
-              width: 24,
-              color: Colors.black,
-            ),
-            title: const Text('EDUC'),
-            onTap: () {
-              launch('https://educ.isen-mediterranee.fr/fr/');
-              Navigator.pop(context);
-            },
-          ),
-          ListTile(
-            leading: SvgPicture.asset(
-              'lib/assets/SVG/globe-solid.svg',
-              height: 24,
-              width: 24,
-              color: Colors.black,
-            ),
-            title: const Text('Site web'),
-            onTap: () {
-              launch('https://www.isen-mediterranee.fr/');
-              Navigator.pop(context);
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}
\ No newline at end of file
diff --git a/lib/widgets/month_view.dart b/lib/widgets/month_view.dart
index e5b23e9..d58a3b2 100644
--- a/lib/widgets/month_view.dart
+++ b/lib/widgets/month_view.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
 
 class MonthView extends StatelessWidget {
   final ValueChanged<DateTime> onDaySelected;
 
-  MonthView({required this.onDaySelected});
+  const MonthView({super.key, required this.onDaySelected});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/notes_caroussel.dart b/lib/widgets/notes_caroussel.dart
index 2c805a6..257b543 100644
--- a/lib/widgets/notes_caroussel.dart
+++ b/lib/widgets/notes_caroussel.dart
@@ -49,7 +49,7 @@ class NotesCaroussel extends StatelessWidget {
               borderRadius: BorderRadius.circular(10.0),
               boxShadow: [
                 BoxShadow(
-                  color: Colors.grey.withOpacity(0.5),
+                  color: Colors.grey.withValues(alpha: 0.5),
                   spreadRadius: 2,
                   blurRadius: 5,
                   offset: const Offset(0, 3),
diff --git a/lib/widgets/week_view.dart b/lib/widgets/week_view.dart
index 175c481..b81679c 100644
--- a/lib/widgets/week_view.dart
+++ b/lib/widgets/week_view.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
@@ -8,14 +7,14 @@ class WeekView extends StatelessWidget {
   final ScrollController scrollController = ScrollController();
   final double arrowWidth = 50; // Adjust this value as needed
 
-  WeekView({required this.onDaySelected, required this.selectedDay});
+  WeekView({super.key, required this.onDaySelected, required this.selectedDay});
 
   @override
   Widget build(BuildContext context) {
     DateTime originalSelectedDay = DateTime(selectedDay.year, selectedDay.month, selectedDay.day);
     DateTime startOfWeek = selectedDay.subtract(Duration(days: selectedDay.weekday - 1));
 
-    WidgetsBinding.instance!.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       double maxScrollExtent = scrollController.position.maxScrollExtent;
       double dayWidth = 120;// Divide by 7 as there are 7 days in a week
       double selectedDayPosition = dayWidth * (originalSelectedDay.weekday - 1); // weekday starts from 1 (Monday)
@@ -31,7 +30,7 @@ class WeekView extends StatelessWidget {
       );
     });
 
-    return Container(
+    return SizedBox(
       height: 75, // Adjust this value as needed
       child: ListView.builder(
         controller: scrollController,
diff --git a/pubspec.yaml b/pubspec.yaml
index 42c41d6..d9b77d8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -36,7 +36,7 @@ dependencies:
   flutter_svg: ^2.0.10+1
   url_launcher: ^6.3.1
   icalendar_parser: ^2.0.0
-  intl: ^0.19.0
+  intl: ^0.20.2
   provider: ^6.0.1
   http: ^1.2.2
   path_provider: ^2.1.5
@@ -51,6 +51,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  integration_test:
+    sdk: flutter
   flutter_launcher_icons: "^0.14.3"
 
   # The "flutter_lints" package below contains a set of recommended lints to
@@ -58,12 +60,14 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^5.0.0
+  flutter_lints: ^6.0.0
+  mocktail: ^1.0.4
 
 flutter_launcher_icons:
   image_path: "lib/assets/flut_logo.png"
   android: true
   ios: true
+  remove_alpha_ios: true
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/test/screens/calendar_screen_test.dart b/test/screens/calendar_screen_test.dart
new file mode 100644
index 0000000..fa0e378
--- /dev/null
+++ b/test/screens/calendar_screen_test.dart
@@ -0,0 +1,120 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:intl/date_symbol_data_local.dart';
+
+import 'package:flut/screens/calendar_screen.dart';
+import 'package:flut/services/api_service.dart';
+// import 'package:flut/model/calendar_event.dart';
+
+// --- MOCKS ---
+
+class MockApiService extends Mock implements ApiService {}
+
+void main() {
+  // late MockApiService mockApi;
+
+  setUpAll(() async {
+    registerFallbackValue(DateTime(2000)); // fallback for DateTime args
+    await initializeDateFormatting('fr_FR', '');
+  });
+
+  setUp(() {
+    // mockApi = MockApiService();
+  });
+
+  group('CalendarScreenState - date helpers', () {
+    final state = CalendarScreen().createState();
+
+    test('isOnSelectedDay returns true for event during selected day', () {
+      state.selectedDay = DateTime(2025, 9, 14);
+      final eventDate = DateTime(2025, 9, 14, 15, 0);
+      expect(state.isOnSelectedDay(eventDate), isTrue);
+    });
+
+    test('isOnSelectedDay returns false for previous day', () {
+      state.selectedDay = DateTime(2025, 9, 14);
+      final eventDate = DateTime(2025, 9, 13, 23, 59);
+      expect(state.isOnSelectedDay(eventDate), isFalse);
+    });
+
+/*
+Disabling this test as it fails from 22h00 to 23h59
+    test('isToday returns true for later today', () {
+      final now = DateTime.now();
+      final laterToday = now.add(const Duration(hours: 2));
+      expect(state.isToday(laterToday), isTrue);
+    });
+ */
+
+    test('isToday returns false for tomorrow', () {
+      final tomorrow = DateTime.now().add(const Duration(days: 1));
+      expect(state.isToday(tomorrow), isFalse);
+    });
+
+    test('isThisWeek returns true for +3 days', () {
+      final in3 = DateTime.now().add(const Duration(days: 3));
+      expect(state.isThisWeek(in3), isTrue);
+    });
+
+    test('isThisWeek returns false for +10 days', () {
+      final in10 = DateTime.now().add(const Duration(days: 10));
+      expect(state.isThisWeek(in10), isFalse);
+    });
+
+    test('isWithinSelectedWeek true if inside same week', () {
+      state.selectedDay = DateTime(2025, 9, 17); // Wednesday
+      final thursday = DateTime(2025, 9, 18);
+      expect(state.isWithinSelectedWeek(thursday), isTrue);
+    });
+
+    test('isWithinSelectedWeek false if next week', () {
+      state.selectedDay = DateTime(2025, 9, 17);
+      final nextWeek = DateTime(2025, 9, 25);
+      expect(state.isWithinSelectedWeek(nextWeek), isFalse);
+    });
+  });
+  /*
+  group('CalendarScreen widget + apiService', () {
+    testWidgets('shows loading then DayView with events', (tester) async {
+      final fakeEvent = CalendarEvent(
+        id: '1',
+        title: '08:00 - 10:00 - Mocked class name - Teacher name - Teacher surname - Location - Class Type - Class duration -  - ID',
+        start: DateTime.now().add(const Duration(hours: 1)),
+        end: DateTime.now().add(const Duration(hours: 2)),
+        allDay: false,
+        editable: false,
+        className: 'CT',
+      );
+      when(() => mockApi.fetchCalendar(any(), any(), any()))
+          .thenAnswer((_) async => [fakeEvent]);
+
+      await tester.pumpWidget(MaterialApp(
+        home: CalendarScreen(apiService: mockApi, token: 'fake-token'),
+      ));
+
+      // First frame = waiting
+      expect(find.byType(CircularProgressIndicator), findsOneWidget);
+
+      await tester.pump(Duration(seconds: 1));
+
+      // After future completes we should see DayView
+      expect(find.text('Mocked class name'), findsOneWidget);
+
+      verify(() => mockApi.fetchCalendar(any(), any(), any())).called(greaterThan(0));
+    });
+
+    testWidgets('shows error if apiService throws', (tester) async {
+      when(() => mockApi.fetchCalendar(any(), any(), any()))
+          .thenThrow(Exception('network down'));
+
+      await tester.pumpWidget(MaterialApp(
+        home: CalendarScreen(apiService: mockApi, token: 'fake-token'),
+      ));
+
+      await tester.pump(Duration(seconds: 1));
+
+      expect(find.textContaining('Error:'), findsOneWidget);
+    });
+  });
+   */
+}
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 20f5dee..4305dff 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -5,26 +5,8 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
 
-import 'package:flut/main.dart';
 
 void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
+  // TODO: add unit tests
 }
diff --git a/test_driver/screenshot_test.dart b/test_driver/screenshot_test.dart
new file mode 100644
index 0000000..f57db16
--- /dev/null
+++ b/test_driver/screenshot_test.dart
@@ -0,0 +1,15 @@
+import 'dart:io';
+
+import 'package:integration_test/integration_test_driver_extended.dart';
+
+Future<void> main() async {
+  await integrationDriver(
+    onScreenshot: (String screenshotName, List<int> screenshotBytes,
+        [Map<String, Object?>? json]) async {
+      final File image =
+      await File('screenshots/$screenshotName.png').create(recursive: true);
+      image.writeAsBytesSync(screenshotBytes);
+      return true;
+    },
+  );
+}