diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index b5c29eca..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-timeout_in: 30m
-env:
- FLUTTER_CHANNEL: stable
- FLUTTER_VERSION: v1.12.13+hotfix.5
- DOCKER_VERSION: v1.12.13-hotfix.5 # docker tags cannot have plus
-
-task:
- # this task should fail fast or rely on 'depends_on' for all other tasks
- name: Static analysis, formatting, and unit tests
- container:
- image: cirrusci/flutter:$DOCKER_VERSION
- pub_cache:
- folder: ~/.pub-cache
- activate_coverage_script: pub global activate coverage
- tests_script: ./scripts/runTests.sh
-
-task:
- name: Integration Tests for $app_arch (Linux)
- # don't run for PRs
- only_if: $CIRRUS_PR == ''
- skip: '!changesInclude(".cirrus.yml", "$app_arch/*", "$app_arch/**/*")'
- env:
- EMULATOR_API_LEVEL: 28
- ANDROID_ABI: "default;x86"
- matrix:
- app_arch: bloc_flutter
- app_arch: bloc_library
- app_arch: built_redux
- app_arch: firestore_redux
- app_arch: frideos_library
- app_arch: inherited_widget
- app_arch: mobx
- app_arch: mvc
- app_arch: mvi_flutter
- app_arch: mvu
- app_arch: change_notifier_provider
- app_arch: redux
- app_arch: scoped_model
- app_arch: simple_bloc_flutter
- app_arch: vanilla
- app_arch: states_rebuilder
- container:
- image: cirrusci/flutter:$DOCKER_VERSION
- cpu: 4
- memory: 10G
- kvm: true
- fix_kvm_script: sudo chown cirrus:cirrus /dev/kvm
- install_images_script: sdkmanager "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"
- create_device_script:
- echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"
- start_emulator_background_script:
- $ANDROID_HOME/emulator/emulator-headless -verbose -avd test -no-audio -no-window
- pub_cache:
- folder: ~/.pub-cache
- wait_for_emulator_script:
- - ./scripts/android-wait-for-emulator.sh
-# - adb shell input keyevent 82
- doctor_script: flutter doctor -v
- devices_script: flutter devices
- ci_script: ./scripts/ci.sh ./$app_arch || ./scripts/ci.sh ./$app_arch
-
-task:
- name: Integration Tests for $app_arch (macOS)
- # don't run for PRs
- only_if: $CIRRUS_PR == ''
- skip: '!changesInclude(".cirrus.yml", "$app_arch/*", "$app_arch/**/*")'
- env:
- matrix:
- app_arch: bloc_flutter
- app_arch: bloc_library
- app_arch: built_redux
- app_arch: firestore_redux
- app_arch: frideos_library
- app_arch: inherited_widget
- app_arch: mvc
- app_arch: mvi_flutter
- app_arch: mvu
- app_arch: change_notifier_provider
- app_arch: redux
- app_arch: scoped_model
- app_arch: simple_bloc_flutter
- app_arch: vanilla
- app_arch: states_rebuilder
- osx_instance:
- image: mojave-xcode-11.2.1-flutter
- simulator_script:
- - xcrun simctl list devicetypes
- - xcrun simctl list runtimes
- # create simulator
- - udid=$(xcrun simctl create "iPhone X" com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2)
- # boot simulator
- - xcrun simctl boot $udid
- pin_flutter_script:
-# - sudo gem install cocoapods # missing from mojave-xcode-11.2.1-flutter (not found)
- - flutter --version
- # pin to ${FLUTTER_VERSION}
- - wget --quiet --output-document=flutter.zip https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/macos/flutter_macos_${FLUTTER_VERSION}-${FLUTTER_CHANNEL}.zip && unzip -qq flutter.zip > /dev/null && rm flutter.zip
- - export PATH="$PATH":"$HOME/.pub-cache/bin"
- - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
- - flutter --version
- doctor_script:
- - export PATH="$PATH":"$HOME/.pub-cache/bin"
- - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
- - flutter doctor -v
- devices_script:
- - export PATH="$PATH":"$HOME/.pub-cache/bin"
- - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
- - flutter devices
- ci_script:
- - export PATH="$PATH":"$HOME/.pub-cache/bin"
- - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
- - ./scripts/ci.sh ./$app_arch || ./scripts/ci.sh ./$app_arch
diff --git a/.fvmrc b/.fvmrc
new file mode 100644
index 00000000..2bb4682a
--- /dev/null
+++ b/.fvmrc
@@ -0,0 +1,3 @@
+{
+ "flutter": "3.35.2"
+}
\ No newline at end of file
diff --git a/.github/actions/dart_analysis_and_tests/action.yml b/.github/actions/dart_analysis_and_tests/action.yml
new file mode 100644
index 00000000..5120e7f3
--- /dev/null
+++ b/.github/actions/dart_analysis_and_tests/action.yml
@@ -0,0 +1,43 @@
+name: "Validate"
+description: "Runs lint, format, and test on an app"
+inputs:
+ working-directory:
+ description: "Directory to run validation in"
+ required: true
+
+runs:
+ using: "composite"
+ steps:
+ - name: Set up flutter
+ uses: kuhnroyal/flutter-fvm-config-action/setup@v3
+
+ - name: Get dependencies
+ shell: bash
+ run: dart pub get
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Check dart formatting
+ shell: bash
+ run: dart format -o none --set-exit-if-changed .
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Check dart analysis
+ shell: bash
+ run: dart analyze --fatal-infos --fatal-warnings .
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Run unit tests and prepare coverage
+ shell: bash
+ run: |
+ dart pub global activate coverage
+ dart run test --coverage=coverage
+ dart pub global run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.dart_tool/package_config.json --report-on=lib
+ # Extract directory name for artifact naming
+ echo "DIR_NAME=$(basename "${{ inputs.working-directory }}")" >> $GITHUB_ENV
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Upload coverage artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: coverage-lcov-${{ env.DIR_NAME }}
+ path: ${{ inputs.working-directory }}/coverage/lcov.info
diff --git a/.github/actions/flutter_analysis_test_build/action.yml b/.github/actions/flutter_analysis_test_build/action.yml
new file mode 100644
index 00000000..188e03a1
--- /dev/null
+++ b/.github/actions/flutter_analysis_test_build/action.yml
@@ -0,0 +1,93 @@
+name: "Validate"
+description: "Runs lint, format, and test on an app"
+inputs:
+ working-directory:
+ description: "Directory to run validation in"
+ required: true
+ run-integration-tests:
+ description: "Run integration tests"
+ required: false
+ default: "true"
+ deploy-to-netlify:
+ description: "Deploy to Netlify"
+ required: true
+ default: "false"
+ netlify-auth-token:
+ description: "Netlify auth token"
+ required: true
+ netlify-site-id:
+ description: "Netlify site id"
+ required: true
+runs:
+ using: "composite"
+ steps:
+ - name: Set up flutter
+ uses: kuhnroyal/flutter-fvm-config-action/setup@v3
+
+ - name: Get dependencies
+ shell: bash
+ run: flutter pub get
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Check dart formatting
+ shell: bash
+ run: dart format -o none --set-exit-if-changed .
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Check dart analysis
+ shell: bash
+ run: dart analyze --fatal-infos --fatal-warnings .
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Run unit tests and prepare coverage
+ shell: bash
+ if: '[ -d "${{ inputs.working-directory }}/test" ]'
+ run: |
+ flutter test --coverage
+ # Extract directory name for artifact naming
+ echo "DIR_NAME=$(basename "${{ inputs.working-directory }}")" >> $GITHUB_ENV
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Upload coverage artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: coverage-lcov-${{ env.DIR_NAME }}
+ path: ${{ inputs.working-directory }}/coverage/lcov.info
+
+ - name: Run linux integration tests
+ if: ${{ inputs.run-integration-tests != 'false' }}
+ shell: bash
+ run: |
+ sudo apt-get update
+ sudo apt-get install \
+ clang \
+ cmake \
+ git \
+ ninja-build \
+ pkg-config \
+ libgtk-3-dev \
+ liblzma-dev \
+ libstdc++-12-dev \
+ libglu1-mesa \
+ xvfb
+ export DISPLAY=:99 # Set display for Xvfb
+ xvfb-run -a flutter test integration_test/app_test.dart -d linux
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Build web app
+ if: ${{ inputs.deploy-to-netlify != 'false' }}
+ shell: bash
+ run: |
+ flutter build web --wasm
+ working-directory: ${{ inputs.working-directory }}
+
+ - name: Deploy to Netlify
+ if: ${{ inputs.deploy-to-netlify != 'false' }}
+ uses: nwtgck/actions-netlify@v3.0
+ with:
+ publish-dir: ${{ inputs.working-directory }}/build/web
+ production-deploy: true
+ deploy-message: "Deploy from GitHub Actions"
+ env:
+ NETLIFY_AUTH_TOKEN: ${{ inputs.netlify-auth-token }}
+ NETLIFY_SITE_ID: ${{ inputs.netlify-site-id }}
diff --git a/.github/workflows/analyze_test_build.yml b/.github/workflows/analyze_test_build.yml
new file mode 100644
index 00000000..a5a90740
--- /dev/null
+++ b/.github/workflows/analyze_test_build.yml
@@ -0,0 +1,295 @@
+name: Static Analysis, Run Tests and Build Web Apps
+
+on:
+ pull_request:
+ push:
+ branches:
+ - main
+
+jobs:
+ bloc_flutter:
+ name: bloc_flutter
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./bloc_flutter
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.BLOC_FLUTTER_NETLIFY_SITE_ID }}
+ bloc_library:
+ name: bloc_library
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./bloc_library
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.BLOC_LIBRARY_NETLIFY_SITE_ID }}
+ blocs:
+ name: blocs
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/dart_analysis_and_tests
+ with:
+ working-directory: ./blocs
+ change_notifier_provider:
+ name: change_notifier_provider
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./change_notifier_provider
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.CHANGE_NOTIFIER_PROVIDER_NETLIFY_SITE_ID }}
+ freezed_provider_value_notifier:
+ name: freezed_provider_value_notifier
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./freezed_provider_value_notifier
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.FREEZED_PROVIDER_VALUE_NOTIFIER_NETLIFY_SITE_ID }}
+ inherited_widget:
+ name: inherited_widget
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./inherited_widget
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.INHERITED_WIDGET_NETLIFY_SITE_ID }}
+ mobx:
+ name: mobx
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./mobx
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.MOBX_NETLIFY_SITE_ID }}
+ mvi_base:
+ name: mvi_base
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/dart_analysis_and_tests
+ with:
+ working-directory: ./mvi_base
+ mvi_flutter:
+ name: mvi_flutter
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./mvi_flutter
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.MVI_NETLIFY_SITE_ID }}
+ redux:
+ name: redux
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./redux
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.REDUX_NETLIFY_SITE_ID }}
+ scoped_model:
+ name: scoped_model
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./scoped_model
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.SCOPED_MODEL_NETLIFY_SITE_IT }}
+ signals:
+ name: signals
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./signals
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.SIGNALS_NETLIFY_SITE_ID }}
+ simple_bloc_flutter:
+ name: simple_bloc_flutter
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./simple_bloc_flutter
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.SIMPLE_BLOC_NETLIFY_SITE_ID }}
+ simple_blocs:
+ name: simple_blocs
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/dart_analysis_and_tests
+ with:
+ working-directory: ./simple_blocs
+ todos_repository_local_storage:
+ name: todos_repository_local_storage
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./todos_repository_local_storage
+ run-integration-tests: false
+ vanilla:
+ name: vanilla
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Static Analysis, Run Tests, and Build web app
+ uses: ./.github/actions/flutter_analysis_test_build
+ with:
+ working-directory: ./vanilla
+ deploy-to-netlify: ${{ github.ref_name == 'main' }}
+ netlify-auth-token: ${{ secrets.NETLIFY_AUTH_TOKEN }}
+ netlify-site-id: ${{ secrets.VANILLA_NETLIFY_SITE_ID }}
+ combine_and_upload_coverage:
+ name: Combine and Upload Coverage
+ runs-on: ubuntu-latest
+ needs:
+ - bloc_flutter
+ - bloc_library
+ - blocs
+ - change_notifier_provider
+ - freezed_provider_value_notifier
+ - inherited_widget
+ - mobx
+ - mvi_base
+ - mvi_flutter
+ - redux
+ - scoped_model
+ - signals
+ - simple_bloc_flutter
+ - simple_blocs
+ - todos_repository_local_storage
+ - vanilla
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ - name: Download coverage artifacts
+ uses: actions/download-artifact@v4
+ with:
+ path: .
+ - name: Combine coverage files
+ run: |
+ combineCoverage() {
+ local artifact_dir=$1
+ local repo_dir=$2
+ # Extract the package directory path from the artifact name
+ # coverage-lcov-vanilla -> ./vanilla
+ local package_name=$(basename "$artifact_dir")
+ local package_dir="./${package_name#coverage-lcov-}"
+ escapedPath="$(echo $package_dir | sed 's/\//\\\//g')"
+
+ if [[ -d "$artifact_dir" ]]; then
+ # Find the lcov.info file in the artifact directory
+ for lcov_file in "$artifact_dir"/*.info; do
+ if [[ -f "$lcov_file" ]]; then
+ echo "Combining coverage from $package_dir"
+ # combine line coverage info from package tests to a common file
+ sed "s/^SF:lib/SF:$escapedPath\/lib/g" "$lcov_file" >> "$repo_dir/lcov.info"
+ break
+ fi
+ done
+ fi
+ }
+
+ # Initialize the combined coverage file
+ touch lcov.info
+
+ # Combine coverage from all downloaded artifacts
+ for artifact_dir in coverage-lcov-*/; do
+ if [[ -d "$artifact_dir" ]]; then
+ combineCoverage "$artifact_dir" "."
+ fi
+ done
+
+ echo "Combined coverage file created:"
+ ls -la lcov.info
+ echo "First few lines of combined coverage:"
+ head -10 lcov.info
+
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v5
+ with:
+ files: ./lcov.info
+ disable_search: true
+ env:
+ CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 34d26916..8bb94fa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,9 @@ lcov.info
!**/*/ios/**/default.pbxuser
!**/*/ios/**/default.perspectivev3
**/*/generated_plugin_registrant.dart
+
+.vscode/
+
+# FVM Version Cache
+.fvm/
+.cursor/
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d09dd464..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,352 +0,0 @@
-language: generic
-env:
- global:
- - FLUTTER_CHANNEL=stable
- - FLUTTER_VERSION=1.12.13+hotfix.5-${FLUTTER_CHANNEL}
- - API=28
- - ABI=x86
- - GOO=default
- - ANDROID_TOOLS=4333796 # android-28
- - ANDROID_HOME=${HOME}/android-sdk
- - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
- - JDK="1.8" # the JDK used for running tests
- - TOOLS=${ANDROID_HOME}/tools
- # PATH order is incredibly important. e.g. the 'emulator' script exists in more than one place!
- - PATH=${ANDROID_HOME}:${ANDROID_HOME}/emulator:${TOOLS}:${TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}
- - FLUTTER_HOME=${HOME}/flutter
- - PATH=${HOME}/.pub-cache/bin:${PATH}
- - PATH=${FLUTTER_HOME}/bin:${FLUTTER_HOME}/bin/cache/dart-sdk/bin:${PATH}
-
-jobs:
- include:
-
- - stage: Static analysis, formatting, and unit tests
- language: generic
- dist: bionic
- os: linux
- env: All unit and widget tests
- before_script:
- - sudo apt-get install -y --no-install-recommends lib32stdc++6 libstdc++6 > /dev/null
-
- # install pre-compiled flutter
- - wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_v${FLUTTER_VERSION}.tar.xz && tar xf flutter.tar.xz > /dev/null && rm flutter.tar.xz
- - export PATH="$PATH":"$HOME/.pub-cache/bin"
- - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
- - flutter doctor -v
- - pub global activate coverage
- script: ./scripts/runTests.sh
- after_success: bash <(curl -s https://codecov.io/bash) -f lcov.info
- cache:
- directories:
- - $HOME/.pub-cache
-
- - &integration-test
- stage: Testing
- dist: bionic
- language: generic
- os: linux
- env: bloc_flutter_android
- # Run integration tests on android
- before_install: &before_install_linux
- - java -version
-
- # Set up KVM
- - sudo apt-get -y --no-install-recommends install bridge-utils libpulse0 libvirt-bin qemu-kvm virtinst ubuntu-vm-builder > /dev/null
- # add travis user to groups
- - sudo adduser $USER libvirt
- - sudo adduser $USER kvm
-
- # Set up JDK 8 for Android SDK
- - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
- - export TARGET_JDK="${JDK}"
- - JDK="1.8" # used when running sdkmanager
- - source ~/.install-jdk-travis.sh
-
- # Set up Android SDK
- - wget -q "https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_TOOLS.zip" -O android-sdk-tools.zip
- - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}
- - rm android-sdk-tools.zip
-
- # Avoid harmless sdkmanager warning
- - mkdir ~/.android
- - echo 'count=0' > ~/.android/repositories.cfg
-
- # Accept licenses before installing components, no need to echo y for each component
- - yes | sdkmanager --licenses >/dev/null
-
- # Download SDK tools
- - sdkmanager "platform-tools" >/dev/null
- - sdkmanager "tools" >/dev/null # A second time per Travis docs, gets latest versions
- - sdkmanager "build-tools;28.0.3" >/dev/null # Implicit gradle dependency - gradle drives changes
- - sdkmanager "platforms;android-$API" >/dev/null # We need the API of the emulator we will run
- - sdkmanager "platforms;android-28" >/dev/null # We need the API of the current compileSdkVersion from gradle.properties -
-
- - sdkmanager "emulator" >/dev/null
- - |
- if [[ $ABI =~ "arm" ]]; then
- # Download a pinned version of the emulator since default version can cause issues
- ${ANDROID_HOME}/emulator/emulator -version
- emulator_version=5264690 # 29.2.1.0 (build_id 5889189) ==> 28.0.23.0 (build_id 5264690)
- # sudo apt-get install -y libunwind8 libc++1
- curl -fo emulator.zip "https://dl.google.com/android/repository/emulator-linux-$emulator_version.zip"
- rm -rf "${ANDROID_HOME}/emulator"
- unzip -q emulator.zip -d "${ANDROID_HOME}"
- rm -f emulator.zip
- # install build tools and platforms for arm (to allow emulator to run)
- sdkmanager "build-tools;25.0.2" "platforms;android-25" > /dev/null
- fi
- - ${ANDROID_HOME}/emulator/emulator -version
-
- - sdkmanager "extras;android;m2repository" >/dev/null
- - sdkmanager "system-images;android-$API;$GOO;$ABI" >/dev/null # install system images for emulator
-
- # Create an Android emulator
- # - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$API;$GOO;$ABI" -c 10M
- - echo no | avdmanager --verbose create avd --force -n test -k "system-images;android-$API;$GOO;$ABI"
- # - EMU_PARAMS="
- # -verbose
- # -no-snapshot
- # -no-window
- # -no-audio
- # -no-boot-anim
- # -camera-back none
- # -camera-front none
- # -selinux permissive
- # -qemu -m 2048"
- - EMU_PARAMS="
- -avd test
- -verbose
- -no-window
- -no-audio
- "
- - EMU_COMMAND="emulator"
- - |
- if [[ $ABI =~ "x86" ]]; then
- EMU_COMMAND="emulator"
- else
- # emulate graphics if running on ARM
- EMU_PARAMS="${EMU_PARAMS} -gpu swiftshader"
- fi
- # This double "sudo" monstrosity is used to have Travis execute the
- # emulator with its new group permissions and help preserve the rule
- # of least privilege.
- - sudo -E sudo -u $USER -E bash -c "${ANDROID_HOME}/emulator/${EMU_COMMAND} ${EMU_PARAMS} &"
-
- # install flutter (while emulator is starting)
- - sudo apt-get install -y --no-install-recommends lib32stdc++6 libstdc++6 > /dev/null
- - wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_v${FLUTTER_VERSION}.tar.xz
- - tar xf flutter.tar.xz -C $(dirname ${FLUTTER_HOME})
- - rm flutter.tar.xz
-
- # Switch back to our target JDK version to build and run tests
- - JDK="${TARGET_JDK}"
- - source ~/.install-jdk-travis.sh
-
- - flutter doctor -v
-
- # wait for emulator to finish startup
- - ./scripts/android-wait-for-emulator.sh
- # unlock screen
- - adb shell input keyevent 82 &
-
- script: travis_retry ./scripts/ci.sh ./bloc_flutter
- cache:
- directories:
- - $HOME/.pub-cache
- - $HOME/.gradle
-
-# - <<: *integration-test
- - stage: Testing
- os: osx
-# osx_image: xcode9.4
-# osx_image: xcode9.2
- osx_image: xcode11.3 # for firebase
- env: bloc_flutter_ios
-# env: vanilla_ios
- # Run integration tests on ios
- before_install: &before_install_osx
-# - xcrun simctl list devicetypes
-# - xcrun simctl list runtimes
-# # create simulator
-# - udid=$(xcrun simctl create "iPhone X" com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-11-2)
-# # boot simulator
-# - xcrun simctl boot $udid
-# - xcrun simctl list
- - xcrun simctl create "iPhone X" com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
- # skip homebrew update
- - export HOMEBREW_NO_AUTO_UPDATE=1
- # - brew update
- - brew install libimobiledevice
- - brew install ideviceinstaller
- - brew install ios-deploy
- - sudo gem install cocoapods
-
- # install pre-compiled flutter
- - wget --quiet --output-document=flutter.zip https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/macos/flutter_macos_v${FLUTTER_VERSION}.zip && unzip -qq flutter.zip > /dev/null && rm flutter.zip
- - export PATH="$PATH":"$HOME/.pub-cache/bin"
- - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
- - flutter doctor -v
- script: travis_retry ./scripts/ci.sh ./bloc_flutter
- cache:
- directories:
- - $HOME/.pub-cache
-
- - <<: *integration-test
- os: linux
- env: built_redux_android
- script: travis_retry ./scripts/ci.sh ./built_redux
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: built_redux_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./built_redux
- - <<: *integration-test
- os: linux
- env: bloc_library_android
- script: travis_retry ./scripts/ci.sh ./bloc_library
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: bloc_library_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./bloc_library
- - <<: *integration-test
- os: linux
- env: firestore_redux_android
- script: travis_retry ./scripts/ci.sh ./firestore_redux
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: firestore_redux_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./firestore_redux
- - <<: *integration-test
- os: linux
- env: frideos_library_android
- script: travis_retry ./scripts/ci.sh ./frideos_library
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: frideos_library_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./frideos_library
- - <<: *integration-test
- os: linux
- env: inherited_widget_android
- script: travis_retry ./scripts/ci.sh ./inherited_widget
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: inherited_widget_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./inherited_widget
- - <<: *integration-test
- os: linux
- env: mvc_android
- script: travis_retry ./scripts/ci.sh ./mvc
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: mvc_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./mvc
- - <<: *integration-test
- os: linux
- env: mvi_flutter_android
- script: travis_retry ./scripts/ci.sh ./mvi_flutter
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: mvi_flutter_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./mvi_flutter
- - <<: *integration-test
- os: linux
- env: mvu_android
- script: travis_retry ./scripts/ci.sh ./mvu
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: mvu_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./mvu
- - <<: *integration-test
- os: linux
- env: redux_android
- script: travis_retry ./scripts/ci.sh ./redux
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: redux_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./redux
- - <<: *integration-test
- os: linux
- env: change_notifier_provider_android
- script: travis_retry ./scripts/ci.sh ./change_notifier_provider
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: change_notifier_provider_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./change_notifier_provider
- - <<: *integration-test
- os: linux
- env: scoped_model_android
- script: travis_retry ./scripts/ci.sh ./scoped_model
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: scoped_model_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./scoped_model
- - <<: *integration-test
- os: linux
- env: simple_bloc_flutter_android
- script: travis_retry ./scripts/ci.sh ./simple_bloc_flutter
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: simple_bloc_flutter_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./simple_bloc_flutter
- - <<: *integration-test
- os: linux
- env: vanilla_android
- script: travis_retry ./scripts/ci.sh ./vanilla
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: vanilla_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./vanilla
- - <<: *integration-test
- os: linux
- env: mobx_android
- script: travis_retry ./scripts/ci.sh ./mobx
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: mobx_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./mobx
- - <<: *integration-test
- os: linux
- env: states_rebuilder_android
- script: travis_retry ./scripts/ci.sh ./states_rebuilder
- - <<: *integration-test
- os: osx
- osx_image: xcode11.3
- env: states_rebuilder_ios
- before_install: *before_install_osx
- script: travis_retry ./scripts/ci.sh ./states_rebuilder
-
- allow_failures:
-# - env:
-# - bloc_flutter_ios
-# - built_redux_android
-# - firestore_redux_android
-# - firestore_redux_ios
-# - mvu_android
-# - mvu_ios
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 791a857f..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Changelog
-
-## 0.0.1
-
-- Initial version, created by Stagehand
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 74218fa2..00000000
--- a/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.PHONY: clean localize all check_env
-
-FILES := $(shell find . -name '*.arb' | xargs)
-
-all: localize
-
-localize: check_env clean
- flutter pub pub run intl_translation:extract_to_arb --output-dir=./ --no-transformer lib/src/localization.dart
- mv intl_messages.arb intl_en.arb
- flutter pub pub run intl_translation:generate_from_arb --no-use-deferred-loading lib/src/localization.dart $(FILES)
- mv messages*.dart lib/src/localizations
-
-clean:
- rm -f *.arb
-
-check_env:
-ifndef FLUTTER_ROOT
- $(error FLUTTER_ROOT is undefined. Please export a FLUTTER_ROOT pointing to the installation of Flutter.)
-endif
diff --git a/README.md b/README.md
index fe2edd8f..646740c2 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
# flutter_architecture_samples
-[](https://travis-ci.org/brianegan/flutter_architecture_samples)
-[](https://cirrus-ci.com/github/brianegan/flutter_architecture_samples)
-[](https://codecov.io/gh/brianegan/flutter_architecture_samples)
+[](https://github.com/brianegan/flutter_architecture_samples/actions/workflows/analyze_test_build.ymll)
+[](https://codecov.io/gh/brianegan/flutter_architecture_samples)
@@ -18,35 +17,30 @@ The Flutter Architecture Samples project demonstrates strategies to help solve
or avoid these common problems. This project implements the same app using
different architectural concepts and tools.
-You can use the samples in this project as a learning reference, or as a
-starting point for creating your own apps. The focus of this project is on
-demonstrating how to structure your code, design your architecture, and the
-eventual impact of adopting these patterns on testing and maintaining your app.
-You can use the techniques demonstrated here in many different ways to build
-apps. Your own particular priorities will impact how you implement the concepts
-in these projects, so you should not consider these samples to be canonical
-examples. To ensure the focus is kept on the aims described above, the app uses
-a simple UI.
+You can use the samples in this project as a learning reference, as a roughly
+apples-to-apples comparison of different approaches, or as a starting point for
+creating your own apps. The focus of this project is on demonstrating how to
+structure your code, design your architecture, and the eventual impact of
+adopting these patterns on testing and maintaining your app. You can use the
+techniques demonstrated here in many different ways to build apps. Your own
+particular priorities will impact how you implement the concepts in these
+projects, so you should not consider these samples to be canonical examples. To
+ensure the focus is kept on the aims described above, the app uses a simple UI.
### Current Samples
-- [Vanilla Lifting State Up Example](vanilla) ([Web Demo](https://fas_vanilla.codemagic.app)) - Uses the tools Flutter provides out of the box to manage app state.
-- [InheritedWidget Example](inherited_widget) ([Web Demo](https://fas_inherited_widget.codemagic.app)) - Uses an InheritedWidget to pass app state down the widget hierarchy.
-- [Change Notifier + Provider Example](change_notifier_provider) ([Web Demo](https://fas_change_notifier_provider.codemagic.app)) - Uses the [ChangeNotifier](https://api.flutter.dev/flutter/foundation/ChangeNotifier-class.html) class from Flutter with [provider](https://pub.dev/packages/provider) package now recommended by the Flutter team.
-- [BLoC Example](bloc_flutter) ([Web Demo](https://fas_bloc_flutter.codemagic.app)) - An implementation of the BLoC pattern, which uses Sinks for Inputs and Streams for Outputs
-- [Bloc Library Example](bloc_library) ([Web Demo](https://fas_bloc_library.codemagic.app)) - Uses the [bloc](https://pub.dartlang.org/packages/bloc) and [flutter_bloc](https://pub.dartlang.org/packages/flutter_bloc) libraries to manage app state and update Widgets.
-- [MobX Example](mobx) ([Web Demo](https://fas_mobx.codemagic.app)) - Uses the [MobX](https://pub.dev/packages/mobx) library to manage app state and update widgets using `Observables`, `Actions` and `Reactions`.
-- [Redux Example](redux) ([Web Demo](https://fas_redux.codemagic.app)) - Uses the [Redux](https://pub.dartlang.org/packages/redux) library to manage app state and update Widgets
-- ["Simple" BLoC Example](simple_bloc_flutter) ([Web Demo](https://fas_simple_bloc.codemagic.app)) - Similar to the BLoC pattern, but uses Functions for Inputs and Streams for Outputs. Results in far less code compared to standard BLoC.
-- [MVI Example](mvi_flutter) ([Web Demo](https://fas_mvi.codemagic.app)) - Uses the concepts from Cycle.JS and applies them to Flutter.
-- [states_rebuilder Example](states_rebuilder) ([Web Demo](https://fas_states_rebuilder.codemagic.app)) - Uses the [states_rebuilder](https://pub.dev/packages/states_rebuilder) library to manage app state and update Widgets.
-- [built_redux Example](built_redux) - Uses the [built_redux](https://pub.dartlang.org/packages/built_redux) library to enforce immutability and manage app state
-- [scoped_model Example](scoped_model) - Uses the [scoped_model](https://pub.dartlang.org/packages/scoped_model) library to hold app state and notify Widgets of Updates
-- [Firestore Redux Example](firestore_redux) - Uses the [Redux](https://pub.dartlang.org/packages/redux) library to manage app state and update Widgets and
- adds [Cloud_Firestore](https://firebase.google.com/docs/firestore/) as the Todos database.
-- [MVU Example](mvu) - Uses the [dartea](https://pub.dartlang.org/packages/dartea) library to manage app state and update Widgets.
-- [MVC Example](mvc) - Uses the [MVC](https://pub.dartlang.org/packages/mvc_pattern) library to implement the traditional MVC design pattern.
-- [Frideos Example](frideos_library) - Uses the [Frideos](https://pub.dartlang.org/packages/frideos) library to manage app state and update widgets using streams.
+- [Vanilla Lifting State Up Example](vanilla) ([Web Demo](https://fas-vanilla.netlify.app)) - Uses the tools Flutter provides out of the box to manage app state.
+- [InheritedWidget Example](inherited_widget) ([Web Demo](https://fas-inherited-widget.netlify.app)) - Uses an InheritedWidget to pass app state down the widget hierarchy.
+- [Change Notifier + Provider Example](change_notifier_provider) ([Web Demo](https://fas-change-notifier-provider.netlify.app)) - Uses the [ChangeNotifier](https://api.flutter.dev/flutter/foundation/ChangeNotifier-class.html) class from Flutter with [provider](https://pub.dev/packages/provider) package now recommended by the Flutter team.
+- [Freezed + Provider + Value Notifier](freezed_provider_value_notifier) ([Web Demo](https://fas-freezed-provider-value-notifier.netlify.app)) - Uses the [ValueNotifier](https://api.flutter.dev/flutter/foundation/ValueNotifier-class.html) class from Flutter with [provider](https://pub.dev/packages/provider) package.
+- [BLoC Example](bloc_flutter) ([Web Demo](https://fas-bloc-flutter.netlify.app/)) - An implementation of the original [BLoC pattern](https://www.youtube.com/watch?v=PLHln7wHgPE&list=PLOU2XLYxmsIIJr3vjxggY7yGcGO7i9BK5&index=13) described by Paolo Soares at DartConf 2018, which uses Sinks for Inputs and Streams for Outputs
+- [Bloc Library Example](bloc_library) ([Web Demo](https://fas-bloc-library.netlify.app)) - Uses the [bloc](https://pub.dartlang.org/packages/bloc) and [flutter_bloc](https://pub.dartlang.org/packages/flutter_bloc) libraries to manage app state and update Widgets.
+- [MobX Example](mobx) ([Web Demo](https://fas-mobx.netlify.app)) - Uses the [MobX](https://pub.dev/packages/mobx) library to manage app state and update widgets using `Observables`, `Actions` and `Reactions`.
+- [Redux Example](redux) ([Web Demo](https://fas-redux.netlify.app)) - Uses the [Redux](https://pub.dartlang.org/packages/redux) library to manage app state and update Widgets
+- ["Simple" BLoC Example](simple_bloc_flutter) ([Web Demo](https://fas-simple-bloc.netlify.app/)) - Similar to the BLoC pattern, but uses Functions for Inputs and Streams for Outputs. Results in far less code compared to original BLoC pattern if code sharing with AngularDart apps isn't an important use case for your app.
+- [Signals Example](signals) ([Web Demo](https://fas-signals.netlify.app)) - Uses the [Signals](https://pub.dev/packages/signals) package by [Rody Davis](https://pub.dev/publishers/rodydavis.com/packages).
+- [MVI Example](mvi_flutter) ([Web Demo](https://fas-mvi.netlify.app)) - Uses the concepts from [Cycle.JS](https://cycle.js.org/) and applies them to Flutter.
+- [scoped_model Example](scoped_model) ([Web Demo](https://fas-scoped-model.netlify.app)) - Uses the [scoped_model](https://pub.dartlang.org/packages/scoped_model) library to hold app state and notify Widgets of Updates
### Supporting Code
@@ -60,37 +54,19 @@ window.localStorage for web projects.
- [todos_repository_local_storage](todos_repository_local_storage) - Implements
the todos repository using the file system, window.localStorage, and
SharedPreferences as the data source.
-- [firebase_flutter_repository](firebase_flutter_repository) - Implements
-the todos repository using firestore as the data source.
-- [firebase_rtdb_flutter_repository](firebase_rtdb_flutter_repository) -
-Implements the todos repository using firebase real-time database as the data
-source.
### Running the samples
-#### iOS / Android
-
```
cd
flutter run
```
-#### Web
-
-Make sure you're on Flutter version "Flutter 1.12.13+hotfix.6 • channel beta" or
-newer. Not all samples support web at this time, so please check the sample
-directory for a `lib/main_web.dart` file.
-
-```
-cd
-flutter run -d chrome -t lib/main_web.dart
-```
-
### Why a todo app?
-The app in this project aims to be simple enough that you can understand it
-quickly, but complex enough to showcase difficult design decisions and testing
-scenarios. For more information, see the [app's specification](app_spec.md).
+The app in this project aims to be as simple as possible while still showcasing
+different design decisions and testing scenarios. For more information, see the
+[app's specification](app_spec.md).
### Be excellent to each other
diff --git a/analysis_options.yaml b/analysis_options.yaml
deleted file mode 100644
index 962f9342..00000000
--- a/analysis_options.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Pedantic 1.9.0
-#
-# Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
-# for details. All rights reserved. Use of this source code is governed by a
-# BSD-style license that can be found in the LICENSE file.
-#
-# Google internally enforced rules. See README.md for more information,
-# including a list of lints that are intentionally _not_ enforced.
-
-linter:
- rules:
- - always_declare_return_types
- - always_require_non_null_named_parameters
- - annotate_overrides
- - avoid_empty_else
- - avoid_init_to_null
- - avoid_null_checks_in_equality_operators
- - avoid_relative_lib_imports
- - avoid_return_types_on_setters
- - avoid_shadowing_type_parameters
- - avoid_types_as_parameter_names
- - camel_case_extensions
- - curly_braces_in_flow_control_structures
- - empty_catches
- - empty_constructor_bodies
- - library_names
- - library_prefixes
- - no_duplicate_case_values
- - null_closures
- - omit_local_variable_types
- - prefer_adjacent_string_concatenation
- - prefer_collection_literals
- - prefer_conditional_assignment
- - prefer_contains
- - prefer_equal_for_default_values
- - prefer_final_fields
- - prefer_for_elements_to_map_fromIterable
- - prefer_generic_function_type_aliases
- - prefer_if_null_operators
- - prefer_is_empty
- - prefer_is_not_empty
- - prefer_iterable_whereType
- - prefer_single_quotes
- - prefer_spread_collections
- - recursive_getters
- - slash_for_doc_comments
- - type_init_formals
- - unawaited_futures
- - unnecessary_const
- - unnecessary_new
- - unnecessary_null_in_if_null_operators
- - unnecessary_this
- - unrelated_type_equality_checks
- - use_function_type_syntax_for_parameters
- - use_rethrow_when_possible
- - valid_regexps
diff --git a/app_spec.md b/app_spec.md
index 751da2c2..3351d1cc 100644
--- a/app_spec.md
+++ b/app_spec.md
@@ -1,6 +1,6 @@
# Application Specification
-We have created this short spec to help you create awesome and consistent todo apps. Make sure to not only read it but to understand it as well.
+We have created this short spec to help you create consistent todo apps. Consistency is key to form an "apples to apples" comparison between different approaches.
## Reference Application
@@ -17,8 +17,9 @@ All examples must include a README describing the general implementation, any fr
- Format your code with `dartfmt`
- Use the `.analysis_options.yaml` from the vanilla implementation and ensure there are no analysis errors
- Use the Theme and Widgets provided by the base package for the visual look, unless it makes sense to demonstrate an alternative practice.
-- Your app should work on both Android and iOS
+- Your app should work on all platforms
- Your app should contain tests
+- Your app must pass the integration tests
## User Interface
diff --git a/assets/add-todo.png b/assets/add-todo.png
index 606fc63f..2b2d365f 100644
Binary files a/assets/add-todo.png and b/assets/add-todo.png differ
diff --git a/assets/edit-todo.png b/assets/edit-todo.png
index 17579d0a..44851a58 100644
Binary files a/assets/edit-todo.png and b/assets/edit-todo.png differ
diff --git a/assets/favicon-16x16.png b/assets/favicon-16x16.png
index ee713738..d7013256 100644
Binary files a/assets/favicon-16x16.png and b/assets/favicon-16x16.png differ
diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png
index cad7bfaf..af89dc70 100644
Binary files a/assets/favicon-32x32.png and b/assets/favicon-32x32.png differ
diff --git a/assets/filter.png b/assets/filter.png
index cca3a364..73eef157 100644
Binary files a/assets/filter.png and b/assets/filter.png differ
diff --git a/assets/mark-all.png b/assets/mark-all.png
index 4a758e54..15ec9dcc 100644
Binary files a/assets/mark-all.png and b/assets/mark-all.png differ
diff --git a/assets/screenshot.png b/assets/screenshot.png
index ec0b619a..03390a8d 100644
Binary files a/assets/screenshot.png and b/assets/screenshot.png differ
diff --git a/assets/stats.png b/assets/stats.png
index d9729597..a1f4e774 100644
Binary files a/assets/stats.png and b/assets/stats.png differ
diff --git a/assets/todo-details.png b/assets/todo-details.png
index 59fd22ba..f5f8445d 100644
Binary files a/assets/todo-details.png and b/assets/todo-details.png differ
diff --git a/assets/todo-list.png b/assets/todo-list.png
index 30f8b5b5..68f55686 100644
Binary files a/assets/todo-list.png and b/assets/todo-list.png differ
diff --git a/bloc_flutter/.metadata b/bloc_flutter/.metadata
index 1b5cec02..05a8ab44 100644
--- a/bloc_flutter/.metadata
+++ b/bloc_flutter/.metadata
@@ -4,7 +4,42 @@
# This file should be version controlled and should not be manually edited.
version:
- revision: 27321ebbad34b0a3fafe99fac037102196d655ff
- channel: stable
+ revision: "05db9689081f091050f01aed79f04dce0c750154"
+ channel: "stable"
project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+ platforms:
+ - platform: root
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+ - platform: android
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+ - platform: ios
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+ - platform: linux
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+ - platform: macos
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+ - platform: web
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+ - platform: windows
+ create_revision: 05db9689081f091050f01aed79f04dce0c750154
+ base_revision: 05db9689081f091050f01aed79f04dce0c750154
+
+ # User provided section
+
+ # List of Local paths (relative to this file) that should be
+ # ignored by the migrate tool.
+ #
+ # Files that are not part of the templates will be ignored by default.
+ unmanaged_files:
+ - 'lib/main.dart'
+ - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/bloc_flutter/analysis_options.yaml b/bloc_flutter/analysis_options.yaml
new file mode 100644
index 00000000..134f2137
--- /dev/null
+++ b/bloc_flutter/analysis_options.yaml
@@ -0,0 +1,34 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+analyzer:
+ language:
+ strict-casts: true
+ strict-inference: true
+ strict-raw-types: true
+
+linter:
+ # The lint rules applied to this project can be customized in the
+ # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+ # included above or to enable additional rules. A list of all available lints
+ # and their documentation is published at https://dart.dev/lints.
+ #
+ # Instead of disabling a lint rule for the entire project in the
+ # section below, it can also be suppressed for a single line of code
+ # or a specific dart file by using the `// ignore: name_of_lint` and
+ # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+ # producing the lint.
+ rules:
+ # avoid_print: false # Uncomment to disable the `avoid_print` rule
+ # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/bloc_flutter/android/.gitignore b/bloc_flutter/android/.gitignore
index bc2100d8..be3943c9 100644
--- a/bloc_flutter/android/.gitignore
+++ b/bloc_flutter/android/.gitignore
@@ -5,3 +5,10 @@ gradle-wrapper.jar
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java
+.cxx/
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/bloc_flutter/android/app/build.gradle b/bloc_flutter/android/app/build.gradle
deleted file mode 100644
index b0d80781..00000000
--- a/bloc_flutter/android/app/build.gradle
+++ /dev/null
@@ -1,68 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
- localPropertiesFile.withReader('UTF-8') { reader ->
- localProperties.load(reader)
- }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
- throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
- flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
- flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
- compileSdkVersion 28
-
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- }
-
- lintOptions {
- disable 'InvalidPackage'
- }
-
- defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.example.bloc_flutter"
- minSdkVersion 16
- targetSdkVersion 28
- versionCode flutterVersionCode.toInteger()
- versionName flutterVersionName
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- multiDexEnabled true
- }
-
- buildTypes {
- release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
- signingConfig signingConfigs.debug
- }
- }
-}
-
-flutter {
- source '../..'
-}
-
-dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- testImplementation 'junit:junit:4.12'
- androidTestImplementation 'androidx.test:runner:1.1.1'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-}
diff --git a/bloc_flutter/android/app/build.gradle.kts b/bloc_flutter/android/app/build.gradle.kts
new file mode 100644
index 00000000..f8e5e923
--- /dev/null
+++ b/bloc_flutter/android/app/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+ id("com.android.application")
+ id("kotlin-android")
+ // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+ id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+ namespace = "com.example.bloc_flutter_sample"
+ compileSdk = flutter.compileSdkVersion
+ ndkVersion = flutter.ndkVersion
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+ }
+
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_11.toString()
+ }
+
+ defaultConfig {
+ // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+ applicationId = "com.example.bloc_flutter_sample"
+ // You can update the following values to match your application needs.
+ // For more information, see: https://flutter.dev/to/review-gradle-config.
+ minSdk = flutter.minSdkVersion
+ targetSdk = flutter.targetSdkVersion
+ versionCode = flutter.versionCode
+ versionName = flutter.versionName
+ }
+
+ buildTypes {
+ release {
+ // TODO: Add your own signing config for the release build.
+ // Signing with the debug keys for now, so `flutter run --release` works.
+ signingConfig = signingConfigs.getByName("debug")
+ }
+ }
+}
+
+flutter {
+ source = "../.."
+}
diff --git a/bloc_flutter/android/app/src/debug/AndroidManifest.xml b/bloc_flutter/android/app/src/debug/AndroidManifest.xml
index 0e7c814b..399f6981 100644
--- a/bloc_flutter/android/app/src/debug/AndroidManifest.xml
+++ b/bloc_flutter/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
-
-
diff --git a/bloc_flutter/android/app/src/main/AndroidManifest.xml b/bloc_flutter/android/app/src/main/AndroidManifest.xml
index 02fd0f47..9866d0a0 100644
--- a/bloc_flutter/android/app/src/main/AndroidManifest.xml
+++ b/bloc_flutter/android/app/src/main/AndroidManifest.xml
@@ -1,21 +1,25 @@
-
-
+
+
+
@@ -27,4 +31,15 @@
android:name="flutterEmbedding"
android:value="2" />
+
+
+
+
+
+
+
diff --git a/bloc_flutter/android/app/src/main/kotlin/com/example/bloc_flutter/MainActivity.kt b/bloc_flutter/android/app/src/main/kotlin/com/example/bloc_flutter/MainActivity.kt
deleted file mode 100644
index 4a5aea1c..00000000
--- a/bloc_flutter/android/app/src/main/kotlin/com/example/bloc_flutter/MainActivity.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.bloc_flutter
-
-import androidx.annotation.NonNull;
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugins.GeneratedPluginRegistrant
-
-class MainActivity: FlutterActivity() {
- override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
- GeneratedPluginRegistrant.registerWith(flutterEngine);
- }
-}
diff --git a/bloc_flutter/android/app/src/main/kotlin/com/example/bloc_flutter_sample/MainActivity.kt b/bloc_flutter/android/app/src/main/kotlin/com/example/bloc_flutter_sample/MainActivity.kt
new file mode 100644
index 00000000..c525aee6
--- /dev/null
+++ b/bloc_flutter/android/app/src/main/kotlin/com/example/bloc_flutter_sample/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.example.bloc_flutter_sample
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()
diff --git a/bloc_flutter/android/app/src/main/res/drawable-v21/launch_background.xml b/bloc_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 00000000..f74085f3
--- /dev/null
+++ b/bloc_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+
+
+
+