diff --git a/.DS_Store b/.DS_Store index 4bd8225b..50b6c093 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index a6d70a2a..2d390f02 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -3,7 +3,7 @@ name: Eatvio App Android Test on: [ pull_request ] env: - flutter_version: "3.24.5" + flutter_version: "3.29.1" java_version: "21.x" flutter_channel: "stable" @@ -68,13 +68,13 @@ jobs: - name: Build apk run: | - flutter build apk + flutter build apk --profile - name: Rename and move apk run: | TIMESTAMP=$(date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME + mv build/app/outputs/flutter-apk/app-profile.apk $APK_NAME echo "APK build finished $APK_NAME" echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV diff --git a/.gitea/workflows/docker-run-tests.yml b/.gitea/workflows/docker-run-tests.yml index 99cc866e..cf14247c 100644 --- a/.gitea/workflows/docker-run-tests.yml +++ b/.gitea/workflows/docker-run-tests.yml @@ -3,7 +3,7 @@ name: Eatvio App Android Test on custom docker on: [ pull_request ] env: - flutter_version: "3.24.5" + flutter_version: "3.29.1" java_version: "21.x" flutter_channel: "stable" my_local_cache_dir: "/opt/hostedtoolcache/" @@ -40,7 +40,8 @@ jobs: run: flutter test # - name: Build apk - # run: flutter build apk + # run: flutter build apk + # some test # - name: Rename and move apk # run: | diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 24078471..badcf5b1 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -3,7 +3,7 @@ name: Eatvio App Android Test on: [ pull_request ] env: - flutter_version: "3.24.5" + flutter_version: "3.29.1" java_version: "21.x" flutter_channel: "stable" my_local_cache_dir: "/opt/hostedtoolcache/" @@ -30,10 +30,10 @@ jobs: java-version: ${{ env.java_version }} cache: gradle - - name: Install utils for Android SDK + - name: Install utils for Android SDK run: | apt-get update - apt-get install -y openjdk-11-jdk wget jq clang cmake ninja-build libgtk-3-dev + apt-get install -y openjdk-11-jdk wget jq clang cmake ninja-build libgtk-3-dev - name: Install Android SDK if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -50,14 +50,14 @@ jobs: sdkmanager "platform-tools" "platforms;android-35" "platforms;android-34" "platforms;android-33" "platforms;android-31" sdkmanager "build-tools;34.0.0" sdkmanager "ndk;25.1.8937393" - sdkmanager --install "cmake;3.22.1" + sdkmanager --install "cmake;3.22.1" - name: Set up Android environment variables id: "android-env-setup" run: | echo "ANDROID_SDK_ROOT=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV echo "PATH=$PATH:${{ env.my_local_cache_dir }}Android/Sdk/cmdline-tools/latest/bin:${{ env.my_local_cache_dir }}Android/Sdk/platform-tools:${{ env.my_local_cache_dir }}Android/Sdk/build-tools/30.0.3:${{ env.my_local_cache_dir }}Android/Sdk/build-tools/34.0.0" >> $GITHUB_ENV - echo "ANDROID_HOME=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV + echo "ANDROID_HOME=${{ env.my_local_cache_dir }}Android/Sdk" >> $GITHUB_ENV - id: flutter-action uses: actions/flutter-action@v2 @@ -88,7 +88,7 @@ jobs: run: | git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }} flutter config --android-sdk="$ANDROID_HOME" - flutter doctor -v + flutter doctor -v - name: Get dependencies run: flutter pub get @@ -97,18 +97,18 @@ jobs: run: flutter analyze - name: Test - run: flutter test + run: flutter test - name: Build apk - run: flutter build apk + run: flutter build apk --profile - name: Rename and move apk run: | TIMESTAMP=$(TZ=Europe/Moscow date +'%Y-%m-%d-%H-%M') APK_NAME="eatvio_app_${TIMESTAMP}.apk" - mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME + mv build/app/outputs/flutter-apk/app-profile.apk $APK_NAME echo "APK build finished $APK_NAME" - echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV + echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV - name: Upload APK artifact uses: actions/upload-artifact@v3 diff --git a/.gitignore b/.gitignore index 4a5c4e73..5bb96d46 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /.flutter-plugins-dependencies /.packages /node_modules/ +/android/app/release/app-release.aab +/android/app/upload-keystore.jks diff --git a/analysis_options.yaml b/analysis_options.yaml index e8fba18e..7db716b4 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,11 +1,14 @@ - linter: rules: - require_trailing_commas analyzer: - exclude: - - '**/*.g.dart' + exclude: + - '**/*.g.dart' + - '**/l10n.dart' + - '**/messages_all.dart' + - '**/messages_en.dart' + - '**/messages_ru.dart' errors: invalid_annotation_target: ignore plugins: @@ -38,4 +41,4 @@ dart_code_metrics: # - no-boolean-literal-compare # - no-empty-block # - prefer-conditional-expressions -# - no-equal-then-else \ No newline at end of file +# - no-equal-then-else diff --git a/android/.idea/caches/deviceStreaming.xml b/android/.idea/caches/deviceStreaming.xml index 5a2f8669..b35232ec 100644 --- a/android/.idea/caches/deviceStreaming.xml +++ b/android/.idea/caches/deviceStreaming.xml @@ -8,17 +8,31 @@