From 25aeef94265d54b28940a8b1f6b326c541656bdb Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 16:36:36 +0300
Subject: [PATCH 01/39] feat(ci): build apk

---
 .gitea/workflows/build.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 4a2d90f8..316807f2 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -66,8 +66,15 @@ jobs:
           touch .env
           flutter test
 
-#      - name: Build apk
-#        run: flutter build apk
+      - name: Build apk
+        run: flutter build apk
+
+      - 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
+          echo "APK build finished $APK_NAME"
 
 # Runs a set of commands using the runners shell
 #      - name: Start release build

From 657dfdc14246f394f6ab55a95bb594d343ec61f8 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 16:38:18 +0300
Subject: [PATCH 02/39] feat(ci): build test apk

---
 .gitea/workflows/test.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 27c7c439..23585485 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -65,3 +65,13 @@ jobs:
         run: |
           touch .env
           flutter test
+
+      - name: Build apk
+        run: flutter build apk
+
+      - 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
+          echo "APK build finished $APK_NAME"
\ No newline at end of file

From cd68e9db3046aa7cb5cfc9312f36abaabdc6f0ca Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 16:47:40 +0300
Subject: [PATCH 03/39] feat(ci): add android sdk install

---
 .gitea/workflows/build.yml | 38 +++++++++++++++++++++++++++-----------
 .gitea/workflows/test.yml  | 27 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 316807f2..ae06efca 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -13,22 +13,38 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ env.java_version }}
+          cache: 'gradle'
+
+      - name: Install Android SDK
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          unzip commandlinetools.zip
+          mkdir -p $HOME/Android/Sdk
+          mv cmdline-tools $HOME/Android/Sdk/
+          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          yes | sdkmanager --licenses
+          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
+
+      - name: Set up Android environment variables
+        run: |
+          echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+
       - uses: actions/cache@v2
         with:
           path: ${{ runner.tool_cache }}/flutter
           key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
 
-      - name: Install jq
-        run: |
-          apt update
-          apt-get install -y jq
-
-      - uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "12.x"
-          cache: "gradle"
-
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 23585485..db90d605 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -13,6 +13,33 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: ${{ env.java_version }}
+          cache: 'gradle'
+
+      - name: Install Android SDK
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          unzip commandlinetools.zip
+          mkdir -p $HOME/Android/Sdk
+          mv cmdline-tools $HOME/Android/Sdk/
+          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          yes | sdkmanager --licenses
+          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
+
+      - name: Set up Android environment variables
+        run: |
+          echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+
       - uses: actions/cache@v2
         with:
           path: ${{ runner.tool_cache }}/flutter

From 943502f78d60227d7c70000ac1374340fdf8883e Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 16:51:01 +0300
Subject: [PATCH 04/39] feat(ci): add android sdk install for mac

---
 .gitea/workflows/build.yml | 14 +++++++-------
 .gitea/workflows/test.yml  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index ae06efca..e9837822 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -23,21 +23,21 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          sudo apt-get update
-          sudo apt-get install -y openjdk-11-jdk wget
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          brew install --cask android-sdk
+          mkdir -p $HOME/Android/Sdk/cmdline-tools
+          cd $HOME/Android/Sdk/cmdline-tools
+          wget https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mkdir -p $HOME/Android/Sdk
-          mv cmdline-tools $HOME/Android/Sdk/
+          mv cmdline-tools latest
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
       - uses: actions/cache@v2
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index db90d605..dd1c5a7a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -23,21 +23,21 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          sudo apt-get update
-          sudo apt-get install -y openjdk-11-jdk wget
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+          brew install --cask android-sdk
+          mkdir -p $HOME/Android/Sdk/cmdline-tools
+          cd $HOME/Android/Sdk/cmdline-tools
+          wget https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mkdir -p $HOME/Android/Sdk
-          mv cmdline-tools $HOME/Android/Sdk/
+          mv cmdline-tools latest
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
       - uses: actions/cache@v2

From 96f5fa3d12f02f0cdb51e31b639cb99ea528fd1b Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 16:58:11 +0300
Subject: [PATCH 05/39] feat(ci): add android sdk without sudo

---
 .gitea/workflows/build.yml | 14 +++++++-------
 .gitea/workflows/test.yml  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index e9837822..094a029a 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -23,21 +23,21 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          brew install --cask android-sdk
-          mkdir -p $HOME/Android/Sdk/cmdline-tools
-          cd $HOME/Android/Sdk/cmdline-tools
-          wget https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip -O commandlinetools.zip
+          apt-get update
+          apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mv cmdline-tools latest
+          mkdir -p $HOME/Android/Sdk
+          mv cmdline-tools $HOME/Android/Sdk/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
       - uses: actions/cache@v2
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index dd1c5a7a..78bc049d 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -23,21 +23,21 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          brew install --cask android-sdk
-          mkdir -p $HOME/Android/Sdk/cmdline-tools
-          cd $HOME/Android/Sdk/cmdline-tools
-          wget https://dl.google.com/android/repository/commandlinetools-mac-7583922_latest.zip -O commandlinetools.zip
+          apt-get update
+          apt-get install -y openjdk-11-jdk wget
+          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mv cmdline-tools latest
+          mkdir -p $HOME/Android/Sdk
+          mv cmdline-tools $HOME/Android/Sdk/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools:$ANDROID_SDK_ROOT/build-tools/30.0.3:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
       - uses: actions/cache@v2

From 2e4545d5a617ef1abb5c6cc56bacd0da6e2fbbb2 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:02:12 +0300
Subject: [PATCH 06/39] feat(ci): <sdk>/cmdline-tools/latest/

