forked from eatvio/eatvio_app
Compare commits
300 Commits
dda0aa7440
...
Issue-957
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
85d32dd3a1 | ||
|
|
af3b40d5f2 | ||
|
|
63fc824449 | ||
|
|
2859607f4d | ||
|
|
48af13e37c | ||
|
|
91c8300da7 | ||
|
|
ea107ff07e | ||
|
|
9d78d9c991 | ||
|
|
86324c9897 | ||
|
|
9ef9a7289c | ||
|
|
10c7e0a584 | ||
|
|
8cdce6a885 | ||
|
|
777b389e13 | ||
|
|
ed60588988 | ||
| 5d86b7c71b | |||
|
|
50aefde842 | ||
| 5fbd578463 | |||
|
|
426bd49aa1 | ||
| c6fc20d217 | |||
|
|
17e18dc68b | ||
| d483295aab | |||
|
|
c8284338aa | ||
|
|
03ec91a595 | ||
|
|
e814683984 | ||
|
|
684415ef5b | ||
|
|
631ceb2b7a | ||
|
|
71a405c63f | ||
|
|
4ca90eb2df | ||
|
|
f17f1ecb57 | ||
|
|
a71bcc752d | ||
|
|
aac085def4 | ||
|
|
b6b13b1db5 | ||
|
|
6629286bf1 | ||
|
|
966bc23f0b | ||
|
|
a13b623ca2 | ||
|
|
ee2dd75a94 | ||
|
|
c450a41715 | ||
|
|
55b6b75134 | ||
|
|
335e36dd18 | ||
| 7106bde4ae | |||
|
|
4f241f7db6 | ||
|
|
3d7755a9a2 | ||
|
|
decc8c63e6 | ||
|
|
ad5b48ef1b | ||
|
|
e8dc0138e2 | ||
|
|
96896671b6 | ||
|
|
5e2f0430d9 | ||
|
|
2da3b10e63 | ||
|
|
5cb121d733 | ||
|
|
109013c25c | ||
|
|
f5d14d213f | ||
|
|
26ae28a705 | ||
|
|
7672477c03 | ||
|
|
07277d6e48 | ||
|
|
9d1bedff26 | ||
|
|
e39638be7f | ||
| 442fc0ec14 | |||
| a8f8cc8eb0 | |||
|
|
3892bf00aa | ||
|
|
a492c2d964 | ||
|
|
89268e1132 | ||
| 60753a13d2 | |||
|
|
08eeea6ba4 | ||
|
|
58d99424a0 | ||
|
|
c6cdb5bf01 | ||
|
|
50deaeddd1 | ||
|
|
56fb2f1bac | ||
|
|
24185cc875 | ||
|
|
9e7bf258d0 | ||
|
|
098633b3ac | ||
|
|
c3aa77b02d | ||
|
|
2d5384f2ec | ||
|
|
1c7e494f90 | ||
|
|
8bbe2613d2 | ||
|
|
5f6ceab6a1 | ||
|
|
250a3f5d73 | ||
|
|
3e0d8b6c27 | ||
|
|
9ed3b37272 | ||
|
|
ae628a6ecc | ||
|
|
88d8ec52d9 | ||
|
|
937921e26f | ||
|
|
d324bd6540 | ||
|
|
5766e216c8 | ||
|
|
ee9b97b694 | ||
|
|
31eec6c9d7 | ||
|
|
5fae3eb5e8 | ||
|
|
b0a167b9e9 | ||
|
|
0b2e026d1d | ||
|
|
0641513ebe | ||
|
|
be0a99b164 | ||
|
|
8b1d08b2aa | ||
|
|
6dab0d159b | ||
|
|
5167766dbf | ||
| cc79e40df9 | |||
|
|
cdc5936d3c | ||
|
|
67e770f5d0 | ||
|
|
6f666a8859 | ||
|
|
c540cbe6df | ||
|
|
6c4104e9ea | ||
|
|
6d1bcb85fb | ||
|
|
9753644570 | ||
|
|
75983818d1 | ||
|
|
5b149e2fd2 | ||
|
|
699148b202 | ||
|
|
6e7894b911 | ||
|
|
d4f41fe6cf | ||
|
|
bb97c395dd | ||
|
|
b7804db49d | ||
|
|
e90a466a5b | ||
|
|
5f30aaeb2a | ||
|
|
516dfa4158 | ||
|
|
ae07851396 | ||
|
|
34eccb7db5 | ||
|
|
042cc0ea20 | ||
|
|
f81aebe9d8 | ||
|
|
d70aaf955f | ||
|
|
c91e83adaf | ||
|
|
531f732b1a | ||
|
|
d10f2f1356 | ||
|
|
bf110b70c1 | ||
|
|
97418e11d4 | ||
|
|
225077907f | ||
|
|
296adc8229 | ||
|
|
7dd7e3b488 | ||
|
|
a496edaf4c | ||
|
|
400cc004ef | ||
|
|
beda152df0 | ||
|
|
42ffde820d | ||
|
|
adb7b0bd74 | ||
|
|
a768eefed0 | ||
|
|
0ac50d6d18 | ||
|
|
a0d8fda50d | ||
|
|
1d286fa8d9 | ||
|
|
c2a5e7305e | ||
|
|
bbb1b28692 | ||
|
|
21a65caea9 | ||
|
|
eac366e9ae | ||
|
|
278f4d7e10 | ||
|
|
ac5504a514 | ||
|
|
843e1ce4dd | ||
|
|
db6db89567 | ||
|
|
044d86e710 | ||
|
|
4ff880e079 | ||
|
|
05b9ca17c7 | ||
|
|
a1c0c2694b | ||
|
|
2d7407ce99 | ||
| 62fe5ebfa0 | |||
|
|
3dc36ab52d | ||
| 190e212eb4 | |||
|
|
cf3d1a945c | ||
|
|
c54915f45d | ||
|
|
b188570882 | ||
|
|
d0794670f6 | ||
|
|
3b53ed6f7d | ||
|
|
a003814265 | ||
|
|
e99465a550 | ||
|
|
a01f3914c4 | ||
|
|
15f9149cfd | ||
|
|
79df8c5f9a | ||
|
|
a93da1b505 | ||
|
|
8144013747 | ||
|
|
7bac2a13ac | ||
|
|
29589ef6fd | ||
|
|
97a6fe57e9 | ||
|
|
8309498d9e | ||
|
|
aa098b31bc | ||
|
|
7a85c65918 | ||
|
|
6ff35fd162 | ||
|
|
6811b325be | ||
|
|
92205c09d6 | ||
| 008dba9fed | |||
|
|
55ca558bfb | ||
|
|
91499ae207 | ||
|
|
4bacdf5e76 | ||
|
|
e76c1aed20 | ||
|
|
de8f879f59 | ||
|
|
f6809a06b3 | ||
|
|
775d4fb80f | ||
|
|
64e9df69f7 | ||
|
|
6ccfcdedda | ||
|
|
d3c8034b8f | ||
|
|
44ede73ceb | ||
| 2c63990afc | |||
|
|
eb69b253bc | ||
|
|
f26886a7c5 | ||
|
|
13ccf56df0 | ||
|
|
c0032f7a95 | ||
|
|
4852d2cf10 | ||
|
|
41e96c63c6 | ||
|
|
c786821275 | ||
|
|
7b425e56f1 | ||
|
|
bf2ba1fbda | ||
|
|
d206e7ec12 | ||
|
|
a778257215 | ||
|
|
497ff19cfa | ||
|
|
bb59552e3e | ||
|
|
55b2bb0436 | ||
|
|
90746d0be7 | ||
|
|
d70d172c69 | ||
|
|
4e23992d22 | ||
|
|
7a846ed218 | ||
|
|
fcc2936c22 | ||
|
|
b11cf2c0b0 | ||
|
|
0ead14bca5 | ||
|
|
08e56d9777 | ||
|
|
99659f7ea1 | ||
|
|
e158d812e4 | ||
|
|
3d774267ca | ||
|
|
aeb89a9aba | ||
|
|
a4f5bfdb4d | ||
|
|
5b705dfb72 | ||
|
|
a792dcd163 | ||
|
|
9c7ca14017 | ||
|
|
38118055a5 | ||
|
|
5d6e25858b | ||
|
|
42b443c3ba | ||
|
|
21f7c40cde | ||
|
|
f56092d88f | ||
|
|
2b97c0f57d | ||
|
|
a1304e4612 | ||
|
|
7b534cf891 | ||
|
|
22b2e5f249 | ||
|
|
5dfdbe4543 | ||
|
|
5c9a9c22ba | ||
|
|
4f920359c8 | ||
|
|
2ab3bc1cf0 | ||
|
|
91bd8f9d68 | ||
| 9c6f6bdfb1 | |||
|
|
fe1e81e455 | ||
|
|
b7e064a560 | ||
|
|
f1b7a24044 | ||
|
|
cb441b4027 | ||
| 7282fea59a | |||
|
|
4adec4dbbc | ||
|
|
d5b0e972a5 | ||
|
|
391efeb8dd | ||
| d115af6f8e | |||
|
|
2408443a26 | ||
|
|
c378c7fc16 | ||
|
|
070a3e39e7 | ||
|
|
d1753e99f8 | ||
|
|
960afbd6ed | ||
|
|
70e4a42e98 | ||
|
|
04061cb4c1 | ||
|
|
edd064d20d | ||
|
|
cdb7378265 | ||
|
|
746d366c18 | ||
|
|
c2a506cdbf | ||
|
|
abe4985f0e | ||
|
|
ca06b2bd0f | ||
|
|
04c932646d | ||
|
|
3d4363185b | ||
|
|
953230b387 | ||
|
|
9d845e1264 | ||
|
|
32de60742e | ||
|
|
3923b61c67 | ||
|
|
0cd8e662d9 | ||
| 89ea73fc59 | |||
|
|
9e33063c30 | ||
|
|
f3d4478c65 | ||
| 673aa86370 | |||
|
|
1738d27b82 | ||
|
|
d0becb9e11 | ||
|
|
965ae2f02b | ||
|
|
9fcfac87d4 | ||
|
|
2a25be5aa4 | ||
| b420d11996 | |||
|
|
cbeb91a9f0 | ||
|
|
9ca09e8137 | ||
|
|
8917f54e7b | ||
|
|
626f74d20d | ||
|
|
7df32dabd2 | ||
|
|
2e57cd9519 | ||
|
|
c6c42b0525 | ||
|
|
58bb766721 | ||
|
|
0be7392a39 | ||
|
|
4deda92c5e | ||
|
|
b83d91e7f2 | ||
| e5029f581d | |||
|
|
c69fe7f0a6 | ||
| fc0e9b1063 | |||
|
|
453f119317 | ||
|
|
6d0bee4da8 | ||
|
|
04d4be38d4 | ||
| fa22cf5d36 | |||
| 91e8348015 | |||
|
|
1b948b99e3 | ||
|
|
b6eac3c46f | ||
|
|
6fa944b3df | ||
|
|
c31411c4a2 | ||
|
|
6214d19a14 | ||
|
|
db5dddff86 | ||
|
|
39775cd7a8 | ||
|
|
36e2f12e3f | ||
|
|
66d2533add | ||
|
|
425f16bfc9 | ||
|
|
c5e30d8f00 | ||
|
|
d0935fbaae | ||
|
|
dc400ef5b7 | ||
|
|
992cb38cdd |
@@ -3,19 +3,19 @@ name: Eatvio App Android Test
|
||||
on: [ pull_request ]
|
||||
|
||||
env:
|
||||
flutter_version: "3.32.0"
|
||||
flutter_version: "3.41.2"
|
||||
java_version: "21.x"
|
||||
flutter_channel: "stable"
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: [ dev-office ]
|
||||
runs-on: [ ubuntu-latest ]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: https://github.com/actions/checkout@v3
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
uses: https://github.com/actions/setup-java@v3
|
||||
with:
|
||||
distribution: "zulu"
|
||||
java-version: ${{ env.java_version }}
|
||||
@@ -24,7 +24,7 @@ jobs:
|
||||
- name: Install Android SDK
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y openjdk-11-jdk wget
|
||||
apt-get install -y openjdk-11-jdk wget xz-utils tar
|
||||
wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
|
||||
unzip commandlinetools.zip
|
||||
mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
|
||||
@@ -44,7 +44,7 @@ jobs:
|
||||
apt-get install -y jq
|
||||
|
||||
- id: flutter-action
|
||||
uses: actions/flutter-action@v2
|
||||
uses: https://github.com/subosito/flutter-action@v2
|
||||
with:
|
||||
channel: ${{ env.flutter_channel }}
|
||||
flutter-version: ${{ env.flutter_version }}
|
||||
@@ -79,7 +79,7 @@ jobs:
|
||||
echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
|
||||
|
||||
- name: Upload APK artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: https://github.com/actions/upload-artifact@v3
|
||||
with:
|
||||
name: ${{ env.APK_NAME }}
|
||||
path: ${{ env.APK_NAME }}
|
||||
|
||||
@@ -3,7 +3,7 @@ name: Eatvio App Android Test on custom docker
|
||||
on: [ pull_request ]
|
||||
|
||||
env:
|
||||
flutter_version: "3.32.0"
|
||||
flutter_version: "3.41.2"
|
||||
java_version: "21.x"
|
||||
flutter_channel: "stable"
|
||||
my_local_cache_dir: "/opt/hostedtoolcache/"
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
runs-on: [ dev-office-flutter ]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: https://github.com/actions/checkout@v3
|
||||
|
||||
- name: Set up Android environment variables
|
||||
id: "android-env-setup"
|
||||
@@ -52,7 +52,7 @@ jobs:
|
||||
# echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
|
||||
|
||||
# - name: Upload APK artifact
|
||||
# uses: actions/upload-artifact@v3
|
||||
# uses: https://github.com/actions/upload-artifact@v3
|
||||
# with:
|
||||
# name: ${{ env.APK_NAME }}
|
||||
# path: ${{ env.APK_NAME }}
|
||||
|
||||
@@ -8,11 +8,14 @@ jobs:
|
||||
build:
|
||||
runs-on: [macos-arm64]
|
||||
steps:
|
||||
- name: Fastlane version
|
||||
run: fastlane --version
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
uses: https://github.com/actions/checkout@v2
|
||||
|
||||
- name: Checkout env repository
|
||||
uses: actions/checkout@v2
|
||||
uses: https://github.com/actions/checkout@v2
|
||||
with:
|
||||
repository: mso7nueh/eatvio_app_env
|
||||
path: env_repo
|
||||
@@ -54,11 +57,13 @@ jobs:
|
||||
|
||||
- name: Flutter build
|
||||
run: |
|
||||
flutter upgrade
|
||||
flutter clean
|
||||
flutter pub get
|
||||
flutter pub upgrade
|
||||
flutter pub run build_runner build --delete-conflicting-outputs
|
||||
# Configure Flutter for release mode
|
||||
pod repo update
|
||||
flutter build ios --config-only --release
|
||||
cd ios
|
||||
pod update
|
||||
|
||||
@@ -1,27 +1,39 @@
|
||||
name: Eatvio App Android Test
|
||||
|
||||
on: [ pull_request ]
|
||||
on: [pull_request]
|
||||
|
||||
env:
|
||||
flutter_version: "3.35.1"
|
||||
java_version: "21.x"
|
||||
flutter_channel: "stable"
|
||||
my_local_cache_dir: "/opt/hostedtoolcache/"
|
||||
ANDROID_SDK_ROOT: "/opt/hostedtoolcache/Android/Sdk"
|
||||
flutter_version: '3.41.2'
|
||||
java_version: '21.x'
|
||||
flutter_channel: 'stable'
|
||||
my_local_cache_dir: '/opt/hostedtoolcache/'
|
||||
ANDROID_SDK_ROOT: '/opt/hostedtoolcache/Android/Sdk'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: [ dev-office ]
|
||||
runs-on: [ubuntu-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: https://github.com/actions/checkout@v3
|
||||
|
||||
# Пока что не нужно проксирование
|
||||
# - name: Set proxy server
|
||||
# env:
|
||||
# PROXY_USER: ${{ secrets.PROXY_USER }}
|
||||
# PROXY_PASSWORD: ${{ secrets.PROXY_PASSWORD }}
|
||||
# run: |
|
||||
# echo "Setting up proxy..."
|
||||
# cat <<EOF >/etc/apt/apt.conf.d/proxy.conf
|
||||
# Acquire::http::Proxy "socks5h://${PROXY_USER}:${PROXY_PASSWORD}@10.55.5.202:19843/";
|
||||
# EOF
|
||||
|
||||
- name: Checkout env repository
|
||||
uses: actions/checkout@v3
|
||||
uses: https://github.com/actions/checkout@v3
|
||||
with:
|
||||
repository: mso7nueh/eatvio_app_env
|
||||
repository: eatvio/eatvio_app_env
|
||||
path: env_repo
|
||||
token: ${{ vars.MSO7NUEH_TOKEN }}
|
||||
# Здесь может быть токен любого юзера с доступом в gitea
|
||||
token: ${{ vars.READ_USER_GITEA_TOKEN }}
|
||||
ref: main
|
||||
|
||||
- name: Copy .env file
|
||||
@@ -56,22 +68,22 @@ jobs:
|
||||
|
||||
- name: Cache Android SDK
|
||||
id: cache-sdk
|
||||
uses: "https://gitea.com/actions/cache@v4"
|
||||
uses: 'https://github.com/actions/cache@v4'
|
||||
with:
|
||||
path: ${{ env.my_local_cache_dir }}
|
||||
key: ${{ runner.os }}-cache-sdk
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v3
|
||||
uses: https://github.com/actions/setup-java@v3
|
||||
with:
|
||||
distribution: "zulu"
|
||||
distribution: 'zulu'
|
||||
java-version: ${{ env.java_version }}
|
||||
cache: gradle
|
||||
|
||||
- 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-17-jdk wget jq clang cmake ninja-build libgtk-3-dev
|
||||
|
||||
- name: Install Android SDK
|
||||
if: steps.cache-sdk.outputs.cache-hit != 'true'
|
||||
@@ -90,25 +102,31 @@ 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"
|
||||
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
|
||||
with:
|
||||
channel: ${{ env.flutter_channel }}
|
||||
flutter-version: ${{ env.flutter_version }}
|
||||
cache: true
|
||||
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" # optional, change this to force refresh cache
|
||||
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
|
||||
pub-cache-key: "flutter-pub:os:-:channel:-:version:-:arch:-:hash:" # optional, change this to force refresh cache of dart pub get dependencies
|
||||
pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
|
||||
- name: Set up Flutter
|
||||
run: |
|
||||
FLUTTER_DIR="${{ env.my_local_cache_dir }}flutter"
|
||||
if [ ! -f "$FLUTTER_DIR/bin/flutter" ]; then
|
||||
echo "Downloading Flutter ${{ env.flutter_version }}..."
|
||||
curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/${{ env.flutter_channel }}/linux/flutter_linux_${{ env.flutter_version }}-${{ env.flutter_channel }}.tar.xz"
|
||||
echo "Extracting Flutter..."
|
||||
mkdir -p "${{ env.my_local_cache_dir }}"
|
||||
tar xf /tmp/flutter.tar.xz -C "${{ env.my_local_cache_dir }}"
|
||||
rm /tmp/flutter.tar.xz
|
||||
else
|
||||
echo "Flutter already cached at $FLUTTER_DIR"
|
||||
fi
|
||||
echo "$FLUTTER_DIR/bin" >> $GITHUB_PATH
|
||||
echo "$FLUTTER_DIR/bin/cache/dart-sdk/bin" >> $GITHUB_PATH
|
||||
echo "$HOME/.pub-cache/bin" >> $GITHUB_PATH
|
||||
|
||||
# - name: Print flutter-action outputs
|
||||
# shell: bash
|
||||
@@ -126,9 +144,11 @@ 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 }}
|
||||
ARCH=$(uname -m)
|
||||
if [ "$ARCH" = "x86_64" ]; then ARCH="x64"; fi
|
||||
git config --global --add safe.directory "${{ env.my_local_cache_dir }}flutter"
|
||||
flutter config --android-sdk="$ANDROID_HOME"
|
||||
flutter doctor -v
|
||||
flutter doctor -v
|
||||
|
||||
- name: Get dependencies
|
||||
run: |
|
||||
@@ -144,14 +164,70 @@ jobs:
|
||||
|
||||
- name: Test coverage
|
||||
run: |
|
||||
echo "📊 Analyzing test coverage..."
|
||||
echo ""
|
||||
awk -F: '
|
||||
/^LF:/ { total += $2 }
|
||||
/^LH:/ { covered += $2 }
|
||||
END {
|
||||
if (total == 0) {
|
||||
print "Coverage: 0%"
|
||||
/^SF:/ {
|
||||
file = $0
|
||||
sub(/^SF:/, "", file)
|
||||
sub(/^[[:space:]]+/, "", file)
|
||||
is_generated = 0
|
||||
if (file ~ /\.(g|freezed|gr|mocks)\.dart$/) {
|
||||
is_generated = 1
|
||||
generated_files++
|
||||
} else if (file ~ /\/(build|\.dart_tool|generated)\//) {
|
||||
is_generated = 1
|
||||
generated_files++
|
||||
} else if (file ~ /\/l10n\.dart$/) {
|
||||
is_generated = 1
|
||||
generated_files++
|
||||
} else if (file ~ /\/dev_tools\//) {
|
||||
is_generated = 1
|
||||
generated_files++
|
||||
} else if (file ~ /(firebase_api|firebase_options)\.dart$/) {
|
||||
is_generated = 1
|
||||
generated_files++
|
||||
} else {
|
||||
printf "Coverage: %.2f%%\n", (covered / total) * 100
|
||||
source_files++
|
||||
}
|
||||
}
|
||||
/^LF:/ {
|
||||
if (!is_generated) {
|
||||
total += $2
|
||||
} else {
|
||||
generated_lines += $2
|
||||
}
|
||||
}
|
||||
/^LH:/ {
|
||||
if (!is_generated) {
|
||||
covered += $2
|
||||
} else {
|
||||
generated_covered += $2
|
||||
}
|
||||
}
|
||||
END {
|
||||
print "📁 Files:"
|
||||
printf " Source files: %d\n", source_files
|
||||
printf " Generated files: %d (excluded)\n", generated_files
|
||||
print ""
|
||||
print "📝 Lines:"
|
||||
printf " Total lines: %d\n", total
|
||||
printf " Covered lines: %d\n", covered
|
||||
printf " Uncovered lines: %d\n", total - covered
|
||||
print ""
|
||||
if (total == 0) {
|
||||
print "⚠️ Coverage: 0%"
|
||||
exit 1
|
||||
} else {
|
||||
percentage = (covered / total) * 100
|
||||
printf "✅ Coverage: %.2f%%\n", percentage
|
||||
print ""
|
||||
if (percentage < 70) {
|
||||
printf "❌ FAIL: Coverage is below 70%%\n"
|
||||
exit 1
|
||||
} else {
|
||||
printf "💚 Excellent: Coverage is above 70%%\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
' coverage/lcov.info
|
||||
@@ -169,10 +245,10 @@ 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
|
||||
echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV
|
||||
|
||||
- name: Upload APK artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
uses: https://github.com/actions/upload-artifact@v3
|
||||
with:
|
||||
name: ${{ env.APK_NAME }}
|
||||
path: ${{ env.APK_NAME }}
|
||||
|
||||
7
.gitignore
vendored
7
.gitignore
vendored
@@ -19,4 +19,9 @@ ios/XCBuildData/
|
||||
env/.env
|
||||
.env
|
||||
android/key.properties
|
||||
app/upload-keystore.jks
|
||||
app/upload-keystore.jks
|
||||
coverage/
|
||||
backend/
|
||||
.fvm/
|
||||
.fvmrc
|
||||
/eatvio
|
||||
5
Makefile
5
Makefile
@@ -7,4 +7,7 @@ run-analyse:
|
||||
run-checks: run-analyse run-tests
|
||||
|
||||
build-generated-files:
|
||||
dart run build_runner build --delete-conflicting-outputs
|
||||
dart run build_runner build --delete-conflicting-outputs
|
||||
|
||||
clean-coverage:
|
||||
@./scripts/remove_generated_from_coverage.sh
|
||||
@@ -4,7 +4,8 @@ linter:
|
||||
rules:
|
||||
prefer_const_constructors: true
|
||||
prefer_const_declarations: true
|
||||
prefer_const_literals_to_create_immutables: true
|
||||
prefer_const_literals_to_create_immutables: true
|
||||
use_null_aware_elements: false
|
||||
|
||||
analyzer:
|
||||
exclude:
|
||||
|
||||
55
analyze_coverage.py
Normal file
55
analyze_coverage.py
Normal file
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env python3
|
||||
import re
|
||||
|
||||
def analyze_coverage():
|
||||
files = {}
|
||||
current_file = None
|
||||
|
||||
with open('coverage/lcov.info', 'r', encoding='utf-8') as f:
|
||||
lines = f.readlines()
|
||||
|
||||
i = 0
|
||||
while i < len(lines):
|
||||
line = lines[i].strip()
|
||||
if line.startswith('SF:'):
|
||||
current_file = line[3:]
|
||||
files[current_file] = {'total': 0, 'covered': 0}
|
||||
i += 1
|
||||
elif line.startswith('LF:') and current_file:
|
||||
files[current_file]['total'] = int(line[3:])
|
||||
i += 1
|
||||
elif line.startswith('LH:') and current_file:
|
||||
files[current_file]['covered'] = int(line[3:])
|
||||
i += 1
|
||||
else:
|
||||
i += 1
|
||||
|
||||
# Filter out generated files
|
||||
filtered = []
|
||||
for f, d in files.items():
|
||||
if not f.endswith('.g.dart') and not 'generated' in f.lower() and not f.endswith('l10n.dart'):
|
||||
filtered.append((f, d))
|
||||
|
||||
# Find files with less than 50% coverage
|
||||
low_coverage = []
|
||||
for f, d in filtered:
|
||||
if d['total'] > 0:
|
||||
pct = d['covered']/d['total']*100
|
||||
if pct < 50:
|
||||
low_coverage.append((f, d))
|
||||
|
||||
# Sort by coverage percentage (lowest first)
|
||||
sorted_files = sorted(
|
||||
low_coverage,
|
||||
key=lambda x: (x[1]['covered']/x[1]['total']*100 if x[1]['total'] > 0 else 0)
|
||||
)
|
||||
|
||||
print('Files with less than 50% coverage:')
|
||||
print('=' * 80)
|
||||
for f, d in sorted_files[:50]:
|
||||
pct = d['covered']/d['total']*100
|
||||
print(f'{pct:6.1f}% ({d["covered"]:4d}/{d["total"]:4d}) - {f}')
|
||||
|
||||
if __name__ == '__main__':
|
||||
analyze_coverage()
|
||||
|
||||
52
analyze_coverage_by_uncovered.py
Normal file
52
analyze_coverage_by_uncovered.py
Normal file
@@ -0,0 +1,52 @@
|
||||
#!/usr/bin/env python3
|
||||
import re
|
||||
|
||||
def analyze_coverage_by_uncovered():
|
||||
files = {}
|
||||
current_file = None
|
||||
|
||||
with open('coverage/lcov.info', 'r', encoding='utf-8') as f:
|
||||
lines = f.readlines()
|
||||
|
||||
i = 0
|
||||
while i < len(lines):
|
||||
line = lines[i].strip()
|
||||
if line.startswith('SF:'):
|
||||
current_file = line[3:]
|
||||
files[current_file] = {'total': 0, 'covered': 0}
|
||||
i += 1
|
||||
elif line.startswith('LF:') and current_file:
|
||||
files[current_file]['total'] = int(line[3:])
|
||||
i += 1
|
||||
elif line.startswith('LH:') and current_file:
|
||||
files[current_file]['covered'] = int(line[3:])
|
||||
i += 1
|
||||
else:
|
||||
i += 1
|
||||
|
||||
# Filter out generated files and UI screens/widgets (hard to test)
|
||||
filtered = []
|
||||
exclude_patterns = ['.g.dart', 'generated', 'l10n.dart', '/pages/', '/widgets/', '_screen.dart', '_widget.dart']
|
||||
|
||||
for f, d in files.items():
|
||||
if d['total'] > 0:
|
||||
# Skip UI files
|
||||
should_exclude = any(pattern in f for pattern in exclude_patterns)
|
||||
if not should_exclude:
|
||||
uncovered = d['total'] - d['covered']
|
||||
pct = d['covered']/d['total']*100
|
||||
filtered.append((f, d, uncovered, pct))
|
||||
|
||||
# Sort by uncovered lines (most uncovered first)
|
||||
sorted_files = sorted(filtered, key=lambda x: x[2], reverse=True)
|
||||
|
||||
print('Files sorted by uncovered lines (excluding UI screens/widgets):')
|
||||
print('=' * 100)
|
||||
print(f'{"Uncovered":>10} {"Covered":>8} {"Total":>8} {"%":>7} {"File":<60}')
|
||||
print('=' * 100)
|
||||
for f, d, uncovered, pct in sorted_files[:30]:
|
||||
print(f'{uncovered:>10} {d["covered"]:>8} {d["total"]:>8} {pct:>6.1f}% {f}')
|
||||
|
||||
if __name__ == '__main__':
|
||||
analyze_coverage_by_uncovered()
|
||||
|
||||
52
analyze_output.txt
Normal file
52
analyze_output.txt
Normal file
@@ -0,0 +1,52 @@
|
||||
Files with less than 50% coverage:
|
||||
================================================================================
|
||||
0.0% ( 0/ 37) - lib/core/firebase_api.dart
|
||||
0.0% ( 0/ 1) - lib/features/auth/models/oauth_verification_confirm_request.dart
|
||||
0.0% ( 0/ 1) - lib/features/auth/models/oauth_verification_confirm_response.dart
|
||||
0.0% ( 0/ 1) - lib/features/auth/models/oauth_verification_request_response.dart
|
||||
0.0% ( 0/ 342) - lib/features/dev_tools/test_cases.dart
|
||||
0.9% ( 2/ 220) - lib/features/dev_tools/presentation/dev_tools_screen.dart
|
||||
2.4% ( 1/ 42) - lib/features/auth/presentation/pages/scan_qr_code_screen.dart
|
||||
2.9% ( 1/ 34) - lib/features/diary/presentation/pages/barcode_scanner_screen.dart
|
||||
3.6% ( 1/ 28) - lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart
|
||||
3.8% ( 1/ 26) - lib/features/update_screen/presentation/update_screen.dart
|
||||
4.4% ( 4/ 90) - lib/core/widgets/custom_popup.dart
|
||||
5.9% ( 1/ 17) - lib/features/recipe/presentation/pages/my_recipes_screen.dart
|
||||
6.2% ( 2/ 32) - lib/features/consultations/presentation/pages/consultations_screen.dart
|
||||
7.1% ( 1/ 14) - lib/features/menu/presentation/pages/blocked_users_screen.dart
|
||||
7.7% ( 1/ 13) - lib/features/registration_v2/presentation/pages/registration_v2_page.dart
|
||||
8.3% ( 18/ 217) - lib/features/blog_post/presentation/pages/blog_post_screen.dart
|
||||
11.1% ( 1/ 9) - lib/features/registration_v2/presentation/widgets/step_progress.dart
|
||||
11.8% ( 14/ 119) - lib/features/auth/sdk/social_auth_facade.dart
|
||||
13.0% ( 3/ 23) - lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
|
||||
14.5% ( 11/ 76) - lib/core/app_router.dart
|
||||
19.3% ( 11/ 57) - lib/features/create_recipe/presentation/widgets/image_widget.dart
|
||||
19.6% ( 10/ 51) - lib/features/create_recipe/entities/recipe_create_entity.dart
|
||||
19.7% ( 12/ 61) - lib/features/create_recipe/presentation/widgets/step_image_widget.dart
|
||||
20.0% ( 6/ 30) - lib/core/image_compressing/image_compress_utility.dart
|
||||
20.0% ( 57/ 285) - lib/features/complaining/presentation/complaining_bottom_sheet.dart
|
||||
21.9% ( 7/ 32) - lib/core/routing/content_routes.dart
|
||||
25.6% ( 46/ 180) - lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
|
||||
26.8% ( 11/ 41) - lib/features/create_recipe/reporitories/recipe_repository.dart
|
||||
27.4% ( 96/ 351) - lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
|
||||
28.0% ( 28/ 100) - lib/core/utils/image_constant.dart
|
||||
28.4% ( 23/ 81) - lib/core/websockets/ws_manager.dart
|
||||
29.0% ( 157/ 541) - lib/features/profile/presentation/pages/profile_screen.dart
|
||||
29.3% ( 137/ 468) - lib/features/notifications/models/notification_model.dart
|
||||
33.1% ( 47/ 142) - lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart
|
||||
33.3% ( 9/ 27) - lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart
|
||||
35.2% ( 58/ 165) - lib/features/registration/presentation/pages/registration_screen.dart
|
||||
35.6% ( 36/ 101) - lib/features/chat/presentation/pages/empty_chat_screen.dart
|
||||
36.0% ( 9/ 25) - lib/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart
|
||||
36.7% ( 11/ 30) - lib/core/routing/main_navigation_routes.dart
|
||||
37.5% ( 3/ 8) - lib/core/permission_handler/permission_handler.dart
|
||||
38.6% ( 22/ 57) - lib/features/registration/presentation/pages/date_of_birth_screen.dart
|
||||
38.9% ( 35/ 90) - lib/core/routing/other_routes.dart
|
||||
39.0% ( 30/ 77) - lib/features/create_diet/presentation/widgets/diet_image_picker_widget.dart
|
||||
39.3% ( 119/ 303) - lib/features/settings/presentation/pages/settings_screen.dart
|
||||
39.3% ( 22/ 56) - lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
|
||||
40.0% ( 4/ 10) - lib/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_state.dart
|
||||
40.0% ( 4/ 10) - lib/features/registration/services/registration_analytics_service.dart
|
||||
41.5% ( 95/ 229) - lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
|
||||
41.9% ( 31/ 74) - lib/features/create_plan/presentation/widgets/plan_image_picker_widget.dart
|
||||
42.7% ( 67/ 157) - lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
|
||||
@@ -1 +1,94 @@
|
||||
{"agcgw":{"url":"connect-drru.hispace.dbankcloud.ru","backurl":"connect-drru.hispace.dbankcloud.cn","websocketurl":"connect-ws-drru.hispace.dbankcloud.ru","websocketbackurl":"connect-ws-drru.hispace.dbankcloud.cn"},"agcgw_all":{"SG":"connect-dra.dbankcloud.cn","SG_back":"connect-dra.hispace.hicloud.com","CN":"connect-drcn.dbankcloud.cn","CN_back":"connect-drcn.hispace.hicloud.com","RU":"connect-drru.hispace.dbankcloud.ru","RU_back":"connect-drru.hispace.dbankcloud.cn","DE":"connect-dre.dbankcloud.cn","DE_back":"connect-dre.hispace.hicloud.com"},"websocketgw_all":{"SG":"connect-ws-dra.hispace.dbankcloud.cn","SG_back":"connect-ws-dra.hispace.dbankcloud.com","CN":"connect-ws-drcn.hispace.dbankcloud.cn","CN_back":"connect-ws-drcn.hispace.dbankcloud.com","RU":"connect-ws-drru.hispace.dbankcloud.ru","RU_back":"connect-ws-drru.hispace.dbankcloud.cn","DE":"connect-ws-dre.hispace.dbankcloud.cn","DE_back":"connect-ws-dre.hispace.dbankcloud.com"},"client":{"cp_id":"20007000036693451","product_id":"461323198429446894","client_id":"1595824543740483264","client_secret":"2A1727B0D31AA9BE1F5D9E8A5CDA1A67B9EF084AC9FB68D6C633A3CCB08ECDEE","project_id":"461323198429446894","app_id":"113238569","api_key":"DQEDAJNRITp9M3uc1rPHyT8PzLc7bnVcKJAeavZZk0TQNMx9ifvBebr+JOmZe9tEvjnLwv7c1hAHXmPGR/gWG86iABDrCVotq+NGnw==","package_name":"com.eatvioapp.app"},"oauth_client":{"client_id":"113238569","client_type":1},"app_info":{"app_id":"113238569","package_name":"com.eatvioapp.app"},"service":{"analytics":{"collector_url":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com","collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn","collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn","collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com","collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn","resource_id":"p1","channel_id":""},"ml":{"mlservice_url":"ml-api-drru.ai.dbankcloud.ru,ml-api-drru.ai.dbankcloud.cn"},"cloudstorage":{"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg":"https://ops-dra.agcstorage.link","storage_url_de":"https://ops-dre.agcstorage.link","storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn","storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru","storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia","storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu","storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn"},"search":{"url":"https://search-drru.cloud.huawei.ru"},"edukit":{"edu_url":"edukit.cloud.huawei.com.cn","dh_url":"edukit.cloud.huawei.com.cn"}},"region":"RU","configuration_version":"3.0","appInfos":[{"package_name":"com.eatvioapp.app","client":{"app_id":"113238569"},"app_info":{"package_name":"com.eatvioapp.app","app_id":"113238569"},"oauth_client":{"client_type":1,"client_id":"113238569"}}]}
|
||||
{
|
||||
"agcgw" : {
|
||||
"url" : "connect-drru.hispace.dbankcloud.ru",
|
||||
"backurl" : "connect-drru.hispace.dbankcloud.cn",
|
||||
"websocketurl" : "connect-ws-drru.hispace.dbankcloud.ru",
|
||||
"websocketbackurl" : "connect-ws-drru.hispace.dbankcloud.cn"
|
||||
},
|
||||
"agcgw_all" : {
|
||||
"SG" : "connect-dra.dbankcloud.cn",
|
||||
"SG_back" : "connect-dra.hispace.hicloud.com",
|
||||
"CN" : "connect-drcn.dbankcloud.cn",
|
||||
"CN_back" : "connect-drcn.hispace.hicloud.com",
|
||||
"RU" : "connect-drru.hispace.dbankcloud.ru",
|
||||
"RU_back" : "connect-drru.hispace.dbankcloud.cn",
|
||||
"DE" : "connect-dre.dbankcloud.cn",
|
||||
"DE_back" : "connect-dre.hispace.hicloud.com"
|
||||
},
|
||||
"websocketgw_all" : {
|
||||
"SG" : "connect-ws-dra.hispace.dbankcloud.cn",
|
||||
"SG_back" : "connect-ws-dra.hispace.dbankcloud.com",
|
||||
"CN" : "connect-ws-drcn.hispace.dbankcloud.cn",
|
||||
"CN_back" : "connect-ws-drcn.hispace.dbankcloud.com",
|
||||
"RU" : "connect-ws-drru.hispace.dbankcloud.ru",
|
||||
"RU_back" : "connect-ws-drru.hispace.dbankcloud.cn",
|
||||
"DE" : "connect-ws-dre.hispace.dbankcloud.cn",
|
||||
"DE_back" : "connect-ws-dre.hispace.dbankcloud.com"
|
||||
},
|
||||
"client" : {
|
||||
"cp_id" : "20007000036693451",
|
||||
"product_id" : "461323198429446894",
|
||||
"client_id" : "1595824543740483264",
|
||||
"client_secret" : "2A1727B0D31AA9BE1F5D9E8A5CDA1A67B9EF084AC9FB68D6C633A3CCB08ECDEE",
|
||||
"project_id" : "461323198429446894",
|
||||
"app_id" : "113238569",
|
||||
"api_key" : "DQEDAJNRITp9M3uc1rPHyT8PzLc7bnVcKJAeavZZk0TQNMx9ifvBebr+JOmZe9tEvjnLwv7c1hAHXmPGR/gWG86iABDrCVotq+NGnw==",
|
||||
"package_name" : "com.eatvioapp.app"
|
||||
},
|
||||
"oauth_client" : {
|
||||
"client_id" : "113238569",
|
||||
"client_type" : 1
|
||||
},
|
||||
"app_info" : {
|
||||
"app_id" : "113238569",
|
||||
"package_name" : "com.eatvioapp.app"
|
||||
},
|
||||
"service" : {
|
||||
"analytics" : {
|
||||
"collector_url" : "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
|
||||
"collector_url_cn" : "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
|
||||
"collector_url_de" : "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
|
||||
"collector_url_ru" : "datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
|
||||
"collector_url_sg" : "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
|
||||
"resource_id" : "p1",
|
||||
"channel_id" : ""
|
||||
},
|
||||
"ml" : {
|
||||
"mlservice_url" : "ml-api-drru.ai.dbankcloud.ru,ml-api-drru.ai.dbankcloud.cn"
|
||||
},
|
||||
"cloudstorage" : {
|
||||
"storage_url" : "https://agc-storage-drcn.platform.dbankcloud.cn",
|
||||
"storage_url_ru" : "https://agc-storage-drru.cloud.huawei.ru",
|
||||
"storage_url_sg" : "https://ops-dra.agcstorage.link",
|
||||
"storage_url_de" : "https://ops-dre.agcstorage.link",
|
||||
"storage_url_cn" : "https://agc-storage-drcn.platform.dbankcloud.cn",
|
||||
"storage_url_ru_back" : "https://agc-storage-drru.cloud.huawei.ru",
|
||||
"storage_url_sg_back" : "https://agc-storage-dra.cloud.huawei.asia",
|
||||
"storage_url_de_back" : "https://agc-storage-dre.cloud.huawei.eu",
|
||||
"storage_url_cn_back" : "https://agc-storage-drcn.cloud.huawei.com.cn"
|
||||
},
|
||||
"search" : {
|
||||
"url" : "https://search-drru.cloud.huawei.ru"
|
||||
},
|
||||
"edukit" : {
|
||||
"edu_url" : "edukit.cloud.huawei.com.cn",
|
||||
"dh_url" : "edukit.cloud.huawei.com.cn"
|
||||
}
|
||||
},
|
||||
"region" : "RU",
|
||||
"configuration_version" : "3.0",
|
||||
"appInfos" : [ {
|
||||
"package_name" : "com.eatvioapp.app",
|
||||
"client" : {
|
||||
"app_id" : "113238569"
|
||||
},
|
||||
"app_info" : {
|
||||
"package_name" : "com.eatvioapp.app",
|
||||
"app_id" : "113238569"
|
||||
},
|
||||
"oauth_client" : {
|
||||
"client_type" : 1,
|
||||
"client_id" : "113238569"
|
||||
}
|
||||
} ]
|
||||
}
|
||||
@@ -4,6 +4,7 @@ plugins {
|
||||
id 'com.google.gms.google-services'
|
||||
// END: FlutterFire Configuration
|
||||
id "kotlin-android"
|
||||
id "kotlin-parcelize"
|
||||
id "dev.flutter.flutter-gradle-plugin"
|
||||
id 'com.huawei.agconnect'
|
||||
}
|
||||
@@ -19,15 +20,15 @@ def yandexClientId = project.hasProperty('YANDEX_CLIENT_ID') ? project.property(
|
||||
android {
|
||||
namespace = "com.eatvioapp.app"
|
||||
compileSdk = flutter.compileSdkVersion
|
||||
ndkVersion = "27.0.12077973"
|
||||
ndkVersion = flutter.ndkVersion
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_11.toString()
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
@@ -68,10 +69,10 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'com.huawei.agconnect:agconnect-core:1.9.1.301'
|
||||
implementation 'com.huawei.hms:push:6.12.0.300'
|
||||
implementation 'com.huawei.agconnect:agconnect-core:1.9.5.300'
|
||||
implementation 'com.huawei.hms:push:6.13.0.301'
|
||||
// Huawei Analytics dependency to satisfy com.huawei.hianalytics.* references during R8
|
||||
implementation 'com.huawei.hms:hianalytics:6.12.0.300'
|
||||
implementation 'com.huawei.hms:hianalytics:6.12.0.301'
|
||||
// BouncyCastle provider required by Huawei secure utils used transitively by HMS
|
||||
implementation 'org.bouncycastle:bcprov-jdk15to18:1.78.1'
|
||||
}
|
||||
|
||||
@@ -21,6 +21,12 @@
|
||||
<meta-data
|
||||
android:name="push_kit_auto_init_enabled"
|
||||
android:value="true" />
|
||||
<meta-data
|
||||
android:name="com.huawei.hms.client.appid"
|
||||
android:value="appid=113238569" />
|
||||
<meta-data
|
||||
android:name="com.huawei.hms.client.cpid"
|
||||
android:value="cpid=20007000036693451" />
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
@@ -49,32 +55,19 @@
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="https" />
|
||||
|
||||
<!-- Main domains -->
|
||||
<data android:host="eatvio.ru" />
|
||||
<data android:host="www.eatvio.ru" />
|
||||
<data android:host="eatvio.com" />
|
||||
<data android:host="www.eatvio.com" />
|
||||
|
||||
<!-- Development/Subdomains -->
|
||||
<data android:host="*.eatvio.ru" />
|
||||
<data android:host="*.eatvio.com" />
|
||||
|
||||
<data android:pathPattern="/ru/recipe/.*" />
|
||||
<data android:pathPattern="/en/recipe/.*" />
|
||||
|
||||
<data android:pathPattern="/ru/blog_post/.*" />
|
||||
<data android:pathPattern="/en/blog_post/.*" />
|
||||
|
||||
<data android:pathPattern="/ru/diet/.*" />
|
||||
<data android:pathPattern="/en/diet/.*" />
|
||||
|
||||
<data android:pathPattern="/ru/plan/.*" />
|
||||
<data android:pathPattern="/en/plan/.*" />
|
||||
|
||||
<data android:pathPattern="/ru/chat/.*" />
|
||||
<data android:pathPattern="/en/chat/.*" />
|
||||
|
||||
<data android:pathPattern="/ru/chat" />
|
||||
<data android:pathPattern="/en/chat" />
|
||||
|
||||
<data android:pathPattern="/ru/profile/.*" />
|
||||
<data android:pathPattern="/en/profile/.*" />
|
||||
|
||||
<data android:pathPattern="/ru/diary/.*" />
|
||||
<data android:pathPattern="/en/diary/.*" />
|
||||
<!-- Simplify patterns to allow navigation within the app for all matching hosts -->
|
||||
<data android:pathPattern="/.*" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<!-- Don't delete the meta-data below.
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package com.eatvioapp.app
|
||||
|
||||
import android.app.PendingIntent
|
||||
import android.content.Intent
|
||||
import android.util.Log
|
||||
import androidx.core.app.NotificationCompat
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import com.huawei.hms.push.HmsMessageService
|
||||
import com.huawei.hms.push.RemoteMessage
|
||||
|
||||
@@ -13,6 +17,45 @@ class HmsPushService : HmsMessageService() {
|
||||
override fun onMessageReceived(message: RemoteMessage?) {
|
||||
super.onMessageReceived(message)
|
||||
Log.i("HMS", "onMessageReceived: ${message?.data}")
|
||||
|
||||
if (message == null) return
|
||||
|
||||
// Берём action_url из data-поля, если оно есть.
|
||||
val actionUrl = message.dataOfMap["action_url"]
|
||||
|
||||
// Строим системное уведомление, по тапу по которому откроется MainActivity с action_url.
|
||||
showNotification(message, actionUrl)
|
||||
}
|
||||
|
||||
private fun showNotification(message: RemoteMessage, actionUrl: String?) {
|
||||
val context = applicationContext
|
||||
|
||||
// Интент для запуска Flutter-активити.
|
||||
val intent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
|
||||
if (!actionUrl.isNullOrBlank()) {
|
||||
putExtra("action_url", actionUrl)
|
||||
}
|
||||
}
|
||||
|
||||
val pendingIntent = PendingIntent.getActivity(
|
||||
context,
|
||||
0,
|
||||
intent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
|
||||
)
|
||||
|
||||
val channelId = "hms_push_channel"
|
||||
|
||||
val notification = NotificationCompat.Builder(context, channelId)
|
||||
.setSmallIcon(R.mipmap.ic_launcher) // используем иконку приложения
|
||||
.setContentTitle(message.notification?.title ?: context.getString(R.string.app_name))
|
||||
.setContentText(message.notification?.body ?: "")
|
||||
.setAutoCancel(true)
|
||||
.setContentIntent(pendingIntent)
|
||||
.build()
|
||||
|
||||
NotificationManagerCompat.from(context).notify(message.messageId.hashCode(), notification)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.eatvioapp.app
|
||||
|
||||
import android.content.Intent
|
||||
import android.content.pm.ApplicationInfo
|
||||
import android.content.pm.PackageManager
|
||||
import android.os.Bundle
|
||||
import io.flutter.embedding.android.FlutterActivity
|
||||
import io.flutter.embedding.engine.FlutterEngine
|
||||
import io.flutter.plugin.common.MethodChannel
|
||||
@@ -14,12 +14,13 @@ import kotlinx.coroutines.launch
|
||||
|
||||
class MainActivity: FlutterActivity() {
|
||||
private val channelName = "com.eatvioapp/hms_push"
|
||||
private var methodChannel: MethodChannel? = null
|
||||
|
||||
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
|
||||
super.configureFlutterEngine(flutterEngine)
|
||||
|
||||
MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channelName)
|
||||
.setMethodCallHandler { call, result ->
|
||||
methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channelName)
|
||||
methodChannel?.setMethodCallHandler { call, result ->
|
||||
when (call.method) {
|
||||
"getHuaweiToken" -> {
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
@@ -47,17 +48,21 @@ class MainActivity: FlutterActivity() {
|
||||
}
|
||||
|
||||
if (appId.isNullOrBlank()) {
|
||||
android.util.Log.e("HMS", "Missing Huawei appId. Ensure agconnect-services.json or manifest meta-data is configured.")
|
||||
runOnUiThread {
|
||||
result.error("HMS_TOKEN_ERROR", "Missing Huawei appId. Ensure agconnect-services.json or manifest meta-data is configured.", null)
|
||||
}
|
||||
return@launch
|
||||
}
|
||||
android.util.Log.i("HMS", "Getting token for appId: $appId")
|
||||
val token = HmsInstanceId.getInstance(applicationContext)
|
||||
.getToken(appId, "HCM")
|
||||
android.util.Log.i("HMS", "Token retrieved successfully")
|
||||
runOnUiThread {
|
||||
result.success(token)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
android.util.Log.e("HMS", "Error getting HMS token: ${e.message}", e)
|
||||
runOnUiThread {
|
||||
result.error("HMS_TOKEN_ERROR", e.message, null)
|
||||
}
|
||||
@@ -67,5 +72,33 @@ class MainActivity: FlutterActivity() {
|
||||
else -> result.notImplemented()
|
||||
}
|
||||
}
|
||||
|
||||
// Обрабатываем возможный action_url, с которым была открыта Activity (например, из HMS уведомления).
|
||||
handleIntentForActionUrl(intent)
|
||||
}
|
||||
|
||||
override fun onNewIntent(intent: Intent) {
|
||||
super.onNewIntent(intent)
|
||||
// Обработка нового интента, когда Activity уже запущена (тап по уведомлению).
|
||||
handleIntentForActionUrl(intent)
|
||||
}
|
||||
|
||||
private fun handleIntentForActionUrl(intent: Intent?) {
|
||||
if (intent == null) return
|
||||
|
||||
// Вариант 1: action_url лежит в extras.
|
||||
val fromExtras = intent.extras?.getString("action_url")
|
||||
|
||||
// Вариант 2: action_url передан как data Uri.
|
||||
val dataUri = intent.data
|
||||
val fromData = dataUri?.toString()
|
||||
|
||||
val actionUrl = fromExtras ?: fromData
|
||||
if (actionUrl.isNullOrBlank()) return
|
||||
|
||||
android.util.Log.i("HMS", "MainActivity.handleIntentForActionUrl: $actionUrl")
|
||||
|
||||
// Проксируем URL во Flutter, где уже есть общая логика навигации по диплинкам.
|
||||
methodChannel?.invokeMethod("openActionUrl", actionUrl)
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,3 +1,7 @@
|
||||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||
android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
# This builtInKotlin flag was added automatically by Flutter migrator
|
||||
android.builtInKotlin=false
|
||||
# This newDsl flag was added automatically by Flutter migrator
|
||||
android.newDsl=false
|
||||
|
||||
BIN
assets/fonts/Mulish-Black.ttf
Normal file
BIN
assets/fonts/Mulish-Black.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-BlackItalic.ttf
Normal file
BIN
assets/fonts/Mulish-BlackItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-Bold.ttf
Normal file
BIN
assets/fonts/Mulish-Bold.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-BoldItalic.ttf
Normal file
BIN
assets/fonts/Mulish-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-ExtraBold.ttf
Normal file
BIN
assets/fonts/Mulish-ExtraBold.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-ExtraBoldItalic.ttf
Normal file
BIN
assets/fonts/Mulish-ExtraBoldItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-ExtraLight.ttf
Normal file
BIN
assets/fonts/Mulish-ExtraLight.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-ExtraLightItalic.ttf
Normal file
BIN
assets/fonts/Mulish-ExtraLightItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-Italic.ttf
Normal file
BIN
assets/fonts/Mulish-Italic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-Light.ttf
Normal file
BIN
assets/fonts/Mulish-Light.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-LightItalic.ttf
Normal file
BIN
assets/fonts/Mulish-LightItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-Medium.ttf
Normal file
BIN
assets/fonts/Mulish-Medium.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-MediumItalic.ttf
Normal file
BIN
assets/fonts/Mulish-MediumItalic.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-Regular.ttf
Normal file
BIN
assets/fonts/Mulish-Regular.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-SemiBold.ttf
Normal file
BIN
assets/fonts/Mulish-SemiBold.ttf
Normal file
Binary file not shown.
BIN
assets/fonts/Mulish-SemiBoldItalic.ttf
Normal file
BIN
assets/fonts/Mulish-SemiBoldItalic.ttf
Normal file
Binary file not shown.
3
assets/icons/crossed_eye.svg
Normal file
3
assets/icons/crossed_eye.svg
Normal file
@@ -0,0 +1,3 @@
|
||||
<svg width="10" height="9" viewBox="0 0 10 9" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M8.53669 8.89177L6.8122 7.15382C6.52317 7.26749 6.22614 7.34957 5.92111 7.40005C5.61615 7.45053 5.3063 7.47578 4.99155 7.47578C3.95998 7.47578 3.01527 7.19683 2.15742 6.63893C1.29964 6.08096 0.619788 5.34562 0.117849 4.43293C0.0770142 4.36144 0.047164 4.28862 0.0282984 4.21447C0.00943278 4.14041 0 4.06506 0 3.98842C0 3.91178 0.0102087 3.8356 0.030626 3.75987C0.0510433 3.68423 0.0816693 3.61224 0.122504 3.5439C0.317857 3.21368 0.525501 2.89417 0.745437 2.58538C0.96529 2.2765 1.22096 2.00328 1.51243 1.76572L0.406101 0.633204C0.338315 0.564287 0.303606 0.478889 0.301972 0.377008C0.300421 0.275127 0.337662 0.185536 0.413696 0.108233C0.484667 0.0360776 0.570746 0 0.671934 0C0.773041 0 0.85908 0.0360776 0.93005 0.108233L9.05304 8.3668C9.12091 8.43579 9.15689 8.52119 9.16097 8.62299C9.16505 8.72487 9.12908 8.81446 9.05304 8.89177C8.98207 8.96392 8.89599 9 8.79481 9C8.6937 9 8.60766 8.96392 8.53669 8.89177ZM4.99155 6.01955C5.10025 6.01955 5.20405 6.01299 5.30295 5.99988C5.40194 5.98676 5.49855 5.95815 5.5928 5.91406L3.09751 3.37713C3.05725 3.47295 3.02989 3.57118 3.01544 3.67181C3.00098 3.77237 2.99375 3.8779 2.99375 3.98842C2.99375 4.5537 3.18772 5.03355 3.57565 5.42795C3.96358 5.82235 4.43554 6.01955 4.99155 6.01955ZM4.99155 0.501058C6.02622 0.501058 6.97529 0.781293 7.83878 1.34176C8.70227 1.90223 9.38344 2.64201 9.88227 3.56109C9.91992 3.62436 9.94896 3.69224 9.96937 3.76473C9.98979 3.83721 10 3.91178 10 3.98842C10 4.06506 9.99106 4.13962 9.97317 4.21211C9.95529 4.28459 9.92748 4.35247 9.88975 4.41574C9.74086 4.70378 9.57442 4.97521 9.39042 5.23004C9.20634 5.48487 9.00057 5.72471 8.77312 5.94956C8.67136 6.05302 8.55074 6.10059 8.41125 6.09229C8.27184 6.08399 8.15121 6.02811 8.04937 5.92465L7.0223 4.88517C6.97142 4.83344 6.93781 4.77369 6.92147 4.70594C6.90514 4.63827 6.90608 4.56769 6.92429 4.49421C6.94749 4.40868 6.96411 4.32565 6.97415 4.24511C6.98428 4.16465 6.98934 4.07909 6.98934 3.98842C6.98934 3.42313 6.79538 2.94329 6.40745 2.54888C6.01952 2.15448 5.54755 1.95728 4.99155 1.95728C4.90236 1.95728 4.81898 1.96322 4.74139 1.97509C4.66381 1.98688 4.58447 2.00461 4.50337 2.02827C4.43117 2.04994 4.35894 2.05248 4.28666 2.03587C4.21446 2.01926 4.15293 1.9851 4.10205 1.93337L3.64584 1.46967C3.50643 1.32785 3.46012 1.16274 3.50692 0.974343C3.55372 0.785942 3.67136 0.665878 3.85985 0.614149C4.04516 0.575788 4.23174 0.547349 4.41958 0.528832C4.60742 0.510316 4.79807 0.501058 4.99155 0.501058ZM5.94046 3.04758C6.03977 3.15876 6.1216 3.28347 6.18596 3.42172C6.25032 3.55997 6.29066 3.70449 6.30699 3.85527C6.31516 3.91531 6.29303 3.95699 6.2406 3.98032C6.18817 4.00357 6.139 3.9919 6.0931 3.94532L5.04153 2.88093C4.99563 2.83427 4.98542 2.78428 5.0109 2.73097C5.0363 2.67767 5.07852 2.65101 5.13757 2.65101C5.29593 2.66438 5.44199 2.70478 5.57577 2.7722C5.70962 2.83954 5.83119 2.93133 5.94046 3.04758Z" fill="#2F80ED"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.9 KiB |
28716
coverage/lcov.info
28716
coverage/lcov.info
File diff suppressed because it is too large
Load Diff
12
ios/Flutter/ephemeral/flutter_native_integration.env
Normal file
12
ios/Flutter/ephemeral/flutter_native_integration.env
Normal file
@@ -0,0 +1,12 @@
|
||||
FLUTTER_ROOT=C:\Users\Alexander\fvm\versions\3.44.0
|
||||
FLUTTER_APPLICATION_PATH=C:\Users\Alexander\eatvio_app
|
||||
FLUTTER_FRAMEWORK_SWIFT_PACKAGE_PATH=C:\Users\Alexander\eatvio_app\ios\Flutter\ephemeral\Packages\.packages\FlutterFramework
|
||||
COCOAPODS_PARALLEL_CODE_SIGN=true
|
||||
FLUTTER_TARGET=lib\main.dart
|
||||
FLUTTER_BUILD_DIR=build
|
||||
FLUTTER_BUILD_NAME=1.3.23
|
||||
FLUTTER_BUILD_NUMBER=105
|
||||
DART_OBFUSCATION=false
|
||||
TRACK_WIDGET_CREATION=true
|
||||
TREE_SHAKE_ICONS=false
|
||||
PACKAGE_CONFIG=.dart_tool/package_config.json
|
||||
@@ -388,7 +388,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
CURRENT_PROJECT_VERSION = 81;
|
||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||
DEVELOPMENT_TEAM = VL68C36HYS;
|
||||
ENABLE_BITCODE = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
@@ -539,7 +539,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
CURRENT_PROJECT_VERSION = 81;
|
||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||
DEVELOPMENT_TEAM = VL68C36HYS;
|
||||
ENABLE_BITCODE = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
@@ -578,7 +578,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
|
||||
CODE_SIGN_STYLE = Manual;
|
||||
CURRENT_PROJECT_VERSION = 81;
|
||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||
DEVELOPMENT_TEAM = VL68C36HYS;
|
||||
ENABLE_BITCODE = NO;
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>82</string>
|
||||
<string>$(FLUTTER_BUILD_NUMBER)</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
|
||||
@@ -48,8 +48,33 @@ platform :ios do
|
||||
UI.message "Configuring Flutter for release mode..."
|
||||
sh("cd .. && flutter build ios --config-only --release")
|
||||
|
||||
# Read build number from Flutter Generated.xcconfig
|
||||
generated_xcconfig_path = File.join("..", "Flutter", "Generated.xcconfig")
|
||||
flutter_build_number = nil
|
||||
|
||||
if File.exist?(generated_xcconfig_path)
|
||||
File.foreach(generated_xcconfig_path) do |line|
|
||||
matches = line.match(/FLUTTER_BUILD_NUMBER=(.*)/)
|
||||
if matches
|
||||
flutter_build_number = matches[1].strip
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if flutter_build_number.nil?
|
||||
UI.user_error!("Could not find FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
|
||||
end
|
||||
|
||||
UI.message "Flutter build number: #{flutter_build_number}"
|
||||
|
||||
match(type: "appstore", readonly: true)
|
||||
increment_build_number(xcodeproj: "Runner.xcodeproj")
|
||||
|
||||
# Set build number explicitly instead of incrementing
|
||||
increment_build_number(
|
||||
xcodeproj: "Runner.xcodeproj",
|
||||
build_number: flutter_build_number
|
||||
)
|
||||
|
||||
build_app(
|
||||
workspace: "Runner.xcworkspace",
|
||||
@@ -74,7 +99,7 @@ platform :ios do
|
||||
skip_submission: true,
|
||||
distribute_external: false,
|
||||
notify_external_testers: false,
|
||||
changelog: "TestFlight build #{get_build_number(xcodeproj: 'Runner.xcodeproj')}",
|
||||
changelog: "TestFlight build #{flutter_build_number}",
|
||||
verbose: true
|
||||
)
|
||||
rescue => ex
|
||||
|
||||
@@ -33,15 +33,16 @@ class AppConfig {
|
||||
}
|
||||
|
||||
/// Список глобальных BlocProvider'ов
|
||||
/// Используются lazy: true для отложенной инициализации, чтобы не блокировать старт приложения
|
||||
List<BlocProvider> get globalBlocProviders => [
|
||||
BlocProvider<NewMessagesCubit>(create: (context) => sl<NewMessagesCubit>()),
|
||||
BlocProvider<NotificationsCubit>(create: (context) => sl<NotificationsCubit>()..getNotifications()),
|
||||
BlocProvider<FeedCubit>(create: (context) => sl<FeedCubit>()..loadFeedBlogPostList()),
|
||||
BlocProvider<ProfileAvatarCubit>(create: (context) => sl<ProfileAvatarCubit>()..getMyProfile()),
|
||||
BlocProvider<ChatsCubit>(create: (context) => sl<ChatsCubit>()..getChatRoomsWithLoading()),
|
||||
BlocProvider<ViewsCubit>(create: (context) => sl<ViewsCubit>()),
|
||||
BlocProvider<NewMessagesCubit>(lazy: true, create: (context) => sl<NewMessagesCubit>()),
|
||||
BlocProvider<NotificationsCubit>(lazy: true, create: (context) => sl<NotificationsCubit>()),
|
||||
BlocProvider<FeedCubit>(lazy: true, create: (context) => sl<FeedCubit>()),
|
||||
BlocProvider<ProfileAvatarCubit>(lazy: true, create: (context) => sl<ProfileAvatarCubit>()),
|
||||
BlocProvider<ChatsCubit>(lazy: true, create: (context) => sl<ChatsCubit>()),
|
||||
BlocProvider<ViewsCubit>(lazy: true, create: (context) => sl<ViewsCubit>()),
|
||||
BlocProvider<InternetConnectionCubit>(lazy: false, create: (context) => sl<InternetConnectionCubit>()),
|
||||
BlocProvider<MarketingCubit>(create: (context) => sl<MarketingCubit>()),
|
||||
BlocProvider<MarketingCubit>(lazy: true, create: (context) => sl<MarketingCubit>()),
|
||||
];
|
||||
|
||||
/// Делегаты локализации
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import 'dart:async';
|
||||
import 'dart:developer';
|
||||
import 'dart:io' as io;
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/env_config.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/error_report_policy.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart' as di;
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/firebase_options.dart';
|
||||
@@ -14,6 +17,7 @@ import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
|
||||
/// Класс для инициализации приложения
|
||||
class AppInitializer {
|
||||
|
||||
/// Инициализация всех сервисов приложения
|
||||
static Future<void> initialize({required AppBuildType buildType}) async {
|
||||
await _initializeEnvironment();
|
||||
@@ -37,9 +41,19 @@ class AppInitializer {
|
||||
|
||||
/// Инициализация Firebase
|
||||
static Future<void> _initializeFirebase() async {
|
||||
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
|
||||
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform).timeout(
|
||||
const Duration(seconds: 10),
|
||||
onTimeout: () {
|
||||
throw TimeoutException('Firebase initialization timeout');
|
||||
},
|
||||
);
|
||||
if (sl<AppConfig>().buildType == AppBuildType.prod) {
|
||||
await FirebaseMessaging.instance.requestPermission();
|
||||
try {
|
||||
await FirebaseMessaging.instance.requestPermission().timeout(const Duration(seconds: 5));
|
||||
} catch (e) {
|
||||
// Разрешение не критично, продолжаем работу
|
||||
log('Failed to request Firebase messaging permission: $e');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,6 +81,11 @@ class AppInitializer {
|
||||
options.dsn = EnvConfig.sentryDsn;
|
||||
options.tracesSampleRate = 1.0;
|
||||
options.debug = false;
|
||||
options.beforeSend = (event, hint) {
|
||||
if (kDebugMode) return null;
|
||||
if (!ErrorReportPolicy.allowSentryEvent(event, hint)) return null;
|
||||
return event;
|
||||
};
|
||||
}, appRunner: appRunner);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import 'dart:developer' as developer;
|
||||
import 'package:eatvio_app/core/const.dart';
|
||||
import 'package:eatvio_app/core/routing/auth_routes.dart';
|
||||
import 'package:eatvio_app/core/routing/content_routes.dart';
|
||||
import 'package:eatvio_app/core/routing/main_navigation_routes.dart';
|
||||
@@ -5,6 +7,7 @@ import 'package:eatvio_app/core/routing/other_routes.dart';
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/core/routing/settings_routes.dart';
|
||||
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
||||
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_native_splash/flutter_native_splash.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
@@ -13,6 +16,9 @@ import 'package:go_router/go_router.dart';
|
||||
class AppRouter {
|
||||
static GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
|
||||
|
||||
static const List<String> deepLinkHosts = ['eatvio.ru', 'eatvio.com', 'dev2.eatvio.com'];
|
||||
static const List<String> metaSegments = ['ru', 'en', 'api', 'v2'];
|
||||
|
||||
static GoRouter appRouter = GoRouter(
|
||||
initialLocation: RouteConstants.updateScreen,
|
||||
navigatorKey: navigatorKey,
|
||||
@@ -26,52 +32,212 @@ class AppRouter {
|
||||
],
|
||||
);
|
||||
|
||||
/// Обработка редиректов для deep links
|
||||
static String? _resolveRecipeDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length != 2) return null;
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
developer.log('Deep link: recipe/$contentIdentifier', name: 'AppRouter');
|
||||
return '/about-recipes-screen?slug=$contentIdentifier';
|
||||
}
|
||||
|
||||
static String? _resolveBlogPostDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length != 2) return null;
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
developer.log('Deep link: blog_post/$contentIdentifier', name: 'AppRouter');
|
||||
return '/blog-post-screen?id=$contentIdentifier';
|
||||
}
|
||||
|
||||
static String? _resolvePlanDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length != 2) return null;
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
final planId = int.tryParse(contentIdentifier);
|
||||
if (planId != null) {
|
||||
developer.log('Deep link: diary', name: 'AppRouter');
|
||||
return RouteConstants.diaryScreen;
|
||||
}
|
||||
developer.log('Deep link: plan/$contentIdentifier', name: 'AppRouter');
|
||||
return '/about-plan-screen?slug=$contentIdentifier';
|
||||
}
|
||||
|
||||
static String? _resolveDietDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length == 2) {
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
final dietId = int.tryParse(contentIdentifier);
|
||||
if (dietId != null) {
|
||||
developer.log('Deep link: diet/id=$dietId', name: 'AppRouter');
|
||||
return '/about-diet-screen?id=$dietId';
|
||||
}
|
||||
developer.log('Deep link: diet/slug=$contentIdentifier', name: 'AppRouter');
|
||||
return '/about-diet-screen?slug=$contentIdentifier';
|
||||
}
|
||||
const dietTabIndexWithHiddenPlansTab = 3;
|
||||
const dietTabIndexWithoutHiddenPlansTab = 4;
|
||||
|
||||
final initialTabIndex = hidePlans ? dietTabIndexWithHiddenPlansTab : dietTabIndexWithoutHiddenPlansTab;
|
||||
return '${RouteConstants.feedScreen}?initialTabIndex=$initialTabIndex';
|
||||
}
|
||||
|
||||
static String? _resolveChatDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length == 2) {
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
developer.log('Deep link: chat/$contentIdentifier', name: 'AppRouter');
|
||||
return '${RouteConstants.chatScreen}?uuid=$contentIdentifier';
|
||||
} else if (effectiveSegments.length == 3 && effectiveSegments[1] == 'show') {
|
||||
final contentIdentifier = effectiveSegments[2];
|
||||
developer.log('Deep link: chat/$contentIdentifier', name: 'AppRouter');
|
||||
return '${RouteConstants.chatScreen}?uuid=$contentIdentifier';
|
||||
}
|
||||
|
||||
developer.log('Deep link: chat', name: 'AppRouter');
|
||||
return RouteConstants.chatSelectScreen;
|
||||
}
|
||||
|
||||
static String? _resolveProfileDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length == 2) {
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
developer.log('Deep link: profile/$contentIdentifier', name: 'AppRouter');
|
||||
return '/profile-screen?slug=$contentIdentifier';
|
||||
}
|
||||
return RouteConstants.myProfileScreen;
|
||||
}
|
||||
|
||||
static String? _resolveBadgeDeepLink(List<String> effectiveSegments) {
|
||||
return RouteConstants.myProfileScreen;
|
||||
}
|
||||
|
||||
static String? _resolveDiaryDeepLink(List<String> effectiveSegments) {
|
||||
developer.log('Deep link: diary', name: 'AppRouter');
|
||||
return RouteConstants.diaryScreen;
|
||||
}
|
||||
|
||||
static String? _resolveConsultantDiaryCommentDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length != 2) return null;
|
||||
final contentIdentifier = effectiveSegments[1];
|
||||
developer.log('Deep link: consultant_diary_comment/$contentIdentifier → diary', name: 'AppRouter');
|
||||
return RouteConstants.diaryScreen;
|
||||
}
|
||||
|
||||
static String? _resolveConsultationsDeepLink(List<String> effectiveSegments) {
|
||||
if (effectiveSegments.length != 3 || effectiveSegments[1] != 'status') return RouteConstants.consultationsScreen;
|
||||
final consultationId = effectiveSegments[2];
|
||||
developer.log('Deep link: consultations/status/$consultationId', name: 'AppRouter');
|
||||
return '${InfoByOrderScreen.path}?planId=$consultationId';
|
||||
}
|
||||
|
||||
static String? _resolveDeepLinkUri(Uri uri) {
|
||||
final host = uri.host.toLowerCase();
|
||||
final segments = uri.pathSegments;
|
||||
|
||||
final isDeepLink = deepLinkHosts.any((allowedHost) => host == allowedHost || host.endsWith('.$allowedHost'));
|
||||
|
||||
if (!isDeepLink) {
|
||||
return null;
|
||||
}
|
||||
|
||||
developer.log('Deep link detected: host=$host, path=${uri.path}, segments=$segments', name: 'AppRouter');
|
||||
|
||||
if (segments.isEmpty) {
|
||||
developer.log('Empty segments in deep link, redirecting to feed', name: 'AppRouter');
|
||||
return RouteConstants.feedScreen;
|
||||
}
|
||||
|
||||
final effectiveSegments = segments.where((segment) => !metaSegments.contains(segment)).toList();
|
||||
if (effectiveSegments.isEmpty) {
|
||||
developer.log('No effective segments after language check, redirecting to feed', name: 'AppRouter');
|
||||
return RouteConstants.feedScreen;
|
||||
}
|
||||
|
||||
final type = effectiveSegments[0];
|
||||
|
||||
switch (type) {
|
||||
case 'recipe':
|
||||
final target = _resolveRecipeDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'blog_post':
|
||||
final target = _resolveBlogPostDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'plan':
|
||||
final target = _resolvePlanDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'diet':
|
||||
final target = _resolveDietDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'chat':
|
||||
final target = _resolveChatDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'profile':
|
||||
final target = _resolveProfileDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'badge':
|
||||
final target = _resolveBadgeDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'diary':
|
||||
final target = _resolveDiaryDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'consultant_diary_comment':
|
||||
final target = _resolveConsultantDiaryCommentDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
case 'consultations':
|
||||
final target = _resolveConsultationsDeepLink(effectiveSegments);
|
||||
if (target != null) return target;
|
||||
break;
|
||||
}
|
||||
|
||||
developer.log('Unknown deep link format: ${effectiveSegments.length} effective segments, type=$type, redirecting to feed', name: 'AppRouter');
|
||||
return RouteConstants.feedScreen;
|
||||
}
|
||||
|
||||
static String? _handleRedirect(BuildContext context, GoRouterState state) {
|
||||
final segments = state.uri.pathSegments;
|
||||
if (segments.length == 4) {
|
||||
final type = segments[1];
|
||||
switch (type) {
|
||||
case 'diary':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/diary-screen';
|
||||
}
|
||||
}
|
||||
if (segments.length == 3) {
|
||||
final type = segments[1];
|
||||
final contentIdentifier = segments[2];
|
||||
return _resolveDeepLinkUri(state.uri);
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case 'recipe':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/about-recipes-screen?slug=$contentIdentifier';
|
||||
case 'blog_post':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/blog-post-screen?id=$contentIdentifier';
|
||||
case 'plan':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/about-plan-screen?slug=$contentIdentifier';
|
||||
case 'diet':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/about-diet-screen?slug=$contentIdentifier';
|
||||
case 'chat':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/chat-select-screen';
|
||||
case 'profile':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/profile-screen?slug=$contentIdentifier';
|
||||
}
|
||||
}
|
||||
if (segments.length == 2) {
|
||||
final type = segments[1];
|
||||
switch (type) {
|
||||
case 'chat':
|
||||
FlutterNativeSplash.remove();
|
||||
return '/chat-select-screen';
|
||||
}
|
||||
static void navigateByDeepLinkUrl(String url) {
|
||||
if (url.isEmpty) {
|
||||
developer.log('navigateByDeepLinkUrl: empty url, redirecting to feed', name: 'AppRouter');
|
||||
appRouter.go(RouteConstants.feedScreen);
|
||||
return;
|
||||
}
|
||||
|
||||
return null;
|
||||
Uri? uri;
|
||||
try {
|
||||
uri = Uri.tryParse(url);
|
||||
} catch (e) {
|
||||
developer.log('navigateByDeepLinkUrl: failed to parse url=$url, error=$e, redirecting to feed', name: 'AppRouter');
|
||||
appRouter.go(RouteConstants.feedScreen);
|
||||
return;
|
||||
}
|
||||
|
||||
if (uri == null) {
|
||||
developer.log('navigateByDeepLinkUrl: uri is null for url=$url, redirecting to feed', name: 'AppRouter');
|
||||
appRouter.go(RouteConstants.feedScreen);
|
||||
return;
|
||||
}
|
||||
|
||||
if (uri.host.isEmpty && uri.pathSegments.isNotEmpty) {
|
||||
uri = Uri(
|
||||
scheme: 'https',
|
||||
host: deepLinkHosts.first,
|
||||
pathSegments: uri.pathSegments,
|
||||
queryParameters: uri.queryParameters.isEmpty ? null : uri.queryParameters,
|
||||
);
|
||||
}
|
||||
|
||||
final target = _resolveDeepLinkUri(uri);
|
||||
FlutterNativeSplash.remove();
|
||||
if (target != null) {
|
||||
appRouter.go(target);
|
||||
return;
|
||||
}
|
||||
developer.log('navigateByDeepLinkUrl: unresolved url=$url (normalized=${uri.toString()}), redirecting to feed', name: 'AppRouter');
|
||||
appRouter.go(RouteConstants.feedScreen);
|
||||
}
|
||||
|
||||
static void navigateToRegisterViaSocial({required AuthResultEntity authResult, required String provider}) {
|
||||
|
||||
@@ -5,15 +5,13 @@ import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
|
||||
import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
|
||||
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
||||
|
||||
class CommentsCubit extends Cubit<CommentsState> {
|
||||
final FeedRepository feedRepository;
|
||||
final CommentsRepository commentsRepository;
|
||||
|
||||
CommentsCubit({
|
||||
required this.feedRepository,
|
||||
required this.commentsRepository,
|
||||
}) : super(const CommentsState());
|
||||
CommentsCubit({required this.feedRepository, required this.commentsRepository}) : super(const CommentsState());
|
||||
|
||||
void setReplyId(int? replyId) {
|
||||
emit((state as CommentsStateLoaded).copyWith(replyId: replyId));
|
||||
@@ -36,51 +34,34 @@ class CommentsCubit extends Cubit<CommentsState> {
|
||||
emit(CommentsState.loaded(comment: await feedRepository.getPlansComments(slug: id)));
|
||||
break;
|
||||
}
|
||||
} catch (e) {
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
emit(CommentsState.error(errorMessage: e.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> sendComment({
|
||||
required String id,
|
||||
required String commentText,
|
||||
required CommentSourceType commentSourceType,
|
||||
int? parentCommentId,
|
||||
}) async {
|
||||
Future<bool> sendComment({required String id, required String commentText, required CommentSourceType commentSourceType, int? parentCommentId}) async {
|
||||
try {
|
||||
switch (commentSourceType) {
|
||||
case CommentSourceType.blogPost:
|
||||
await feedRepository.sendBlogPostComment(
|
||||
id: id,
|
||||
commentText: commentText,
|
||||
parentCommentId: parentCommentId,
|
||||
);
|
||||
await feedRepository.sendBlogPostComment(id: id, commentText: commentText, parentCommentId: parentCommentId);
|
||||
break;
|
||||
case CommentSourceType.diet:
|
||||
await feedRepository.sendDietsComment(
|
||||
id: id,
|
||||
commentText: commentText,
|
||||
parentCommentId: parentCommentId,
|
||||
);
|
||||
await feedRepository.sendDietsComment(id: id, commentText: commentText, parentCommentId: parentCommentId);
|
||||
break;
|
||||
case CommentSourceType.recipe:
|
||||
await feedRepository.sendRecipesComment(
|
||||
id: id,
|
||||
commentText: commentText,
|
||||
parentCommentId: parentCommentId,
|
||||
);
|
||||
await feedRepository.sendRecipesComment(id: id, commentText: commentText, parentCommentId: parentCommentId);
|
||||
break;
|
||||
case CommentSourceType.plan:
|
||||
await feedRepository.sendPlansComment(
|
||||
slug: id,
|
||||
commentText: commentText,
|
||||
parentCommentId: parentCommentId,
|
||||
);
|
||||
await feedRepository.sendPlansComment(slug: id, commentText: commentText, parentCommentId: parentCommentId);
|
||||
break;
|
||||
}
|
||||
getComments(id, commentSourceType);
|
||||
} catch (e) {
|
||||
return true;
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
emit(CommentsState.error(errorMessage: e.toString()));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,6 +74,7 @@ class CommentsCubit extends Cubit<CommentsState> {
|
||||
emit(CommentsState.loaded(comment: updatedCommentModel));
|
||||
return true;
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
emit(CommentsState.loaded(comment: commentModel));
|
||||
log(e.toString(), stackTrace: st);
|
||||
}
|
||||
@@ -101,13 +83,15 @@ class CommentsCubit extends Cubit<CommentsState> {
|
||||
|
||||
Future<bool> updateComment({required int id, required String body}) async {
|
||||
final commentModel = (state as CommentsStateLoaded).comment;
|
||||
final updatedCommentModel =
|
||||
commentModel.copyWith(data: commentModel.data.map((comment) => comment.id == id ? comment.copyWith(body: body) : comment).toList());
|
||||
final updatedCommentModel = commentModel.copyWith(
|
||||
data: commentModel.data.map((comment) => comment.id == id ? comment.copyWith(body: body) : comment).toList(),
|
||||
);
|
||||
try {
|
||||
await commentsRepository.updateComment(id: id, body: body);
|
||||
emit(CommentsState.loaded(comment: updatedCommentModel));
|
||||
return true;
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
emit(CommentsState.loaded(comment: commentModel));
|
||||
log(e.toString(), stackTrace: st);
|
||||
}
|
||||
|
||||
@@ -7,18 +7,12 @@ class CommentsRepository {
|
||||
CommentsRepository({required this.service});
|
||||
|
||||
Future<void> deleteComment({required int id}) async {
|
||||
try {
|
||||
return service.deleteComment(id);
|
||||
} catch (e) {
|
||||
rethrow;
|
||||
}
|
||||
return service.deleteComment(id);
|
||||
|
||||
}
|
||||
|
||||
Future<void> updateComment({required int id, required String body}) async {
|
||||
try {
|
||||
return service.updateComment(id, CommentUpdateModel(body: body));
|
||||
} catch (e) {
|
||||
rethrow;
|
||||
}
|
||||
return service.updateComment(id, CommentUpdateModel(body: body));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,4 +69,9 @@ class AppConstants {
|
||||
static const String usersEndpoint = '/users';
|
||||
static const String postsEndpoint = '/posts';
|
||||
static const String commentsEndpoint = '/comments';
|
||||
|
||||
// Delay of pending requests
|
||||
/// 30 секунд стоит потому что запрос может идти 12-15 секунд
|
||||
/// Особенно если производится отладка на сервере разработчика
|
||||
static const Duration pendingDelay = Duration(seconds: 30);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'package:eatvio_app/core/cubit/marketing/marketing_cubit_state.dart';
|
||||
import 'package:eatvio_app/core/prefs.dart';
|
||||
import 'package:eatvio_app/core/prefs_keys.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
||||
|
||||
class MarketingCubit extends Cubit<MarketingCubitState> {
|
||||
final Prefs prefs;
|
||||
@@ -22,8 +23,9 @@ class MarketingCubit extends Cubit<MarketingCubitState> {
|
||||
await prefs.setBool(PrefsKeys.marketingBottomSheetHasBeenShown, true);
|
||||
}
|
||||
return needToShowMarketingBottomSheet;
|
||||
} catch (e) {
|
||||
rethrow;
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ class StateUtils {
|
||||
if (isError(state)) {
|
||||
// Попытка извлечь сообщение об ошибке из состояния
|
||||
final stateString = state.toString();
|
||||
final errorMatch = RegExp(r'error[:\s]+([^,}]+)').firstMatch(stateString);
|
||||
final errorMatch = RegExp(r'error[:\s]+([^,}]+)', caseSensitive: false).firstMatch(stateString);
|
||||
return errorMatch?.group(1)?.trim();
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import 'package:eatvio_app/core/cubit/marketing/marketing_cubit.dart';
|
||||
import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_cubit.dart';
|
||||
import 'package:eatvio_app/core/local_db/diary_local_data_source.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_sync_runner.dart';
|
||||
import 'package:eatvio_app/core/views/cubit/views_cubit.dart';
|
||||
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
|
||||
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart';
|
||||
@@ -21,6 +23,7 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
|
||||
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/bloc/glossary_sync_cubit.dart';
|
||||
import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
|
||||
import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
|
||||
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
|
||||
@@ -45,7 +48,7 @@ import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_
|
||||
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
|
||||
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
|
||||
import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart';
|
||||
import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart';
|
||||
import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recipes_cubit.dart';
|
||||
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
|
||||
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
|
||||
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
|
||||
@@ -71,15 +74,21 @@ class CubitRegistrations {
|
||||
sl.registerLazySingleton<ProfileAvatarCubit>(() => ProfileAvatarCubit(profileRepository: sl()));
|
||||
sl.registerLazySingleton<ChatsCubit>(() => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl()));
|
||||
sl.registerLazySingleton<InternetConnectionCubit>(() => InternetConnectionCubit());
|
||||
sl.registerLazySingleton<GlossarySyncCubit>(
|
||||
() => GlossarySyncCubit(
|
||||
syncService: sl<GlossarySyncService>(),
|
||||
connectionCubit: sl<InternetConnectionCubit>(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Регистрация Cubit'ов как фабрик
|
||||
static void _registerFactoryCubits() {
|
||||
// Auth related cubits
|
||||
sl.registerFactory<AuthCubit>(() => AuthCubit(authRepository: sl()));
|
||||
sl.registerFactory<AuthCubit>(() => AuthCubit(authRepository: sl(), firebaseApi: sl(), prefs: sl(), profileRepository: sl()));
|
||||
sl.registerFactory<RegistrationCubit>(() => RegistrationCubit(registrationRepository: sl(), prefs: sl()));
|
||||
sl.registerFactory<ResetPasswordCubit>(() => ResetPasswordCubit(resetPasswordRepository: sl()));
|
||||
sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl()));
|
||||
sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl(), prefs: sl()));
|
||||
sl.registerFactory<OAuthCubit>(() => OAuthCubit(authRepository: sl(), prefs: sl()));
|
||||
sl.registerFactory<RegistrationCubitV2>(() => RegistrationCubitV2(registrationRepository: sl()));
|
||||
// Feed related cubits
|
||||
@@ -114,7 +123,7 @@ class CubitRegistrations {
|
||||
// User content cubits
|
||||
sl.registerFactory<MyDietsCubit>(() => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl()));
|
||||
sl.registerFactory<MyPlansCubit>(() => MyPlansCubit(myPlansRepository: sl()));
|
||||
sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl()));
|
||||
sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl(), recipeRepository: sl()));
|
||||
|
||||
// Other feature cubits
|
||||
sl.registerFactory<CalendarCubit>(() => CalendarCubit(calendarRepository: sl()));
|
||||
@@ -126,6 +135,8 @@ class CubitRegistrations {
|
||||
profileRepository: sl(),
|
||||
dietRepository: sl(),
|
||||
settingsRepository: sl(),
|
||||
localDataSource: sl<DiaryLocalDataSource>(),
|
||||
connectionCubit: sl<InternetConnectionCubit>(),
|
||||
),
|
||||
);
|
||||
sl.registerFactory<SettingsCubit>(
|
||||
|
||||
@@ -1,10 +1,23 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/constants/app_constants.dart';
|
||||
import 'package:eatvio_app/core/interceptors/offline_error_interceptor.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/sentry_error_reporter.dart';
|
||||
import 'package:eatvio_app/core/interceptors/phone_verify_error_interceptor.dart';
|
||||
import 'package:eatvio_app/core/interceptors/token_interceptor.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/diary_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/glossary_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/media_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/pending_ops_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/sync_meta_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/diary_local_data_source.dart';
|
||||
import 'package:eatvio_app/core/prefs.dart';
|
||||
import 'package:get_it/get_it.dart';
|
||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import 'package:sentry_dio/sentry_dio.dart';
|
||||
|
||||
/// Регистрация внешних зависимостей в системе внедрения зависимостей
|
||||
class ExternalRegistrations {
|
||||
@@ -12,21 +25,51 @@ class ExternalRegistrations {
|
||||
|
||||
/// Регистрация всех внешних зависимостей
|
||||
static void registerAll() {
|
||||
sl.registerLazySingleton<ErrorReporter>(SentryErrorReporter.new);
|
||||
_registerDio();
|
||||
_registerDatabase();
|
||||
_registerPrefs();
|
||||
}
|
||||
|
||||
/// Регистрация Dio HTTP клиента
|
||||
static void _registerDio() {
|
||||
sl.registerLazySingleton(
|
||||
() =>
|
||||
Dio(BaseOptions(baseUrl: sl<AppConfig>().baseUrl, headers: {'accept': 'application/json', 'content-type': 'application/json'}))
|
||||
..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor()]),
|
||||
() => Dio(
|
||||
BaseOptions(
|
||||
baseUrl: sl<AppConfig>().baseUrl,
|
||||
headers: {'accept': 'application/json', 'content-type': 'application/json'},
|
||||
connectTimeout: AppConstants.pendingDelay,
|
||||
receiveTimeout: AppConstants.pendingDelay,
|
||||
sendTimeout: AppConstants.pendingDelay,
|
||||
),
|
||||
)..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor(), OfflineErrorInterceptor()])
|
||||
..addSentry(
|
||||
failedRequestStatusCodes: const [SentryStatusCode.defaultRange()],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Регистрация базы данных и локальных источников
|
||||
static void _registerDatabase() {
|
||||
sl.registerLazySingleton<AppDatabase>(() => AppDatabase());
|
||||
sl.registerLazySingleton<DiaryDao>(() => sl<AppDatabase>().diaryDao);
|
||||
sl.registerLazySingleton<GlossaryDao>(() => sl<AppDatabase>().glossaryDao);
|
||||
sl.registerLazySingleton<MediaDao>(() => sl<AppDatabase>().mediaDao);
|
||||
sl.registerLazySingleton<PendingOpsDao>(() => sl<AppDatabase>().pendingOpsDao);
|
||||
sl.registerLazySingleton<SyncMetaDao>(() => sl<AppDatabase>().syncMetaDao);
|
||||
sl.registerLazySingleton<DiaryLocalDataSource>(
|
||||
() => DiaryLocalDataSource(
|
||||
diaryDao: sl(),
|
||||
glossaryDao: sl(),
|
||||
mediaDao: sl(),
|
||||
pendingOpsDao: sl(),
|
||||
syncMetaDao: sl(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Регистрация Prefs
|
||||
static void _registerPrefs() {
|
||||
sl.registerSingletonAsync<Prefs>(()async => Prefs(await SharedPreferences.getInstance()));
|
||||
sl.registerSingletonAsync<Prefs>(() async => Prefs(await SharedPreferences.getInstance()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
|
||||
import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_cubit.dart';
|
||||
import 'package:eatvio_app/core/local_db/diary_local_data_source.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/diary_sync_runner.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_sync_runner.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_sync_service.dart';
|
||||
import 'package:eatvio_app/core/views/repository/views_repository.dart';
|
||||
import 'package:eatvio_app/features/auth/repositories/auth_repository.dart';
|
||||
import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart';
|
||||
@@ -17,6 +23,7 @@ import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
|
||||
import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
|
||||
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
|
||||
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
|
||||
import 'package:eatvio_app/features/barcode/repositories/barcode_repository.dart';
|
||||
import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_repository.dart';
|
||||
import 'package:eatvio_app/features/menu/repositories/notification_settings_repository.dart';
|
||||
import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
|
||||
@@ -53,8 +60,37 @@ class RepositoryRegistrations {
|
||||
sl.registerLazySingleton<CalendarRepository>(() => CalendarRepository(calendarService: sl()));
|
||||
sl.registerLazySingleton<SettingsRepository>(() => SettingsRepository(settingsService: sl()));
|
||||
sl.registerLazySingleton<ConsultantRepository>(() => ConsultantRepository(consultantService: sl()));
|
||||
sl.registerLazySingleton<DiaryRepository>(() => DiaryRepository(diaryService: sl()));
|
||||
sl.registerLazySingleton<GlossaryRepository>(() => GlossaryRepository(glossaryService: sl()));
|
||||
sl.registerLazySingleton<DiaryRepository>(
|
||||
() => DiaryRepository(
|
||||
diaryService: sl(),
|
||||
localDataSource: sl<DiaryLocalDataSource>(),
|
||||
connectionCubit: sl<InternetConnectionCubit>(),
|
||||
),
|
||||
);
|
||||
|
||||
// Offline-First sync services
|
||||
sl.registerLazySingleton<GlossarySyncService>(
|
||||
() => GlossarySyncService(
|
||||
api: sl<GlossarySyncApiService>(),
|
||||
dio: sl<Dio>(instanceName: 'glossaryDio'),
|
||||
localDataSource: sl(),
|
||||
),
|
||||
);
|
||||
sl.registerLazySingleton<DiarySyncRunner>(
|
||||
() => DiarySyncRunner(
|
||||
localDataSource: sl(),
|
||||
diaryService: sl(),
|
||||
connectionCubit: sl(),
|
||||
),
|
||||
);
|
||||
sl.registerLazySingleton<GlossaryRepository>(
|
||||
() => GlossaryRepository(
|
||||
glossaryService: sl(),
|
||||
localDataSource: sl<DiaryLocalDataSource>(),
|
||||
connectionCubit: sl<InternetConnectionCubit>(),
|
||||
),
|
||||
);
|
||||
sl.registerLazySingleton<BarcodeRepository>(() => BarcodeRepository(barcodeService: sl(), dio: sl()));
|
||||
sl.registerLazySingleton<DietRepository>(() => DietRepository(dietsService: sl()));
|
||||
sl.registerLazySingleton<PlansRepository>(() => PlansRepository(plansService: sl()));
|
||||
sl.registerLazySingleton<PlanRepository>(() => PlanRepository(planService: sl()));
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/comments/services/comments_service.dart';
|
||||
import 'package:eatvio_app/core/firebase_api.dart';
|
||||
import 'package:eatvio_app/core/interceptors/offline_error_interceptor.dart';
|
||||
import 'package:eatvio_app/core/interceptors/token_interceptor.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_sync_service.dart';
|
||||
import 'package:sentry_dio/sentry_dio.dart';
|
||||
import 'package:eatvio_app/core/views/service/views_service.dart';
|
||||
import 'package:eatvio_app/core/websockets/ws_service.dart';
|
||||
import 'package:eatvio_app/features/auth/services/auth_service.dart';
|
||||
@@ -19,6 +25,7 @@ import 'package:eatvio_app/features/diary/services/diary_service.dart';
|
||||
import 'package:eatvio_app/features/diets/services/diet_service.dart';
|
||||
import 'package:eatvio_app/features/feed/services/feed_service.dart';
|
||||
import 'package:eatvio_app/features/glossary/services/glossary_service.dart';
|
||||
import 'package:eatvio_app/features/barcode/services/barcode_service.dart';
|
||||
import 'package:eatvio_app/features/menu/services/blocked_users_service.dart';
|
||||
import 'package:eatvio_app/features/menu/services/notification_settings_service.dart';
|
||||
import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart';
|
||||
@@ -55,7 +62,23 @@ class ServiceRegistrations {
|
||||
sl.registerLazySingleton<SettingsService>(() => SettingsService(sl()));
|
||||
sl.registerLazySingleton<ConsultantService>(() => ConsultantService(sl()));
|
||||
sl.registerLazySingleton<DiaryService>(() => DiaryService(sl()));
|
||||
// GlossarySyncApiService: отдельный Dio с увеличенным таймаутом
|
||||
// — дамп глоссария (~200k записей) идёт ~35 секунд, стандартные 30s не хватает
|
||||
// — также используется в GlossarySyncService для dio.download()
|
||||
final glossaryDio = Dio(
|
||||
BaseOptions(
|
||||
baseUrl: sl<AppConfig>().baseUrl,
|
||||
headers: {'accept': 'application/json', 'content-type': 'application/json'},
|
||||
connectTimeout: const Duration(seconds: 30),
|
||||
receiveTimeout: const Duration(seconds: 120),
|
||||
sendTimeout: const Duration(seconds: 30),
|
||||
),
|
||||
)..interceptors.addAll([TokenInterceptor(), OfflineErrorInterceptor()])
|
||||
..addSentry();
|
||||
sl.registerLazySingleton<Dio>(() => glossaryDio, instanceName: 'glossaryDio');
|
||||
sl.registerLazySingleton<GlossarySyncApiService>(() => GlossarySyncApiService(glossaryDio));
|
||||
sl.registerLazySingleton<GlossaryService>(() => GlossaryService(sl()));
|
||||
sl.registerLazySingleton<BarcodeService>(() => BarcodeService(sl()));
|
||||
sl.registerLazySingleton<DietService>(() => DietService(sl()));
|
||||
sl.registerLazySingleton<PlansService>(() => PlansService(sl()));
|
||||
sl.registerLazySingleton<PlanService>(() => PlanService(sl()));
|
||||
@@ -70,7 +93,7 @@ class ServiceRegistrations {
|
||||
sl.registerLazySingleton<CancelPlanService>(() => CancelPlanService(sl()));
|
||||
sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
|
||||
sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
|
||||
sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi());
|
||||
sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi(errorReporter: sl()));
|
||||
sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
|
||||
sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
|
||||
sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
|
||||
|
||||
80
lib/core/error_reporting/error_report_policy.dart
Normal file
80
lib/core/error_reporting/error_report_policy.dart
Normal file
@@ -0,0 +1,80 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
|
||||
/// Rules for which errors are sent to crash reporting.
|
||||
///
|
||||
/// [shouldReport] is used by [ErrorReporter]. [allowSentryEvent] is used in
|
||||
/// [SentryFlutter.init] as a last-line filter (Dio failed-request capture, etc.).
|
||||
class ErrorReportPolicy {
|
||||
ErrorReportPolicy._();
|
||||
|
||||
/// When `false`, the error is not sent via [ErrorReporter].
|
||||
static bool shouldReport(Object? error) {
|
||||
if (error == null) return false;
|
||||
if (error is String) return false;
|
||||
if (error is SocketException) return false;
|
||||
|
||||
if (error is DioException) {
|
||||
return _shouldReportDio(error);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// Used in SDK [SentryOptions.beforeSend]. Return `false` to drop the event.
|
||||
///
|
||||
/// For [DioException], rules differ from [shouldReport]: events from `sentry_dio`
|
||||
/// (e.g. 5xx) must pass through here, while [shouldReport] returns false for 5xx
|
||||
/// so [SentryErrorReporter] does not duplicate them after `catch` in cubits / manual [report] calls.
|
||||
static bool allowSentryEvent(SentryEvent event, Hint hint) {
|
||||
final t = event.throwable;
|
||||
if (t == null) return true;
|
||||
if (t is DioException) {
|
||||
return _allowSentrySdkDio(t);
|
||||
}
|
||||
return shouldReport(t);
|
||||
}
|
||||
|
||||
/// Cancel, timeouts, socket / connection errors — do not send (noisy, often user environment).
|
||||
static bool _isTransientDioFailure(DioException e) {
|
||||
switch (e.type) {
|
||||
case DioExceptionType.cancel:
|
||||
case DioExceptionType.connectionTimeout:
|
||||
case DioExceptionType.sendTimeout:
|
||||
case DioExceptionType.receiveTimeout:
|
||||
case DioExceptionType.connectionError:
|
||||
return true;
|
||||
case DioExceptionType.unknown:
|
||||
case DioExceptionType.badResponse:
|
||||
case DioExceptionType.badCertificate:
|
||||
break;
|
||||
}
|
||||
return e.error is SocketException;
|
||||
}
|
||||
|
||||
/// Noise to drop for any Dio-originated SDK event; do not use for manual [report].
|
||||
static bool _allowSentrySdkDio(DioException e) {
|
||||
if (_isTransientDioFailure(e)) return false;
|
||||
final code = e.response?.statusCode;
|
||||
if (code != null && code >= 400 && code < 500) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool _shouldReportDio(DioException e) {
|
||||
if (_isTransientDioFailure(e)) return false;
|
||||
|
||||
final code = e.response?.statusCode;
|
||||
if (code != null) {
|
||||
if (code >= 500 && code <= 599) {
|
||||
return false;
|
||||
}
|
||||
if (code >= 400 && code < 500) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
9
lib/core/error_reporting/error_reporter.dart
Normal file
9
lib/core/error_reporting/error_reporter.dart
Normal file
@@ -0,0 +1,9 @@
|
||||
/// Application-wide error reporting (e.g. Sentry).
|
||||
abstract class ErrorReporter {
|
||||
Future<void> report(
|
||||
Object error,
|
||||
StackTrace? stackTrace, {
|
||||
String? origin,
|
||||
Map<String, Object?>? extras,
|
||||
});
|
||||
}
|
||||
14
lib/core/error_reporting/no_op_error_reporter.dart
Normal file
14
lib/core/error_reporting/no_op_error_reporter.dart
Normal file
@@ -0,0 +1,14 @@
|
||||
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||
|
||||
/// Reporting sink that does nothing (dev tooling, tests, diagnostics).
|
||||
class NoOpErrorReporter implements ErrorReporter {
|
||||
const NoOpErrorReporter();
|
||||
|
||||
@override
|
||||
Future<void> report(
|
||||
Object error,
|
||||
StackTrace? stackTrace, {
|
||||
String? origin,
|
||||
Map<String, Object?>? extras,
|
||||
}) async {}
|
||||
}
|
||||
17
lib/core/error_reporting/report_from.dart
Normal file
17
lib/core/error_reporting/report_from.dart
Normal file
@@ -0,0 +1,17 @@
|
||||
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/no_op_error_reporter.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
|
||||
/// Отправка в [ErrorReporter] с тегом origin = [context.runtimeType] (имя кубита/виджета и т.д.).
|
||||
///
|
||||
/// Если [ErrorReporter] не зарегистрирован (например, после [GetIt.reset] в тестах), используется [NoOpErrorReporter].
|
||||
Future<void> reportFrom(Object error, StackTrace? stackTrace, Object context) {
|
||||
final reporter = sl.isRegistered<ErrorReporter>()
|
||||
? sl<ErrorReporter>()
|
||||
: const NoOpErrorReporter();
|
||||
return reporter.report(
|
||||
error,
|
||||
stackTrace,
|
||||
origin: context.runtimeType.toString(),
|
||||
);
|
||||
}
|
||||
33
lib/core/error_reporting/sentry_error_reporter.dart
Normal file
33
lib/core/error_reporting/sentry_error_reporter.dart
Normal file
@@ -0,0 +1,33 @@
|
||||
import 'package:eatvio_app/core/error_reporting/error_report_policy.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
|
||||
class SentryErrorReporter implements ErrorReporter {
|
||||
SentryErrorReporter();
|
||||
|
||||
@override
|
||||
Future<void> report(
|
||||
Object error,
|
||||
StackTrace? stackTrace, {
|
||||
String? origin,
|
||||
Map<String, Object?>? extras,
|
||||
}) async {
|
||||
if (!ErrorReportPolicy.shouldReport(error)) return;
|
||||
|
||||
await Sentry.captureException(
|
||||
error,
|
||||
stackTrace: stackTrace,
|
||||
withScope: (scope) {
|
||||
if (origin != null && origin.isNotEmpty) {
|
||||
scope.setTag('origin', origin);
|
||||
}
|
||||
if (extras != null && extras.isNotEmpty) {
|
||||
scope.setContexts(
|
||||
'report_extras',
|
||||
extras.map((k, v) => MapEntry(k, v?.toString())),
|
||||
);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,47 @@
|
||||
import 'dart:async';
|
||||
import 'dart:developer';
|
||||
import 'dart:io';
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/app_initializer.dart';
|
||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/core/token_storage.dart';
|
||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:flutter/services.dart' show MethodChannel, PlatformException;
|
||||
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||
|
||||
class FirebaseApi {
|
||||
final ErrorReporter _errorReporter;
|
||||
final _firebaseMessaging = FirebaseMessaging.instance;
|
||||
|
||||
FirebaseApi({required ErrorReporter errorReporter}) : _errorReporter = errorReporter;
|
||||
|
||||
Future<String?> getToken() async {
|
||||
String? token;
|
||||
|
||||
if (await _isHuaweiDevice()) {
|
||||
token = await _getHuaweiPushTokenNative();
|
||||
token = await _getHuaweiPushTokenNative().timeout(
|
||||
const Duration(seconds: 5),
|
||||
onTimeout: () => null,
|
||||
);
|
||||
} else {
|
||||
if ((sl<AppConfig>().buildType == AppBuildType.prod)) {
|
||||
await _firebaseMessaging.requestPermission();
|
||||
try {
|
||||
await _firebaseMessaging.requestPermission().timeout(
|
||||
const Duration(seconds: 5),
|
||||
);
|
||||
} catch (e) {
|
||||
// Разрешение не критично, продолжаем
|
||||
log('Failed to request Firebase messaging permission: $e');
|
||||
}
|
||||
}
|
||||
token = await _firebaseMessaging.getToken();
|
||||
token = await _firebaseMessaging.getToken().timeout(
|
||||
const Duration(seconds: 5),
|
||||
onTimeout: () => null,
|
||||
);
|
||||
}
|
||||
return token;
|
||||
}
|
||||
@@ -35,13 +52,20 @@ class FirebaseApi {
|
||||
await sl<Dio>().post(
|
||||
'/api/anonymous_token',
|
||||
data: {
|
||||
'platform': Platform.isIOS ? 'ios' : 'android',
|
||||
'platform': Platform.isIOS ? 'ios' : (await _isHuaweiDevice()) ? 'huawei' : 'android',
|
||||
'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
|
||||
'token': await getToken(),
|
||||
},
|
||||
).timeout(
|
||||
const Duration(seconds: 10),
|
||||
onTimeout: () {
|
||||
throw TimeoutException('registerAnonymousPushToken timeout');
|
||||
},
|
||||
);
|
||||
} catch (e, st) {
|
||||
log(e.toString(), stackTrace: st);
|
||||
await _errorReporter.report(e, st, origin: 'FirebaseApi');
|
||||
// Не пробрасываем ошибку дальше, так как это не критичная операция
|
||||
}
|
||||
}
|
||||
|
||||
@@ -57,9 +81,16 @@ class FirebaseApi {
|
||||
'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
|
||||
'token': await getToken(),
|
||||
},
|
||||
).timeout(
|
||||
const Duration(seconds: 10),
|
||||
onTimeout: () {
|
||||
throw TimeoutException('registerPushToken timeout');
|
||||
},
|
||||
);
|
||||
} catch (e, st) {
|
||||
log(e.toString(), stackTrace: st);
|
||||
await _errorReporter.report(e, st, origin: 'FirebaseApi');
|
||||
// Не пробрасываем ошибку дальше, так как это не критичная операция
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -84,10 +115,12 @@ class FirebaseApi {
|
||||
} on PlatformException catch (e, st) {
|
||||
showErrorToast('$e $st');
|
||||
log(e.toString(), stackTrace: st);
|
||||
await _errorReporter.report(e, st, origin: 'FirebaseApi');
|
||||
return null;
|
||||
} catch (e, st) {
|
||||
showErrorToast('$e $st');
|
||||
log(e.toString(), stackTrace: st);
|
||||
await _errorReporter.report(e, st, origin: 'FirebaseApi');
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import 'dart:io';
|
||||
import 'package:eatvio_app/core/app_initializer.dart';
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:flutter_image_compress/flutter_image_compress.dart';
|
||||
import 'package:image/image.dart' as img;
|
||||
import 'package:path/path.dart' as p;
|
||||
|
||||
abstract class ImageCompressUtility {
|
||||
@@ -27,33 +29,21 @@ abstract class ImageCompressUtility {
|
||||
}
|
||||
|
||||
static Future<File> compressFile(File file) async {
|
||||
final image = img.decodeImage(file.readAsBytesSync())!;
|
||||
int width = image.width;
|
||||
int height = image.height;
|
||||
try {
|
||||
final appConfig = sl<AppConfig>();
|
||||
if (appConfig.buildType == AppBuildType.tests) {
|
||||
return file;
|
||||
}
|
||||
} catch (_) {}
|
||||
|
||||
if (width > height) {
|
||||
if (width > 1080) {
|
||||
height = (height * 1080) ~/ width;
|
||||
width = 1080;
|
||||
}
|
||||
} else {
|
||||
if (height > 1080) {
|
||||
width = (width * 1080) ~/ height;
|
||||
height = 1080;
|
||||
}
|
||||
final compressedPath = '${p.withoutExtension(file.path)}_compressed.jpg';
|
||||
|
||||
final result = await FlutterImageCompress.compressAndGetFile(file.absolute.path, compressedPath, quality: 90, minHeight: 1080, minWidth: 1080);
|
||||
|
||||
if (result == null) {
|
||||
return file;
|
||||
}
|
||||
|
||||
String filePathWithoutExtension = p.withoutExtension(file.path);
|
||||
String compressedFilePath = '${filePathWithoutExtension}_compressed.jpg';
|
||||
|
||||
final result = await FlutterImageCompress.compressAndGetFile(
|
||||
file.absolute.path,
|
||||
compressedFilePath,
|
||||
quality: 90,
|
||||
minHeight: height,
|
||||
minWidth: width,
|
||||
);
|
||||
|
||||
return File(result!.path);
|
||||
return File(result.path);
|
||||
}
|
||||
}
|
||||
|
||||
96
lib/core/interceptors/offline_error_interceptor.dart
Normal file
96
lib/core/interceptors/offline_error_interceptor.dart
Normal file
@@ -0,0 +1,96 @@
|
||||
import 'package:dio/dio.dart';
|
||||
|
||||
/// Исключение, возникающее при получении структурированного ответа об ошибке от сервера.
|
||||
/// [retryable] — если true, операция может быть повторена позже (5xx, таймаут).
|
||||
/// Если false — операция провалилась окончательно (4xx, валидация, не найдено).
|
||||
class OfflineOperationException implements Exception {
|
||||
final String message;
|
||||
final String? code;
|
||||
final bool retryable;
|
||||
|
||||
const OfflineOperationException({
|
||||
required this.message,
|
||||
this.code,
|
||||
required this.retryable,
|
||||
});
|
||||
|
||||
@override
|
||||
String toString() => 'OfflineOperationException(retryable: $retryable, code: $code, message: $message)';
|
||||
}
|
||||
|
||||
/// Dio-интерцептор для парсинга Envelope-ошибок от сервера.
|
||||
///
|
||||
/// Ожидаемый формат ответа при ошибке:
|
||||
/// {
|
||||
/// "message": "Human readable",
|
||||
/// "error": {
|
||||
/// "code": "validation_error",
|
||||
/// "message": "...",
|
||||
/// "retryable": false
|
||||
/// }
|
||||
/// }
|
||||
///
|
||||
/// Если поле `error.retryable` отсутствует или сервер вернул 5xx — считаем retryable = true.
|
||||
class OfflineErrorInterceptor extends Interceptor {
|
||||
@override
|
||||
void onError(DioException err, ErrorInterceptorHandler handler) {
|
||||
// Таймауты и проблемы соединения — всегда retryable
|
||||
if (err.type == DioExceptionType.connectionTimeout ||
|
||||
err.type == DioExceptionType.receiveTimeout ||
|
||||
err.type == DioExceptionType.sendTimeout ||
|
||||
err.type == DioExceptionType.connectionError) {
|
||||
return handler.next(
|
||||
err.copyWith(
|
||||
error: const OfflineOperationException(
|
||||
message: 'Нет соединения с сервером',
|
||||
code: 'connection_error',
|
||||
retryable: true,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
final response = err.response;
|
||||
if (response == null) {
|
||||
return handler.next(err);
|
||||
}
|
||||
|
||||
// 5xx — серверные ошибки, retryable
|
||||
if (response.statusCode != null && response.statusCode! >= 500) {
|
||||
return handler.next(
|
||||
err.copyWith(
|
||||
error: const OfflineOperationException(
|
||||
message: 'Ошибка сервера',
|
||||
code: 'server_error',
|
||||
retryable: true,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
// 4xx — пробуем распарсить Envelope
|
||||
try {
|
||||
final data = response.data;
|
||||
if (data is Map<String, dynamic> && data.containsKey('error')) {
|
||||
final errorEnvelope = data['error'] as Map<String, dynamic>;
|
||||
final retryable = errorEnvelope['retryable'] as bool? ?? false;
|
||||
final code = errorEnvelope['code'] as String?;
|
||||
final message = errorEnvelope['message'] as String? ?? data['message'] as String? ?? 'Ошибка';
|
||||
|
||||
return handler.next(
|
||||
err.copyWith(
|
||||
error: OfflineOperationException(
|
||||
message: message,
|
||||
code: code,
|
||||
retryable: retryable,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (_) {
|
||||
// Не смогли распарсить — передаём дальше как есть
|
||||
}
|
||||
|
||||
handler.next(err);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/app_router.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
|
||||
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
@@ -12,18 +13,21 @@ class PhoneVerifyErrorInterceptor extends Interceptor {
|
||||
final data = err.response?.data;
|
||||
|
||||
if (data is Map<String, dynamic> && data['type'] == 'unverificated_phone') {
|
||||
final String phone = await sl<ProfileRepository>().getMyPhone();
|
||||
final String phone = await sl<ProfileRepository>().getMyPhone();
|
||||
final String passKey = await sl<ProfileRepository>().getPassKey(routeName: 'user_detailz.change-phone-verify', routeParams: {"phone": phone});
|
||||
await showErrorDialog(AppRouter.navigatorKey.currentContext!,
|
||||
title: 'Привяжите номер телефона', description: 'Для того, что бы выполнить это действие необходимо привязать номер телефона');
|
||||
await showErrorDialog(
|
||||
AppRouter.navigatorKey.currentContext!,
|
||||
title: 'Привяжите номер телефона',
|
||||
description: 'Для того, что бы выполнить это действие необходимо привязать номер телефона',
|
||||
);
|
||||
final currentContext = AppRouter.navigatorKey.currentContext;
|
||||
|
||||
if (currentContext != null && currentContext.mounted && GoRouter.of(currentContext).state.path == RouteConstants.stepperBecomeConsultantScreen) {
|
||||
GoRouter.of(currentContext).pop();
|
||||
}
|
||||
AppRouter.navigatorKey.currentContext?.pushNamed('verifyScreen', extra: passKey);
|
||||
return handler.reject(
|
||||
DioException(
|
||||
requestOptions: err.requestOptions,
|
||||
response: err.response,
|
||||
error: 'Phone number not verified',
|
||||
type: DioExceptionType.badResponse,
|
||||
),
|
||||
DioException(requestOptions: err.requestOptions, response: err.response, error: 'Phone number not verified', type: DioExceptionType.badResponse),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/app_router.dart';
|
||||
import 'package:eatvio_app/core/token_storage.dart';
|
||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
class TokenInterceptor extends Interceptor {
|
||||
@@ -23,6 +25,7 @@ class TokenInterceptor extends Interceptor {
|
||||
ErrorInterceptorHandler handler,
|
||||
) async {
|
||||
if (err.response?.statusCode == 401) {
|
||||
await sl<WsManager>().clear();
|
||||
await TokenStorage.removeTokenInStorage();
|
||||
AppRouter.navigatorKey.currentContext?.go('/auth-screen');
|
||||
}
|
||||
|
||||
@@ -2,13 +2,14 @@ import 'dart:async';
|
||||
import 'dart:developer';
|
||||
|
||||
import 'package:connectivity_plus/connectivity_plus.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/env_config.dart';
|
||||
import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_state.dart';
|
||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
||||
|
||||
class InternetConnectionCubit extends Cubit<InternetConnectionState> {
|
||||
InternetConnectionCubit() : super(InternetConnectionState()) {
|
||||
@@ -28,12 +29,23 @@ class InternetConnectionCubit extends Cubit<InternetConnectionState> {
|
||||
late StreamSubscription<List<ConnectivityResult>> _connectivitySubscription;
|
||||
late final AppLifecycleListener _listener;
|
||||
|
||||
/// Отдельный легковесный Dio без авторизационных интерцепторов —
|
||||
/// используется только для проверки доступности сети.
|
||||
final Dio _checkDio = Dio(BaseOptions(
|
||||
connectTimeout: const Duration(seconds: 5),
|
||||
receiveTimeout: const Duration(seconds: 5),
|
||||
followRedirects: true,
|
||||
// Любой HTTP-ответ = интернет доступен
|
||||
validateStatus: (status) => true,
|
||||
));
|
||||
|
||||
Future<void> checkConnection() async {
|
||||
late List<ConnectivityResult> result;
|
||||
|
||||
try {
|
||||
result = await _connectivity.checkConnectivity();
|
||||
} on PlatformException catch (e) {
|
||||
} on PlatformException catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
log('Couldn\'t check connectivity status', error: e);
|
||||
return;
|
||||
}
|
||||
@@ -42,32 +54,67 @@ class InternetConnectionCubit extends Cubit<InternetConnectionState> {
|
||||
}
|
||||
|
||||
Future<void> _updateAccessStatus(List<ConnectivityResult> result) async {
|
||||
final hasInternet = await _checkInternetAccess(result);
|
||||
if (!hasInternet) showInternetConnectionToast();
|
||||
emit(state.copyWith(isInternetAvailable: hasInternet));
|
||||
try {
|
||||
final hasInternet = await _checkInternetAccess(result);
|
||||
final wasOnline = state.isInternetAvailable;
|
||||
// Показываем toast только при переходе online → offline,
|
||||
// а не при каждом срабатывании проверки
|
||||
if (wasOnline && !hasInternet) showInternetConnectionToast();
|
||||
if (!isClosed) {
|
||||
emit(state.copyWith(isInternetAvailable: hasInternet));
|
||||
}
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> _checkInternetAccess(List<ConnectivityResult> result) async {
|
||||
if (result.contains(ConnectivityResult.none)) {
|
||||
return false;
|
||||
log('[InternetCheck] connectivity result: $result');
|
||||
|
||||
final rawUrls = [
|
||||
EnvConfig.googleCheckUrl,
|
||||
EnvConfig.yandexCheckUrl,
|
||||
EnvConfig.baseUrl,
|
||||
];
|
||||
|
||||
final urls = rawUrls
|
||||
.map((u) => u.trim())
|
||||
.where((u) => u.isNotEmpty && Uri.tryParse(u)?.hasScheme == true)
|
||||
.toList();
|
||||
|
||||
if (urls.isEmpty) {
|
||||
log('[InternetCheck] No valid check URLs configured, assuming online');
|
||||
return true;
|
||||
}
|
||||
|
||||
final uris = [Uri.parse(EnvConfig.googleCheckUrl), Uri.parse(EnvConfig.yandexCheckUrl), Uri.parse(EnvConfig.devBaseUrl), Uri.parse(EnvConfig.baseUrl)];
|
||||
for (final uri in uris) {
|
||||
try {
|
||||
final response = await http.get(uri).timeout(const Duration(seconds: 3));
|
||||
return response.statusCode >= 100 && response.statusCode < 600;
|
||||
} catch (e) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
final futures = urls.map((url) =>
|
||||
_checkDio.get<void>(url)
|
||||
.then((_) {
|
||||
log('[InternetCheck] $url → OK');
|
||||
return true;
|
||||
})
|
||||
.catchError((Object e) {
|
||||
// DioException с ответом от сервера = интернет есть
|
||||
if (e is DioException && e.response != null) {
|
||||
log('[InternetCheck] $url → ${e.response!.statusCode} (has response, internet OK)');
|
||||
return true;
|
||||
}
|
||||
log('[InternetCheck] $url → FAILED: $e');
|
||||
return false;
|
||||
})
|
||||
);
|
||||
|
||||
final results = await Future.wait(futures);
|
||||
final hasInternet = results.any((ok) => ok);
|
||||
log('[InternetCheck] final result: hasInternet=$hasInternet');
|
||||
return hasInternet;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> close() {
|
||||
_connectivitySubscription.cancel();
|
||||
_listener.dispose();
|
||||
_checkDio.close();
|
||||
return super.close();
|
||||
}
|
||||
}
|
||||
|
||||
84
lib/core/local_db/app_database.dart
Normal file
84
lib/core/local_db/app_database.dart
Normal file
@@ -0,0 +1,84 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:drift_flutter/drift_flutter.dart';
|
||||
import 'dao/diary_dao.dart';
|
||||
import 'dao/glossary_dao.dart';
|
||||
import 'dao/media_dao.dart';
|
||||
import 'dao/pending_ops_dao.dart';
|
||||
import 'dao/sync_meta_dao.dart';
|
||||
import 'tables/diary_days_table.dart';
|
||||
import 'tables/glossary_cache_table.dart';
|
||||
import 'tables/meals_table.dart';
|
||||
import 'tables/media_table.dart';
|
||||
import 'tables/pending_operations_table.dart';
|
||||
import 'tables/portions_table.dart';
|
||||
import 'tables/sync_meta_table.dart';
|
||||
|
||||
part 'app_database.g.dart';
|
||||
|
||||
/// Главная база данных приложения (Drift/SQLite).
|
||||
/// Используется для офлайн-хранения данных дневника и глоссария.
|
||||
@DriftDatabase(
|
||||
tables: [
|
||||
DiaryDaysTable,
|
||||
MealsTable,
|
||||
PortionsTable,
|
||||
GlossaryCacheTable,
|
||||
PendingOperationsTable,
|
||||
SyncMetaTable,
|
||||
MediaTable,
|
||||
],
|
||||
daos: [
|
||||
DiaryDao,
|
||||
GlossaryDao,
|
||||
PendingOpsDao,
|
||||
SyncMetaDao,
|
||||
MediaDao,
|
||||
],
|
||||
)
|
||||
class AppDatabase extends _$AppDatabase {
|
||||
AppDatabase() : super(_openConnection());
|
||||
|
||||
/// Конструктор для тестов: принимает произвольный executor (например NativeDatabase.memory()).
|
||||
AppDatabase.forTesting(super.executor);
|
||||
|
||||
@override
|
||||
int get schemaVersion => 3;
|
||||
|
||||
@override
|
||||
MigrationStrategy get migration => MigrationStrategy(
|
||||
onCreate: (Migrator m) async {
|
||||
await m.createAll();
|
||||
},
|
||||
onUpgrade: (Migrator m, int from, int to) async {
|
||||
if (from < 2) {
|
||||
// Новые таблицы для offline-first (добавлены в v2)
|
||||
await m.createTable(pendingOperationsTable);
|
||||
await m.createTable(syncMetaTable);
|
||||
// Добавляем уникальный индекс для meals
|
||||
try {
|
||||
await customStatement(
|
||||
'CREATE UNIQUE INDEX IF NOT EXISTS meals_unique_day_type '
|
||||
'ON meals(diary_day_id, type_no)',
|
||||
);
|
||||
} catch (_) {}
|
||||
}
|
||||
if (from < 3) {
|
||||
// Таблица медиа для фото дневника (добавлена в v3)
|
||||
await m.createTable(mediaTable);
|
||||
}
|
||||
},
|
||||
beforeOpen: (details) async {
|
||||
// WAL mode — позволяет параллельные чтение/запись из разных изолятов
|
||||
// (основной + compute для глоссария). Без этого: "database is locked".
|
||||
await customStatement('PRAGMA journal_mode = WAL;');
|
||||
// Если БД занята — ждать до 30 секунд вместо мгновенной ошибки
|
||||
await customStatement('PRAGMA busy_timeout = 30000;');
|
||||
await customStatement('PRAGMA foreign_keys = ON;');
|
||||
},
|
||||
);
|
||||
|
||||
static QueryExecutor _openConnection() {
|
||||
return driftDatabase(name: 'eatvio_offline_db');
|
||||
}
|
||||
}
|
||||
|
||||
85
lib/core/local_db/dao/diary_dao.dart
Normal file
85
lib/core/local_db/dao/diary_dao.dart
Normal file
@@ -0,0 +1,85 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/diary_days_table.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/meals_table.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/portions_table.dart';
|
||||
|
||||
part 'diary_dao.g.dart';
|
||||
|
||||
/// DAO для работы с дневником питания в локальной БД.
|
||||
/// Реализует паттерн Cache-Aside: данные кэшируются после успешного ответа сети.
|
||||
@DriftAccessor(tables: [DiaryDaysTable, MealsTable, PortionsTable])
|
||||
class DiaryDao extends DatabaseAccessor<AppDatabase> with _$DiaryDaoMixin {
|
||||
DiaryDao(super.db);
|
||||
|
||||
// ─── Diary Days ────────────────────────────────────────────────────────────
|
||||
|
||||
/// Получить день дневника по дате (формат: YYYY-MM-DD).
|
||||
/// Возвращает null если день не кэширован локально.
|
||||
Future<DiaryDaysTableData?> getDayByDate(String date) {
|
||||
return (select(db.diaryDaysTable)..where((t) => t.date.equals(date))).getSingleOrNull();
|
||||
}
|
||||
|
||||
/// Получить все meal для дня дневника.
|
||||
Future<List<MealsTableData>> getMealsForDay(int diaryDayId) {
|
||||
return (select(db.mealsTable)..where((t) => t.diaryDayId.equals(diaryDayId))).get();
|
||||
}
|
||||
|
||||
/// Получить все порции для конкретного meal.
|
||||
Future<List<PortionsTableData>> getPortionsForMeal(int mealId) {
|
||||
return (select(db.portionsTable)..where((t) => t.mealId.equals(mealId))).get();
|
||||
}
|
||||
|
||||
/// Upsert целого дня из сети (вставка или обновление по дате).
|
||||
/// Используем ON CONFLICT(date) т.к. уникальность по дате, а не по autoincrement id.
|
||||
Future<int> upsertDay(DiaryDaysTableCompanion day) {
|
||||
return into(db.diaryDaysTable).insert(
|
||||
day,
|
||||
onConflict: DoUpdate(
|
||||
(old) => day,
|
||||
target: [db.diaryDaysTable.date],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Upsert приема пищи (вставка или обновление по diaryDayId + typeNo).
|
||||
Future<int> upsertMeal(MealsTableCompanion meal) {
|
||||
return into(db.mealsTable).insert(
|
||||
meal,
|
||||
onConflict: DoUpdate(
|
||||
(old) => meal,
|
||||
target: [db.mealsTable.diaryDayId, db.mealsTable.typeNo],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/// Upsert порции (вставка или обновление по id).
|
||||
Future<int> upsertPortion(PortionsTableCompanion portion) {
|
||||
return into(db.portionsTable).insertOnConflictUpdate(portion);
|
||||
}
|
||||
|
||||
/// Обновить локальный serverId дня после успешной синхронизации.
|
||||
Future<void> updateServerId(int localId, int serverId) async {
|
||||
await (update(db.diaryDaysTable)..where((t) => t.id.equals(localId)))
|
||||
.write(DiaryDaysTableCompanion(serverId: Value(serverId)));
|
||||
}
|
||||
|
||||
/// Удалить все приёмы пищи и порции для дня (используется при перезаписи из сети).
|
||||
Future<void> clearMealsForDay(int diaryDayId) async {
|
||||
await (delete(db.mealsTable)..where((t) => t.diaryDayId.equals(diaryDayId))).go();
|
||||
}
|
||||
|
||||
/// Удалить все порции для конкретного приёма пищи.
|
||||
/// BUG-6 fix: позволяет атомарно перезаписать порции одного meal.
|
||||
Future<void> clearPortionsForMeal(int mealId) async {
|
||||
await (delete(db.portionsTable)..where((t) => t.mealId.equals(mealId))).go();
|
||||
}
|
||||
|
||||
/// Очистить кэш дней дневника старше [ttlDays] дней.
|
||||
/// Вызывается периодически для экономии места на устройстве.
|
||||
Future<int> clearExpiredCache({int ttlDays = 14}) {
|
||||
final cutoffDate = DateTime.now().subtract(Duration(days: ttlDays));
|
||||
final cutoffStr = cutoffDate.toIso8601String().substring(0, 10); // YYYY-MM-DD
|
||||
return (delete(db.diaryDaysTable)..where((t) => t.date.isSmallerThanValue(cutoffStr))).go();
|
||||
}
|
||||
}
|
||||
58
lib/core/local_db/dao/glossary_dao.dart
Normal file
58
lib/core/local_db/dao/glossary_dao.dart
Normal file
@@ -0,0 +1,58 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/glossary_cache_table.dart';
|
||||
|
||||
part 'glossary_dao.g.dart';
|
||||
|
||||
/// DAO для работы с кэшем глоссария продуктов (~200k записей).
|
||||
/// Оптимизирован для быстрого bulk-insert при синхронизации.
|
||||
@DriftAccessor(tables: [GlossaryCacheTable])
|
||||
class GlossaryDao extends DatabaseAccessor<AppDatabase> with _$GlossaryDaoMixin {
|
||||
GlossaryDao(super.db);
|
||||
|
||||
// ─── Read ──────────────────────────────────────────────────────────────────
|
||||
|
||||
/// Получить продукты по списку ID (для обогащения порций КБЖУ).
|
||||
Future<List<GlossaryCacheTableData>> getByIds(List<int> ids) {
|
||||
return (select(db.glossaryCacheTable)..where((t) => t.id.isIn(ids))).get();
|
||||
}
|
||||
|
||||
/// Поиск по названию (нечёткий, регистронезависимый).
|
||||
Future<List<GlossaryCacheTableData>> search(String query, {int limit = 30}) {
|
||||
return (select(db.glossaryCacheTable)
|
||||
..where((t) => t.name.like('%$query%'))
|
||||
..limit(limit))
|
||||
.get();
|
||||
}
|
||||
|
||||
/// Фильтр по группе продуктов.
|
||||
Future<List<GlossaryCacheTableData>> getByGroup(int groupId, {int limit = 50}) {
|
||||
return (select(db.glossaryCacheTable)
|
||||
..where((t) => t.productGroupId.equals(groupId))
|
||||
..limit(limit))
|
||||
.get();
|
||||
}
|
||||
|
||||
/// Количество продуктов в кэше (для сверки с /meta total_count).
|
||||
Future<int> getCount() async {
|
||||
final countExpr = db.glossaryCacheTable.id.count();
|
||||
final query = selectOnly(db.glossaryCacheTable)..addColumns([countExpr]);
|
||||
final result = await query.getSingleOrNull();
|
||||
return result?.read(countExpr) ?? 0;
|
||||
}
|
||||
|
||||
// ─── Write ─────────────────────────────────────────────────────────────────
|
||||
|
||||
/// Bulk upsert — вставляет или заменяет по server id при конфликте.
|
||||
/// Вызывается чанками по 500 записей из изолята при синхронизации.
|
||||
Future<void> bulkUpsert(List<GlossaryCacheTableCompanion> items) async {
|
||||
await batch((batch) {
|
||||
batch.insertAllOnConflictUpdate(db.glossaryCacheTable, items);
|
||||
});
|
||||
}
|
||||
|
||||
/// Очистить весь кэш глоссария (используется при первом полном дампе).
|
||||
Future<int> clearAll() {
|
||||
return delete(db.glossaryCacheTable).go();
|
||||
}
|
||||
}
|
||||
31
lib/core/local_db/dao/media_dao.dart
Normal file
31
lib/core/local_db/dao/media_dao.dart
Normal file
@@ -0,0 +1,31 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/media_table.dart';
|
||||
|
||||
part 'media_dao.g.dart';
|
||||
|
||||
/// DAO для работы с медиа-файлами (фото) приёмов пищи в локальной БД.
|
||||
@DriftAccessor(tables: [MediaTable])
|
||||
class MediaDao extends DatabaseAccessor<AppDatabase> with _$MediaDaoMixin {
|
||||
MediaDao(super.db);
|
||||
|
||||
/// Получить все медиа для конкретного meal.
|
||||
Future<List<MediaTableData>> getMediaForMeal(int mealId) {
|
||||
return (select(db.mediaTable)..where((t) => t.mealId.equals(mealId))).get();
|
||||
}
|
||||
|
||||
/// Вставить или обновить медиа-запись.
|
||||
Future<int> upsertMedia(MediaTableCompanion media) {
|
||||
return into(db.mediaTable).insertOnConflictUpdate(media);
|
||||
}
|
||||
|
||||
/// Удалить все медиа для конкретного meal.
|
||||
Future<void> clearMediaForMeal(int mealId) async {
|
||||
await (delete(db.mediaTable)..where((t) => t.mealId.equals(mealId))).go();
|
||||
}
|
||||
|
||||
/// Удалить конкретную медиа-запись по серверному ID.
|
||||
Future<void> deleteByServerId(int serverId) async {
|
||||
await (delete(db.mediaTable)..where((t) => t.serverId.equals(serverId))).go();
|
||||
}
|
||||
}
|
||||
75
lib/core/local_db/dao/pending_ops_dao.dart
Normal file
75
lib/core/local_db/dao/pending_ops_dao.dart
Normal file
@@ -0,0 +1,75 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/pending_operations_table.dart';
|
||||
|
||||
part 'pending_ops_dao.g.dart';
|
||||
|
||||
/// DAO для управления очередью офлайн-операций (Write-Behind queue).
|
||||
///
|
||||
/// Жизненный цикл операции:
|
||||
/// INSERT (pending) → отправка → markSynced / markFailed / incrementRetry
|
||||
@DriftAccessor(tables: [PendingOperationsTable])
|
||||
class PendingOpsDao extends DatabaseAccessor<AppDatabase> with _$PendingOpsDaoMixin {
|
||||
PendingOpsDao(super.db);
|
||||
|
||||
static const _statusPending = 'pending';
|
||||
static const _statusSynced = 'synced';
|
||||
static const _statusFailed = 'failed';
|
||||
|
||||
// ─── Read ──────────────────────────────────────────────────────────────────
|
||||
|
||||
/// Получить все PENDING операции в порядке создания (FIFO).
|
||||
Future<List<PendingOperationsTableData>> getPendingOps() {
|
||||
return (select(db.pendingOperationsTable)
|
||||
..where((t) => t.status.equals(_statusPending))
|
||||
..orderBy([(t) => OrderingTerm.asc(t.createdAt)]))
|
||||
.get();
|
||||
}
|
||||
|
||||
/// Получить одну операцию по ID.
|
||||
Future<PendingOperationsTableData?> getById(String id) {
|
||||
return (select(db.pendingOperationsTable)..where((t) => t.id.equals(id))).getSingleOrNull();
|
||||
}
|
||||
|
||||
/// Количество PENDING операций (для отображения в UI).
|
||||
Future<int> getPendingCount() async {
|
||||
final countExpr = db.pendingOperationsTable.id.count();
|
||||
final query = selectOnly(db.pendingOperationsTable)
|
||||
..addColumns([countExpr])
|
||||
..where(db.pendingOperationsTable.status.equals(_statusPending));
|
||||
final result = await query.getSingleOrNull();
|
||||
return result?.read(countExpr) ?? 0;
|
||||
}
|
||||
|
||||
// ─── Write ─────────────────────────────────────────────────────────────────
|
||||
|
||||
/// Добавить новую операцию в очередь.
|
||||
Future<void> enqueue(PendingOperationsTableCompanion op) {
|
||||
return into(db.pendingOperationsTable).insert(op);
|
||||
}
|
||||
|
||||
/// Пометить операцию как успешно синхронизированную.
|
||||
Future<void> markSynced(String id) async {
|
||||
await (update(db.pendingOperationsTable)..where((t) => t.id.equals(id)))
|
||||
.write(const PendingOperationsTableCompanion(status: Value(_statusSynced)));
|
||||
}
|
||||
|
||||
/// Пометить операцию как ошибочную (retryable: false).
|
||||
Future<void> markFailed(String id) async {
|
||||
await (update(db.pendingOperationsTable)..where((t) => t.id.equals(id)))
|
||||
.write(const PendingOperationsTableCompanion(status: Value(_statusFailed)));
|
||||
}
|
||||
|
||||
/// Увеличить счётчик попыток (retryable: true).
|
||||
Future<void> incrementRetry(String id) async {
|
||||
final op = await getById(id);
|
||||
if (op == null) return;
|
||||
await (update(db.pendingOperationsTable)..where((t) => t.id.equals(id)))
|
||||
.write(PendingOperationsTableCompanion(retryCount: Value(op.retryCount + 1)));
|
||||
}
|
||||
|
||||
/// Удалить все SYNCED операции (очистка истории).
|
||||
Future<int> clearSynced() {
|
||||
return (delete(db.pendingOperationsTable)..where((t) => t.status.equals(_statusSynced))).go();
|
||||
}
|
||||
}
|
||||
46
lib/core/local_db/dao/sync_meta_dao.dart
Normal file
46
lib/core/local_db/dao/sync_meta_dao.dart
Normal file
@@ -0,0 +1,46 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/tables/sync_meta_table.dart';
|
||||
|
||||
part 'sync_meta_dao.g.dart';
|
||||
|
||||
/// DAO для хранения мета-данных синхронизации глоссария.
|
||||
/// Реализует key-value хранилище поверх sync_meta таблицы.
|
||||
@DriftAccessor(tables: [SyncMetaTable])
|
||||
class SyncMetaDao extends DatabaseAccessor<AppDatabase> with _$SyncMetaDaoMixin {
|
||||
SyncMetaDao(super.db);
|
||||
|
||||
// Предопределённые ключи
|
||||
static const keyGlossaryChecksum = 'glossary_checksum';
|
||||
static const keyGlossaryEtag = 'glossary_etag';
|
||||
static const keyGlossaryLastDumpAt = 'glossary_last_dump_at';
|
||||
|
||||
// ─── Generic key-value ────────────────────────────────────────────────────
|
||||
|
||||
Future<String?> getValue(String key) async {
|
||||
final row = await (select(db.syncMetaTable)..where((t) => t.key.equals(key))).getSingleOrNull();
|
||||
return row?.value;
|
||||
}
|
||||
|
||||
Future<void> setValue(String key, String value) {
|
||||
return into(db.syncMetaTable).insertOnConflictUpdate(
|
||||
SyncMetaTableCompanion(key: Value(key), value: Value(value)),
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Typed accessors ──────────────────────────────────────────────────────
|
||||
|
||||
Future<String?> getGlossaryChecksum() => getValue(keyGlossaryChecksum);
|
||||
Future<String?> getGlossaryEtag() => getValue(keyGlossaryEtag);
|
||||
Future<String?> getGlossaryLastDumpAt() => getValue(keyGlossaryLastDumpAt);
|
||||
|
||||
Future<void> saveGlossaryMeta({
|
||||
required String checksum,
|
||||
required String? etag,
|
||||
required String lastDumpAt,
|
||||
}) async {
|
||||
await setValue(keyGlossaryChecksum, checksum);
|
||||
await setValue(keyGlossaryLastDumpAt, lastDumpAt);
|
||||
if (etag != null) await setValue(keyGlossaryEtag, etag);
|
||||
}
|
||||
}
|
||||
231
lib/core/local_db/diary_local_data_source.dart
Normal file
231
lib/core/local_db/diary_local_data_source.dart
Normal file
@@ -0,0 +1,231 @@
|
||||
import 'dart:convert';
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/diary_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/glossary_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/media_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/pending_ops_dao.dart';
|
||||
import 'package:eatvio_app/core/local_db/dao/sync_meta_dao.dart';
|
||||
import 'package:uuid/uuid.dart';
|
||||
|
||||
/// Единый фасад над всеми DAO для использования в DiaryRepository.
|
||||
/// Изолирует детали реализации Drift от бизнес-логики репозитория.
|
||||
class DiaryLocalDataSource {
|
||||
final DiaryDao _diaryDao;
|
||||
final GlossaryDao _glossaryDao;
|
||||
final MediaDao _mediaDao;
|
||||
final PendingOpsDao _pendingOpsDao;
|
||||
final SyncMetaDao _syncMetaDao;
|
||||
final _uuid = const Uuid();
|
||||
|
||||
DiaryLocalDataSource({
|
||||
required DiaryDao diaryDao,
|
||||
required GlossaryDao glossaryDao,
|
||||
required MediaDao mediaDao,
|
||||
required PendingOpsDao pendingOpsDao,
|
||||
required SyncMetaDao syncMetaDao,
|
||||
}) : _diaryDao = diaryDao,
|
||||
_glossaryDao = glossaryDao,
|
||||
_mediaDao = mediaDao,
|
||||
_pendingOpsDao = pendingOpsDao,
|
||||
_syncMetaDao = syncMetaDao;
|
||||
|
||||
// ─── Дневник (чтение) ────────────────────────────────────────────────────
|
||||
|
||||
Future<DiaryDaysTableData?> getCachedDay(String date) {
|
||||
return _diaryDao.getDayByDate(date);
|
||||
}
|
||||
|
||||
Future<List<MealsTableData>> getCachedMeals(int diaryDayId) {
|
||||
return _diaryDao.getMealsForDay(diaryDayId);
|
||||
}
|
||||
|
||||
Future<List<PortionsTableData>> getCachedPortions(int mealId) {
|
||||
return _diaryDao.getPortionsForMeal(mealId);
|
||||
}
|
||||
|
||||
// ─── Дневник (запись/кэширование) ────────────────────────────────────────
|
||||
|
||||
Future<void> cacheDiaryDay({
|
||||
required String date,
|
||||
int? serverId,
|
||||
String wakeup = '06:30',
|
||||
String retire = '22:30',
|
||||
int closed = 0,
|
||||
String comment = '',
|
||||
String state = 'init',
|
||||
bool hasChosenDiet = false,
|
||||
bool hasChosenPlan = false,
|
||||
String? serverUpdatedAt,
|
||||
}) async {
|
||||
await _diaryDao.upsertDay(DiaryDaysTableCompanion(
|
||||
date: Value(date),
|
||||
serverId: Value(serverId),
|
||||
wakeup: Value(wakeup),
|
||||
retire: Value(retire),
|
||||
closed: Value(closed),
|
||||
comment: Value(comment),
|
||||
state: Value(state),
|
||||
hasChosenDiet: Value(hasChosenDiet),
|
||||
hasChosenPlan: Value(hasChosenPlan),
|
||||
serverUpdatedAt: Value(serverUpdatedAt),
|
||||
cachedAt: Value(DateTime.now().toIso8601String()),
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> cacheMeal({
|
||||
required int diaryDayId,
|
||||
required int typeNo,
|
||||
String? time,
|
||||
int satiety = 0,
|
||||
int? mood,
|
||||
}) async {
|
||||
await _diaryDao.upsertMeal(MealsTableCompanion(
|
||||
diaryDayId: Value(diaryDayId),
|
||||
typeNo: Value(typeNo),
|
||||
time: Value(time),
|
||||
satiety: Value(satiety),
|
||||
mood: Value(mood),
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> cachePortion({
|
||||
required int mealId,
|
||||
required String productName,
|
||||
required String portion,
|
||||
required int quantity,
|
||||
int? productNutritionalValueId,
|
||||
String state = 'eaten',
|
||||
bool fromDiet = false,
|
||||
}) async {
|
||||
await _diaryDao.upsertPortion(PortionsTableCompanion(
|
||||
mealId: Value(mealId),
|
||||
productName: Value(productName),
|
||||
portion: Value(portion),
|
||||
quantity: Value(quantity),
|
||||
productNutritionalValueId: Value(productNutritionalValueId),
|
||||
state: Value(state),
|
||||
fromDiet: Value(fromDiet),
|
||||
));
|
||||
}
|
||||
|
||||
/// Удалить все приёмы пищи (и каскадно порции) для дня.
|
||||
/// Вызывается перед кэшированием свежих данных с сервера.
|
||||
Future<void> clearCachedMeals(int diaryDayId) {
|
||||
return _diaryDao.clearMealsForDay(diaryDayId);
|
||||
}
|
||||
|
||||
/// Удалить все порции для конкретного meal.
|
||||
/// BUG-6 fix: используется для атомарной перезаписи порций одного meal,
|
||||
/// без удаления данных остальных meals.
|
||||
Future<void> clearCachedPortions(int mealId) {
|
||||
return _diaryDao.clearPortionsForMeal(mealId);
|
||||
}
|
||||
|
||||
Future<int> clearExpiredDiaryCache({int ttlDays = 14}) {
|
||||
return _diaryDao.clearExpiredCache(ttlDays: ttlDays);
|
||||
}
|
||||
|
||||
// ─── Глоссарий ────────────────────────────────────────────────────────────
|
||||
|
||||
Future<List<GlossaryCacheTableData>> getGlossaryByIds(List<int> ids) {
|
||||
return _glossaryDao.getByIds(ids);
|
||||
}
|
||||
|
||||
Future<List<GlossaryCacheTableData>> searchGlossary(String query) {
|
||||
return _glossaryDao.search(query);
|
||||
}
|
||||
|
||||
Future<List<GlossaryCacheTableData>> getGlossaryByGroup(int groupId) {
|
||||
return _glossaryDao.getByGroup(groupId);
|
||||
}
|
||||
|
||||
Future<int> getGlossaryCount() => _glossaryDao.getCount();
|
||||
|
||||
Future<void> bulkUpsertGlossary(List<GlossaryCacheTableCompanion> items) {
|
||||
return _glossaryDao.bulkUpsert(items);
|
||||
}
|
||||
|
||||
// ─── Очередь операций ────────────────────────────────────────────────────
|
||||
|
||||
/// Добавить операцию в очередь. Возвращает сгенерированный idempotency key (UUID v4).
|
||||
Future<String> enqueueOperation({
|
||||
required String type,
|
||||
required Map<String, dynamic> payload,
|
||||
String? localFilePath,
|
||||
}) async {
|
||||
final id = _uuid.v4();
|
||||
await _pendingOpsDao.enqueue(PendingOperationsTableCompanion(
|
||||
id: Value(id),
|
||||
type: Value(type),
|
||||
payload: Value(_encodePayload(payload)),
|
||||
status: const Value('pending'),
|
||||
retryCount: const Value(0),
|
||||
localFilePath: Value(localFilePath),
|
||||
createdAt: Value(DateTime.now().toIso8601String()),
|
||||
));
|
||||
return id; // Этот UUID используется как Idempotency-Key при отправке
|
||||
}
|
||||
|
||||
Future<List<PendingOperationsTableData>> getPendingOps() {
|
||||
return _pendingOpsDao.getPendingOps();
|
||||
}
|
||||
|
||||
Future<int> getPendingCount() => _pendingOpsDao.getPendingCount();
|
||||
|
||||
Future<void> markSynced(String id) => _pendingOpsDao.markSynced(id);
|
||||
Future<void> markFailed(String id) => _pendingOpsDao.markFailed(id);
|
||||
Future<void> incrementRetry(String id) => _pendingOpsDao.incrementRetry(id);
|
||||
Future<void> clearSyncedOps() => _pendingOpsDao.clearSynced();
|
||||
|
||||
// ─── Мета-данные синхронизации ────────────────────────────────────────────
|
||||
|
||||
Future<String?> getGlossaryChecksum() => _syncMetaDao.getGlossaryChecksum();
|
||||
Future<String?> getGlossaryEtag() => _syncMetaDao.getGlossaryEtag();
|
||||
Future<String?> getGlossaryLastDumpAt() => _syncMetaDao.getGlossaryLastDumpAt();
|
||||
|
||||
Future<void> saveGlossaryMeta({
|
||||
required String checksum,
|
||||
String? etag,
|
||||
required String lastDumpAt,
|
||||
}) {
|
||||
return _syncMetaDao.saveGlossaryMeta(
|
||||
checksum: checksum,
|
||||
etag: etag,
|
||||
lastDumpAt: lastDumpAt,
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Медиа (фото дневника) ─────────────────────────────────────────────
|
||||
|
||||
Future<List<MediaTableData>> getCachedMedia(int mealId) {
|
||||
return _mediaDao.getMediaForMeal(mealId);
|
||||
}
|
||||
|
||||
Future<void> cacheMedia({
|
||||
required int mealId,
|
||||
int? serverId,
|
||||
String? url,
|
||||
String? localPath,
|
||||
String status = 'synced',
|
||||
}) async {
|
||||
await _mediaDao.upsertMedia(MediaTableCompanion(
|
||||
mealId: Value(mealId),
|
||||
serverId: Value(serverId),
|
||||
url: Value(url),
|
||||
localPath: Value(localPath),
|
||||
status: Value(status),
|
||||
createdAt: Value(DateTime.now().toIso8601String()),
|
||||
));
|
||||
}
|
||||
|
||||
Future<void> clearCachedMedia(int mealId) {
|
||||
return _mediaDao.clearMediaForMeal(mealId);
|
||||
}
|
||||
|
||||
// ─── Утилиты ─────────────────────────────────────────────────────────────
|
||||
|
||||
String _encodePayload(Map<String, dynamic> payload) {
|
||||
return jsonEncode(payload);
|
||||
}
|
||||
}
|
||||
264
lib/core/local_db/services/diary_sync_runner.dart
Normal file
264
lib/core/local_db/services/diary_sync_runner.dart
Normal file
@@ -0,0 +1,264 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/interceptors/offline_error_interceptor.dart';
|
||||
import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_cubit.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:eatvio_app/core/local_db/diary_local_data_source.dart';
|
||||
import 'package:eatvio_app/features/diary/models/create_day_model.dart';
|
||||
import 'package:eatvio_app/features/diary/services/diary_service.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
||||
/// FIFO-воркер синхронизации дневника.
|
||||
///
|
||||
/// Подписывается на [InternetConnectionCubit].
|
||||
/// При переходе состояния в online запускает обработку очереди [pending_operations].
|
||||
///
|
||||
/// Обработка ошибок:
|
||||
/// - [OfflineOperationException] с retryable=false → markFailed (показываем ошибку в UI)
|
||||
/// - [OfflineOperationException] с retryable=true → incrementRetry + exponential backoff
|
||||
/// - DioException / ConnectionError → оставляем PENDING
|
||||
class DiarySyncRunner {
|
||||
final DiaryLocalDataSource _localDataSource;
|
||||
final DiaryService _diaryService;
|
||||
final InternetConnectionCubit _connectionCubit;
|
||||
|
||||
StreamSubscription? _subscription;
|
||||
bool _isSyncing = false;
|
||||
|
||||
static const int _maxRetries = 5;
|
||||
|
||||
DiarySyncRunner({
|
||||
required DiaryLocalDataSource localDataSource,
|
||||
required DiaryService diaryService,
|
||||
required InternetConnectionCubit connectionCubit,
|
||||
}) : _localDataSource = localDataSource,
|
||||
_diaryService = diaryService,
|
||||
_connectionCubit = connectionCubit;
|
||||
|
||||
/// Начать прослушивание изменений сети.
|
||||
void start() {
|
||||
_subscription = _connectionCubit.stream.listen((state) {
|
||||
if (state.isInternetAvailable && !_isSyncing) {
|
||||
_processQueue();
|
||||
}
|
||||
});
|
||||
|
||||
// Запустить немедленно если уже online
|
||||
if (_connectionCubit.state.isInternetAvailable) {
|
||||
_processQueue();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// Остановить прослушивание.
|
||||
void dispose() {
|
||||
_subscription?.cancel();
|
||||
}
|
||||
|
||||
/// Обработать очередь pending_operations в FIFO порядке.
|
||||
Future<void> _processQueue() async {
|
||||
if (_isSyncing) return;
|
||||
_isSyncing = true;
|
||||
|
||||
try {
|
||||
final ops = await _localDataSource.getPendingOps();
|
||||
if (ops.isEmpty) return;
|
||||
|
||||
debugPrint('[DiarySyncRunner] Обрабатываю ${ops.length} операций...');
|
||||
|
||||
for (final op in ops) {
|
||||
if (!_connectionCubit.state.isInternetAvailable) break;
|
||||
if (op.retryCount >= _maxRetries) {
|
||||
await _localDataSource.markFailed(op.id);
|
||||
continue;
|
||||
}
|
||||
|
||||
await _processOperation(op);
|
||||
|
||||
// Небольшая пауза между операциями
|
||||
await Future.delayed(const Duration(milliseconds: 200));
|
||||
}
|
||||
|
||||
// Очистить синхронизированные операции
|
||||
await _localDataSource.clearSyncedOps();
|
||||
} finally {
|
||||
_isSyncing = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Обработать одну операцию из очереди.
|
||||
Future<void> _processOperation(PendingOperationsTableData op) async {
|
||||
try {
|
||||
await _executeOperation(op);
|
||||
await _localDataSource.markSynced(op.id);
|
||||
debugPrint('[DiarySyncRunner] ✅ Операция ${op.type} синхронизирована');
|
||||
} on OfflineOperationException catch (e) {
|
||||
_handleOfflineException(op, e);
|
||||
} on DioException catch (e) {
|
||||
// OfflineErrorInterceptor заворачивает OfflineOperationException в DioException.error
|
||||
if (e.error is OfflineOperationException) {
|
||||
await _handleOfflineException(op, e.error as OfflineOperationException);
|
||||
} else {
|
||||
// Сетевая ошибка без Envelope — retryable
|
||||
debugPrint('[DiarySyncRunner] DioException: $e');
|
||||
await _localDataSource.incrementRetry(op.id);
|
||||
}
|
||||
} catch (e) {
|
||||
// Необработанная ошибка — считаем retryable
|
||||
debugPrint('[DiarySyncRunner] Unknown error: $e');
|
||||
await _localDataSource.incrementRetry(op.id);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _handleOfflineException(PendingOperationsTableData op, OfflineOperationException e) async {
|
||||
debugPrint('[DiarySyncRunner] OfflineException: retryable=${e.retryable}, code=${e.code}');
|
||||
if (e.retryable) {
|
||||
await _localDataSource.incrementRetry(op.id);
|
||||
// Exponential backoff: ждём 2^retryCount секунды
|
||||
final delay = Duration(seconds: _pow2(op.retryCount).clamp(1, 30));
|
||||
await Future.delayed(delay);
|
||||
} else {
|
||||
// Не retryable — помечаем как FAILED навсегда
|
||||
await _localDataSource.markFailed(op.id);
|
||||
}
|
||||
}
|
||||
|
||||
/// Выполнить конкретную операцию на основе её типа.
|
||||
Future<void> _executeOperation(PendingOperationsTableData op) async {
|
||||
final payload = jsonDecode(op.payload) as Map<String, dynamic>;
|
||||
|
||||
switch (op.type) {
|
||||
case 'create_day':
|
||||
await _diaryService.createDay(
|
||||
idempotencyKey: op.id,
|
||||
body: CreateDayModel(day: payload['day'] as String),
|
||||
);
|
||||
|
||||
case 'create_portion':
|
||||
await _diaryService.addProductToMealIdempotent(
|
||||
idempotencyKey: op.id,
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['meal_id'] as int,
|
||||
productName: payload['product_name'] as String,
|
||||
portion: payload['portion'] as String,
|
||||
quantity: payload['quantity'] as int,
|
||||
productNutritionalValueId: payload['product_nutritional_value_id'] as int?,
|
||||
);
|
||||
|
||||
case 'delete_portion':
|
||||
await _diaryService.deleteProductFromMealIdempotent(
|
||||
idempotencyKey: op.id,
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['meal_id'] as int,
|
||||
portionModel: payload['portion_id'] as int,
|
||||
);
|
||||
|
||||
case 'update_portion':
|
||||
final data = <String, dynamic>{
|
||||
'product_name': payload['product_name'] as String,
|
||||
'portion': payload['portion'] as String,
|
||||
'quantity': payload['quantity'] as int,
|
||||
};
|
||||
if (payload['product_nutritional_value_id'] != null) {
|
||||
data['product_nutritional_value_id'] = payload['product_nutritional_value_id'] as int;
|
||||
}
|
||||
data['state'] = payload['state'] as String;
|
||||
await _diaryService.updateProductInMeal(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['meal_id'] as int,
|
||||
portionModel: payload['portion_id'] as int,
|
||||
productInMeal: data,
|
||||
);
|
||||
|
||||
case 'mark_eaten':
|
||||
await _diaryService.markEaten(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['meal_id'] as int,
|
||||
portionModel: payload['portion_id'] as int,
|
||||
);
|
||||
|
||||
case 'unmark_eaten':
|
||||
await _diaryService.unmarkEaten(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['meal_id'] as int,
|
||||
portionModel: payload['portion_id'] as int,
|
||||
);
|
||||
|
||||
case 'restore':
|
||||
await _diaryService.restore(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['meal_id'] as int,
|
||||
portionModel: payload['portion_id'] as int,
|
||||
);
|
||||
|
||||
case 'fill_satiety':
|
||||
await _diaryService.fillSatiety(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['type_no'] as int,
|
||||
satiety: payload['satiety'] as int,
|
||||
);
|
||||
|
||||
case 'fill_mood':
|
||||
await _diaryService.fillMood(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['type_no'] as int,
|
||||
mood: payload['mood'] as int,
|
||||
);
|
||||
|
||||
case 'fill_time':
|
||||
await _diaryService.fillTime(
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['type_no'] as int,
|
||||
time: payload['time'] as String,
|
||||
);
|
||||
|
||||
case 'fill_wakeup':
|
||||
await _diaryService.fillWakeup(
|
||||
diary: payload['diary_id'] as int,
|
||||
wakeUp: payload['wakeup'] as String,
|
||||
);
|
||||
|
||||
case 'fill_retire':
|
||||
await _diaryService.fillRetire(
|
||||
diary: payload['diary_id'] as int,
|
||||
retire: payload['retire'] as String,
|
||||
);
|
||||
|
||||
case 'upload_photo':
|
||||
// Для фото: сначала загружаем файл с диска
|
||||
if (op.localFilePath != null) {
|
||||
final file = File(op.localFilePath!);
|
||||
if (await file.exists()) {
|
||||
await _diaryService.uploadPhotoIdempotent(
|
||||
idempotencyKey: op.id,
|
||||
diary: payload['diary_id'] as int,
|
||||
typeNo: payload['type_no'] as int,
|
||||
photo: file,
|
||||
);
|
||||
} else {
|
||||
// Файл не найден — не можем загрузить, помечаем failed
|
||||
throw const OfflineOperationException(
|
||||
message: 'Файл фото не найден на устройстве',
|
||||
code: 'file_not_found',
|
||||
retryable: false,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
case 'delete_photo':
|
||||
await _diaryService.deletePhotoOfMeal(
|
||||
diaryId: payload['diary_id'] as int,
|
||||
typeNo: payload['type_no'] as int,
|
||||
userAttachment: payload['media_id'] as int,
|
||||
);
|
||||
|
||||
default:
|
||||
debugPrint('[DiarySyncRunner] Неизвестный тип операции: ${op.type}');
|
||||
}
|
||||
}
|
||||
|
||||
int _pow2(int n) => n <= 0 ? 1 : 1 << n;
|
||||
}
|
||||
84
lib/core/local_db/services/glossary_dump_response.dart
Normal file
84
lib/core/local_db/services/glossary_dump_response.dart
Normal file
@@ -0,0 +1,84 @@
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
|
||||
part 'glossary_dump_response.g.dart';
|
||||
|
||||
/// Один продукт из дампа глоссария.
|
||||
@JsonSerializable()
|
||||
class GlossaryDumpItem {
|
||||
final int id;
|
||||
final String name;
|
||||
|
||||
@JsonKey(name: 'product_group_id')
|
||||
final int productGroupId;
|
||||
|
||||
@JsonKey(name: 'energy_on_100gr')
|
||||
final double energyOn100gr;
|
||||
|
||||
@JsonKey(name: 'proteins_on_100gr')
|
||||
final double proteinsOn100gr;
|
||||
|
||||
@JsonKey(name: 'fats_on_100gr')
|
||||
final double fatsOn100gr;
|
||||
|
||||
@JsonKey(name: 'carbohydrates_on_100gr')
|
||||
final double carbohydratesOn100gr;
|
||||
|
||||
@JsonKey(name: 'portion_mass_gr', defaultValue: 0.0)
|
||||
final double portionMassGr;
|
||||
|
||||
@JsonKey(name: 'energy_on_portion', defaultValue: 0.0)
|
||||
final double energyOnPortion;
|
||||
|
||||
@JsonKey(name: 'proteins_on_portion', defaultValue: 0.0)
|
||||
final double proteinsOnPortion;
|
||||
|
||||
@JsonKey(name: 'fats_on_portion', defaultValue: 0.0)
|
||||
final double fatsOnPortion;
|
||||
|
||||
@JsonKey(name: 'carbohydrates_on_portion', defaultValue: 0.0)
|
||||
final double carbohydratesOnPortion;
|
||||
|
||||
@JsonKey(name: 'updated_at')
|
||||
final String updatedAt;
|
||||
|
||||
const GlossaryDumpItem({
|
||||
required this.id,
|
||||
required this.name,
|
||||
required this.productGroupId,
|
||||
required this.energyOn100gr,
|
||||
required this.proteinsOn100gr,
|
||||
required this.fatsOn100gr,
|
||||
required this.carbohydratesOn100gr,
|
||||
this.portionMassGr = 0.0,
|
||||
this.energyOnPortion = 0.0,
|
||||
this.proteinsOnPortion = 0.0,
|
||||
this.fatsOnPortion = 0.0,
|
||||
this.carbohydratesOnPortion = 0.0,
|
||||
required this.updatedAt,
|
||||
});
|
||||
|
||||
factory GlossaryDumpItem.fromJson(Map<String, dynamic> json) =>
|
||||
_$GlossaryDumpItemFromJson(json);
|
||||
Map<String, dynamic> toJson() => _$GlossaryDumpItemToJson(this);
|
||||
}
|
||||
|
||||
/// Ответ /api/glossaries/dump
|
||||
@JsonSerializable()
|
||||
class GlossaryDumpResponse {
|
||||
final int total;
|
||||
|
||||
@JsonKey(name: 'updated_at')
|
||||
final String updatedAt;
|
||||
|
||||
final List<GlossaryDumpItem> data;
|
||||
|
||||
const GlossaryDumpResponse({
|
||||
required this.total,
|
||||
required this.updatedAt,
|
||||
required this.data,
|
||||
});
|
||||
|
||||
factory GlossaryDumpResponse.fromJson(Map<String, dynamic> json) =>
|
||||
_$GlossaryDumpResponseFromJson(json);
|
||||
Map<String, dynamic> toJson() => _$GlossaryDumpResponseToJson(this);
|
||||
}
|
||||
25
lib/core/local_db/services/glossary_meta_model.dart
Normal file
25
lib/core/local_db/services/glossary_meta_model.dart
Normal file
@@ -0,0 +1,25 @@
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
|
||||
part 'glossary_meta_model.g.dart';
|
||||
|
||||
/// Ответ /api/glossaries/meta — лёгкая проверка версии данных.
|
||||
@JsonSerializable()
|
||||
class GlossaryMetaModel {
|
||||
@JsonKey(name: 'total_count')
|
||||
final int totalCount;
|
||||
|
||||
@JsonKey(name: 'last_updated_at')
|
||||
final String lastUpdatedAt;
|
||||
|
||||
final String checksum;
|
||||
|
||||
const GlossaryMetaModel({
|
||||
required this.totalCount,
|
||||
required this.lastUpdatedAt,
|
||||
required this.checksum,
|
||||
});
|
||||
|
||||
factory GlossaryMetaModel.fromJson(Map<String, dynamic> json) =>
|
||||
_$GlossaryMetaModelFromJson(json);
|
||||
Map<String, dynamic> toJson() => _$GlossaryMetaModelToJson(this);
|
||||
}
|
||||
272
lib/core/local_db/services/glossary_sync_runner.dart
Normal file
272
lib/core/local_db/services/glossary_sync_runner.dart
Normal file
@@ -0,0 +1,272 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:drift/drift.dart';
|
||||
import 'package:eatvio_app/core/local_db/diary_local_data_source.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_sync_service.dart';
|
||||
import 'package:eatvio_app/core/local_db/app_database.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
|
||||
/// Стадии синхронизации глоссария (для UI-отслеживания).
|
||||
enum GlossarySyncStage { checking, downloading, processing, saving }
|
||||
|
||||
/// Callback-типы для отслеживания прогресса синхронизации.
|
||||
typedef SyncStageCallback = void Function(GlossarySyncStage stage);
|
||||
typedef DownloadProgressCallback = void Function(double progress);
|
||||
typedef ProcessingProgressCallback = void Function(int processed, int total);
|
||||
|
||||
/// Сервис синхронизации глоссария продуктов.
|
||||
///
|
||||
/// Стратегия:
|
||||
/// 1. GET /api/glossaries/meta → сравнить checksum с локальным
|
||||
/// 2. Если отличается → скачать /api/glossaries/dump в файл (без OOM)
|
||||
/// 3. Парсинг + bulk-insert данных через изолят (compute)
|
||||
/// 4. Сохранить новые meta-данные в sync_meta
|
||||
class GlossarySyncService {
|
||||
final GlossarySyncApiService _api;
|
||||
final Dio _dio;
|
||||
final DiaryLocalDataSource _localDataSource;
|
||||
bool _isSyncing = false;
|
||||
|
||||
GlossarySyncService({
|
||||
required GlossarySyncApiService api,
|
||||
required Dio dio,
|
||||
required DiaryLocalDataSource localDataSource,
|
||||
}) : _api = api,
|
||||
_dio = dio,
|
||||
_localDataSource = localDataSource;
|
||||
|
||||
/// Запустить проверку и синхронизацию глоссария.
|
||||
/// Возвращает количество обновлённых записей (0 если кэш актуален).
|
||||
///
|
||||
/// Опциональные коллбэки для отслеживания прогресса в UI:
|
||||
/// - [onStageChanged] — смена стадии (checking → downloading → processing → saving)
|
||||
/// - [onDownloadProgress] — прогресс скачивания файла (0.0–1.0)
|
||||
/// - [onProcessingProgress] — прогресс парсинга/вставки (processed, total)
|
||||
Future<int> sync({
|
||||
SyncStageCallback? onStageChanged,
|
||||
DownloadProgressCallback? onDownloadProgress,
|
||||
ProcessingProgressCallback? onProcessingProgress,
|
||||
}) async {
|
||||
// Защита от повторного запуска (например при многократном нажатии кнопки)
|
||||
if (_isSyncing) return 0;
|
||||
_isSyncing = true;
|
||||
try {
|
||||
// Шаг 1: Получить мета-данные (лёгкий запрос ~100 байт)
|
||||
onStageChanged?.call(GlossarySyncStage.checking);
|
||||
final meta = await _api.getMeta();
|
||||
|
||||
// Шаг 2: Сравнить checksum
|
||||
final localChecksum = await _localDataSource.getGlossaryChecksum();
|
||||
if (localChecksum == meta.checksum) {
|
||||
debugPrint('[GlossarySyncService] Глоссарий актуален (checksum совпадает)');
|
||||
return 0;
|
||||
}
|
||||
|
||||
debugPrint('[GlossarySyncService] Checksum изменился, загружаем обновления...');
|
||||
|
||||
// Шаг 3: Получить локальные метаданные для инкрементального обновления
|
||||
final lastDumpAt = await _localDataSource.getGlossaryLastDumpAt();
|
||||
final etag = await _localDataSource.getGlossaryEtag();
|
||||
|
||||
// Шаг 4: Скачать дамп в ФАЙЛ (не в память!) — избегаем OOM на ~200k записей
|
||||
onStageChanged?.call(GlossarySyncStage.downloading);
|
||||
final tempDir = await getTemporaryDirectory();
|
||||
final dumpFile = File('${tempDir.path}/glossary_dump.json');
|
||||
|
||||
final updatedAfter = lastDumpAt ?? '2000-01-01T00:00:00Z';
|
||||
final response = await _dio.download(
|
||||
'/api/glossaries/dump',
|
||||
dumpFile.path,
|
||||
queryParameters: {'updated_after': updatedAfter},
|
||||
options: Options(
|
||||
headers: {
|
||||
if (etag != null) 'If-None-Match': etag,
|
||||
},
|
||||
),
|
||||
onReceiveProgress: (received, total) {
|
||||
if (total > 0 && onDownloadProgress != null) {
|
||||
onDownloadProgress(received / total);
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
// Сохраняем ETag из ответа для следующего условного запроса
|
||||
final responseEtag = response.headers.value('etag') ?? etag;
|
||||
|
||||
debugPrint('[GlossarySyncService] Дамп скачан в ${dumpFile.path}');
|
||||
|
||||
// Шаг 5: Парсинг файла + bulk-insert в изоляте
|
||||
// Передаём RootIsolateToken чтобы изолят мог использовать platform channels (drift)
|
||||
onStageChanged?.call(GlossarySyncStage.processing);
|
||||
final token = RootIsolateToken.instance!;
|
||||
final result = await compute(
|
||||
_parseAndInsertInIsolate,
|
||||
_IsolateArgs(filePath: dumpFile.path, token: token),
|
||||
);
|
||||
|
||||
if (result.isServerError) {
|
||||
debugPrint('[GlossarySyncService] Сервер вернул ошибку в теле дампа, синхронизация пропущена');
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Уведомляем о финальном прогрессе
|
||||
onProcessingProgress?.call(result.count, result.count);
|
||||
|
||||
// Шаг 6: Сохранить актуальные meta-данные (включая etag из ответа)
|
||||
onStageChanged?.call(GlossarySyncStage.saving);
|
||||
await _localDataSource.saveGlossaryMeta(
|
||||
checksum: meta.checksum,
|
||||
etag: responseEtag,
|
||||
lastDumpAt: result.updatedAt ?? updatedAfter,
|
||||
);
|
||||
|
||||
// Очистка
|
||||
if (await dumpFile.exists()) {
|
||||
await dumpFile.delete();
|
||||
}
|
||||
|
||||
debugPrint('[GlossarySyncService] Синхронизировано ${result.count} продуктов');
|
||||
return result.count;
|
||||
} catch (e) {
|
||||
debugPrint('[GlossarySyncService] Ошибка синхронизации: $e');
|
||||
rethrow;
|
||||
} finally {
|
||||
_isSyncing = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// Статический метод для compute() — выполняется в отдельном изоляте.
|
||||
/// Парсит JSON файл, конвертирует в companions и вставляет чанками.
|
||||
static Future<_IsolateResult> _parseAndInsertInIsolate(_IsolateArgs args) async {
|
||||
// Инициализируем platform channels в изоляте (нужно для drift_flutter)
|
||||
BackgroundIsolateBinaryMessenger.ensureInitialized(args.token);
|
||||
|
||||
final file = File(args.filePath);
|
||||
final rawContent = file.readAsStringSync();
|
||||
|
||||
// ─── Защита от «склеенных» ответов сервера ─────────────────────────────
|
||||
final content = _sanitizeJsonResponse(rawContent);
|
||||
if (content == null) {
|
||||
debugPrint('[GlossarySyncService] Файл дампа повреждён (невозможно восстановить JSON)');
|
||||
return const _IsolateResult(count: 0, updatedAt: null, isServerError: true);
|
||||
}
|
||||
|
||||
final Map<String, dynamic> json;
|
||||
try {
|
||||
json = jsonDecode(content) as Map<String, dynamic>;
|
||||
} catch (e) {
|
||||
debugPrint('[GlossarySyncService] Не удалось распарсить дамп: $e');
|
||||
return const _IsolateResult(count: 0, updatedAt: null, isServerError: true);
|
||||
}
|
||||
|
||||
final dataList = (json['data'] as List<dynamic>?) ?? [];
|
||||
final updatedAt = json['updated_at']?.toString();
|
||||
|
||||
if (dataList.isEmpty) return _IsolateResult(count: 0, updatedAt: updatedAt);
|
||||
|
||||
final db = AppDatabase();
|
||||
try {
|
||||
const chunkSize = 500;
|
||||
int total = 0;
|
||||
|
||||
for (var i = 0; i < dataList.length; i += chunkSize) {
|
||||
final end = (i + chunkSize > dataList.length) ? dataList.length : i + chunkSize;
|
||||
final chunk = dataList.sublist(i, end);
|
||||
|
||||
final companions = chunk.map((item) {
|
||||
final m = item as Map<String, dynamic>;
|
||||
return GlossaryCacheTableCompanion(
|
||||
id: Value(m['id'] as int),
|
||||
name: Value((m['name'] as String?) ?? ''),
|
||||
productGroupId: Value((m['product_group_id'] as int?) ?? 0),
|
||||
energyOn100gr: Value((m['energy_on_100gr'] as num?)?.toDouble() ?? 0.0),
|
||||
proteinsOn100gr: Value((m['proteins_on_100gr'] as num?)?.toDouble() ?? 0.0),
|
||||
fatsOn100gr: Value((m['fats_on_100gr'] as num?)?.toDouble() ?? 0.0),
|
||||
carbohydratesOn100gr: Value((m['carbohydrates_on_100gr'] as num?)?.toDouble() ?? 0.0),
|
||||
portionMassGr: Value((m['portion_mass_gr'] as num?)?.toDouble() ?? 0.0),
|
||||
energyOnPortion: Value((m['energy_on_portion'] as num?)?.toDouble() ?? 0.0),
|
||||
proteinsOnPortion: Value((m['proteins_on_portion'] as num?)?.toDouble() ?? 0.0),
|
||||
fatsOnPortion: Value((m['fats_on_portion'] as num?)?.toDouble() ?? 0.0),
|
||||
carbohydratesOnPortion: Value((m['carbohydrates_on_portion'] as num?)?.toDouble() ?? 0.0),
|
||||
updatedAt: Value(m['updated_at']?.toString() ?? ''),
|
||||
);
|
||||
}).toList();
|
||||
|
||||
await db.glossaryDao.bulkUpsert(companions);
|
||||
total += companions.length;
|
||||
debugPrint('[GlossarySyncService] Обработано $total/${dataList.length} продуктов');
|
||||
}
|
||||
|
||||
return _IsolateResult(count: total, updatedAt: updatedAt);
|
||||
} finally {
|
||||
await db.close();
|
||||
}
|
||||
}
|
||||
|
||||
/// Обрезает невалидный «склеенный» JSON до первой валидной части.
|
||||
///
|
||||
/// Сервер иногда падает в процессе стриминга дампа и дописывает
|
||||
/// {"message":"Server error.",...} прямо в тело — без разделителя.
|
||||
/// Пример: ...,"deleted_at":null}{"message":"Server error.",...}
|
||||
///
|
||||
/// Формат дампа: {"total":N,"updated_at":"...","data":[{...},{...},...]}
|
||||
/// После обрезки на `}{` получается: {"total":N,...,"data":[...,{..."deleted_at":null}
|
||||
/// Нужно закрыть массив и объект: добавить `]}`
|
||||
static String? _sanitizeJsonResponse(String raw) {
|
||||
if (!raw.contains('}{') && !_hasServerErrorMarker(raw)) {
|
||||
return raw;
|
||||
}
|
||||
|
||||
final splicePattern = RegExp(r'}\s*{');
|
||||
final match = splicePattern.firstMatch(raw);
|
||||
if (match != null) {
|
||||
var truncated = raw.substring(0, match.start + 1);
|
||||
debugPrint('[GlossarySyncService] Обнаружена склейка на позиции ${match.start}, обрезаем дамп');
|
||||
|
||||
// Закрываем незавершённую JSON-структуру.
|
||||
// Дамп имеет строго определённый формат:
|
||||
// {"total":N,"updated_at":"...","data":[{...},...,{...}]}
|
||||
// После обрезки на `}{` получается:
|
||||
// {"total":N,"updated_at":"...","data":[...,{..."deleted_at":null}
|
||||
// Нужно закрыть массив data и корневой объект → дописываем ']}'
|
||||
if (truncated.contains('"data":[')) {
|
||||
truncated += ']}';
|
||||
debugPrint('[GlossarySyncService] Дописали ]} для закрытия JSON-структуры');
|
||||
}
|
||||
return truncated;
|
||||
}
|
||||
|
||||
if (_hasServerErrorMarker(raw)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return raw;
|
||||
}
|
||||
|
||||
static bool _hasServerErrorMarker(String content) {
|
||||
return content.contains('"Server error"') ||
|
||||
content.contains('"Server Error"') ||
|
||||
(content.indexOf('"message"') > 1000 && content.contains('"error"'));
|
||||
}
|
||||
}
|
||||
|
||||
/// Аргументы для передачи в compute() изолят.
|
||||
class _IsolateArgs {
|
||||
final String filePath;
|
||||
final RootIsolateToken token;
|
||||
const _IsolateArgs({required this.filePath, required this.token});
|
||||
}
|
||||
|
||||
/// Результат работы изолята.
|
||||
class _IsolateResult {
|
||||
final int count;
|
||||
final String? updatedAt;
|
||||
/// true если сервер вернул ошибку внутри стрима дампа
|
||||
final bool isServerError;
|
||||
const _IsolateResult({required this.count, this.updatedAt, this.isServerError = false});
|
||||
}
|
||||
27
lib/core/local_db/services/glossary_sync_service.dart
Normal file
27
lib/core/local_db/services/glossary_sync_service.dart
Normal file
@@ -0,0 +1,27 @@
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_meta_model.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/glossary_dump_response.dart';
|
||||
import 'package:retrofit/retrofit.dart';
|
||||
|
||||
part 'glossary_sync_service.g.dart';
|
||||
|
||||
/// Retrofit-сервис для синхронизации глоссария продуктов.
|
||||
/// Использует новые offline-first эндпоинты бэкенда.
|
||||
@RestApi()
|
||||
abstract class GlossarySyncApiService {
|
||||
factory GlossarySyncApiService(Dio dio, {String? baseUrl}) = _GlossarySyncApiService;
|
||||
|
||||
/// Получить метаданные глоссария для проверки актуальности кэша.
|
||||
/// Сравниваем checksum с локально сохранённым — если совпадает, кэш актуален.
|
||||
@GET('/api/glossaries/meta')
|
||||
Future<GlossaryMetaModel> getMeta();
|
||||
|
||||
/// Получить дамп продуктов (обновлённых после [updatedAfter]).
|
||||
/// [updatedAfter] — ISO 8601 дата последней синхронизации из sync_meta.
|
||||
/// [ifNoneMatch] — ETag из предыдущего ответа для условного запроса (304).
|
||||
@GET('/api/glossaries/dump')
|
||||
Future<HttpResponse<GlossaryDumpResponse>> getDump({
|
||||
@Query('updated_after') String? updatedAfter,
|
||||
@Header('If-None-Match') String? ifNoneMatch,
|
||||
});
|
||||
}
|
||||
49
lib/core/local_db/tables/diary_days_table.dart
Normal file
49
lib/core/local_db/tables/diary_days_table.dart
Normal file
@@ -0,0 +1,49 @@
|
||||
import 'package:drift/drift.dart';
|
||||
|
||||
/// Локальный кэш дней дневника питания.
|
||||
/// server_id — ID записи на сервере (null до синхронизации).
|
||||
/// server_updated_at — timestamp последнего обновления на сервере.
|
||||
/// cached_at — время кэширования записи локально.
|
||||
class DiaryDaysTable extends Table {
|
||||
@override
|
||||
String get tableName => 'diary_days';
|
||||
|
||||
// Локальный первичный ключ (autoincrement)
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
|
||||
// ID записи на сервере (null, если день ещё не синхронизирован)
|
||||
IntColumn get serverId => integer().nullable().named('server_id')();
|
||||
|
||||
// Дата дня в формате YYYY-MM-DD
|
||||
TextColumn get date => text().named('date')();
|
||||
|
||||
// Время пробуждения HH:MM
|
||||
TextColumn get wakeup => text().withDefault(const Constant('06:30'))();
|
||||
|
||||
// Время отхода ко сну HH:MM
|
||||
TextColumn get retire => text().withDefault(const Constant('22:30'))();
|
||||
|
||||
IntColumn get closed => integer().withDefault(const Constant(0))();
|
||||
|
||||
TextColumn get comment => text().withDefault(const Constant(''))();
|
||||
|
||||
// Статус конечного автомата (init, active, finished, etc.)
|
||||
TextColumn get state => text().withDefault(const Constant('init'))();
|
||||
|
||||
// Флаг: есть выбранная диета
|
||||
BoolColumn get hasChosenDiet => boolean().withDefault(const Constant(false)).named('has_chosen_diet')();
|
||||
|
||||
// Флаг: есть выбранный план
|
||||
BoolColumn get hasChosenPlan => boolean().withDefault(const Constant(false)).named('has_chosen_plan')();
|
||||
|
||||
// Дата последнего обновления на сервере (ISO 8601 string, nullable)
|
||||
TextColumn get serverUpdatedAt => text().nullable().named('server_updated_at')();
|
||||
|
||||
// Время кэширования записи (ISO 8601 string)
|
||||
TextColumn get cachedAt => text().named('cached_at')();
|
||||
|
||||
@override
|
||||
List<Set<Column>> get uniqueKeys => [
|
||||
{date},
|
||||
];
|
||||
}
|
||||
40
lib/core/local_db/tables/glossary_cache_table.dart
Normal file
40
lib/core/local_db/tables/glossary_cache_table.dart
Normal file
@@ -0,0 +1,40 @@
|
||||
import 'package:drift/drift.dart';
|
||||
|
||||
/// Локальный кэш продуктов из глоссария (~200k записей).
|
||||
/// Заполняется через GlossarySyncService из /api/glossaries/dump.
|
||||
class GlossaryCacheTable extends Table {
|
||||
@override
|
||||
String get tableName => 'glossary_cache';
|
||||
|
||||
// ID продукта с сервера (не autoincrement — используем серверный ID)
|
||||
IntColumn get id => integer().named('id')();
|
||||
|
||||
TextColumn get name => text()();
|
||||
|
||||
IntColumn get productGroupId => integer().named('product_group_id')();
|
||||
|
||||
RealColumn get energyOn100gr => real().named('energy_on_100gr')();
|
||||
|
||||
RealColumn get proteinsOn100gr => real().named('proteins_on_100gr')();
|
||||
|
||||
RealColumn get fatsOn100gr => real().named('fats_on_100gr')();
|
||||
|
||||
RealColumn get carbohydratesOn100gr => real().named('carbohydrates_on_100gr')();
|
||||
|
||||
// Масса порции в граммах (0 = продукт в граммах, >0 = порционный)
|
||||
RealColumn get portionMassGr => real().withDefault(const Constant(0)).named('portion_mass_gr')();
|
||||
|
||||
RealColumn get energyOnPortion => real().withDefault(const Constant(0)).named('energy_on_portion')();
|
||||
|
||||
RealColumn get proteinsOnPortion => real().withDefault(const Constant(0)).named('proteins_on_portion')();
|
||||
|
||||
RealColumn get fatsOnPortion => real().withDefault(const Constant(0)).named('fats_on_portion')();
|
||||
|
||||
RealColumn get carbohydratesOnPortion => real().withDefault(const Constant(0)).named('carbohydrates_on_portion')();
|
||||
|
||||
// ISO 8601 строка — время последнего обновления на сервере
|
||||
TextColumn get updatedAt => text().named('updated_at')();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {id};
|
||||
}
|
||||
29
lib/core/local_db/tables/meals_table.dart
Normal file
29
lib/core/local_db/tables/meals_table.dart
Normal file
@@ -0,0 +1,29 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'diary_days_table.dart';
|
||||
|
||||
/// Приёмы пищи, привязанные к дню дневника.
|
||||
/// type_no: 1-завтрак, 2-обед, 3-ужин, 4-полдник, 5-перекус
|
||||
class MealsTable extends Table {
|
||||
@override
|
||||
String get tableName => 'meals';
|
||||
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
|
||||
// Ссылка на локальный дневник
|
||||
IntColumn get diaryDayId => integer().named('diary_day_id').references(DiaryDaysTable, #id, onDelete: KeyAction.cascade)();
|
||||
|
||||
// Тип приёма пищи (1-5)
|
||||
IntColumn get typeNo => integer().named('type_no')();
|
||||
|
||||
// Время приёма пищи HH:MM:SS (nullable)
|
||||
TextColumn get time => text().nullable()();
|
||||
|
||||
IntColumn get satiety => integer().withDefault(const Constant(0))();
|
||||
|
||||
IntColumn get mood => integer().nullable()();
|
||||
|
||||
@override
|
||||
List<Set<Column>> get uniqueKeys => [
|
||||
{diaryDayId, typeNo},
|
||||
];
|
||||
}
|
||||
35
lib/core/local_db/tables/media_table.dart
Normal file
35
lib/core/local_db/tables/media_table.dart
Normal file
@@ -0,0 +1,35 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'meals_table.dart';
|
||||
|
||||
/// Кэш медиа-файлов (фото) приёмов пищи.
|
||||
/// Хранит мета-данные фотографий для офлайн-доступа.
|
||||
///
|
||||
/// status:
|
||||
/// 'synced' — фото загружено на сервер
|
||||
/// 'pending_upload' — фото создано офлайн, ожидает загрузки
|
||||
/// 'pending_delete' — фото помечено на удаление, ожидает синхронизации
|
||||
class MediaTable extends Table {
|
||||
@override
|
||||
String get tableName => 'media';
|
||||
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
|
||||
// Ссылка на локальный приём пищи
|
||||
IntColumn get mealId => integer().named('meal_id')
|
||||
.references(MealsTable, #id, onDelete: KeyAction.cascade)();
|
||||
|
||||
// ID записи на сервере (null до синхронизации)
|
||||
IntColumn get serverId => integer().nullable().named('server_id')();
|
||||
|
||||
// URL фото на сервере (null для неотправленных)
|
||||
TextColumn get url => text().nullable()();
|
||||
|
||||
// Локальный путь к файлу (null для фото только с сервера)
|
||||
TextColumn get localPath => text().nullable().named('local_path')();
|
||||
|
||||
// Статус синхронизации: 'synced', 'pending_upload', 'pending_delete'
|
||||
TextColumn get status => text().withDefault(const Constant('synced'))();
|
||||
|
||||
// Время создания записи (ISO 8601 string)
|
||||
TextColumn get createdAt => text().named('created_at')();
|
||||
}
|
||||
40
lib/core/local_db/tables/pending_operations_table.dart
Normal file
40
lib/core/local_db/tables/pending_operations_table.dart
Normal file
@@ -0,0 +1,40 @@
|
||||
import 'package:drift/drift.dart';
|
||||
|
||||
/// Очередь офлайн-операций (Write-Behind queue).
|
||||
/// Каждая запись — мутация, которая должна быть отправлена на сервер.
|
||||
///
|
||||
/// Жизненный цикл статуса:
|
||||
/// pending → synced (успешно отправлена)
|
||||
/// pending → failed (retryable: false)
|
||||
/// pending → pending (retryable: true, retry_count++)
|
||||
class PendingOperationsTable extends Table {
|
||||
@override
|
||||
String get tableName => 'pending_operations';
|
||||
|
||||
// UUID v4 — используется как Idempotency-Key для сервера
|
||||
TextColumn get id => text()();
|
||||
|
||||
// Тип операции: 'create_portion', 'update_portion', 'delete_portion',
|
||||
// 'create_day', 'fill_meal_time', 'fill_satiety', 'fill_mood',
|
||||
// 'fill_wakeup', 'fill_retire', 'finish_day',
|
||||
// 'upload_photo', 'delete_photo'
|
||||
TextColumn get type => text()();
|
||||
|
||||
// JSON payload запроса (тело для API)
|
||||
TextColumn get payload => text()();
|
||||
|
||||
// Статус: 'pending', 'synced', 'failed'
|
||||
TextColumn get status => text().withDefault(const Constant('pending'))();
|
||||
|
||||
// Счётчик попыток отправки
|
||||
IntColumn get retryCount => integer().withDefault(const Constant(0)).named('retry_count')();
|
||||
|
||||
// Локальный путь к файлу фото (только для upload_photo операций)
|
||||
TextColumn get localFilePath => text().nullable().named('local_file_path')();
|
||||
|
||||
// Время создания операции (ISO 8601 string)
|
||||
TextColumn get createdAt => text().named('created_at')();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {id};
|
||||
}
|
||||
28
lib/core/local_db/tables/portions_table.dart
Normal file
28
lib/core/local_db/tables/portions_table.dart
Normal file
@@ -0,0 +1,28 @@
|
||||
import 'package:drift/drift.dart';
|
||||
import 'meals_table.dart';
|
||||
|
||||
/// Порции продуктов внутри приёмов пищи.
|
||||
class PortionsTable extends Table {
|
||||
@override
|
||||
String get tableName => 'portions';
|
||||
|
||||
IntColumn get id => integer().autoIncrement()();
|
||||
|
||||
IntColumn get mealId => integer().named('meal_id').references(MealsTable, #id, onDelete: KeyAction.cascade)();
|
||||
|
||||
TextColumn get productName => text().named('product_name')();
|
||||
|
||||
// Единица измерения: 'gr' или 'pcs'
|
||||
TextColumn get portion => text()();
|
||||
|
||||
IntColumn get quantity => integer()();
|
||||
|
||||
// ID продукта из глоссария (nullable — если ручной ввод)
|
||||
IntColumn get productNutritionalValueId => integer().nullable().named('product_nutritional_value_id')();
|
||||
|
||||
// Состояние порции (eaten, eaten_deleted, filled_diet, etc.)
|
||||
TextColumn get state => text().withDefault(const Constant('eaten'))();
|
||||
|
||||
// Из диеты (0 = пользователь, 1 = из диеты)
|
||||
BoolColumn get fromDiet => boolean().withDefault(const Constant(false)).named('from_diet')();
|
||||
}
|
||||
16
lib/core/local_db/tables/sync_meta_table.dart
Normal file
16
lib/core/local_db/tables/sync_meta_table.dart
Normal file
@@ -0,0 +1,16 @@
|
||||
import 'package:drift/drift.dart';
|
||||
|
||||
/// Мета-данные синхронизации глоссария.
|
||||
/// Используется как key-value хранилище для ETag, checksum, last_dump_at.
|
||||
class SyncMetaTable extends Table {
|
||||
@override
|
||||
String get tableName => 'sync_meta';
|
||||
|
||||
// Ключ: 'glossary_checksum', 'glossary_etag', 'glossary_last_dump_at'
|
||||
TextColumn get key => text()();
|
||||
|
||||
TextColumn get value => text()();
|
||||
|
||||
@override
|
||||
Set<Column> get primaryKey => {key};
|
||||
}
|
||||
@@ -4,6 +4,9 @@ import 'package:eatvio_app/core/di/cubit_registrations.dart';
|
||||
import 'package:eatvio_app/core/di/external_registrations.dart';
|
||||
import 'package:eatvio_app/core/di/repository_registrations.dart';
|
||||
import 'package:eatvio_app/core/di/service_registrations.dart';
|
||||
import 'package:eatvio_app/core/local_db/services/diary_sync_runner.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/bloc/glossary_sync_cubit.dart';
|
||||
import 'package:eatvio_app/core/prefs.dart';
|
||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
||||
import 'package:get_it/get_it.dart';
|
||||
|
||||
@@ -15,9 +18,12 @@ Future<void> init({required AppBuildType buildType}) async {
|
||||
// Регистрация AppConfig
|
||||
AppConfigRegistration.registerAppConfig(buildType: buildType);
|
||||
|
||||
// Регистрация внешних зависимостей (Dio, etc.)
|
||||
// Регистрация внешних зависимостей (Dio, БД, etc.)
|
||||
ExternalRegistrations.registerAll();
|
||||
|
||||
// Ожидание инициализации асинхронных зависимостей
|
||||
await sl.getAsync<Prefs>();
|
||||
|
||||
// Регистрация сервисов
|
||||
ServiceRegistrations.registerAll();
|
||||
|
||||
@@ -28,5 +34,12 @@ Future<void> init({required AppBuildType buildType}) async {
|
||||
CubitRegistrations.registerAll();
|
||||
|
||||
// Регистрация WebSocket менеджера
|
||||
sl.registerLazySingleton<WsManager>(() => WsManager(wsService: sl()));
|
||||
sl.registerLazySingleton<WsManager>(() => WsManager(wsService: sl(), errorReporter: sl()));
|
||||
|
||||
// Запуск FIFO-воркера синхронизации дневника
|
||||
// Подписывается на InternetConnectionCubit и обрабатывает очередь при появлении сети
|
||||
sl<DiarySyncRunner>().start();
|
||||
|
||||
// Запуск синхронизации глоссария с отслеживанием прогресса в UI
|
||||
sl<GlossarySyncCubit>().start();
|
||||
}
|
||||
|
||||
64
lib/core/notifications/push_navigation_handler.dart
Normal file
64
lib/core/notifications/push_navigation_handler.dart
Normal file
@@ -0,0 +1,64 @@
|
||||
import 'dart:developer' as developer;
|
||||
|
||||
import 'package:eatvio_app/core/app_router.dart';
|
||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
||||
class PushNavigationHandler {
|
||||
static bool _initialized = false;
|
||||
static const MethodChannel _hmsChannel = MethodChannel('com.eatvioapp/hms_push');
|
||||
|
||||
static Future<void> initialize() async {
|
||||
if (_initialized) return;
|
||||
_initialized = true;
|
||||
|
||||
try {
|
||||
final initialMessage = await FirebaseMessaging.instance.getInitialMessage();
|
||||
if (initialMessage != null) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
_handleMessageInternal(initialMessage, source: 'initialMessage');
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
developer.log('PushNavigationHandler: error while getting initialMessage: $e', name: 'PushNavigationHandler');
|
||||
}
|
||||
|
||||
FirebaseMessaging.onMessageOpenedApp.listen((message) => _handleMessageInternal(message, source: 'onMessageOpenedApp'));
|
||||
|
||||
_hmsChannel.setMethodCallHandler((call) async {
|
||||
if (call.method == 'openActionUrl') {
|
||||
final url = call.arguments as String? ?? '';
|
||||
handleActionUrlFromNative(url);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
static void handleActionUrlFromNative(String url) {
|
||||
if (url.isEmpty) {
|
||||
developer.log('PushNavigationHandler.handleActionUrlFromNative: empty url', name: 'PushNavigationHandler');
|
||||
return;
|
||||
}
|
||||
|
||||
developer.log('PushNavigationHandler.handleActionUrlFromNative: navigating by url=$url', name: 'PushNavigationHandler');
|
||||
|
||||
AppRouter.navigateByDeepLinkUrl(url);
|
||||
}
|
||||
|
||||
static void handleMessage(RemoteMessage message) {
|
||||
_handleMessageInternal(message, source: 'manualHandle');
|
||||
}
|
||||
|
||||
static void _handleMessageInternal(RemoteMessage message, {required String source}) {
|
||||
final data = message.data;
|
||||
final actionUrl = data['action_url'] as String?;
|
||||
if (actionUrl == null || actionUrl.isEmpty) {
|
||||
developer.log('PushNavigationHandler: no action_url in message data, source=$source, data=$data', name: 'PushNavigationHandler');
|
||||
return;
|
||||
}
|
||||
|
||||
developer.log('PushNavigationHandler: navigating by action_url=$actionUrl, source=$source', name: 'PushNavigationHandler');
|
||||
|
||||
AppRouter.navigateByDeepLinkUrl(actionUrl);
|
||||
}
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
enum PrefsKeys { hasAnonymousTokenBeenSent, welcomeScreenWasShowed, registrationDate, marketingBottomSheetHasBeenShown }
|
||||
enum PrefsKeys { hasAnonymousTokenBeenSent, welcomeScreenWasShowed, registrationDate, marketingBottomSheetHasBeenShown, isEmailVerificationSkipped }
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import 'package:eatvio_app/core/firebase_api.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
||||
import 'package:eatvio_app/features/auth/presentation/pages/auth_screen.dart';
|
||||
@@ -12,19 +10,14 @@ import 'package:eatvio_app/features/registration/presentation/pages/verify_email
|
||||
import 'package:eatvio_app/features/registration_v2/presentation/pages/registration_v2_page.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
/// Маршруты для аутентификации
|
||||
class AuthRoutes {
|
||||
/// Создание маршрутов аутентификации
|
||||
|
||||
static List<RouteBase> createRoutes() {
|
||||
return [
|
||||
GoRoute(
|
||||
path: RouteConstants.authScreen,
|
||||
name: 'authScreen',
|
||||
builder: (context, state) => const AuthScreen(),
|
||||
redirect: (context, state) {
|
||||
sl<FirebaseApi>().registerAnonymousPushToken();
|
||||
return null;
|
||||
},
|
||||
routes: [
|
||||
GoRoute(path: RouteConstants.registrationScreen, name: 'registrationScreen', builder: (context, state) => const RegistrationScreen()),
|
||||
GoRoute(path: RouteConstants.registrationScreenV2, name: 'registrationScreenV2', builder: (context, state) => const RegistrationV2Page()),
|
||||
|
||||
@@ -17,12 +17,20 @@ class ContentRoutes {
|
||||
name: 'aboutPlanScreen',
|
||||
builder: (context, state) {
|
||||
final slug = state.uri.queryParameters['slug'];
|
||||
final commentIdStr = state.uri.queryParameters['commentId'];
|
||||
final commentId = int.tryParse(commentIdStr ?? '');
|
||||
|
||||
if (slug != null) {
|
||||
return AboutPlanScreen(slug: slug, navigateToComments: false, index: null);
|
||||
return AboutPlanScreen(slug: slug, navigateToComments: commentId != null, index: null, highlightedCommentId: commentId);
|
||||
}
|
||||
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
return AboutPlanScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
|
||||
return AboutPlanScreen(
|
||||
slug: data['slug'] as String,
|
||||
index: data['index'] as int?,
|
||||
navigateToComments: data['navigateToComments'] as bool? ?? (data['commentId'] != null),
|
||||
highlightedCommentId: data['commentId'] as int?,
|
||||
);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
@@ -30,12 +38,20 @@ class ContentRoutes {
|
||||
name: 'aboutRecipesScreen',
|
||||
builder: (context, state) {
|
||||
final slug = state.uri.queryParameters['slug'];
|
||||
final commentIdStr = state.uri.queryParameters['commentId'];
|
||||
final commentId = int.tryParse(commentIdStr ?? '');
|
||||
|
||||
if (slug != null) {
|
||||
return AboutRecipeScreen(recipeSlug: slug, navigateToComments: false, index: null);
|
||||
return AboutRecipeScreen(recipeSlug: slug, navigateToComments: commentId != null, index: null, highlightedCommentId: commentId);
|
||||
}
|
||||
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
return AboutRecipeScreen(recipeSlug: data['recipe'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
|
||||
return AboutRecipeScreen(
|
||||
recipeSlug: data['recipe'] as String,
|
||||
index: data['index'] as int?,
|
||||
navigateToComments: data['navigateToComments'] as bool? ?? (data['commentId'] != null),
|
||||
highlightedCommentId: data['commentId'] as int?,
|
||||
);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
@@ -43,16 +59,28 @@ class ContentRoutes {
|
||||
name: 'aboutDietScreen',
|
||||
builder: (context, state) {
|
||||
final slug = state.uri.queryParameters['slug'];
|
||||
final idStr = state.uri.queryParameters['id'];
|
||||
final id = int.tryParse(idStr ?? '');
|
||||
final commentIdStr = state.uri.queryParameters['commentId'];
|
||||
final commentId = int.tryParse(commentIdStr ?? '');
|
||||
|
||||
if (slug != null) {
|
||||
return AboutDietScreen(id: null, slug: slug, index: null, navigateToComments: false);
|
||||
return AboutDietScreen(id: null, slug: slug, index: null, navigateToComments: commentId != null, highlightedCommentId: commentId);
|
||||
}
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
return AboutDietScreen(
|
||||
id: data['id'] as int?,
|
||||
slug: data['slug'] as String?,
|
||||
index: data['index'] as int?,
|
||||
navigateToComments: data['navigateToComments'] as bool,
|
||||
);
|
||||
if (id != null && id > 0) {
|
||||
return AboutDietScreen(id: id, slug: null, index: null, navigateToComments: commentId != null, highlightedCommentId: commentId);
|
||||
}
|
||||
final data = state.extra as Map<String, dynamic>?;
|
||||
if (data != null) {
|
||||
return AboutDietScreen(
|
||||
id: data['id'] as int?,
|
||||
slug: data['slug'] as String?,
|
||||
index: data['index'] as int?,
|
||||
navigateToComments: data['navigateToComments'] as bool? ?? (data['commentId'] != null),
|
||||
highlightedCommentId: data['commentId'] as int?,
|
||||
);
|
||||
}
|
||||
return const AboutDietScreen(id: null, slug: null, index: null, navigateToComments: false, highlightedCommentId: null);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
@@ -65,12 +93,20 @@ class ContentRoutes {
|
||||
name: 'blogPostScreen',
|
||||
builder: (context, state) {
|
||||
final id = state.uri.queryParameters['id'];
|
||||
final commentIdStr = state.uri.queryParameters['commentId'];
|
||||
final commentId = int.tryParse(commentIdStr ?? '');
|
||||
final parsedId = int.tryParse(id ?? '');
|
||||
|
||||
if (parsedId != null) {
|
||||
return BlogPostScreen(id: parsedId);
|
||||
return BlogPostScreen(id: parsedId, highlightedCommentId: commentId);
|
||||
}
|
||||
|
||||
return BlogPostScreen(id: state.extra as int);
|
||||
if (state.extra is int) {
|
||||
return BlogPostScreen(id: state.extra as int);
|
||||
}
|
||||
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
return BlogPostScreen(id: data['id'] as int, highlightedCommentId: data['commentId'] as int?);
|
||||
},
|
||||
),
|
||||
];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
|
||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
|
||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart';
|
||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart';
|
||||
import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
|
||||
import 'package:eatvio_app/features/consultations/presentation/pages/consultations_screen.dart';
|
||||
@@ -23,14 +24,16 @@ class MainNavigationRoutes {
|
||||
return [
|
||||
ShellRoute(
|
||||
builder: (context, state, child) {
|
||||
return BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
|
||||
builder: (BuildContext context, ProfileAvatarState state) {
|
||||
if (state is ProfileAvatarStateLoaded) {
|
||||
return BottomNavigationBarWidget(profileModel: state.profile, child: child);
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
},
|
||||
);
|
||||
// Инициализация ProfileAvatarCubit при первом использовании ShellRoute
|
||||
final profileAvatarCubit = context.read<ProfileAvatarCubit>();
|
||||
if (profileAvatarCubit.state is ProfileAvatarStateLoading) {
|
||||
// Вызываем getMyProfile() только если состояние loading (первый запуск)
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
profileAvatarCubit.getMyProfile();
|
||||
});
|
||||
}
|
||||
|
||||
return _MainShellWithNavScope(currentLocation: state.matchedLocation, child: child);
|
||||
},
|
||||
routes: [
|
||||
GoRoute(
|
||||
@@ -43,7 +46,14 @@ class MainNavigationRoutes {
|
||||
GoRoute(
|
||||
path: RouteConstants.feedScreen,
|
||||
name: 'feedScreen',
|
||||
pageBuilder: (context, state) => const NoTransitionPage(child: FeedScreen()),
|
||||
pageBuilder: (context, state) {
|
||||
final initialTabIndexFromQuery = int.tryParse(state.uri.queryParameters['initialTabIndex'] ?? '');
|
||||
final extra = state.extra;
|
||||
if (extra is int) {
|
||||
return NoTransitionPage(child: FeedScreen(initialTabIndex: extra));
|
||||
}
|
||||
return NoTransitionPage(child: FeedScreen(initialTabIndex: initialTabIndexFromQuery));
|
||||
},
|
||||
redirect: (context, state) async {
|
||||
try {
|
||||
await sl<WsManager>().initialize();
|
||||
@@ -56,7 +66,7 @@ class MainNavigationRoutes {
|
||||
GoRoute(
|
||||
path: RouteConstants.diaryScreen,
|
||||
name: 'diaryScreen',
|
||||
pageBuilder: (context, state) => const NoTransitionPage(child: DiaryScreen()),
|
||||
pageBuilder: (context, state) => NoTransitionPage(child: DiaryScreen(date: state.extra as DateTime?)),
|
||||
),
|
||||
GoRoute(
|
||||
path: ConsultationsScreen.path,
|
||||
@@ -66,7 +76,10 @@ class MainNavigationRoutes {
|
||||
GoRoute(
|
||||
path: RouteConstants.chatSelectScreen,
|
||||
name: 'chatSelectScreen',
|
||||
pageBuilder: (context, state) => const NoTransitionPage(child: ChatsScreen()),
|
||||
pageBuilder: (context, state) {
|
||||
final initialSearchQuery = state.extra is String ? state.extra as String : null;
|
||||
return NoTransitionPage(child: ChatsScreen(initialSearchQuery: initialSearchQuery));
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
path: RouteConstants.notificationsScreen,
|
||||
@@ -76,19 +89,34 @@ class MainNavigationRoutes {
|
||||
GoRoute(
|
||||
path: RouteConstants.menuScreen,
|
||||
name: 'menuScreen',
|
||||
pageBuilder: (context, state) => NoTransitionPage(
|
||||
child: BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
|
||||
builder: (BuildContext context, ProfileAvatarState state) {
|
||||
if (state is ProfileAvatarStateLoaded) {
|
||||
return MenuScreen(profileModel: state.profile);
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
},
|
||||
),
|
||||
),
|
||||
pageBuilder: (context, state) => const NoTransitionPage(child: MenuScreen()),
|
||||
),
|
||||
],
|
||||
),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
/// Wraps the shell with [BottomNavScope] so descendants (e.g. notifications)
|
||||
/// can switch tabs via [BottomNavController.switchToRoute] instead of pushing.
|
||||
class _MainShellWithNavScope extends StatefulWidget {
|
||||
const _MainShellWithNavScope({required this.child, required this.currentLocation});
|
||||
|
||||
final Widget child;
|
||||
final String currentLocation;
|
||||
|
||||
@override
|
||||
State<_MainShellWithNavScope> createState() => _MainShellWithNavScopeState();
|
||||
}
|
||||
|
||||
class _MainShellWithNavScopeState extends State<_MainShellWithNavScope> {
|
||||
final BottomNavController _navController = BottomNavController();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BottomNavScope(
|
||||
controller: _navController,
|
||||
child: BottomNavigationBarWidget(currentLocation: widget.currentLocation, child: widget.child),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'dart:async';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:eatvio_app/core/app_config.dart';
|
||||
import 'package:eatvio_app/core/firebase_api.dart';
|
||||
@@ -6,6 +7,7 @@ import 'package:eatvio_app/core/prefs.dart';
|
||||
import 'package:eatvio_app/core/prefs_keys.dart';
|
||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
||||
import 'package:eatvio_app/core/token_storage.dart';
|
||||
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
|
||||
import 'package:eatvio_app/features/calendar/presentation/pages/calendar_screen.dart';
|
||||
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
|
||||
@@ -58,24 +60,39 @@ class OtherRoutes {
|
||||
builder: (context, state) => const WelcomeScreen(),
|
||||
redirect: (context, state) async {
|
||||
try {
|
||||
final prefs = sl<Prefs>();
|
||||
final firebaseApi = sl<FirebaseApi>();
|
||||
// Prefs уже инициализирован в locator_service, но на всякий случай проверяем
|
||||
final prefs = await sl.getAsync<Prefs>();
|
||||
final welcomeScreenWasShowed = prefs.getBool(PrefsKeys.welcomeScreenWasShowed) ?? false;
|
||||
await firebaseApi.registerPushToken();
|
||||
if (!welcomeScreenWasShowed) {
|
||||
return null;
|
||||
} else if (await TokenStorage.haveTokenInStorage()) {
|
||||
return '/feed-screen';
|
||||
} else {
|
||||
final hasAnonymousTokenBeenSent = prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
|
||||
if (!hasAnonymousTokenBeenSent) {
|
||||
await firebaseApi.registerAnonymousPushToken();
|
||||
prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);
|
||||
}
|
||||
|
||||
if (await TokenStorage.haveTokenInStorage()) {
|
||||
try {
|
||||
final profileRepository = sl<ProfileRepository>();
|
||||
final profile = await profileRepository.getMyProfile();
|
||||
|
||||
final firebaseApi = sl<FirebaseApi>();
|
||||
await firebaseApi.registerPushToken();
|
||||
|
||||
if (profile.emailVerifiedAt != null || (prefs.getBool(PrefsKeys.isEmailVerificationSkipped) ?? false)) {
|
||||
return RouteConstants.feedScreen;
|
||||
}
|
||||
return RouteConstants.verifyEmailScreen;
|
||||
} catch (e) {
|
||||
// Offline-first: если токен есть, но сеть недоступна —
|
||||
// пускаем в приложение с кэшированными данными.
|
||||
// На auth-screen отправляем только если токена нет.
|
||||
if (await TokenStorage.haveTokenInStorage()) {
|
||||
return RouteConstants.feedScreen;
|
||||
}
|
||||
return '/auth-screen';
|
||||
}
|
||||
} else {
|
||||
return '/auth-screen';
|
||||
}
|
||||
} catch (e) {
|
||||
return '/feed-screen';
|
||||
return '/auth-screen';
|
||||
}
|
||||
},
|
||||
),
|
||||
@@ -85,7 +102,27 @@ class OtherRoutes {
|
||||
builder: (context, state) => const UpdateScreen(),
|
||||
redirect: (context, state) async {
|
||||
try {
|
||||
final versions = (await sl<Dio>().get('${sl<AppConfig>().baseUrl}/api/app_versions')).data;
|
||||
// Проверка версии с таймаутом, чтобы не блокировать запуск приложения
|
||||
final versions = await sl<Dio>()
|
||||
.get('${sl<AppConfig>().baseUrl}/api/app_versions')
|
||||
.timeout(
|
||||
const Duration(seconds: 5),
|
||||
onTimeout: () {
|
||||
// При таймауте пропускаем проверку и идем дальше
|
||||
throw TimeoutException('Version check timeout');
|
||||
},
|
||||
)
|
||||
.then((response) => response.data)
|
||||
.catchError((e) {
|
||||
// При любой ошибке пропускаем проверку версии
|
||||
return null;
|
||||
});
|
||||
|
||||
if (versions == null) {
|
||||
// Если проверка не удалась, пропускаем экран обновления
|
||||
return RouteConstants.welcomeScreen;
|
||||
}
|
||||
|
||||
PackageInfo packageInfo = await PackageInfo.fromPlatform();
|
||||
String version = packageInfo.version;
|
||||
Version currentVersion = Version.parse(version);
|
||||
@@ -96,6 +133,7 @@ class OtherRoutes {
|
||||
return RouteConstants.welcomeScreen;
|
||||
}
|
||||
} catch (e) {
|
||||
// При любой ошибке пропускаем экран обновления
|
||||
return RouteConstants.welcomeScreen;
|
||||
}
|
||||
},
|
||||
@@ -121,22 +159,32 @@ class OtherRoutes {
|
||||
GoRoute(
|
||||
path: RecipeCreateScreen.path,
|
||||
name: RecipeCreateScreen.name,
|
||||
builder: (context, state) => RecipeCreateScreen(recipe: state.extra != null ? state.extra as Recipe : null),
|
||||
builder: (context, state) {
|
||||
if (state.extra is Map<String, dynamic>) {
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
return RecipeCreateScreen(recipe: data['recipe'] as Recipe?, autoValidate: data['autoValidate'] as bool? ?? false);
|
||||
}
|
||||
return RecipeCreateScreen(recipe: state.extra != null ? state.extra as Recipe : null);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
path: CreateDietScreen.path,
|
||||
name: CreateDietScreen.name,
|
||||
builder: (context, state) {
|
||||
final diet = state.extra as Diet?;
|
||||
return CreateDietScreen(diet: diet);
|
||||
final data = state.extra as Map<String, dynamic>?;
|
||||
final diet = data?['diet'] as Diet?;
|
||||
final isEditing = data?['isEditing'] as bool?;
|
||||
return CreateDietScreen(diet: diet, isEditing: isEditing);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
path: DietPreviewScreen.path,
|
||||
name: DietPreviewScreen.name,
|
||||
builder: (context, state) {
|
||||
final data = state.extra as Diet;
|
||||
return DietPreviewScreen(diet: data);
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
final diet = data['diet'] as Diet;
|
||||
final isImageInBase64 = data['isImageInBase64'] as bool;
|
||||
return DietPreviewScreen(diet: diet, isImageInBase64: isImageInBase64);
|
||||
},
|
||||
),
|
||||
GoRoute(path: RouteConstants.createPlanScreen, name: 'createPlanScreen', builder: (context, state) => const CreatePlanScreen()),
|
||||
@@ -159,7 +207,7 @@ class OtherRoutes {
|
||||
GoRoute(
|
||||
path: '${RouteConstants.subsScreen}/:slug',
|
||||
name: 'subsScreen',
|
||||
builder: (context, state) => SubsScreen(slug: state.pathParameters['slug']!, subType: state.extra as SubType),
|
||||
builder: (context, state) => SubsScreen(slug: state.pathParameters['slug'], subType: state.extra as SubType),
|
||||
),
|
||||
|
||||
// Chat routes
|
||||
@@ -167,6 +215,10 @@ class OtherRoutes {
|
||||
path: RouteConstants.chatScreen,
|
||||
name: 'chatScreen',
|
||||
builder: (context, state) {
|
||||
final uuidFromQuery = state.uri.queryParameters['uuid'];
|
||||
if (uuidFromQuery != null) {
|
||||
return ChatScreen(uuid: uuidFromQuery, sendInitialMessage: false);
|
||||
}
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
final uuid = data['uuid'] as String;
|
||||
final sendInitialMessage = data['sendInitialMessage'] as bool?;
|
||||
@@ -184,7 +236,12 @@ class OtherRoutes {
|
||||
GoRoute(
|
||||
path: RouteConstants.stepperBecomeConsultantScreen,
|
||||
name: 'stepperBecomeConsultantScreen',
|
||||
builder: (context, state) => StepperBecomeConsultantScreen(slug: state.extra == null ? null : state.extra as String),
|
||||
builder: (context, state) {
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
final slug = data['slug'] as String?;
|
||||
final isCanceled = data['isCanceled'] as bool?;
|
||||
return StepperBecomeConsultantScreen(slug: slug, isCanceled: isCanceled);
|
||||
},
|
||||
),
|
||||
GoRoute(path: RouteConstants.calendarScreen, name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
|
||||
GoRoute(path: RouteConstants.supportScreen, name: 'supportScreen', builder: (context, state) => const SupportScreen()),
|
||||
@@ -217,6 +274,11 @@ class OtherRoutes {
|
||||
path: InfoByOrderScreen.path,
|
||||
name: InfoByOrderScreen.name,
|
||||
builder: (context, state) {
|
||||
final queryParams = state.uri.queryParameters;
|
||||
final planIdFromQuery = int.tryParse(queryParams['planId'] ?? '');
|
||||
if (planIdFromQuery != null) {
|
||||
return InfoByOrderScreen(planId: planIdFromQuery, successfulPayment: null, customerSlug: null, isConsultantView: true);
|
||||
}
|
||||
final data = state.extra as Map<String, dynamic>;
|
||||
final planId = data['planId'] as int;
|
||||
final successfulPayment = data['successfulPayment'] as bool?;
|
||||
@@ -240,14 +302,13 @@ class OtherRoutes {
|
||||
builder: (context, state) {
|
||||
final data = state.extra as Map<String, int>;
|
||||
final diaryId = data['diaryId'] as int;
|
||||
final currentPlanDay = data['currentDiaryDay'] as int;
|
||||
return UserDiaryScreen(diaryId: diaryId, currentPlanDay: currentPlanDay);
|
||||
return UserDiaryScreen(diaryId: diaryId);
|
||||
},
|
||||
),
|
||||
GoRoute(
|
||||
path: PersonalDietSuggestionScreen.path,
|
||||
name: PersonalDietSuggestionScreen.name,
|
||||
builder: (context, state) => PersonalDietSuggestionScreen(dietId: state.extra as int,),
|
||||
builder: (context, state) => PersonalDietSuggestionScreen(dietId: state.extra as int),
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
|
||||
|
||||
/// Helper class for managing themes and colors.
|
||||
class ThemeHelper {
|
||||
@@ -34,7 +34,8 @@ class ThemeHelper {
|
||||
|
||||
var colorScheme = _supportedColorScheme[_appTheme] ?? ColorSchemes.primaryColorScheme;
|
||||
return ThemeData(
|
||||
textTheme: GoogleFonts.mulishTextTheme(),
|
||||
fontFamily: 'Mulish-Local',
|
||||
textTheme: ThemeData.light().textTheme.apply(fontFamily: 'Mulish-Local'),
|
||||
visualDensity: VisualDensity.standard,
|
||||
colorScheme: colorScheme,
|
||||
scaffoldBackgroundColor: colorScheme.onPrimary,
|
||||
|
||||
@@ -1,9 +1,24 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
abstract class TokenStorage {
|
||||
static SharedPreferences? _cachedPrefs;
|
||||
|
||||
static Future<SharedPreferences> _getPrefs() async {
|
||||
_cachedPrefs ??= await SharedPreferences.getInstance();
|
||||
return _cachedPrefs!;
|
||||
}
|
||||
|
||||
/// Clears the cached SharedPreferences instance.
|
||||
/// This is primarily used for testing to ensure fresh state between tests.
|
||||
@visibleForTesting
|
||||
static void clearCache() {
|
||||
_cachedPrefs = null;
|
||||
}
|
||||
|
||||
static Future<bool> haveTokenInStorage() async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
try {
|
||||
final sharedPreferences = await _getPrefs();
|
||||
if (sharedPreferences.getString('token') == null) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -15,25 +30,25 @@ abstract class TokenStorage {
|
||||
}
|
||||
|
||||
static Future<String?> getTokenFromStorage() async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final sharedPreferences = await _getPrefs();
|
||||
return sharedPreferences.getString('token');
|
||||
}
|
||||
|
||||
static Future<void> saveTokenInStorage(String token) async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final sharedPreferences = await _getPrefs();
|
||||
await sharedPreferences.setString('token', token);
|
||||
}
|
||||
|
||||
static Future<void> removeTokenInStorage() async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final sharedPreferences = await _getPrefs();
|
||||
await sharedPreferences.remove('token');
|
||||
}
|
||||
}
|
||||
|
||||
abstract class SocketIdStorage {
|
||||
static Future<bool> haveSocketIdInStorage() async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
try {
|
||||
final sharedPreferences = await TokenStorage._getPrefs();
|
||||
if (sharedPreferences.getString('socketId') == null) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -45,17 +60,17 @@ abstract class SocketIdStorage {
|
||||
}
|
||||
|
||||
static Future<String?> getSocketIdFromStorage() async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final sharedPreferences = await TokenStorage._getPrefs();
|
||||
return sharedPreferences.getString('socketId');
|
||||
}
|
||||
|
||||
static Future<void> saveSocketIdInStorage(String socketId) async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final sharedPreferences = await TokenStorage._getPrefs();
|
||||
await sharedPreferences.setString('socketId', socketId);
|
||||
}
|
||||
|
||||
static Future<void> removeSocketIdInStorage() async {
|
||||
final sharedPreferences = await SharedPreferences.getInstance();
|
||||
final sharedPreferences = await TokenStorage._getPrefs();
|
||||
await sharedPreferences.remove('socketId');
|
||||
}
|
||||
}
|
||||
|
||||
67
lib/core/utils/markdown_utils.dart
Normal file
67
lib/core/utils/markdown_utils.dart
Normal file
@@ -0,0 +1,67 @@
|
||||
/// Утилиты для обработки markdown текста
|
||||
class MarkdownUtils {
|
||||
/// Обрабатывает markdown текст:
|
||||
/// - Исправляет неправильный синтаксис markdown ссылок
|
||||
/// - Автоматически преобразует URL в markdown ссылки
|
||||
/// - Преобразует **текст** в <b>текст</b> для надежного отображения жирного текста
|
||||
static String processMarkdown(String text) {
|
||||
// Сначала исправляем неправильный синтаксис markdown ссылок
|
||||
// Например: [http://example.com](url) -> [http://example.com](http://example.com)
|
||||
final wrongLinkRegex = RegExp(r'\[(https?://[^\]]+|www\.[^\]]+)\]\(([^\)]+)\)');
|
||||
text = text.replaceAllMapped(wrongLinkRegex, (match) {
|
||||
final urlInText = match.group(1)!;
|
||||
if (!urlInText.startsWith('http://') && !urlInText.startsWith('https://') && !urlInText.startsWith('www.')) {
|
||||
return match.group(0)!;
|
||||
}
|
||||
final fullUrl = urlInText.startsWith('www.') ? 'https://$urlInText' : urlInText;
|
||||
return '[$urlInText]($fullUrl)';
|
||||
});
|
||||
|
||||
// Находим все существующие markdown ссылки и их позиции
|
||||
final linkRegex = RegExp(r'\[([^\]]+)\]\(([^\)]+)\)');
|
||||
final existingLinks = <_LinkRange>[];
|
||||
for (final linkMatch in linkRegex.allMatches(text)) {
|
||||
existingLinks.add(_LinkRange(linkMatch.start, linkMatch.end));
|
||||
}
|
||||
|
||||
// Регулярное выражение для поиска URL (http://, https://, www.)
|
||||
final urlRegex = RegExp(r'(https?://[^\s\)]+|www\.[^\s\)]+)', caseSensitive: false);
|
||||
|
||||
// Заменяем URL на markdown ссылки, если они еще не являются ссылками
|
||||
String result = text;
|
||||
int offset = 0;
|
||||
for (final urlMatch in urlRegex.allMatches(text)) {
|
||||
// Проверяем, не находится ли URL внутри существующей markdown ссылки
|
||||
bool isInsideLink = existingLinks.any((link) =>
|
||||
urlMatch.start >= link.start && urlMatch.end <= link.end);
|
||||
if (!isInsideLink) {
|
||||
final url = urlMatch.group(0)!;
|
||||
final fullUrl = url.startsWith('www.') ? 'https://$url' : url;
|
||||
final replacement = '[$url]($fullUrl)';
|
||||
result = result.replaceRange(
|
||||
urlMatch.start + offset,
|
||||
urlMatch.end + offset,
|
||||
replacement,
|
||||
);
|
||||
offset += replacement.length - url.length;
|
||||
}
|
||||
}
|
||||
|
||||
// Гарантируем, что жирный текст будет распознан
|
||||
// Заменяем **текст** на <b>текст</b> вручную для надежности
|
||||
final boldRegex = RegExp(r'\*\*([^*]+)\*\*');
|
||||
result = result.replaceAllMapped(boldRegex, (match) {
|
||||
return '<b>${match.group(1)}</b>';
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
/// Вспомогательный класс для хранения диапазона позиций ссылки
|
||||
class _LinkRange {
|
||||
final int start;
|
||||
final int end;
|
||||
|
||||
_LinkRange(this.start, this.end);
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
extension Capitalization on String {
|
||||
String capitalize() {
|
||||
if (isEmpty) return '';
|
||||
return "${this[0].toUpperCase()}${substring(1).toLowerCase()}";
|
||||
}
|
||||
|
||||
String parseGender() {
|
||||
if (this == 'male') {
|
||||
return 'Мужской';
|
||||
return 'Мужской';
|
||||
} else if (this == 'female') {
|
||||
return 'Женский';
|
||||
}
|
||||
|
||||
@@ -16,6 +16,21 @@ class ValidationUtils {
|
||||
return regex.hasMatch(phone);
|
||||
}
|
||||
|
||||
/// Нормализация номера телефона (+79991234455)
|
||||
static String normalizePhone(String phone) {
|
||||
if (phone.isEmpty) return '';
|
||||
final digits = phone.replaceAll(RegExp(r'[^\d]'), '');
|
||||
if (digits.isEmpty) return '';
|
||||
|
||||
String normalized = digits;
|
||||
if (digits.startsWith('8')) {
|
||||
normalized = '7${digits.substring(1)}';
|
||||
} else if (digits.length == 10) {
|
||||
normalized = '7$digits';
|
||||
}
|
||||
return '+$normalized';
|
||||
}
|
||||
|
||||
/// Валидация URL
|
||||
static bool isValidUrl(String url) {
|
||||
if (url.isEmpty) return false;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
||||
import 'package:eatvio_app/core/views/cubit/views_state.dart';
|
||||
import 'package:eatvio_app/core/views/repository/views_repository.dart';
|
||||
import 'package:eatvio_app/features/feed/models/view_model.dart';
|
||||
@@ -86,9 +88,13 @@ class ViewsCubit extends Cubit<ViewsCubitState> {
|
||||
}
|
||||
|
||||
Future<void> _viewContent({required ViewableContentType type, required List<int> ids}) async {
|
||||
await viewsRepository.viewContent(
|
||||
viewModel: ViewModel(type: type.getStringifiedVersion(), ids: ids),
|
||||
);
|
||||
try {
|
||||
await viewsRepository.viewContent(
|
||||
viewModel: ViewModel(type: type.getStringifiedVersion(), ids: ids),
|
||||
);
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
}
|
||||
}
|
||||
|
||||
void _scheduleDebouncedSend() {
|
||||
|
||||
@@ -7,10 +7,7 @@ class ViewsRepository {
|
||||
ViewsRepository({required this.viewsService});
|
||||
|
||||
Future<void> viewContent({required ViewModel viewModel}) async {
|
||||
try {
|
||||
await viewsService.viewContent(viewModel: viewModel);
|
||||
} catch (e) {
|
||||
rethrow;
|
||||
}
|
||||
await viewsService.viewContent(viewModel: viewModel);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'dart:async';
|
||||
import 'dart:convert';
|
||||
import 'dart:developer';
|
||||
|
||||
@@ -8,12 +9,16 @@ import 'package:eatvio_app/core/const.dart';
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/core/websockets/ws_service.dart';
|
||||
import 'package:eatvio_app/core/token_storage.dart';
|
||||
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
||||
import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
|
||||
|
||||
class WsManager {
|
||||
final WsService wsService;
|
||||
final ErrorReporter _errorReporter;
|
||||
|
||||
WsManager({required this.wsService});
|
||||
WsManager({required this.wsService, required ErrorReporter errorReporter})
|
||||
: _errorReporter = errorReporter;
|
||||
|
||||
PusherChannelsClient? client;
|
||||
int? userId;
|
||||
@@ -22,6 +27,10 @@ class WsManager {
|
||||
PrivateChannel? _privateMessagesChannel;
|
||||
PrivateChannel? _privateDirectChatChannel;
|
||||
|
||||
StreamSubscription? _lifecycleSubscription;
|
||||
StreamSubscription? _eventSubscription;
|
||||
StreamSubscription? _connectionEstablishedSubscription;
|
||||
|
||||
Stream<ChannelReadEvent>? get newMessagesStream => _privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
|
||||
|
||||
Stream<ChannelReadEvent>? get newNotificationsStream => _privateNotificationChannel?.bind('Illuminate\\Notifications\\Events\\BroadcastNotificationCreated');
|
||||
@@ -33,7 +42,7 @@ class WsManager {
|
||||
Future<void> initialize() async {
|
||||
if (client == null) {
|
||||
try {
|
||||
await TokenStorage.haveTokenInStorage();
|
||||
if (!await TokenStorage.haveTokenInStorage()) return;
|
||||
final wsUrl = await wsService.getWebsocket();
|
||||
|
||||
final options = PusherChannelsOptions.fromHost(
|
||||
@@ -71,7 +80,7 @@ class WsManager {
|
||||
}
|
||||
}
|
||||
|
||||
client?.eventStream.listen((event) async {
|
||||
_connectionEstablishedSubscription = client?.eventStream.listen((event) async {
|
||||
if (event.name == 'pusher:connection_established') {
|
||||
final data = event.data;
|
||||
final socketId = extractSocketId(data);
|
||||
@@ -87,26 +96,46 @@ class WsManager {
|
||||
await _initPrivateNotificationsChannel();
|
||||
await _initPrivateMessagesChannel();
|
||||
|
||||
client?.lifecycleStream.listen((data) {
|
||||
_lifecycleSubscription = client?.lifecycleStream.listen((data) {
|
||||
if (data == PusherChannelsClientLifeCycleState.establishedConnection) {
|
||||
_unsubscribe();
|
||||
_subscribe();
|
||||
}
|
||||
});
|
||||
client?.eventStream.listen((event) {
|
||||
EasyDebounce.debounce(
|
||||
'searchChatRoom',
|
||||
const Duration(milliseconds: 300),
|
||||
() => sl<ChatsCubit>().getChatRooms(),
|
||||
);
|
||||
_eventSubscription = client?.eventStream.listen((event) {
|
||||
log('WsManager received event: ${event.name}');
|
||||
// Только если это не системные сообщения Pusher, обновляем список чатов
|
||||
if (!event.name.startsWith('pusher:')) {
|
||||
EasyDebounce.debounce(
|
||||
'searchChatRoom',
|
||||
const Duration(milliseconds: 300),
|
||||
() => sl<ChatsCubit>().getChatRooms(),
|
||||
);
|
||||
}
|
||||
});
|
||||
_subscribe();
|
||||
await _connectCubitsToStreams();
|
||||
} catch (e, st) {
|
||||
await _errorReporter.report(e, st, origin: 'WsManager');
|
||||
log(e.toString(), stackTrace: st);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Подключает ChatsCubit и NotificationsCubit к стримам сокета.
|
||||
/// Вызывается после успешного initialize(), чтобы уведомления и чаты работали
|
||||
/// и при входе уже залогиненного пользователя (редирект на feed), не только после экрана логина.
|
||||
Future<void> _connectCubitsToStreams() async {
|
||||
try {
|
||||
await sl<ChatsCubit>().connectToWebSocket();
|
||||
await sl<NotificationsCubit>().getNotifications();
|
||||
await sl<NotificationsCubit>().connectToWebSocket();
|
||||
} catch (e, st) {
|
||||
log('WsManager._connectCubitsToStreams: $e', stackTrace: st);
|
||||
await _errorReporter.report(e, st, origin: 'WsManager');
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _initPrivateNotificationsChannel() async {
|
||||
final token = await TokenStorage.getTokenFromStorage();
|
||||
_privateNotificationChannel = client?.privateChannel(
|
||||
@@ -166,6 +195,12 @@ class WsManager {
|
||||
|
||||
Future<void> clear() async {
|
||||
await client?.disconnect();
|
||||
await _lifecycleSubscription?.cancel();
|
||||
await _eventSubscription?.cancel();
|
||||
await _connectionEstablishedSubscription?.cancel();
|
||||
_lifecycleSubscription = null;
|
||||
_eventSubscription = null;
|
||||
_connectionEstablishedSubscription = null;
|
||||
client = null;
|
||||
userId = null;
|
||||
_privateDirectChatChannel?.unsubscribe();
|
||||
|
||||
@@ -35,7 +35,7 @@ class CustomOutlinedButton extends BaseButton {
|
||||
margin: margin,
|
||||
decoration: decoration,
|
||||
child: OutlinedButton(
|
||||
style: buttonStyle!,
|
||||
style: buttonStyle ?? OutlinedButton.styleFrom(),
|
||||
onPressed: isDisabled ?? false ? null : onPressed ?? () {},
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
@@ -59,7 +59,7 @@ class CustomOutlinedButton extends BaseButton {
|
||||
margin: margin,
|
||||
decoration: decoration,
|
||||
child: OutlinedButton(
|
||||
style: buttonStyle!,
|
||||
style: buttonStyle ?? OutlinedButton.styleFrom(),
|
||||
onPressed: isDisabled ?? false ? null : onPressed ?? () {},
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
|
||||
@@ -27,7 +27,7 @@ class FeedIconButton extends StatelessWidget {
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (svgIcon != null) svgIcon!,
|
||||
?svgIcon,
|
||||
if (icon != null)
|
||||
Icon(
|
||||
icon,
|
||||
|
||||
@@ -12,15 +12,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
|
||||
class InfoRow extends StatelessWidget {
|
||||
const InfoRow({
|
||||
required this.type,
|
||||
super.key,
|
||||
this.diet,
|
||||
this.itemsBackgroundColor,
|
||||
this.disableDescriptionOfTypes = false,
|
||||
this.plan,
|
||||
this.recipe,
|
||||
});
|
||||
const InfoRow({required this.type, super.key, this.diet, this.itemsBackgroundColor, this.disableDescriptionOfTypes = false, this.plan, this.recipe});
|
||||
final ProductType type;
|
||||
final Color? itemsBackgroundColor;
|
||||
final Diet? diet;
|
||||
@@ -50,44 +42,13 @@ class InfoRow extends StatelessWidget {
|
||||
InfoBouble(
|
||||
backgroundColor: itemsBackgroundColor,
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
'assets/icons/time2.svg',
|
||||
width: 13.3,
|
||||
height: 13.3,
|
||||
),
|
||||
SvgPicture.asset('assets/icons/time2.svg', width: 13.3, height: 13.3),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
switch (type) {
|
||||
ProductType.diet => '${diet?.duration} ${getDayForm(diet?.duration ?? 7, s)}',
|
||||
ProductType.plan => '${plan?.duration} ${getDayForm(plan?.duration ?? 7, s)}',
|
||||
ProductType.recipe => timeTitle ?? '',
|
||||
},
|
||||
style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
InfoBouble(
|
||||
backgroundColor: itemsBackgroundColor,
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
switch (type) {
|
||||
ProductType.diet => 'assets/icons/people.svg',
|
||||
ProductType.plan => 'assets/icons/people.svg',
|
||||
ProductType.recipe => 'assets/icons/calories.svg',
|
||||
},
|
||||
width: 13.3,
|
||||
height: 13.3,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
switch (type) {
|
||||
ProductType.diet => '80 человек прошли',
|
||||
ProductType.plan => '80 человек прошли',
|
||||
ProductType.recipe => '${recipe?.calories.toStringAsFixed(0) ?? '0'} ккал',
|
||||
},
|
||||
style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
|
||||
),
|
||||
Text(switch (type) {
|
||||
ProductType.diet => '${diet?.duration} ${getDayForm(diet?.duration ?? 7, s)}',
|
||||
ProductType.plan => '${plan?.duration} ${getDayForm(plan?.duration ?? 7, s)}',
|
||||
ProductType.recipe => timeTitle ?? '',
|
||||
}, style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
@@ -95,11 +56,17 @@ class InfoRow extends StatelessWidget {
|
||||
InfoBouble(
|
||||
backgroundColor: itemsBackgroundColor,
|
||||
children: [
|
||||
SvgPicture.asset(
|
||||
'assets/icons/steps.svg',
|
||||
width: 13.3,
|
||||
height: 13.3,
|
||||
),
|
||||
SvgPicture.asset('assets/icons/calories.svg', width: 13.3, height: 13.3),
|
||||
const SizedBox(width: 4),
|
||||
Text('${(recipe?.calories ?? 0).toStringAsFixed(0)} ккал', style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
if (type == ProductType.recipe)
|
||||
InfoBouble(
|
||||
backgroundColor: itemsBackgroundColor,
|
||||
children: [
|
||||
SvgPicture.asset('assets/icons/steps.svg', width: 13.3, height: 13.3),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
'${recipe?.steps?.length ?? 0} ${getStepForm(recipe?.steps?.length ?? 0)}',
|
||||
@@ -110,13 +77,7 @@ class InfoRow extends StatelessWidget {
|
||||
if (plan?.type.hasAtLeastOneType() == true || diet?.type.hasAtLeastOneType() == true)
|
||||
InfoBouble(
|
||||
backgroundColor: itemsBackgroundColor,
|
||||
children: [
|
||||
TypeBadges(
|
||||
type: diet?.type,
|
||||
planType: plan?.type,
|
||||
disableDescriptionOfTypes: disableDescriptionOfTypes,
|
||||
),
|
||||
],
|
||||
children: [TypeBadges(type: diet?.type, planType: plan?.type, disableDescriptionOfTypes: disableDescriptionOfTypes)],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user