---
 .gitea/workflows/build.yml | 12 ++++--------
 .gitea/workflows/test.yml  |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 094a029a..7576d6e3 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,6 +1,6 @@
 name: Android Release
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -27,10 +27,10 @@ jobs:
           apt-get install -y openjdk-11-jdk wget
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mkdir -p $HOME/Android/Sdk
-          mv cmdline-tools $HOME/Android/Sdk/
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
@@ -91,7 +91,3 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
-
-# Runs a set of commands using the runners shell
-#      - name: Start release build
-#        run: flutter build appbundle
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 78bc049d..5d7443c9 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Eatvio App Android Test
 
-on: [pull_request]
+on: [ pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -27,10 +27,10 @@ jobs:
           apt-get install -y openjdk-11-jdk wget
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip
-          mkdir -p $HOME/Android/Sdk
-          mv cmdline-tools $HOME/Android/Sdk/
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 

From 70f6ea5d9709a533547e8c07aae61f625f38e46c Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:05:20 +0300
Subject: [PATCH 07/39] feat(ci): licenses agree

---
 .gitea/workflows/build.yml | 1 -
 .gitea/workflows/test.yml  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 7576d6e3..955d74d5 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -31,7 +31,6 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 5d7443c9..589cf373 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,7 +31,6 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables

From 0be58ac6a38a5171c06d8dde9e528ef11f929e69 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:11:32 +0300
Subject: [PATCH 08/39] feat(ci): sdk not found

---
 .gitea/workflows/test.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 589cf373..78c51b95 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -23,20 +23,21 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          apt-get update
-          apt-get install -y openjdk-11-jdk wget
+          sudo apt-get update
+          sudo apt-get install -y openjdk-11-jdk wget unzip
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
-          unzip commandlinetools.zip
+          unzip commandlinetools.zip -d cmdline-tools
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
-          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3
+          yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
 
       - uses: actions/cache@v2
@@ -46,8 +47,7 @@ jobs:
 
       - name: Install jq
         run: |
-          apt update
-          apt-get install -y jq
+          sudo apt-get install -y jq
 
       - uses: actions/setup-java@v3
         with:
@@ -62,7 +62,7 @@ jobs:
           flutter-version: ${{ env.flutter_version }}
           cache: true
 
-      - name: show cache keys
+      - name: Show cache keys
         run: |
           echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
           echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
@@ -73,7 +73,7 @@ jobs:
           echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
         shell: bash
 
-      - name: fix dir permissions
+      - name: Fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
@@ -100,4 +100,4 @@ jobs:
           TIMESTAMP=$(date +'%Y-%m-%d-%H-%M')
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
-          echo "APK build finished $APK_NAME"
\ No newline at end of file
+          echo "APK build finished $APK_NAME"

From 00b3ea34475b2942e5206ed62dbf10a7223aa11a Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:13:26 +0300
Subject: [PATCH 09/39] feat(ci): remove sudo

---
 .gitea/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 78c51b95..ded5232f 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -23,8 +23,8 @@ jobs:
 
       - name: Install Android SDK
         run: |
-          sudo apt-get update
-          sudo apt-get install -y openjdk-11-jdk wget unzip
+          apt-get update
+          apt-get install -y openjdk-11-jdk wget unzip
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
           unzip commandlinetools.zip -d cmdline-tools
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
@@ -47,7 +47,7 @@ jobs:
 
       - name: Install jq
         run: |
-          sudo apt-get install -y jq
+          apt-get install -y jq
 
       - uses: actions/setup-java@v3
         with:

From f540154ba7b41b0e8d9dcf79bdbf413a79fede75 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:17:14 +0300
Subject: [PATCH 10/39] feat(ci): remove licenses

---
 .gitea/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index ded5232f..ffd84a9a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,7 +31,6 @@ jobs:
           mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3
-          yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables

From bac1d2ccb63eba9ab0c319cf66c29ab43d5ac3f6 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:25:31 +0300
Subject: [PATCH 11/39] feat(ci): export sdk root

---
 .gitea/workflows/test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index ffd84a9a..5c324aaf 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Eatvio App Android Test
 
-on: [ pull_request ]
+on: [pull_request]
 
 env:
   flutter_version: "3.22.0"
@@ -17,9 +17,9 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: ${{ env.java_version }}
-          cache: 'gradle'
+          cache: "gradle"
 
       - name: Install Android SDK
         run: |
@@ -38,6 +38,7 @@ jobs:
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+          export ANDROID_SDK_ROOT=/usr/lib/android-sdk
 
       - uses: actions/cache@v2
         with:

From 08c6f6d5849065348103a181ea97585d4263fdfd Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:34:50 +0300
Subject: [PATCH 12/39] feat(ci): fix home + chat search

---
 .gitea/workflows/test.yml                                      | 3 ++-
 .../pages/chat_select_screen/chat_select_screen.dart           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 5c324aaf..d60b45f9 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -35,10 +35,11 @@ jobs:
 
       - name: Set up Android environment variables
         run: |
+          export ANDROID_SDK_HOME=/usr/lib/android-sdk
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
-          export ANDROID_SDK_ROOT=/usr/lib/android-sdk
+          export ANDROID_SDK_HOME=/usr/lib/android-sdk
 
       - uses: actions/cache@v2
         with:
diff --git a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
index a2068225..fe468f3b 100644
--- a/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_select_screen/chat_select_screen.dart
@@ -45,6 +45,7 @@ class ChatSelectScreen extends StatelessWidget {
                 return [
                   SliverAppBar(
                     backgroundColor: Colors.white,
+                    stretchTriggerOffset: 1,
                     forceMaterialTransparency: true,
                     floating: true,
                     snap: true,

From 4ecce48172d9949279bc1802a98c4ab18d992a11 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 19:50:29 +0300
Subject: [PATCH 13/39] feat(ci): flutter config sdk

---
 .gitea/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index d60b45f9..b0f7cc88 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -40,6 +40,7 @@ jobs:
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
           export ANDROID_SDK_HOME=/usr/lib/android-sdk
+          flutter config --android-sdk /usr/lib/android-sdk
 
       - uses: actions/cache@v2
         with:

From 045f967cec05d2df31eae240de4f2c342be579b0 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 19:52:38 +0300
Subject: [PATCH 14/39] feat(ci): move config

---
 .gitea/workflows/test.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index b0f7cc88..69c8729e 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -40,7 +40,6 @@ jobs:
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
           export ANDROID_SDK_HOME=/usr/lib/android-sdk
-          flutter config --android-sdk /usr/lib/android-sdk
 
       - uses: actions/cache@v2
         with:
@@ -95,7 +94,9 @@ jobs:
           flutter test
 
       - name: Build apk
-        run: flutter build apk
+        run: |
+          flutter config --android-sdk /usr/lib/android-sdk
+          flutter build apk
 
       - name: Rename and move apk
         run: |

From cca2768d3d74a70a6c83937967b2992ca502a342 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 19:59:52 +0300
Subject: [PATCH 15/39] feat(ci): move config

---
 .gitea/workflows/test.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 69c8729e..b5b1dfbc 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -78,6 +78,7 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
+          flutter config --android-sdk /usr/lib/android-sdk
 
       - name: Get dependencies
         run: flutter pub get
@@ -94,9 +95,7 @@ jobs:
           flutter test
 
       - name: Build apk
-        run: |
-          flutter config --android-sdk /usr/lib/android-sdk
-          flutter build apk
+        run: flutter build apk
 
       - name: Rename and move apk
         run: |

From 273c08d374e02e41a015b969b77f91b5a68676c8 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Thu, 20 Jun 2024 13:37:27 +0300
Subject: [PATCH 16/39] feat(ci): debug sdk_home

---
 .gitea/workflows/test.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index b5b1dfbc..6f8edc4e 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -95,7 +95,11 @@ jobs:
           flutter test
 
       - name: Build apk
-        run: flutter build apk
+        run: |
+          echo $ANDROID_SDK_HOME
+          echo $ANDROID_HOME
+          echo $PATH
+          flutter build apk
 
       - name: Rename and move apk
         run: |

From 3c22baae334d8e95528e9b2deb4fe33eefa98034 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Thu, 20 Jun 2024 13:49:39 +0300
Subject: [PATCH 17/39] feat(ci): add sdk home

---
 .gitea/workflows/test.yml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 6f8edc4e..2fedac53 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -29,33 +29,27 @@ jobs:
           unzip commandlinetools.zip -d cmdline-tools
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
           mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
-          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3
+          echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |
-          export ANDROID_SDK_HOME=/usr/lib/android-sdk
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
-          export ANDROID_SDK_HOME=/usr/lib/android-sdk
+
+      - name: Debug Environment Variables
+        run: |
+          echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT"
+          echo "ANDROID_HOME: $ANDROID_HOME"
+          echo "PATH: $PATH"
 
       - uses: actions/cache@v2
         with:
           path: ${{ runner.tool_cache }}/flutter
           key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
 
-      - name: Install jq
-        run: |
-          apt-get install -y jq
-
-      - uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "12.x"
-          cache: "gradle"
-
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:
@@ -78,7 +72,7 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
-          flutter config --android-sdk /usr/lib/android-sdk
+          flutter config --android-sdk $HOME/Android/Sdk
 
       - name: Get dependencies
         run: flutter pub get
@@ -96,9 +90,7 @@ jobs:
 
       - name: Build apk
         run: |
-          echo $ANDROID_SDK_HOME
-          echo $ANDROID_HOME
-          echo $PATH
+          flutter config --android-sdk $HOME/Android/Sdk
           flutter build apk
 
       - name: Rename and move apk

From 5ecd3fcccddc82802cea0f45a53b37401d782b2b Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Thu, 20 Jun 2024 13:55:38 +0300
Subject: [PATCH 18/39] feat(ci): remove sdk manager

---
 .gitea/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 2fedac53..a9257bdc 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,7 +31,6 @@ jobs:
           mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |

From a83db37a2d5ec145243701748140497f9cff33d0 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Thu, 20 Jun 2024 14:15:40 +0300
Subject: [PATCH 19/39] feat(ci): jq

---
 .gitea/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index a9257bdc..f55fa84f 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -14,6 +14,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install jq
+        run: |
+          apt-get install -y jq   
+
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -32,6 +36,7 @@ jobs:
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
 
+
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV

From 6a240ddcf92697911c668dce2adeb58fd56172f1 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Thu, 20 Jun 2024 14:18:32 +0300
Subject: [PATCH 20/39] feat(ci): jq

---
 .gitea/workflows/test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index f55fa84f..ef78d70f 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -14,10 +14,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install jq
-        run: |
-          apt-get install -y jq   
-
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -54,6 +50,10 @@ jobs:
           path: ${{ runner.tool_cache }}/flutter
           key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
 
+      - name: Install jq
+        run: |
+          apt-get install -y jq
+
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:

From 104c0c993c3680486dcafd7c70284d894daad221 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Thu, 20 Jun 2024 15:42:52 +0300
Subject: [PATCH 21/39] feat(ci): android home

---
 .gitea/workflows/test.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index ef78d70f..8fd9f90c 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -76,7 +76,7 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
-          flutter config --android-sdk $HOME/Android/Sdk
+          flutter config --android-sdk="$ANDROID_HOME"
 
       - name: Get dependencies
         run: flutter pub get
@@ -94,7 +94,6 @@ jobs:
 
       - name: Build apk
         run: |
-          flutter config --android-sdk $HOME/Android/Sdk
           flutter build apk
 
       - name: Rename and move apk

From 4e761901e3210729bc56bf6b1f50b7f782031700 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 10:17:01 +0300
Subject: [PATCH 22/39] feat(ci): add flutter docotor

---
 .gitea/workflows/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 8fd9f90c..b0a7b5df 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -32,7 +32,6 @@ jobs:
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
 
-
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
@@ -76,7 +75,11 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
+          flutter doctor -v
           flutter config --android-sdk="$ANDROID_HOME"
+          flutter config --android-sdk $ANDROID_HOME
+          echo "ANDROID_HOME: $ANDROID_HOME"
+          flutter doctor -v
 
       - name: Get dependencies
         run: flutter pub get

From 2d92b2da72a8dac620717ca629ab9db065adeec9 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:02:08 +0300
Subject: [PATCH 23/39] feat(ci): accept lic

---
 .gitea/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index b0a7b5df..522cd9bd 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -75,6 +75,8 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
+          flutter doctor --android-licenses
+          repeat 7 echo y
           flutter doctor -v
           flutter config --android-sdk="$ANDROID_HOME"
           flutter config --android-sdk $ANDROID_HOME

From c04e8118c7cc96f4decee18ef0e4fc3cad8da7c7 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:09:20 +0300
Subject: [PATCH 24/39] feat(ci); accept lic

---
 .gitea/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 522cd9bd..967d54e5 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -75,11 +75,11 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
-          flutter doctor --android-licenses
-          repeat 7 echo y
+          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | flutter doctor --android-licenses
           flutter doctor -v
           flutter config --android-sdk="$ANDROID_HOME"
           flutter config --android-sdk $ANDROID_HOME
+          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | flutter doctor --android-licenses
           echo "ANDROID_HOME: $ANDROID_HOME"
           flutter doctor -v
 

From eb2312d2d7c344813199054ce9aa740f4c8fd8a6 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:32:29 +0300
Subject: [PATCH 25/39] feat(ci): add sdk manager

---
 .gitea/workflows/test.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 967d54e5..a169b2c1 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,6 +31,8 @@ jobs:
           mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | sdkmanager --licenses
+          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"    
 
       - name: Set up Android environment variables
         run: |
@@ -79,7 +81,7 @@ jobs:
           flutter doctor -v
           flutter config --android-sdk="$ANDROID_HOME"
           flutter config --android-sdk $ANDROID_HOME
-          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | flutter doctor --android-licenses
+          flutter doctor --android-licenses
           echo "ANDROID_HOME: $ANDROID_HOME"
           flutter doctor -v
 

From 22285017e1a4c853fc3db9a437706f7c64129b07 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:39:42 +0300
Subject: [PATCH 26/39] feat(ci): remove

---
 .gitea/workflows/test.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index a169b2c1..51ce6da3 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -77,12 +77,7 @@ jobs:
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
           flutter --version
-          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | flutter doctor --android-licenses
-          flutter doctor -v
           flutter config --android-sdk="$ANDROID_HOME"
-          flutter config --android-sdk $ANDROID_HOME
-          flutter doctor --android-licenses
-          echo "ANDROID_HOME: $ANDROID_HOME"
           flutter doctor -v
 
       - name: Get dependencies

From 746f39a056ab3d85b986826e887ff3a69201df7c Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:41:46 +0300
Subject: [PATCH 27/39] feat(ci): install sdk manager

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 51ce6da3..7f8a486a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,6 +31,7 @@ jobs:
           mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          apt install sdkmanager
           (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"    
 
@@ -76,7 +77,6 @@ jobs:
       - name: Fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter --version
           flutter config --android-sdk="$ANDROID_HOME"
           flutter doctor -v
 

From 75dfc19eb16b16917b809c59855b69df97e91d2d Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:47:30 +0300
Subject: [PATCH 28/39] feat(ci): sdk manager

---
 .gitea/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 7f8a486a..5b3c026e 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -32,8 +32,8 @@ jobs:
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
           echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
           apt install sdkmanager
-          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | sdkmanager --licenses
-          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"    
+          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses
+          $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
       - name: Set up Android environment variables
         run: |

From 68bef1b0cdfff6744a9e0b3d1fa0388c9d183fe2 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:52:21 +0300
Subject: [PATCH 29/39] feat(ci): back

---
 .gitea/workflows/test.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 5b3c026e..8b3c18c3 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -24,16 +24,14 @@ jobs:
       - name: Install Android SDK
         run: |
           apt-get update
-          apt-get install -y openjdk-11-jdk wget unzip
+          apt-get install -y openjdk-11-jdk wget
           wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
-          unzip commandlinetools.zip -d cmdline-tools
+          unzip commandlinetools.zip
           mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
-          mv cmdline-tools/cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
-          echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          apt install sdkmanager
-          (echo y; echo y; echo y; echo y; echo y; echo y; echo y;) | $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager --licenses
-          $HOME/Android/Sdk/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          export ANDROID_SDK_ROOT=$HOME/Android/Sdk
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
+          yes | sdkmanager --licenses 
 
       - name: Set up Android environment variables
         run: |

From b21409116a531f29e0ce64a26517e5d9f8c89934 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 11:57:54 +0300
Subject: [PATCH 30/39] feat(ci): error ignore

---
 .gitea/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 8b3c18c3..2651a54c 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Eatvio App Android Test
 
-on: [pull_request]
+on: [ pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -31,7 +31,7 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses 
+          yes | sdkmanager --licenses >/dev/null 2>/dev/null
 
       - name: Set up Android environment variables
         run: |

From bae84fd6cf8743c4c765b23aa728b8d259e4cf1a Mon Sep 17 00:00:00 2001
From: apoloz <anatoliy.poloz@gmail.com>
Date: Fri, 21 Jun 2024 09:02:21 +0000
Subject: [PATCH 31/39] Update .gitea/workflows/test.yml

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 2651a54c..7d148c37 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses >/dev/null 2>/dev/null
+          yes | sdkmanager --licenses 2>/dev/null && echo $?
 
       - name: Set up Android environment variables
         run: |

From f3545b892d10a13ad66197a9c1bc655e5fade346 Mon Sep 17 00:00:00 2001
From: apoloz <anatoliy.poloz@gmail.com>
Date: Fri, 21 Jun 2024 09:06:52 +0000
Subject: [PATCH 32/39] Update .gitea/workflows/test.yml

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 7d148c37..0d9e3349 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses 2>/dev/null && echo $?
+          yes | sdkmanager --licenses 2>/dev/null || true
 
       - name: Set up Android environment variables
         run: |

From cd955ca4b913bd034c7c08e59d431ef046848ab0 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 12:18:52 +0300
Subject: [PATCH 33/39] feat(ci): add artifact

---
 .gitea/workflows/test.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 0d9e3349..07a00511 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -102,3 +102,9 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: EatvioApp-APK
+          path: ${{ env.APK_NAME }}

From b2785d635fc86c6c5cc867bae425029e602c4d4b Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 12:33:27 +0300
Subject: [PATCH 34/39] feat(ci): add env

---
 .gitea/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 07a00511..dbda640e 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -102,6 +102,7 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
+          echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v2

From 1fd68a95547c0e34f4c304224b49b947ee1d9304 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 12:45:15 +0300
Subject: [PATCH 35/39] feat(ci): v4

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index dbda640e..1d647e30 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -105,7 +105,7 @@ jobs:
           echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
 
       - name: Upload APK artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: EatvioApp-APK
           path: ${{ env.APK_NAME }}

From d8fe9841f92d6b49f6d51b8ea9561001a42a9b3d Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 12:57:47 +0300
Subject: [PATCH 36/39] feat(ci): v4 gitea

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 1d647e30..ea6dcb07 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -105,7 +105,7 @@ jobs:
           echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
 
       - name: Upload APK artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/gitea-upload-artifact@v4
         with:
           name: EatvioApp-APK
           path: ${{ env.APK_NAME }}

From 6d99b7fe9fdfbd7daca87714b37716d8bc6ae3cd Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Fri, 21 Jun 2024 13:01:56 +0300
Subject: [PATCH 37/39] feat(ci): v3

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index ea6dcb07..a8fbb7d6 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -105,7 +105,7 @@ jobs:
           echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
 
       - name: Upload APK artifact
-        uses: actions/gitea-upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: EatvioApp-APK
           path: ${{ env.APK_NAME }}

From 1f9173d832d7e45c8fd8ad70a1324b7609d56c59 Mon Sep 17 00:00:00 2001
From: Anatoliy Poloz <anatoliy.poloz@gmail.com>
Date: Fri, 21 Jun 2024 14:25:57 +0300
Subject: [PATCH 38/39] remove orphans

---
 .DS_Store | Bin 8196 -> 0 bytes
 bpc       | 104 ------------------
 fc        | 313 ------------------------------------------------------
 rc        | 102 ------------------
 4 files changed, 519 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 bpc
 delete mode 100644 fc
 delete mode 100644 rc

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 506ab56a1bbab76b0cc160948fb2d34d83b3f3f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHML2uJA6n<X2HPv7$5|w&Eio|s)Wut?MODWxf1D6%S0Z>VrYDCN8s!3a+s#4GJ
zANUJg`6c`pPVhb3o7%LUkPs9JJF-6~exL1r&rb4EA`;DEaG$6`L=G}zX&1$c#O<7y
z(w4b$3n;)R`alVV$Q_bP*7kx`z$#!BunJfOtOEan0(fR~a@IWeb*n9{0#<?lQUSg{
zxX6qRgENil)`3EW0KhyhtAsk@0L5_)HVn=*Dk}Qa(StBlVL}X{>1cP^9M~{8)2Qhr
zG@XPQS(pe#sL{c5l{txqMq641tOCmlaO_?tk7DF#A%5>uidbHvC7~)>Ji4IhStPrD
zBz>@Wqdh^c{!j@uqJruvpaFOx1sUrv8S5QbCpdZ-DOt1?cdoPb$4TGJ;;Y|}!X&NL
zzKN||etW0j6r5e>ZTr0(w^J`2CQWbfn$KQH8TprW&wm;A#+}mbr!r2xFzyW$Aq;vj
zdGjia137NWVH_li+tv+E(J6LHmC2-DKi+pA96XxtyOZOC8tR8f(`nHu-@W(vv~wO^
z#PTD{f!mO|UC~W_epP-#ZQ=Ki+JiWf@fnklx5=j=G>oz;3TDo0UZwyFj-a8$5t*+q
zzu-ObJ=4=3`ti`uNcp{kdLKs>XRAH`dCv1W#mRV)*yAg#HtxSe_F4VmZ~D*t=8WfZ
z@IgraiuF9NL>^X>&X(3adw1UM20SptT1bFB>cSh$>(Y6qfA;0|ytO-6?9KVHNT+my
zechtxz$!eyVizwk@>nrF%rDK%2s?Pr4r_XbDPnEw9bupUtcFcifz2t9(?eG{{y$m&
z{eN>4v?E&utO9>r0g-RDTTKje`LdcFkz;Ka`5iJRwwq~G6cj2P2dZ!!c=d-N>Ml%~
W(=a&Gh$~3;ML@}53#-6iRp2MmkvmTS

diff --git a/bpc b/bpc
deleted file mode 100644
index 7221be5e..00000000
--- a/bpc
+++ /dev/null
@@ -1,104 +0,0 @@
-import 'bloc/blog_post_create_bloc.dart';
-import 'models/blog_post_create_model.dart';
-import 'package:eatvio_app/core/app_export.dart';
-import 'package:flutter/material.dart';
-import 'package:eatvio_app/widgets/custom_bottom_bar.dart';
-
-class BlogPostCreateScreen extends StatelessWidget {
-  const BlogPostCreateScreen({Key? key}) : super(key: key);
-  static Widget builder(BuildContext context) {
-    final blog_postID = ModalRoute.of(context)!.settings.arguments;
-    return BlocProvider<BlogPostCreateBloc>(
-        create: (context) => BlogPostCreateBloc(BlogPostCreateState(
-            blog_postModelObj:
-                BlogPostCreateModel(blog_postID: blog_postID.toString())))
-          ..add(BlogPostCreateInitialEvent()),
-        child: BlogPostCreateScreen());
-  }
-
-  Widget build(BuildContext context) {
-    return BlocBuilder<BlogPostCreateBloc, BlogPostCreateState>(
-      builder: (context, state) {
-        if (state is BlogPostCreateInitialState) {
-          // Это начальное состояние, данные ещё не загружены.
-          return Container(
-            color: Colors.white,
-          );
-        } else if (state is BlogPostCreateLoadedState) {
-          // Данные загружены, можно строить экран.
-          return _buildBlogPostCreate(context, state);
-        } else if (state is BlogPostCreateErrorState) {
-          // Произошла ошибка при загрузке данных.
-          return Center(child: Text(state.errorMessage));
-        } else {
-          // Другие состояния, если они есть.
-          return Container(); // Пустой контейнер для необработанных состояний.
-        }
-      },
-    );
-  }
-
-  _buildBlogPostCreate(BuildContext context, BlogPostCreateLoadedState state) {
-    mediaQueryData = MediaQuery.of(context);
-    return Scaffold(
-        resizeToAvoidBottomInset: false,
-        body: SafeArea(
-          child: Container(
-            width: double.maxFinite,
-            decoration: AppDecoration.fillGray,
-            child: ListView(children: [
-              Container(
-                margin: EdgeInsets.only(
-                  left: 16.h,
-                  right: 20.h,
-                  bottom: 10.h,
-                ),
-                padding: EdgeInsets.all(12.h),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.grey.withOpacity(0.5),
-                      spreadRadius: 2,
-                      blurRadius: 5,
-                      offset: Offset(0, 3),
-                    ),
-                  ],
-                ),
-                child: Column(mainAxisSize: MainAxisSize.min, children: [
-                  SizedBox(height: 16.0),
-                  TextFormField(
-                    controller: state.title,
-                    decoration: InputDecoration(labelText: 'Заголовок'),
-                  ),
-                  SizedBox(height: 16.0),
-                  TextFormField(
-                    controller: state.description,
-                    decoration: InputDecoration(labelText: 'Описание'),
-                  ),
-                  SizedBox(height: 16.0),
-                  TextFormField(
-                    controller: state.youtube_url,
-                    decoration: InputDecoration(labelText: 'Ссылка'),
-                  ),
-                  SizedBox(height: 16.0),
-                  // Здесь нужно добавить виджет для загрузки картинки
-                  ElevatedButton(
-                    onPressed: () => context
-                        .read<BlogPostCreateBloc>()
-                        .add(CreateBlogPost()),
-                    child: Text('Создать'),
-                  )
-                ]),
-              )
-            ]),
-          ),
-        ),
-        bottomNavigationBar: _buildBottomBar(context));
-  }
-}
-
-_buildBottomBar(BuildContext context) {
-  return CustomBottomBar(onChanged: (BottomBarEnum type) {});
-}
diff --git a/fc b/fc
deleted file mode 100644
index 07c67735..00000000
--- a/fc
+++ /dev/null
@@ -1,313 +0,0 @@
-import 'bloc/feed_bloc.dart';
-import 'models/feed_model.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:eatvio_app/presentation/feed/feed_screen/widgets/feed_search_view.dart';
-import 'package:eatvio_app/presentation/feed/feed_screen/widgets/feed_scroll_item.dart';
-import 'package:eatvio_app/widgets/custom_bottom_bar.dart';
-import 'package:eatvio_app/widgets/custom_outlined_button.dart';
-import 'package:eatvio_app/core/app_export.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-
-class FeedScreen extends StatelessWidget {
-  static Widget builder(BuildContext context) {
-    return BlocProvider<FeedBloc>(
-        create: (context) => FeedBloc(FeedState(myProfileModelObj: FeedModel()))
-          ..add(FeedInitialEvent()),
-        child: FeedScreen());
-  }
-
-  Widget build(BuildContext context) {
-    return BlocBuilder<FeedBloc, FeedState>(
-      builder: (context, state) {
-        if (state is FeedInitialState) {
-          // Это начальное состояние, данные ещё не загружены.
-          return CircularProgressIndicator(
-            color: Colors.white,
-            backgroundColor: Colors.white,
-          );
-        } else if (state is FeedLoadedState) {
-          // Данные загружены, можно строить экран.
-          return _buildFeedScreen(context, state);
-        } else {
-          // Другие состояния, если они есть.
-          return Container(); // Пустой контейнер для необработанных состояний.
-        }
-      },
-    );
-  }
-
-  _buildFeedScreen(BuildContext context, FeedLoadedState state) {
-    mediaQueryData = MediaQuery.of(context);
-    return Scaffold(
-      backgroundColor: Colors.grey[200],
-      resizeToAvoidBottomInset: true,
-      body: SafeArea(
-        child: SingleChildScrollView(
-          child: Container(
-            width: double.maxFinite,
-            decoration: BoxDecoration(color: Colors.grey[200]),
-            child: Padding(
-              padding: EdgeInsets.all(16),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  _buildSearch(),
-                  SizedBox(height: 20),
-                  _buildMenu(context, state),
-                  SizedBox(height: 20),
-                  _buildBlogPostList(context, state)
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-      bottomNavigationBar: _buildBottomBar(context),
-    );
-  }
-
-  _buildSearch() {
-    return Container(
-      margin: EdgeInsets.only(bottom: 10),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        boxShadow: [
-          BoxShadow(
-            color: Colors.grey.withOpacity(0.5),
-            spreadRadius: 2,
-            blurRadius: 5,
-            offset: Offset(0, 3),
-          ),
-        ],
-      ),
-      child: Padding(
-        padding: const EdgeInsets.all(12.0),
-        child: Column(
-          children: [
-            CustomSearchView(
-              hintText: "Поиск записей",
-            ),
-            SizedBox(height: 10),
-            Row(
-              children: [
-                Flexible(
-                  flex: 5,
-                  child: CustomOutlinedButton(
-                    text: "Найти запись",
-                    buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                  ),
-                ),
-                SizedBox(width: 8), // Add some spacing between the buttons
-                Flexible(
-                  flex: 1,
-                  child: CustomOutlinedButton(
-                    text: "+",
-                    buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                  ),
-                ),
-              ],
-            )
-          ],
-        ),
-      ),
-    );
-  }
-
-  _buildBlogPostList(BuildContext context, FeedLoadedState state) {
-    List<Widget> postWidgets = [];
-
-    if (state.posts != null) {
-      for (var post in state.posts!) {
-        postWidgets.add(_buildFeedEntry(post, context));
-      }
-    }
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: postWidgets,
-    );
-  }
-
-  _buildFeedEntry(post, BuildContext context) {
-    return Container(
-        margin: EdgeInsets.only(bottom: 10),
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: const BorderRadius.all(Radius.circular(12)),
-          boxShadow: [
-            BoxShadow(
-              color: Colors.grey.withOpacity(0.5),
-              spreadRadius: 2,
-              blurRadius: 5,
-              offset: Offset(0, 3),
-            ),
-          ],
-        ),
-        child: Column(children: [
-          ListTile(
-            leading: CachedNetworkImage(
-              imageUrl: dotenv.env['STORAGE_URL']! +
-                  (post["author"]['profile_photo_path'] ?? ''),
-              imageBuilder: (context, imageProvider) => CircleAvatar(
-                backgroundImage: imageProvider,
-                radius: 25,
-              ),
-              placeholder: (context, url) => CircularProgressIndicator(),
-              errorWidget: (context, url, error) => CircleAvatar(
-                child: Icon(Icons.person),
-                backgroundColor: Colors.white,
-                radius: 25,
-              ),
-            ),
-            title: Text(
-              post?['author']['name'] ?? '',
-              style: CustomTextStyles.titleMediumSemiBold,
-            ),
-            subtitle: Text(
-              DateFormat('dd.MM.yyyy')
-                  .format(DateTime.parse(post?['post']['updated_at'])),
-              style: theme.textTheme.bodyMedium,
-            ),
-            onTap: () => Navigator.pushNamed(
-              context,
-              AppRoutes.blogPostScreen,
-              arguments: post?['post']['id'].toString(),
-            ),
-            trailing: PopupMenuButton<String>(
-              onSelected: (value) => print("tap"),
-              itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
-                PopupMenuItem<String>(
-                  value: 'edit',
-                  child: Text('Редактировать'),
-                ),
-                PopupMenuItem<String>(
-                  value: 'delete',
-                  child: Text('Удалить'),
-                ),
-              ],
-            ),
-          ),
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Column(
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Spacer(),
-                    Align(
-                      alignment: Alignment.center,
-                      child: Text(
-                        post?['post']['title'],
-                        style: CustomTextStyles.titleMediumBlack,
-                      ),
-                    ),
-                    Spacer(),
-                  ],
-                ),
-                SizedBox(height: 8.0),
-                Text(
-                  post?['post']['description'],
-                  style: CustomTextStyles.bodyMediumBluegray800,
-                ),
-                SizedBox(height: 16.0),
-                CachedNetworkImage(
-                  imageUrl: dotenv.env['STORAGE_URL']! +
-                      (post?['post']['image'] ?? ''),
-                  imageBuilder: (context, imageProvider) => Stack(
-                    children: [
-                      ClipRRect(
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(8.0)),
-                        child: Image(
-                          image: imageProvider,
-                        ),
-                      ),
-                    ],
-                  ),
-                  placeholder: (context, url) => CircularProgressIndicator(),
-                ),
-                SizedBox(height: 16.0),
-                Row(children: [
-                  Padding(
-                    padding: EdgeInsets.only(left: 4),
-                    child: Row(children: [
-                      Padding(
-                        padding: EdgeInsets.only(right: 4),
-                        child: Icon(Icons.comment_outlined),
-                      ),
-                      Text(
-                        "Комментировать",
-                      )
-                    ]),
-                  ),
-                  Spacer(),
-                  Row(children: [
-                    Padding(
-                      padding: const EdgeInsets.only(right: 4),
-                      child: Icon(Icons.favorite_outline),
-                    ),
-                    Text(
-                      "Нравится",
-                    )
-                  ]),
-                  Spacer(),
-                  Padding(
-                    padding: EdgeInsets.only(right: 4),
-                    child: Icon(Icons.share_outlined),
-                  ),
-                ]),
-              ],
-            ),
-          ),
-        ]));
-  }
-
-  Function onTapBack(BuildContext context) {
-    return () {
-      onTapArrowLeft(context);
-    };
-  }
-
-  _buildBottomBar(BuildContext context) {
-    return CustomBottomBar(onChanged: (BottomBarEnum type) {});
-  }
-
-  onTapArrowLeft(BuildContext context) {
-    NavigatorService.goBack();
-  }
-
-  _buildMenu(BuildContext context, FeedLoadedState state) {
-    return Container(
-      padding: EdgeInsets.all(12),
-      margin: EdgeInsets.only(bottom: 10),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        boxShadow: [
-          BoxShadow(
-            color: Colors.grey.withOpacity(0.5),
-            spreadRadius: 2,
-            blurRadius: 5,
-            offset: Offset(0, 3),
-          ),
-        ],
-      ),
-      child: SingleChildScrollView(
-        scrollDirection: Axis.horizontal,
-        child: Row(
-          children: <Widget>[
-            ScrollItem(title: 'Все'),
-            ScrollItem(title: 'Рецепты'),
-            ScrollItem(title: 'Диеты'),
-            ScrollItem(title: 'Планы'),
-            ScrollItem(title: 'Записи'),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/rc b/rc
deleted file mode 100644
index 49ddfaa0..00000000
--- a/rc
+++ /dev/null
@@ -1,102 +0,0 @@
-import 'bloc/recipe_create_bloc.dart';
-import 'models/recipe_create_model.dart';
-import 'package:eatvio_app/core/app_export.dart';
-import 'package:flutter/material.dart';
-import 'package:eatvio_app/widgets/custom_bottom_bar.dart';
-
-class RecipeCreateScreen extends StatelessWidget {
-  const RecipeCreateScreen({Key? key}) : super(key: key);
-  static Widget builder(BuildContext context) {
-    final recipeID = ModalRoute.of(context)!.settings.arguments;
-    return BlocProvider<RecipeCreateBloc>(
-        create: (context) => RecipeCreateBloc(RecipeCreateState(
-            recipeModelObj: RecipeCreateModel(recipeID: recipeID.toString())))
-          ..add(RecipeCreateInitialEvent()),
-        child: RecipeCreateScreen());
-  }
-
-  Widget build(BuildContext context) {
-    return BlocBuilder<RecipeCreateBloc, RecipeCreateState>(
-      builder: (context, state) {
-        if (state is RecipeCreateInitialState) {
-          // Это начальное состояние, данные ещё не загружены.
-          return Container(
-            color: Colors.white,
-          );
-        } else if (state is RecipeCreateLoadedState) {
-          // Данные загружены, можно строить экран.
-          return _buildRecipeCreate(context, state);
-        } else if (state is RecipeCreateErrorState) {
-          // Произошла ошибка при загрузке данных.
-          return Center(child: Text(state.errorMessage));
-        } else {
-          // Другие состояния, если они есть.
-          return Container(); // Пустой контейнер для необработанных состояний.
-        }
-      },
-    );
-  }
-
-  _buildRecipeCreate(BuildContext context, RecipeCreateLoadedState state) {
-    mediaQueryData = MediaQuery.of(context);
-    return Scaffold(
-        resizeToAvoidBottomInset: false,
-        body: SafeArea(
-          child: Container(
-            width: double.maxFinite,
-            decoration: AppDecoration.fillGray,
-            child: ListView(children: [
-              Container(
-                margin: EdgeInsets.only(
-                  left: 16.h,
-                  right: 20.h,
-                  bottom: 10.h,
-                ),
-                padding: EdgeInsets.all(12.h),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.grey.withOpacity(0.5),
-                      spreadRadius: 2,
-                      blurRadius: 5,
-                      offset: Offset(0, 3),
-                    ),
-                  ],
-                ),
-                child: Column(mainAxisSize: MainAxisSize.min, children: [
-                  SizedBox(height: 16.0),
-                  TextFormField(
-                    controller: state.title,
-                    decoration: InputDecoration(labelText: 'Заголовок'),
-                  ),
-                  SizedBox(height: 16.0),
-                  TextFormField(
-                    controller: state.description,
-                    decoration: InputDecoration(labelText: 'Описание'),
-                  ),
-                  SizedBox(height: 16.0),
-                  TextFormField(
-                    controller: state.video_url,
-                    decoration: InputDecoration(labelText: 'Ссылка'),
-                  ),
-                  SizedBox(height: 16.0),
-                  // Здесь нужно добавить виджет для загрузки картинки
-                  ElevatedButton(
-                    onPressed: () =>
-                        context.read<RecipeCreateBloc>().add(CreateRecipe()),
-                    child: Text('Создать'),
-                  )
-                ]),
-              )
-            ]),
-          ),
-        ),
-        bottomNavigationBar: _buildBottomBar(context));
-  }
-}
-
-_buildBottomBar(BuildContext context) {
-  return CustomBottomBar(onChanged: (BottomBarEnum type) {});
-}

From eaa9247927f1667b576cd617ce301946d11f1e58 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 24 Jun 2024 11:15:43 +0300
Subject: [PATCH 39/39] feat(ci): rename artifact

---
 .gitea/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index a8fbb7d6..ffd32815 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -107,5 +107,5 @@ jobs:
       - name: Upload APK artifact
         uses: actions/upload-artifact@v3
         with:
-          name: EatvioApp-APK
+          name: ${{ env.APK_NAME }}
           path: ${{ env.APK_NAME }}