forked from eatvio/eatvio_app
Compare commits
93 Commits
issue-1089
...
issue-1140
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47b81fba5a | ||
|
|
5308c11ca6 | ||
| 1e8c1ab2eb | |||
|
|
29ee8ae5a8 | ||
|
|
ce073b5a95 | ||
|
|
b05d3b891b | ||
| 87d383152d | |||
| dbe0369d4d | |||
| 4f0ba5c864 | |||
| f9b862f4ad | |||
| 2ea711844f | |||
|
|
70334e1c9b | ||
|
|
508d212f26 | ||
|
|
b6ad316db1 | ||
|
|
8f0ec6d2a3 | ||
|
|
215224f458 | ||
|
|
0e85f86950 | ||
|
|
b4e1500dd4 | ||
| 08bc3c7fb1 | |||
|
|
3db96a1969 | ||
| c6664f4d83 | |||
|
|
db3a32c12e | ||
|
|
5228d43f15 | ||
| 0511bd2cb5 | |||
| 28ae75474a | |||
|
|
c7198c5a48 | ||
|
|
8d4cabf5c6 | ||
|
|
8c33f033ff | ||
|
|
45d072cff4 | ||
| da0ac9d396 | |||
| 22b8ef97b4 | |||
| 6c4572af55 | |||
| e1a1ce4b68 | |||
| 67920b2016 | |||
| ad70d0988e | |||
| 0241265b3c | |||
|
|
fc28062bb5 | ||
| f947182632 | |||
|
|
27b8128a19 | ||
| 924dc2c16a | |||
| 57536aba06 | |||
| 16084ee94c | |||
| bd1155233f | |||
| 53ce73b41e | |||
|
|
1829ad611d | ||
| 2b2991012d | |||
| 7a456c2d9d | |||
| 36079de81c | |||
| 3825a974f9 | |||
| 678d73932c | |||
| 8942e11be9 | |||
|
|
55e1633d1c | ||
| 2668907f60 | |||
| 56ab9b65f9 | |||
| 5b2ac4f228 | |||
| 51aff6c175 | |||
| cba2689406 | |||
| 5f0b7e026b | |||
| 85bc2c6d5c | |||
| f58892bdeb | |||
| f14f426381 | |||
| 6a31880a85 | |||
| 3a41a85f9d | |||
| 194b8d5b16 | |||
|
|
f6f9764811 | ||
| e2d287eb9e | |||
| cf5c42ff4b | |||
| 28c62bf775 | |||
| 3519595ebf | |||
| 30932d9f28 | |||
| b30bf037db | |||
| bfb43104d8 | |||
| 4aadc8a9d8 | |||
| 7308e3e972 | |||
| 76c26457fc | |||
| 67e6526552 | |||
| 1255c9658c | |||
| 85cfcc519e | |||
| dedb55ecca | |||
| 6b4c88068e | |||
| 04dab02a6d | |||
| c45612decb | |||
| db293bf13f | |||
| 05eaa3caa9 | |||
| fe54037cef | |||
| e6601e2fe6 | |||
| c70c9beb20 | |||
| d2fc087699 | |||
| 18925fd95e | |||
| 37a787c8d0 | |||
| fb68f02ca4 | |||
| 4b72258b1f | |||
| 3b8d1bf651 |
@@ -3,7 +3,7 @@ name: Eatvio App Android Test
|
|||||||
on: [ pull_request ]
|
on: [ pull_request ]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
flutter_version: "3.41.2"
|
flutter_version: "3.50.0"
|
||||||
java_version: "21.x"
|
java_version: "21.x"
|
||||||
flutter_channel: "stable"
|
flutter_channel: "stable"
|
||||||
|
|
||||||
|
|||||||
64
.gitea/workflows/contract-sync.yml
Normal file
64
.gitea/workflows/contract-sync.yml
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
name: "Contract sync: flutter manifest -> eatvio (backend)"
|
||||||
|
|
||||||
|
# Автоматический перенос манифеста API-контракта из eatvio_app в eatvio-web.
|
||||||
|
# Триггер: push в main с изменениями api_contract/**.
|
||||||
|
# Результат: PR в eatvio-web с обновлённым tests/Fixtures/Contract/flutter_model_contract.json.
|
||||||
|
# Далее CI eatvio-web сам прогонит FlutterApiContractTest и покажет,
|
||||||
|
# выполняет ли бэкенд требования новых моделей.
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
paths:
|
||||||
|
- "api_contract/**"
|
||||||
|
workflow_dispatch: # ручной запуск для проверки секрета/прав: Actions → Contract sync → Run workflow
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync-manifest:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Open PR in eatvio-web with updated manifest
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.CONTRACT_SYNC_TOKEN }} # PAT с write на eatvio/eatvio
|
||||||
|
API: http://gitea.office.local:3000/api/v1
|
||||||
|
BACKEND_REPO: eatvio/eatvio
|
||||||
|
SRC: api_contract/flutter_model_contract.json
|
||||||
|
DST: tests/Fixtures/Contract/flutter_model_contract.json
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
SHORT_SHA="${GITHUB_SHA::8}"
|
||||||
|
BRANCH="contract-sync/manifest-${SHORT_SHA}"
|
||||||
|
auth="Authorization: token ${TOKEN}"
|
||||||
|
|
||||||
|
DEFAULT_BRANCH=$(curl -sf -H "$auth" "${API}/repos/${BACKEND_REPO}" | grep -o '"default_branch":"[^"]*"' | head -1 | cut -d'"' -f4)
|
||||||
|
|
||||||
|
# Файл не изменился относительно предыдущего синка — выходим тихо.
|
||||||
|
REMOTE_SHA=$(curl -sf -H "$auth" "${API}/repos/${BACKEND_REPO}/contents/${DST}?ref=${DEFAULT_BRANCH}" | grep -o '"sha":"[^"]*"' | head -1 | cut -d'"' -f4)
|
||||||
|
LOCAL_SHA=$(git hash-object -- "${SRC}")
|
||||||
|
if [ "${REMOTE_SHA}" = "${LOCAL_SHA}" ]; then
|
||||||
|
echo "Manifest already in sync with ${BACKEND_REPO}."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 1. Ветка от дефолтной (если уже существует — переиспользуем).
|
||||||
|
curl -sf -X POST -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d "{\"new_branch_name\":\"${BRANCH}\",\"old_branch_name\":\"${DEFAULT_BRANCH}\"}" \
|
||||||
|
"${API}/repos/${BACKEND_REPO}/branches" || echo "branch ${BRANCH} already exists"
|
||||||
|
|
||||||
|
# 2. Обновить файл (contents API требует sha текущего файла).
|
||||||
|
CONTENT_B64=$(base64 -w0 "${SRC}")
|
||||||
|
curl -sf -X PUT -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d "{\"content\":\"${CONTENT_B64}\",\"message\":\"chore(contract): sync flutter manifest (${SHORT_SHA})\",\"sha\":\"${REMOTE_SHA}\",\"branch\":\"${BRANCH}\"}" \
|
||||||
|
"${API}/repos/${BACKEND_REPO}/contents/${DST}" > /dev/null
|
||||||
|
|
||||||
|
# 3. PR (если уже открыт — пропускаем).
|
||||||
|
curl -sf -X POST -H "$auth" -H "Content-Type: application/json" \
|
||||||
|
-d "{\"title\":\"[contract-sync] flutter manifest ${SHORT_SHA}\",\"head\":\"${BRANCH}\",\"base\":\"${DEFAULT_BRANCH}\",\"body\":\"Автоматический синк манифеста из eatvio_app@${GITHUB_SHA}.\\n\\nCI бэкенда прогонит FlutterApiContractTest — если бэкенд не выполняет новые требования моделей, тест упадёт на этом PR.\"}" \
|
||||||
|
"${API}/repos/${BACKEND_REPO}/pulls" > /dev/null \
|
||||||
|
|| echo "PR already exists for ${BRANCH}"
|
||||||
|
|
||||||
|
echo "Sync PR opened: ${BACKEND_REPO} <- ${BRANCH}"
|
||||||
@@ -3,7 +3,7 @@ name: Eatvio App Android Test on custom docker
|
|||||||
on: [ pull_request ]
|
on: [ pull_request ]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
flutter_version: "3.41.2"
|
flutter_version: "3.50.0"
|
||||||
java_version: "21.x"
|
java_version: "21.x"
|
||||||
flutter_channel: "stable"
|
flutter_channel: "stable"
|
||||||
my_local_cache_dir: "/opt/hostedtoolcache/"
|
my_local_cache_dir: "/opt/hostedtoolcache/"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
env:
|
env:
|
||||||
flutter_version: '3.41.2'
|
flutter_version: '3.50.0'
|
||||||
java_version: '21.x'
|
java_version: '21.x'
|
||||||
flutter_channel: 'stable'
|
flutter_channel: 'stable'
|
||||||
my_local_cache_dir: '/opt/hostedtoolcache/'
|
my_local_cache_dir: '/opt/hostedtoolcache/'
|
||||||
@@ -14,7 +14,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: [ubuntu-latest]
|
runs-on: [debian-12]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: https://github.com/actions/checkout@v3
|
- uses: https://github.com/actions/checkout@v3
|
||||||
@@ -74,7 +74,7 @@ jobs:
|
|||||||
uses: 'https://github.com/actions/cache@v4'
|
uses: 'https://github.com/actions/cache@v4'
|
||||||
with:
|
with:
|
||||||
path: ${{ env.my_local_cache_dir }}
|
path: ${{ env.my_local_cache_dir }}
|
||||||
key: ${{ runner.os }}-cache-sdk
|
key: ${{ runner.os }}-cache-sdk-flutter-${{ env.flutter_version }}
|
||||||
|
|
||||||
- name: Set up JDK
|
- name: Set up JDK
|
||||||
uses: https://github.com/actions/setup-java@v3
|
uses: https://github.com/actions/setup-java@v3
|
||||||
@@ -117,15 +117,37 @@ jobs:
|
|||||||
- name: Set up Flutter
|
- name: Set up Flutter
|
||||||
run: |
|
run: |
|
||||||
FLUTTER_DIR="${{ env.my_local_cache_dir }}flutter"
|
FLUTTER_DIR="${{ env.my_local_cache_dir }}flutter"
|
||||||
if [ ! -f "$FLUTTER_DIR/bin/flutter" ]; then
|
EXPECTED_VERSION="${{ env.flutter_version }}"
|
||||||
echo "Downloading Flutter ${{ env.flutter_version }}..."
|
echo "Checking Flutter at $FLUTTER_DIR (need ${EXPECTED_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"
|
CACHED_VERSION=""
|
||||||
|
if [ -d "$FLUTTER_DIR" ]; then
|
||||||
|
git config --global --add safe.directory "$FLUTTER_DIR" || true
|
||||||
|
# flutter --version writes several lines; with pipefail, head closes
|
||||||
|
# the pipe and the step exits before any log line.
|
||||||
|
set +e
|
||||||
|
set +o pipefail
|
||||||
|
CACHED_VERSION="$(git -C "$FLUTTER_DIR" describe --tags --exact-match 2>/dev/null)"
|
||||||
|
CACHED_VERSION="${CACHED_VERSION#v}"
|
||||||
|
if [ -z "$CACHED_VERSION" ] && [ -x "$FLUTTER_DIR/bin/flutter" ]; then
|
||||||
|
VERSION_LINE="$("$FLUTTER_DIR/bin/flutter" --version 2>&1 | head -n 1)"
|
||||||
|
echo "flutter --version: ${VERSION_LINE:-<empty>}"
|
||||||
|
CACHED_VERSION="$(printf '%s\n' "$VERSION_LINE" | awk '{print $2}')"
|
||||||
|
fi
|
||||||
|
set -e
|
||||||
|
set -o pipefail
|
||||||
|
fi
|
||||||
|
echo "Cached Flutter version: '${CACHED_VERSION:-none}'"
|
||||||
|
if [ "$CACHED_VERSION" != "$EXPECTED_VERSION" ]; then
|
||||||
|
echo "Downloading Flutter ${EXPECTED_VERSION}..."
|
||||||
|
rm -rf "$FLUTTER_DIR"
|
||||||
|
curl -fL --retry 3 --retry-delay 2 -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/${{ env.flutter_channel }}/linux/flutter_linux_${EXPECTED_VERSION}-${{ env.flutter_channel }}.tar.xz"
|
||||||
echo "Extracting Flutter..."
|
echo "Extracting Flutter..."
|
||||||
mkdir -p "${{ env.my_local_cache_dir }}"
|
mkdir -p "${{ env.my_local_cache_dir }}"
|
||||||
tar xf /tmp/flutter.tar.xz -C "${{ env.my_local_cache_dir }}"
|
tar xf /tmp/flutter.tar.xz -C "${{ env.my_local_cache_dir }}"
|
||||||
rm /tmp/flutter.tar.xz
|
rm /tmp/flutter.tar.xz
|
||||||
|
git config --global --add safe.directory "$FLUTTER_DIR" || true
|
||||||
else
|
else
|
||||||
echo "Flutter already cached at $FLUTTER_DIR"
|
echo "Flutter ${EXPECTED_VERSION} already cached at $FLUTTER_DIR"
|
||||||
fi
|
fi
|
||||||
echo "$FLUTTER_DIR/bin" >> $GITHUB_PATH
|
echo "$FLUTTER_DIR/bin" >> $GITHUB_PATH
|
||||||
echo "$FLUTTER_DIR/bin/cache/dart-sdk/bin" >> $GITHUB_PATH
|
echo "$FLUTTER_DIR/bin/cache/dart-sdk/bin" >> $GITHUB_PATH
|
||||||
@@ -155,10 +177,19 @@ jobs:
|
|||||||
|
|
||||||
- name: Get dependencies
|
- name: Get dependencies
|
||||||
run: |
|
run: |
|
||||||
flutter clean
|
flutter clean
|
||||||
flutter pub cache repair
|
flutter pub cache repair
|
||||||
flutter pub get
|
flutter pub get
|
||||||
dart run build_runner build --delete-conflicting-outputs
|
dart run build_runner build --delete-conflicting-outputs
|
||||||
|
|
||||||
|
# Контракт манифеста API: манифест обязан быть регенерирован из исходников freezed-моделей.
|
||||||
|
# Diff после регенерации = PR менял модели, но не обновил api_contract/flutter_model_contract.json.
|
||||||
|
# Обновлённый манифест нужно также синхронизировать в eatvio-web: tests/Fixtures/Contract/.
|
||||||
|
- name: API contract manifest check
|
||||||
|
run: |
|
||||||
|
dart run tool/export_api_contract.dart api_contract/flutter_model_contract.json
|
||||||
|
git diff --exit-code api_contract/flutter_model_contract.json \
|
||||||
|
|| (echo "::error::api_contract/flutter_model_contract.json устарел. Регенерируй манифест (make export-api-contract) и синхронизируй его в eatvio-web: tests/Fixtures/Contract/flutter_model_contract.json" && exit 1)
|
||||||
|
|
||||||
- name: Native Analyze
|
- name: Native Analyze
|
||||||
run: flutter analyze
|
run: flutter analyze
|
||||||
|
|||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -16,6 +16,8 @@
|
|||||||
*.mocks.dart
|
*.mocks.dart
|
||||||
android/build/
|
android/build/
|
||||||
ios/XCBuildData/
|
ios/XCBuildData/
|
||||||
|
docs/
|
||||||
|
specs/
|
||||||
env/.env
|
env/.env
|
||||||
.env
|
.env
|
||||||
android/key.properties
|
android/key.properties
|
||||||
|
|||||||
76
AGENTS.md
Normal file
76
AGENTS.md
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
# AGENTS.md
|
||||||
|
|
||||||
|
Flutter/Dart mobile app (iOS + Android, Russian-market nutrition/consulting product).
|
||||||
|
Gitea-hosted; CI is Gitea Actions in `.gitea/workflows/` (not GitHub Actions, though it references `github.com/actions/*`).
|
||||||
|
|
||||||
|
## Toolchain (trust these over README — README version numbers are stale)
|
||||||
|
|
||||||
|
- CI runs **Flutter 3.41.2 stable**, **Java/JDK 21** (`.gitea/workflows/test.yml`).
|
||||||
|
- `pubspec.yaml` requires **Dart SDK ^3.10.4**; app version is `1.3.23+105` (README claims 1.3.0+79 — wrong).
|
||||||
|
- Build/test/lint via Flutter directly or the `Makefile`. The repo has a `package.json` **only** to wire a git pre-push hook via `simple-git-hooks`; it is not a Node project.
|
||||||
|
|
||||||
|
## CRITICAL: generated code is NOT committed
|
||||||
|
|
||||||
|
`.gitignore` excludes `*.g.dart`, `*.freezed.dart`, `*.gr.dart`, `*.mocks.dart`. After any checkout / pull / model change you **must regenerate** before `flutter analyze`, `flutter test`, or any build, or they fail on missing files:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dart run build_runner build --delete-conflicting-outputs
|
||||||
|
# or: make build-generated-files
|
||||||
|
```
|
||||||
|
|
||||||
|
Generators in use: `freezed`, `json_serializable`, `retrofit_generator`, `mockito` (`build_runner`).
|
||||||
|
Exception: `lib/generated/` (l10n output from `intl_utils` / `flutter_intl`) **is** committed — don't regenerate-and-clobber it casually.
|
||||||
|
|
||||||
|
## `.env` (required for running the app, NOT for unit tests)
|
||||||
|
|
||||||
|
- The app loads `.env` at startup (`lib/core/app_initializer.dart` → `dotenv.load`) and ships it as a Flutter asset (`pubspec.yaml` assets).
|
||||||
|
- There is **no `env.example` in the repo** despite README/`ENV_SETUP.md` saying `cp env.example .env`. Locally you must obtain `.env` from the team. In CI it is checked out from a **private `eatvio/eatvio_app_env` repo**.
|
||||||
|
- `flutter test` does **not** need `.env`: tests seed env via `dotenv.loadFromString(...)` (see `test/core/app_config_test.dart`). Access values only through `lib/core/env_config.dart` (`EnvConfig`).
|
||||||
|
- Build types: `AppBuildType { prod, tests, dev }` (`lib/core/app_initializer.dart`). `prod` → `BASE_URL`; `tests`/`dev` → `DEV_BASE_URL`. `main.dart` hardcodes `prod`.
|
||||||
|
|
||||||
|
## Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
make run-analyse # flutter analyze
|
||||||
|
make run-tests # flutter test
|
||||||
|
make run-checks # analyze THEN test (also the pre-push hook)
|
||||||
|
make build-generated-files # build_runner --delete-conflicting-outputs
|
||||||
|
make clean-coverage # strips generated files from coverage/lcov.info
|
||||||
|
```
|
||||||
|
|
||||||
|
Run a single test file / single test:
|
||||||
|
```bash
|
||||||
|
flutter test test/core/app_config_test.dart
|
||||||
|
flutter test test/core/app_config_test.dart --plain-name "creates config with prod build type"
|
||||||
|
```
|
||||||
|
|
||||||
|
Coverage (must be run with the flag): `flutter test --coverage`, then `make clean-coverage`. `analyze_coverage.py` / `analyze_coverage_by_uncovered.py` summarize `coverage/lcov.info`.
|
||||||
|
|
||||||
|
## CI gate (binding constraint on PRs)
|
||||||
|
|
||||||
|
`.gitea/workflows/test.yml` runs on every PR, in order:
|
||||||
|
1. `flutter clean` → `flutter pub get` → `dart run build_runner build --delete-conflicting-outputs`
|
||||||
|
2. `flutter analyze`
|
||||||
|
3. `flutter test --coverage`
|
||||||
|
4. **Coverage must be ≥ 70%** (generated files excluded) or the job fails — keep this in mind when adding untested code.
|
||||||
|
5. `flutter build apk --release --dart-define=HIDE_PLANS=false --dart-define=BUILD_DATE=...`
|
||||||
|
|
||||||
|
Note: other workflow files (`build.yml`, `docker-run-tests.yml`) are simpler/older and do **not** run `build_runner`; `test.yml` is the authoritative one.
|
||||||
|
|
||||||
|
## Architecture map
|
||||||
|
|
||||||
|
- Entry: `lib/main.dart` → `AppInitializer.initialize` (env → DI → Sentry → Firebase → analytics) → runs app under Sentry.
|
||||||
|
- DI: `get_it` (`sl` global), registered in `lib/core/locator_service.dart` via `lib/core/di/*_registrations.dart` (app_config, external, service, repository, cubit).
|
||||||
|
- State: `flutter_bloc` (Cubits/Blocs). Global providers declared in `lib/core/app_config.dart` (`globalBlocProviders`).
|
||||||
|
- Routing: `go_router` (`lib/core/app_router.dart`), with deep-link/push handling in `lib/core/notifications/`.
|
||||||
|
- Networking: `dio` + `retrofit` (→ `.gr.dart`); auth token interceptor in `lib/core/interceptors/`.
|
||||||
|
- Models: `freezed` + `json_serializable` (→ `.freezed.dart` / `.g.dart`).
|
||||||
|
- Realtime: Pusher channels via `lib/core/websockets/` (`WsManager`).
|
||||||
|
- Features: ~40 self-contained folders under `lib/features/<feature>/`, conventionally `.../presentation/bloc/<name>_cubit/<name>_cubit.dart`. Tests mirror `lib/` under `test/` with fixtures in `test/fixtures/`.
|
||||||
|
- Localization: Russian only (`ru`); strings via generated `S` class from `lib/generated/l10n.dart`.
|
||||||
|
|
||||||
|
## Conventions / gotchas
|
||||||
|
|
||||||
|
- `analysis_options.yaml` enables `flutter_lints` + extra `prefer_const_*` rules and **excludes generated + l10n files** from analysis. `dart_code_metrics` is also configured (cyclomatic ≤20, ≤50 lines executable, ≤4 params, nesting ≤5) but metrics exclude `test/**`.
|
||||||
|
- Don't commit secrets: `.env`, `android/key.properties`, `*.jks` keystores are all gitignored.
|
||||||
|
- Comments and many code identifiers are in Russian (UI strings, doc comments like `/// Загрузка переменных окружения`); match surrounding style.
|
||||||
11
Makefile
11
Makefile
@@ -11,3 +11,14 @@ build-generated-files:
|
|||||||
|
|
||||||
clean-coverage:
|
clean-coverage:
|
||||||
@./scripts/remove_generated_from_coverage.sh
|
@./scripts/remove_generated_from_coverage.sh
|
||||||
|
|
||||||
|
# Регенерация манифеста API-контракта из исходников freezed-моделей.
|
||||||
|
# Манифест — источник требований мобильных моделей для eatvio-web
|
||||||
|
# (tests/Fixtures/Contract/flutter_model_contract.json).
|
||||||
|
export-api-contract:
|
||||||
|
dart run tool/export_api_contract.dart api_contract/flutter_model_contract.json
|
||||||
|
|
||||||
|
# Проверка актуальности манифеста (для CI): регенерирует и диффает с закоммиченным.
|
||||||
|
check-api-contract: export-api-contract
|
||||||
|
@git diff --exit-code api_contract/flutter_model_contract.json \
|
||||||
|
|| (echo "api_contract/flutter_model_contract.json устарел: регенерируй (make export-api-contract) и синхронизируй в eatvio-web tests/Fixtures/Contract/" && exit 1)
|
||||||
|
|||||||
@@ -13,36 +13,8 @@ analyzer:
|
|||||||
- '**/messages_all.dart'
|
- '**/messages_all.dart'
|
||||||
- '**/messages_en.dart'
|
- '**/messages_en.dart'
|
||||||
- '**/messages_ru.dart'
|
- '**/messages_ru.dart'
|
||||||
|
- build/**
|
||||||
|
- android/**
|
||||||
|
- ios/**
|
||||||
errors:
|
errors:
|
||||||
invalid_annotation_target: ignore
|
invalid_annotation_target: ignore
|
||||||
plugins:
|
|
||||||
- dart_code_metrics
|
|
||||||
|
|
||||||
dart_code_metrics:
|
|
||||||
extends:
|
|
||||||
- package:dart_code_metrics_presets/flutter_all.yaml
|
|
||||||
- package:dart_code_metrics_presets/bloc.yaml
|
|
||||||
metrics:
|
|
||||||
cyclomatic-complexity: 20
|
|
||||||
lines-of-executable-code: 50
|
|
||||||
number-of-parameters: 4
|
|
||||||
maximum-nesting-level: 5
|
|
||||||
metrics-exclude:
|
|
||||||
- test/**
|
|
||||||
# extends:
|
|
||||||
# - recommended
|
|
||||||
# anti-patterns:
|
|
||||||
# - long-method
|
|
||||||
# - long-parameter-list
|
|
||||||
# metrics:
|
|
||||||
# cyclomatic-complexity: 20
|
|
||||||
# lines-of-executable-code: 50
|
|
||||||
# number-of-parameters: 4
|
|
||||||
# maximum-nesting-level: 5
|
|
||||||
# metrics-exclude:
|
|
||||||
# - test/**
|
|
||||||
# - newline-before-return
|
|
||||||
# - no-boolean-literal-compare
|
|
||||||
# - no-empty-block
|
|
||||||
# - prefer-conditional-expressions
|
|
||||||
# - no-equal-then-else
|
|
||||||
|
|||||||
@@ -22,6 +22,13 @@ android {
|
|||||||
compileSdk = flutter.compileSdkVersion
|
compileSdk = flutter.compileSdkVersion
|
||||||
ndkVersion = flutter.ndkVersion
|
ndkVersion = flutter.ndkVersion
|
||||||
|
|
||||||
|
// Flutter 3.50 + AGP drops assets matching default ignoreAssetsPattern
|
||||||
|
// (files starting with '.' like .env, and '_*'-prefixed folders).
|
||||||
|
// See https://github.com/flutter/flutter/issues/196444
|
||||||
|
androidResources {
|
||||||
|
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
|
||||||
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
|||||||
@@ -8,7 +8,13 @@
|
|||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
<uses-permission
|
||||||
|
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||||
|
android:maxSdkVersion="32" />
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||||
|
android:maxSdkVersion="28"
|
||||||
|
tools:replace="android:maxSdkVersion" />
|
||||||
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
|
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
|
||||||
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
|
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
|
||||||
|
|
||||||
@@ -16,7 +22,8 @@
|
|||||||
android:label="Итвио"
|
android:label="Итвио"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
android:icon="@mipmap/ic_launcher">
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:requestLegacyExternalStorage="true">
|
||||||
<service
|
<service
|
||||||
android:name=".EatvioFcmMessagingService"
|
android:name=".EatvioFcmMessagingService"
|
||||||
android:exported="false">
|
android:exported="false">
|
||||||
|
|||||||
@@ -2,11 +2,14 @@ buildscript {
|
|||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven {url 'https://developer.huawei.com/repo/'}
|
maven {
|
||||||
|
url = 'https://repo.huaweicloud.com/repository/maven/'
|
||||||
|
content { includeGroupByRegex 'com\\.huawei.*' }
|
||||||
|
}
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.12.0'
|
classpath 'com.android.tools.build:gradle:9.3.1'
|
||||||
classpath 'com.huawei.agconnect:agcp:1.9.1.301'
|
classpath 'com.huawei.agconnect:agcp:1.9.1.301'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -15,7 +18,10 @@ allprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven {url 'https://developer.huawei.com/repo/'}
|
maven {
|
||||||
|
url = 'https://repo.huaweicloud.com/repository/maven/'
|
||||||
|
content { includeGroupByRegex 'com\\.huawei.*' }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,6 +59,40 @@ subprojects { Project subproject ->
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AGP 9 lint crashes in CommentDetector with NoSuchMethodError List.removeLast()
|
||||||
|
// (image_picker_android:lintVitalAnalyzeRelease). That check is fatal for release.
|
||||||
|
subprojects { Project subproject ->
|
||||||
|
subproject.tasks.configureEach { task ->
|
||||||
|
if (task.name.startsWith("lintVital")) {
|
||||||
|
task.enabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// AGP 9 enforces AAR metadata: plugins that still declare compileSdk 31 fail the build.
|
||||||
|
subprojects { Project subproject ->
|
||||||
|
def bumpCompileSdk = {
|
||||||
|
if (!subproject.plugins.hasPlugin('com.android.library')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
def androidExt = subproject.extensions.findByName('android')
|
||||||
|
if (androidExt == null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
androidExt.compileSdk = 36
|
||||||
|
} catch (Throwable t) {
|
||||||
|
subproject.logger.warn("[compileSdk-fix] Failed for ${subproject.path}: ${t.message}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// evaluationDependsOn(":app") can leave some projects already evaluated.
|
||||||
|
if (subproject.state.executed) {
|
||||||
|
bumpCompileSdk()
|
||||||
|
} else {
|
||||||
|
subproject.afterEvaluate { bumpCompileSdk() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tasks.register("clean", Delete) {
|
tasks.register("clean", Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,11 @@
|
|||||||
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
|
||||||
|
systemProp.org.gradle.internal.http.connectionTimeout=60000
|
||||||
|
systemProp.org.gradle.internal.http.socketTimeout=120000
|
||||||
|
systemProp.org.gradle.internal.repository.max.retries=5
|
||||||
|
systemProp.org.gradle.internal.repository.initial.backoff=2000
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=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
|
||||||
|
|||||||
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-all.zip
|
||||||
|
|||||||
@@ -12,18 +12,21 @@ pluginManagement {
|
|||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'https://developer.huawei.com/repo/' }
|
maven {
|
||||||
|
url = 'https://repo.huaweicloud.com/repository/maven/'
|
||||||
|
content { includeGroupByRegex 'com\\.huawei.*' }
|
||||||
|
}
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
|
||||||
id "com.android.application" version "8.12.0" apply false
|
id "com.android.application" version "9.3.1" apply false
|
||||||
// START: FlutterFire Configuration
|
// START: FlutterFire Configuration
|
||||||
id "com.google.gms.google-services" version "4.4.3" apply false
|
id "com.google.gms.google-services" version "4.4.3" apply false
|
||||||
// END: FlutterFire Configuration
|
// END: FlutterFire Configuration
|
||||||
id "org.jetbrains.kotlin.android" version "2.2.10" apply false
|
id "org.jetbrains.kotlin.android" version "2.4.20" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
include ":app"
|
include ":app"
|
||||||
|
|||||||
91
api_contract/README.md
Normal file
91
api_contract/README.md
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
# Регламент синхронизации API-контракта (eatvio/eatvio ↔ eatvio/eatvio_app)
|
||||||
|
|
||||||
|
> В тексте «eatvio-web» — локальное имя бэкенд-репозитория **eatvio/eatvio** (не slug!).
|
||||||
|
|
||||||
|
## Стороны и артефакты
|
||||||
|
|
||||||
|
| Репозиторий | Артефакт | Роль |
|
||||||
|
|---|---|---|
|
||||||
|
| eatvio_app | `tool/export_api_contract.dart` | генератор: парсит freezed-декларации из **исходников** (не из `*.g.dart`) |
|
||||||
|
| eatvio_app | `api_contract/flutter_model_contract.json` | **источник истины**: требования мобильных моделей к JSON (required/optional ключи) |
|
||||||
|
| eatvio-web | `tests/Fixtures/Contract/flutter_model_contract.json` | синхронизированная копия, по ней CI бэка валидирует API-ресурсы |
|
||||||
|
| eatvio-web | `tests/Feature/Contract/FlutterApiContractTest.php` | контрактные тесты: worst-case сериализация ресурса ↔ манифест |
|
||||||
|
|
||||||
|
Контракт односторонний по данным: бэкенд отдаёт JSON → flutter читает (`fromJson`). Экстремальный случай — nullable-колонка на бэке при required-поле во flutter: ровно он дал продовой баг FLUTTER-1BX (`satiety: null` → `TypeError` в `_$MealModelFromJson`, дневник мобильных клиентов не работал, КБЖУ-информер показал нули).
|
||||||
|
|
||||||
|
## Направление 1: backend → frontend (бэк меняет ответ API)
|
||||||
|
|
||||||
|
1. Дев меняет API-ресурс в eatvio-web (например, делает поле nullable / удаляет ключ).
|
||||||
|
2. `FlutterApiContractTest` падает, если новое поведение нарушает манифест — **это и есть фильтр обратной несовместимости**.
|
||||||
|
3. Дальше два осознанных пути:
|
||||||
|
- **Сохранить совместимость** (предпочтительно): вернуть значение/дефолт на бэке (`?? 0`, как с `time` → `'00:00:00'`). Манифест не меняется.
|
||||||
|
- **Ломать сознательно**: мержится mobile-first — сначала в eatvio_app поле становится nullable/опциональным, выходит релиз приложения; затем PR в eatvio-web меняет ресурс и копию манифеста. Пока старые версии приложения в рынке — бэк держит старый формат.
|
||||||
|
4. Коммит копии манифеста в eatvio-web без изменения ресурса бессмысленен и не проходит ревью: манифест меняется только вместе с ресурсом.
|
||||||
|
|
||||||
|
## Направление 2: frontend → backend (фронт ужесточает требования)
|
||||||
|
|
||||||
|
1. Дев меняет freezed-модель в eatvio_app (например, добавляет `required int nutrition`).
|
||||||
|
2. CI eatvio_app (`test.yml`, шаг `API contract manifest check`) регенерирует манифест и диффает: устарел → PR не проходит.
|
||||||
|
3. Дев обновляет манифест (`make export-api-contract`) и **в том же PR** синхронизирует копию в eatvio-web (`tests/Fixtures/Contract/`).
|
||||||
|
4. CI eatvio-web прогоняет `FlutterApiContractTest` против новой копии: если бэк не выдаёт новые required-ключи — падает уже там, и бэк добавляет гарантии **до** релиза приложения.
|
||||||
|
5. Порядок релизов: бэк докручивается первым (он назад-совместим), затем выходит приложение.
|
||||||
|
|
||||||
|
## Правила совместимости (шпаргалка)
|
||||||
|
|
||||||
|
| Изменение на бэке | Ломает приложение? | Действие |
|
||||||
|
|---|---|---|
|
||||||
|
| Поле остаётся non-null | нет | ничего |
|
||||||
|
| Добавлен новый ключ | нет (flutter игнорирует лишнее) | ничего; добавить в модель отдельно при необходимости |
|
||||||
|
| non-null → nullable / ключ удалён | **да** | mobile-first: релиз приложения, потом бэк |
|
||||||
|
| flutter: `int` → `int?` | нет | `make export-api-contract` + синк манифеста |
|
||||||
|
| flutter: добавлен `required`-ключ | **бэк может не выполнять** | синк манифеста → бэк добавляет ключ/дефолт до релиза |
|
||||||
|
|
||||||
|
## Автоматика
|
||||||
|
|
||||||
|
| Где | Что | Когда срабатывает |
|
||||||
|
|---|---|---|
|
||||||
|
| eatvio_app, CI | шаг `API contract manifest check` (test.yml) | каждый PR: манифест обязан быть регенерирован из исходников |
|
||||||
|
| eatvio_app, CI | `contract-sync.yml` | push в main с изменениями `api_contract/**` → авто-PR в eatvio (бэкенд) с новой копией манифеста |
|
||||||
|
| eatvio_app, локально | `make export-api-contract` / `make check-api-contract` | руками при работе над моделями |
|
||||||
|
| eatvio-web, CI | `FlutterApiContractTest` (12 тестов) | каждый PR: worst-case сериализация ресурсов ↔ манифест |
|
||||||
|
| eatvio-web, CI | `contract-drift-check.yaml` | еженощно: сравнение локальной копии манифеста с eatvio_app@main, при дрейфе — issue |
|
||||||
|
| eatvio-web, локально | `make sync-flutter-contract` | руками, если авто-PR не пришёл |
|
||||||
|
|
||||||
|
Секреты: `CONTRACT_SYNC_TOKEN` — PAT с write на eatvio/eatvio (для contract-sync) и read eatvio/eatvio_app + issues на eatvio/eatvio (для drift-check).
|
||||||
|
|
||||||
|
## Как команды держат друг друга в рабочем состоянии (три слоя)
|
||||||
|
|
||||||
|
1. **Предотвращение (до мержа).** Контрактные тесты на обеих сторонах: flutter не смержит модели без регенерации манифеста; бэкенд не смержит ресурс, отдающий null/не тот тип там, где приложение требует non-null.
|
||||||
|
2. **Синхронизация (при мерже).** Авто-PR из `contract-sync.yml` приносит новую копию манифеста в бэкенд; CI бэкенда на этом PR показывает, выполняет ли сервер новые требования. Ночной drift-check ловит всё, что проскочило мимо автоматики.
|
||||||
|
3. **Обнаружение (после релиза).** Sentry: группа `TypeError ... in _$XxxFromJson` (проект flutter) = нарушение контракта в проде. Такой issue должен ссылаться на контрактную пару и закрываться фиксом ресурса + контрак тестом.
|
||||||
|
|
||||||
|
Ритуалы:
|
||||||
|
- Меняешь модель в приложении → `make export-api-contract` в том же PR; манифест уедет в бэкенд автоматически.
|
||||||
|
- Меняешь API-ресурс → прогоняй контрактный тест; красный = либо делай совместимо (дефолты), либо mobile-first релиз.
|
||||||
|
- WARNING генератора о коллизии имён моделей (`Step`, `Users`, ...) — повод переименовать Dart-классы: под одним именем могут скрываться разные контракты.
|
||||||
|
|
||||||
|
## Формат манифеста
|
||||||
|
|
||||||
|
Каждая модель: `required` / `optional` (JSON-ключи), `types` (Dart-тип поля) и `kinds`
|
||||||
|
(JSON-вид значения, по которому бэкенд-чекер валидирует payload):
|
||||||
|
|
||||||
|
| kind | Dart-типы | Ожидание в JSON |
|
||||||
|
|---|---|---|
|
||||||
|
| `number` | `int`, `double`, `num` | число (int или float) |
|
||||||
|
| `string` | `String` | строка |
|
||||||
|
| `boolean` | `bool` | строго true/false (int 0/1 — нарушение) |
|
||||||
|
| `list` | `List<...>` | массив |
|
||||||
|
| `map` | `Map<...>` | объект |
|
||||||
|
| `model` | вложенная freezed-модель | объект |
|
||||||
|
| `enum` | Dart enum | строка-имя или int |
|
||||||
|
| `any` / `unknown` | `dynamic` и прочее | не проверяется |
|
||||||
|
|
||||||
|
Это закрывает второй класс мобильных крашей: жёсткие касты (`json['from_diet'] as bool`,
|
||||||
|
`json['quantity'] as num`) роняют приложение даже на non-null значениях — например,
|
||||||
|
если PHP отдаст tinyint `0/1` вместо bool или строку `"150"` вместо числа.
|
||||||
|
|
||||||
|
## Границы подхода
|
||||||
|
|
||||||
|
- Манифест покрывает **ответы** API (fromJson). Контракт запросов (retrofit → FormRequest) пока не формализован.
|
||||||
|
- Новый ключ бэкенда не требует изменения манифеста — flutter молча игнорирует лишнее; расширять модели — добровольно.
|
||||||
|
- `kinds: unknown` не проверяется (неклассифицированные типы), чтобы не давать ложных срабатываний.
|
||||||
4383
api_contract/flutter_model_contract.json
Normal file
4383
api_contract/flutter_model_contract.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
|||||||
import 'package:eatvio_app/app_keys.dart';
|
import 'package:eatvio_app/app_keys.dart';
|
||||||
import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.dart';
|
import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.dart';
|
||||||
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
|
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
/// Helper функции для интеграционных тестов создания рецепта
|
/// Helper функции для интеграционных тестов создания рецепта
|
||||||
|
|||||||
1
ios/.gitignore
vendored
1
ios/.gitignore
vendored
@@ -22,6 +22,7 @@ Flutter/app.flx
|
|||||||
Flutter/app.zip
|
Flutter/app.zip
|
||||||
Flutter/flutter_assets/
|
Flutter/flutter_assets/
|
||||||
Flutter/flutter_export_environment.sh
|
Flutter/flutter_export_environment.sh
|
||||||
|
Flutter/ephemeral/
|
||||||
ServiceDefinitions.json
|
ServiceDefinitions.json
|
||||||
Runner/GeneratedPluginRegistrant.*
|
Runner/GeneratedPluginRegistrant.*
|
||||||
|
|
||||||
|
|||||||
23
ios/Podfile
23
ios/Podfile
@@ -38,9 +38,25 @@ post_install do |installer|
|
|||||||
installer.pods_project.targets.each do |target|
|
installer.pods_project.targets.each do |target|
|
||||||
flutter_additional_ios_build_settings(target)
|
flutter_additional_ios_build_settings(target)
|
||||||
target.build_configurations.each do |config|
|
target.build_configurations.each do |config|
|
||||||
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
|
# iOS 26+ Apple Silicon simulators require arm64. Do not exclude it.
|
||||||
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
|
excluded = config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]']
|
||||||
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
|
if excluded.is_a?(String)
|
||||||
|
cleaned = excluded.split(/\s+/).reject { |arch| arch == 'arm64' }.join(' ')
|
||||||
|
if cleaned.empty?
|
||||||
|
config.build_settings.delete('EXCLUDED_ARCHS[sdk=iphonesimulator*]')
|
||||||
|
else
|
||||||
|
config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = cleaned
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Old plugins (e.g. flutter_keyboard_visibility) pin simulator to x86_64 only.
|
||||||
|
valid_archs = config.build_settings['VALID_ARCHS[sdk=iphonesimulator*]']
|
||||||
|
if valid_archs == 'x86_64'
|
||||||
|
config.build_settings['VALID_ARCHS[sdk=iphonesimulator*]'] = '$(ARCHS_STANDARD)'
|
||||||
|
end
|
||||||
|
|
||||||
|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
|
||||||
|
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
|
||||||
'$(inherited)',
|
'$(inherited)',
|
||||||
## dart: PermissionGroup.camera
|
## dart: PermissionGroup.camera
|
||||||
'PERMISSION_CAMERA=1',
|
'PERMISSION_CAMERA=1',
|
||||||
@@ -50,7 +66,6 @@ post_install do |installer|
|
|||||||
'PERMISSION_PHOTOS=1',
|
'PERMISSION_PHOTOS=1',
|
||||||
'PERMISSION_NOTIFICATIONS=1',
|
'PERMISSION_NOTIFICATIONS=1',
|
||||||
]
|
]
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
|
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
|
||||||
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
|
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
|
||||||
ACF3142BB74D6F5F3C98AD82 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EB9FE5381C3F532BD9A9456D /* GoogleService-Info.plist */; };
|
ACF3142BB74D6F5F3C98AD82 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EB9FE5381C3F532BD9A9456D /* GoogleService-Info.plist */; };
|
||||||
|
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
|
||||||
/* End PBXBuildFile section */
|
/* End PBXBuildFile section */
|
||||||
|
|
||||||
/* Begin PBXCopyFilesBuildPhase section */
|
/* Begin PBXCopyFilesBuildPhase section */
|
||||||
@@ -54,6 +55,7 @@
|
|||||||
DF0C4038A57E19D3ABA03C15 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
DF0C4038A57E19D3ABA03C15 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
||||||
EB9FE5381C3F532BD9A9456D /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
|
EB9FE5381C3F532BD9A9456D /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
|
||||||
FEE92A0E2D772EA300E6E989 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
|
FEE92A0E2D772EA300E6E989 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
|
||||||
|
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
|
||||||
/* End PBXFileReference section */
|
/* End PBXFileReference section */
|
||||||
|
|
||||||
/* Begin PBXFrameworksBuildPhase section */
|
/* Begin PBXFrameworksBuildPhase section */
|
||||||
@@ -61,6 +63,7 @@
|
|||||||
isa = PBXFrameworksBuildPhase;
|
isa = PBXFrameworksBuildPhase;
|
||||||
buildActionMask = 2147483647;
|
buildActionMask = 2147483647;
|
||||||
files = (
|
files = (
|
||||||
|
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
|
||||||
46B43B96F809CEC6058EFDD3 /* Pods_Runner.framework in Frameworks */,
|
46B43B96F809CEC6058EFDD3 /* Pods_Runner.framework in Frameworks */,
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
@@ -81,6 +84,7 @@
|
|||||||
9740EEB11CF90186004384FC /* Flutter */ = {
|
9740EEB11CF90186004384FC /* Flutter */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
|
78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
|
||||||
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
|
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
|
||||||
9740EEB21CF90195004384FC /* Debug.xcconfig */,
|
9740EEB21CF90195004384FC /* Debug.xcconfig */,
|
||||||
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
|
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
|
||||||
@@ -139,6 +143,9 @@
|
|||||||
|
|
||||||
/* Begin PBXNativeTarget section */
|
/* Begin PBXNativeTarget section */
|
||||||
97C146ED1CF9000F007C117D /* Runner */ = {
|
97C146ED1CF9000F007C117D /* Runner */ = {
|
||||||
|
packageProductDependencies = (
|
||||||
|
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
|
||||||
|
);
|
||||||
isa = PBXNativeTarget;
|
isa = PBXNativeTarget;
|
||||||
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
|
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
|
||||||
buildPhases = (
|
buildPhases = (
|
||||||
@@ -165,6 +172,9 @@
|
|||||||
|
|
||||||
/* Begin PBXProject section */
|
/* Begin PBXProject section */
|
||||||
97C146E61CF9000F007C117D /* Project object */ = {
|
97C146E61CF9000F007C117D /* Project object */ = {
|
||||||
|
packageReferences = (
|
||||||
|
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
|
||||||
|
);
|
||||||
isa = PBXProject;
|
isa = PBXProject;
|
||||||
attributes = {
|
attributes = {
|
||||||
BuildIndependentTargetsInParallel = YES;
|
BuildIndependentTargetsInParallel = YES;
|
||||||
@@ -639,6 +649,18 @@
|
|||||||
defaultConfigurationName = Release;
|
defaultConfigurationName = Release;
|
||||||
};
|
};
|
||||||
/* End XCConfigurationList section */
|
/* End XCConfigurationList section */
|
||||||
|
/* Begin XCLocalSwiftPackageReference section */
|
||||||
|
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
|
||||||
|
isa = XCLocalSwiftPackageReference;
|
||||||
|
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
|
||||||
|
};
|
||||||
|
/* End XCLocalSwiftPackageReference section */
|
||||||
|
/* Begin XCSwiftPackageProductDependency section */
|
||||||
|
78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
|
||||||
|
isa = XCSwiftPackageProductDependency;
|
||||||
|
productName = FlutterGeneratedPluginSwiftPackage;
|
||||||
|
};
|
||||||
|
/* End XCSwiftPackageProductDependency section */
|
||||||
};
|
};
|
||||||
rootObject = 97C146E61CF9000F007C117D /* Project object */;
|
rootObject = 97C146E61CF9000F007C117D /* Project object */;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,221 @@
|
|||||||
|
{
|
||||||
|
"pins" : [
|
||||||
|
{
|
||||||
|
"identity" : "abseil-cpp-binary",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/abseil-cpp-binary.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
|
||||||
|
"version" : "1.2024072200.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "app-check",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/app-check.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "97f7d74dd0e8f3d0fe5fc75cc8957aa73bdc948a",
|
||||||
|
"version" : "11.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "appmetrica-sdk-ios",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/appmetrica/appmetrica-sdk-ios",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "ed6c1a73eb2dae875a0d7801390eb6f0ee7bc12e",
|
||||||
|
"version" : "5.16.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "cryptoswift",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "f2a627b84c1ff96f21ac2fcb623ab36142dd5512",
|
||||||
|
"version" : "1.10.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "dkcamera",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/zhangao0086/DKCamera",
|
||||||
|
"state" : {
|
||||||
|
"branch" : "master",
|
||||||
|
"revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "dkimagepickercontroller",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/zhangao0086/DKImagePickerController",
|
||||||
|
"state" : {
|
||||||
|
"branch" : "4.3.9",
|
||||||
|
"revision" : "0bdfeacefa308545adde07bef86e349186335915"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "dkphotogallery",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/zhangao0086/DKPhotoGallery",
|
||||||
|
"state" : {
|
||||||
|
"branch" : "master",
|
||||||
|
"revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "firebase-ios-sdk",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/firebase/firebase-ios-sdk",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "42e81d245e30e49ea6a5830cf2842d44a1591270",
|
||||||
|
"version" : "12.15.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "google-ads-on-device-conversion-ios-sdk",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "dc39082d8881109d35b94b1c122164c0e8d08a55",
|
||||||
|
"version" : "3.6.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "googleappmeasurement",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/GoogleAppMeasurement.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "144855f40d8668927f256a3045f7fdc4c3f4338b",
|
||||||
|
"version" : "12.15.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "googledatatransport",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/GoogleDataTransport.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "ba3358d3c3dbae8ef230b58a46b97ad65e84e974",
|
||||||
|
"version" : "10.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "googleutilities",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/GoogleUtilities.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "5459ee5603def3db0fe14ca522185f42c48d978e",
|
||||||
|
"version" : "8.1.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "grpc-binary",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/grpc-binary.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
|
||||||
|
"version" : "1.69.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "gtm-session-fetcher",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/gtm-session-fetcher.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "724a52eea6329b7e12d3ad8300d76ca9f3895fcc",
|
||||||
|
"version" : "5.3.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "interop-ios-for-google-sdks",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
|
||||||
|
"version" : "101.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "kscrash",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/kstenerud/KSCrash",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "c0177658fc771ae833b6d3b8f5f3f5a14d59ec03",
|
||||||
|
"version" : "2.1.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "leveldb",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/firebase/leveldb.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
|
||||||
|
"version" : "1.22.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "nanopb",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/firebase/nanopb.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
|
||||||
|
"version" : "2.30910.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "promises",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/promises.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
|
||||||
|
"version" : "2.4.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "sdwebimage",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/SDWebImage/SDWebImage",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
|
||||||
|
"version" : "5.21.7"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "sentry-cocoa",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/getsentry/sentry-cocoa",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "9e193ac0b71760603aa666bad7e9e303dd7031a8",
|
||||||
|
"version" : "8.56.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "swift-collections",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/apple/swift-collections.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "88754449ab766a739610b660e117762115fabc9c",
|
||||||
|
"version" : "1.7.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "swiftygif",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/kirualex/SwiftyGif.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "4430cbc148baa3907651d40562d96325426f409a",
|
||||||
|
"version" : "5.4.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "tocropviewcontroller",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/TimOliver/TOCropViewController",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
|
||||||
|
"version" : "2.8.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version" : 2
|
||||||
|
}
|
||||||
@@ -5,6 +5,24 @@
|
|||||||
<BuildAction
|
<BuildAction
|
||||||
parallelizeBuildables = "YES"
|
parallelizeBuildables = "YES"
|
||||||
buildImplicitDependencies = "YES">
|
buildImplicitDependencies = "YES">
|
||||||
|
<PreActions>
|
||||||
|
<ExecutionAction
|
||||||
|
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
|
||||||
|
<ActionContent
|
||||||
|
title = "Run Prepare Flutter Framework Script"
|
||||||
|
scriptText = "/bin/sh "$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh" prepare ">
|
||||||
|
<EnvironmentBuildable>
|
||||||
|
<BuildableReference
|
||||||
|
BuildableIdentifier = "primary"
|
||||||
|
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
|
||||||
|
BuildableName = "Runner.app"
|
||||||
|
BlueprintName = "Runner"
|
||||||
|
ReferencedContainer = "container:Runner.xcodeproj">
|
||||||
|
</BuildableReference>
|
||||||
|
</EnvironmentBuildable>
|
||||||
|
</ActionContent>
|
||||||
|
</ExecutionAction>
|
||||||
|
</PreActions>
|
||||||
<BuildActionEntries>
|
<BuildActionEntries>
|
||||||
<BuildActionEntry
|
<BuildActionEntry
|
||||||
buildForTesting = "YES"
|
buildForTesting = "YES"
|
||||||
|
|||||||
221
ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
Normal file
221
ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
Normal file
@@ -0,0 +1,221 @@
|
|||||||
|
{
|
||||||
|
"pins" : [
|
||||||
|
{
|
||||||
|
"identity" : "abseil-cpp-binary",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/abseil-cpp-binary.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
|
||||||
|
"version" : "1.2024072200.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "app-check",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/app-check.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "97f7d74dd0e8f3d0fe5fc75cc8957aa73bdc948a",
|
||||||
|
"version" : "11.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "appmetrica-sdk-ios",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/appmetrica/appmetrica-sdk-ios",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "ed6c1a73eb2dae875a0d7801390eb6f0ee7bc12e",
|
||||||
|
"version" : "5.16.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "cryptoswift",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "f2a627b84c1ff96f21ac2fcb623ab36142dd5512",
|
||||||
|
"version" : "1.10.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "dkcamera",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/zhangao0086/DKCamera",
|
||||||
|
"state" : {
|
||||||
|
"branch" : "master",
|
||||||
|
"revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "dkimagepickercontroller",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/zhangao0086/DKImagePickerController",
|
||||||
|
"state" : {
|
||||||
|
"branch" : "4.3.9",
|
||||||
|
"revision" : "0bdfeacefa308545adde07bef86e349186335915"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "dkphotogallery",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/zhangao0086/DKPhotoGallery",
|
||||||
|
"state" : {
|
||||||
|
"branch" : "master",
|
||||||
|
"revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "firebase-ios-sdk",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/firebase/firebase-ios-sdk",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "42e81d245e30e49ea6a5830cf2842d44a1591270",
|
||||||
|
"version" : "12.15.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "google-ads-on-device-conversion-ios-sdk",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "dc39082d8881109d35b94b1c122164c0e8d08a55",
|
||||||
|
"version" : "3.6.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "googleappmeasurement",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/GoogleAppMeasurement.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "144855f40d8668927f256a3045f7fdc4c3f4338b",
|
||||||
|
"version" : "12.15.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "googledatatransport",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/GoogleDataTransport.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "ba3358d3c3dbae8ef230b58a46b97ad65e84e974",
|
||||||
|
"version" : "10.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "googleutilities",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/GoogleUtilities.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "5459ee5603def3db0fe14ca522185f42c48d978e",
|
||||||
|
"version" : "8.1.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "grpc-binary",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/grpc-binary.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
|
||||||
|
"version" : "1.69.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "gtm-session-fetcher",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/gtm-session-fetcher.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "724a52eea6329b7e12d3ad8300d76ca9f3895fcc",
|
||||||
|
"version" : "5.3.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "interop-ios-for-google-sdks",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/interop-ios-for-google-sdks.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
|
||||||
|
"version" : "101.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "kscrash",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/kstenerud/KSCrash",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "c0177658fc771ae833b6d3b8f5f3f5a14d59ec03",
|
||||||
|
"version" : "2.1.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "leveldb",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/firebase/leveldb.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
|
||||||
|
"version" : "1.22.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "nanopb",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/firebase/nanopb.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
|
||||||
|
"version" : "2.30910.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "promises",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/google/promises.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
|
||||||
|
"version" : "2.4.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "sdwebimage",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/SDWebImage/SDWebImage",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
|
||||||
|
"version" : "5.21.7"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "sentry-cocoa",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/getsentry/sentry-cocoa",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "9e193ac0b71760603aa666bad7e9e303dd7031a8",
|
||||||
|
"version" : "8.56.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "swift-collections",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/apple/swift-collections.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "88754449ab766a739610b660e117762115fabc9c",
|
||||||
|
"version" : "1.7.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "swiftygif",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/kirualex/SwiftyGif.git",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "4430cbc148baa3907651d40562d96325426f409a",
|
||||||
|
"version" : "5.4.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"identity" : "tocropviewcontroller",
|
||||||
|
"kind" : "remoteSourceControl",
|
||||||
|
"location" : "https://github.com/TimOliver/TOCropViewController",
|
||||||
|
"state" : {
|
||||||
|
"revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
|
||||||
|
"version" : "2.8.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"version" : 2
|
||||||
|
}
|
||||||
@@ -24,6 +24,10 @@
|
|||||||
<string>$(FLUTTER_BUILD_NUMBER)</string>
|
<string>$(FLUTTER_BUILD_NUMBER)</string>
|
||||||
<key>ITSAppUsesNonExemptEncryption</key>
|
<key>ITSAppUsesNonExemptEncryption</key>
|
||||||
<false/>
|
<false/>
|
||||||
|
<key>LSSupportsOpeningDocumentsInPlace</key>
|
||||||
|
<true/>
|
||||||
|
<key>UIFileSharingEnabled</key>
|
||||||
|
<true/>
|
||||||
<key>LSRequiresIPhoneOS</key>
|
<key>LSRequiresIPhoneOS</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>NSAppTransportSecurity</key>
|
<key>NSAppTransportSecurity</key>
|
||||||
|
|||||||
@@ -44,36 +44,94 @@ platform :ios do
|
|||||||
|
|
||||||
UI.message "Using auth_key_path: #{auth_key_path}"
|
UI.message "Using auth_key_path: #{auth_key_path}"
|
||||||
|
|
||||||
|
# Authenticate to App Store Connect early:
|
||||||
|
# needed here by latest_testflight_build_number, not only by upload_to_testflight.
|
||||||
|
app_store_connect_api_key(
|
||||||
|
key_id: "325JS9JCZH",
|
||||||
|
issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3",
|
||||||
|
key_filepath: auth_key_path,
|
||||||
|
duration: 1200,
|
||||||
|
in_house: false
|
||||||
|
)
|
||||||
|
|
||||||
# Configure Flutter for release mode
|
# Configure Flutter for release mode
|
||||||
UI.message "Configuring Flutter for release mode..."
|
UI.message "Configuring Flutter for release mode..."
|
||||||
sh("cd .. && flutter build ios --config-only --release")
|
sh("cd .. && flutter build ios --config-only --release")
|
||||||
|
|
||||||
# Read build number from Flutter Generated.xcconfig
|
# Read version and build number from Flutter Generated.xcconfig.
|
||||||
|
# They are only a floor: the actual build number is derived from TestFlight below,
|
||||||
|
# so repeated CI runs on the same commit can never hit
|
||||||
|
# ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE ("bundle version must be higher").
|
||||||
generated_xcconfig_path = File.join("..", "Flutter", "Generated.xcconfig")
|
generated_xcconfig_path = File.join("..", "Flutter", "Generated.xcconfig")
|
||||||
|
flutter_build_name = nil
|
||||||
flutter_build_number = nil
|
flutter_build_number = nil
|
||||||
|
|
||||||
if File.exist?(generated_xcconfig_path)
|
if File.exist?(generated_xcconfig_path)
|
||||||
File.foreach(generated_xcconfig_path) do |line|
|
File.foreach(generated_xcconfig_path) do |line|
|
||||||
matches = line.match(/FLUTTER_BUILD_NUMBER=(.*)/)
|
if (m = line.match(/FLUTTER_BUILD_NAME=(.*)/))
|
||||||
if matches
|
flutter_build_name = m[1].strip
|
||||||
flutter_build_number = matches[1].strip
|
elsif (m = line.match(/FLUTTER_BUILD_NUMBER=(.*)/))
|
||||||
break
|
flutter_build_number = m[1].strip
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if flutter_build_number.nil?
|
if flutter_build_name.nil? || flutter_build_number.nil?
|
||||||
UI.user_error!("Could not find FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
|
UI.user_error!("Could not find FLUTTER_BUILD_NAME/FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
|
||||||
end
|
end
|
||||||
|
|
||||||
UI.message "Flutter build number: #{flutter_build_number}"
|
UI.message "Flutter version from pubspec: #{flutter_build_name} (#{flutter_build_number})"
|
||||||
|
|
||||||
|
# Apple closes a version train once that version is approved/released.
|
||||||
|
# Uploading into a closed train wastes a full ~8 min build and fails only
|
||||||
|
# at the upload step with altool 90186 ("closed for new build submissions")
|
||||||
|
# / 90062 ("must be higher than the previously approved version").
|
||||||
|
# Fail fast here, before building.
|
||||||
|
closed_train_states = [
|
||||||
|
Spaceship::ConnectAPI::AppStoreVersion::AppVersionState::READY_FOR_DISTRIBUTION,
|
||||||
|
Spaceship::ConnectAPI::AppStoreVersion::AppVersionState::PROCESSING_FOR_DISTRIBUTION,
|
||||||
|
Spaceship::ConnectAPI::AppStoreVersion::AppVersionState::PENDING_DEVELOPER_RELEASE,
|
||||||
|
Spaceship::ConnectAPI::AppStoreVersion::AppVersionState::PENDING_APPLE_RELEASE
|
||||||
|
].join(",")
|
||||||
|
asc_app = Spaceship::ConnectAPI::App.find("com.eatvioapp.app")
|
||||||
|
closed_train = nil
|
||||||
|
if asc_app.nil?
|
||||||
|
UI.important("App com.eatvioapp.app not found in App Store Connect, skipping closed-train guard")
|
||||||
|
else
|
||||||
|
closed_train = asc_app.get_app_store_versions(
|
||||||
|
filter: {
|
||||||
|
appVersionState: closed_train_states,
|
||||||
|
platform: Spaceship::ConnectAPI::Platform::IOS
|
||||||
|
}
|
||||||
|
).find do |v|
|
||||||
|
(Gem::Version.new(v.version_string) >= Gem::Version.new(flutter_build_name))
|
||||||
|
rescue ArgumentError
|
||||||
|
false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if closed_train
|
||||||
|
UI.user_error!(
|
||||||
|
"Version train #{closed_train.version_string} is closed for new submissions " \
|
||||||
|
"(#{closed_train.app_version_state}), pubspec version is #{flutter_build_name}. " \
|
||||||
|
"Bump the version in pubspec.yaml above #{closed_train.version_string} and re-run."
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
asc_latest_build_number = latest_testflight_build_number(
|
||||||
|
app_identifier: "com.eatvioapp.app",
|
||||||
|
version: flutter_build_name,
|
||||||
|
initial_build_number: flutter_build_number.to_i
|
||||||
|
)
|
||||||
|
|
||||||
|
new_build_number = [flutter_build_number.to_i, asc_latest_build_number].max + 1
|
||||||
|
UI.message "Latest TestFlight build number: #{asc_latest_build_number} -> uploading build #{new_build_number}"
|
||||||
|
|
||||||
match(type: "appstore", readonly: true)
|
match(type: "appstore", readonly: true)
|
||||||
|
|
||||||
# Set build number explicitly instead of incrementing
|
# Set build number explicitly instead of incrementing
|
||||||
increment_build_number(
|
increment_build_number(
|
||||||
xcodeproj: "Runner.xcodeproj",
|
xcodeproj: "Runner.xcodeproj",
|
||||||
build_number: flutter_build_number
|
build_number: new_build_number
|
||||||
)
|
)
|
||||||
|
|
||||||
update_code_signing_settings(
|
update_code_signing_settings(
|
||||||
@@ -93,28 +151,33 @@ platform :ios do
|
|||||||
export_team_id: "VL68C36HYS"
|
export_team_id: "VL68C36HYS"
|
||||||
)
|
)
|
||||||
|
|
||||||
app_store_connect_api_key(
|
|
||||||
key_id: "325JS9JCZH",
|
|
||||||
issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3",
|
|
||||||
key_filepath: auth_key_path,
|
|
||||||
duration: 1200,
|
|
||||||
in_house: false
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
begin
|
begin
|
||||||
upload_to_testflight(
|
upload_to_testflight(
|
||||||
skip_waiting_for_build_processing: true,
|
skip_waiting_for_build_processing: true,
|
||||||
skip_submission: true,
|
skip_submission: true,
|
||||||
distribute_external: false,
|
distribute_external: false,
|
||||||
notify_external_testers: false,
|
notify_external_testers: false,
|
||||||
changelog: "TestFlight build #{flutter_build_number}",
|
changelog: "TestFlight build #{new_build_number}",
|
||||||
verbose: true
|
verbose: true
|
||||||
)
|
)
|
||||||
rescue => ex
|
rescue => ex
|
||||||
UI.error "Upload to TestFlight failed: #{ex.message}"
|
# Xcode 26 altool prints a harmless "ERROR: ... CDUploaderStateInfoResumeFilePath"
|
||||||
UI.error "Full error: #{ex.backtrace.join("\n")}"
|
# line even when the package was delivered fine (UPLOAD SUCCEEDED appears in the
|
||||||
raise ex
|
# same output). fastlane < 2.240.0 treats every ERROR line as a failure
|
||||||
|
# (fastlane#30130), so the lane would die after a successful upload.
|
||||||
|
# Real Apple rejections (90186 closed train, 90062 version too low, ...) always
|
||||||
|
# contain UPLOAD FAILED and/or iris-code - those must still fail the lane.
|
||||||
|
if ex.message.include?("CDUploaderStateInfoResumeFilePath") &&
|
||||||
|
!ex.message.include?("UPLOAD FAILED") &&
|
||||||
|
!ex.message.include?("iris-code")
|
||||||
|
UI.important("altool delivered the package but reported a bogus resume-file ERROR " \
|
||||||
|
"(fastlane#30130). Treating upload as successful - " \
|
||||||
|
"verify the build appears in TestFlight.")
|
||||||
|
else
|
||||||
|
UI.error "Upload to TestFlight failed: #{ex.message}"
|
||||||
|
UI.error "Full error: #{ex.backtrace.join("\n")}"
|
||||||
|
raise ex
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class AppKeys {
|
class AppKeys {
|
||||||
// Auth Screen
|
// Auth Screen
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
|
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -15,9 +15,8 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
|
|||||||
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
|
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
|
||||||
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
|
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
|
||||||
|
|
||||||
/// Конфигурация приложения
|
/// Конфигурация приложения
|
||||||
class AppConfig {
|
class AppConfig {
|
||||||
@@ -33,6 +32,20 @@ class AppConfig {
|
|||||||
late String _baseUrl;
|
late String _baseUrl;
|
||||||
String get baseUrl => _baseUrl;
|
String get baseUrl => _baseUrl;
|
||||||
|
|
||||||
|
/// Продуктовые хосты API. Сравнение по хосту целиком: поддомены
|
||||||
|
/// (например `*-hasan.eatvio.ru`) — это стенды разработки, не прод.
|
||||||
|
static const List<String> prodApiHosts = ['eatvio.ru', 'eatvio.com'];
|
||||||
|
|
||||||
|
/// Текущий base URL указывает на продуктовый API?
|
||||||
|
bool get isProdApi {
|
||||||
|
final host = Uri.tryParse(baseUrl)?.host.toLowerCase() ?? '';
|
||||||
|
if (host.isEmpty) return false;
|
||||||
|
return prodApiHosts.any((prodHost) => host == prodHost || host == 'www.$prodHost');
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Работаем на стенде разработки/stage (не на продуктовом API)?
|
||||||
|
bool get isDevOrStageStand => !isProdApi;
|
||||||
|
|
||||||
void setBaseUrl(String baseUrls) {
|
void setBaseUrl(String baseUrls) {
|
||||||
_baseUrl = baseUrls;
|
_baseUrl = baseUrls;
|
||||||
_persistBaseUrl(baseUrls);
|
_persistBaseUrl(baseUrls);
|
||||||
@@ -83,12 +96,7 @@ class AppConfig {
|
|||||||
];
|
];
|
||||||
|
|
||||||
/// Делегаты локализации
|
/// Делегаты локализации
|
||||||
List<LocalizationsDelegate> get localizationDelegates => [
|
List<LocalizationsDelegate> get localizationDelegates => [S.delegate, ...GlobalMaterialLocalizations.delegates];
|
||||||
S.delegate,
|
|
||||||
GlobalMaterialLocalizations.delegate,
|
|
||||||
GlobalWidgetsLocalizations.delegate,
|
|
||||||
GlobalCupertinoLocalizations.delegate,
|
|
||||||
];
|
|
||||||
|
|
||||||
/// Поддерживаемые локали
|
/// Поддерживаемые локали
|
||||||
List<Locale> get supportedLocales => [
|
List<Locale> get supportedLocales => [
|
||||||
|
|||||||
@@ -18,21 +18,22 @@ class AppInitializer {
|
|||||||
static Future<void> initialize({required AppBuildType buildType}) async {
|
static Future<void> initialize({required AppBuildType buildType}) async {
|
||||||
await _initializeEnvironment();
|
await _initializeEnvironment();
|
||||||
await _initializeDependencyInjection(buildType: buildType);
|
await _initializeDependencyInjection(buildType: buildType);
|
||||||
await _initializeSentry();
|
_preserveSplash();
|
||||||
await _initializeFirebase();
|
await _initializeFirebase();
|
||||||
await _initializeDebugMode();
|
await _initializeDebugMode();
|
||||||
await _initializeAnalytics();
|
await _initializeAnalytics();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Инициализация Sentry
|
static void _preserveSplash() {
|
||||||
static Future<void> _initializeSentry() async {
|
|
||||||
final widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized();
|
final widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized();
|
||||||
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
|
FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Загрузка переменных окружения
|
/// Загрузка переменных окружения
|
||||||
static Future<void> _initializeEnvironment() async {
|
static Future<void> _initializeEnvironment() async {
|
||||||
await dotenv.load(fileName: ".env");
|
if (!dotenv.isInitialized) {
|
||||||
|
await dotenv.load(fileName: '.env');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Инициализация Firebase
|
/// Инициализация Firebase
|
||||||
@@ -64,20 +65,25 @@ class AppInitializer {
|
|||||||
|
|
||||||
/// Инициализация аналитики
|
/// Инициализация аналитики
|
||||||
static Future<void> _initializeAnalytics() async {
|
static Future<void> _initializeAnalytics() async {
|
||||||
AppMetrica.activate(AppMetricaConfig(EnvConfig.appMetricaApiKey));
|
AppMetrica.activate(AppMetricaConfig(EnvConfig.appMetricaApiKey, flutterCrashReporting: false));
|
||||||
AppMetrica.reportEvent('Application started');
|
AppMetrica.reportEvent('Application started');
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Запуск приложения с Sentry
|
/// Запуск приложения с Sentry
|
||||||
static Future<void> runAppWithSentry(VoidCallback appRunner) async {
|
static Future<void> runAppWithSentry(
|
||||||
|
FutureOr<void> Function() appRunner,
|
||||||
|
) async {
|
||||||
|
SentryWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
await _initializeEnvironment();
|
||||||
|
const sendInDebug = bool.fromEnvironment('SENTRY_IN_DEBUG');
|
||||||
await SentryFlutter.init((options) {
|
await SentryFlutter.init((options) {
|
||||||
options.dsn = EnvConfig.sentryDsn;
|
options.dsn = EnvConfig.sentryDsn;
|
||||||
options.tracesSampleRate = 1.0;
|
options.tracesSampleRate = 1.0;
|
||||||
options.debug = false;
|
options.debug = false;
|
||||||
|
if (kDebugMode && sendInDebug) options.environment = 'debug';
|
||||||
options.beforeSend = (event, hint) {
|
options.beforeSend = (event, hint) {
|
||||||
if (kDebugMode) return null;
|
if (kDebugMode && !sendInDebug) return null;
|
||||||
if (!ErrorReportPolicy.allowSentryEvent(event, hint)) return null;
|
return ErrorReportPolicy.prepareSentryEvent(event, hint);
|
||||||
return event;
|
|
||||||
};
|
};
|
||||||
}, appRunner: appRunner);
|
}, appRunner: appRunner);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import 'package:eatvio_app/core/routing/route_constants.dart';
|
|||||||
import 'package:eatvio_app/core/routing/settings_routes.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/auth/entities/auth_result_entity.dart';
|
||||||
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
|
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_native_splash/flutter_native_splash.dart';
|
import 'package:flutter_native_splash/flutter_native_splash.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
|
|||||||
import 'package:eatvio_app/core/widgets/custom_divider.dart';
|
import 'package:eatvio_app/core/widgets/custom_divider.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
void showCommentsActionsBottomSheet(
|
void showCommentsActionsBottomSheet(
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ part 'comments_service.g.dart';
|
|||||||
|
|
||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class CommentsService {
|
abstract class CommentsService {
|
||||||
factory CommentsService(Dio dio, {String baseUrl}) = _CommentsService;
|
factory CommentsService(
|
||||||
|
Dio dio, {
|
||||||
|
String baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _CommentsService;
|
||||||
|
|
||||||
@DELETE('/api/comments/{id}')
|
@DELETE('/api/comments/{id}')
|
||||||
Future<void> deleteComment(@Path('id') int id);
|
Future<void> deleteComment(@Path('id') int id);
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
|
|||||||
import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
|
import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
|
import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
|
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart';
|
||||||
import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
|
import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
|
||||||
import 'package:get_it/get_it.dart';
|
import 'package:get_it/get_it.dart';
|
||||||
|
|
||||||
@@ -97,6 +98,7 @@ class CubitRegistrations {
|
|||||||
systemPipCoordinator: sl(),
|
systemPipCoordinator: sl(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
sl.registerLazySingleton<FeedCubit>(() => FeedCubit(feedRepository: sl()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Регистрация Cubit'ов как фабрик
|
/// Регистрация Cubit'ов как фабрик
|
||||||
@@ -108,10 +110,15 @@ class CubitRegistrations {
|
|||||||
firebaseApi: sl(),
|
firebaseApi: sl(),
|
||||||
prefs: sl(),
|
prefs: sl(),
|
||||||
profileRepository: sl(),
|
profileRepository: sl(),
|
||||||
|
sessionLifecycleService: sl(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
sl.registerFactory<RegistrationCubit>(
|
sl.registerFactory<RegistrationCubit>(
|
||||||
() => RegistrationCubit(registrationRepository: sl(), prefs: sl()),
|
() => RegistrationCubit(
|
||||||
|
registrationRepository: sl(),
|
||||||
|
prefs: sl(),
|
||||||
|
sessionLifecycleService: sl(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
sl.registerFactory<ResetPasswordCubit>(
|
sl.registerFactory<ResetPasswordCubit>(
|
||||||
() => ResetPasswordCubit(resetPasswordRepository: sl()),
|
() => ResetPasswordCubit(resetPasswordRepository: sl()),
|
||||||
@@ -120,14 +127,21 @@ class CubitRegistrations {
|
|||||||
() => VerifyEmailCubit(profileRepository: sl(), prefs: sl()),
|
() => VerifyEmailCubit(profileRepository: sl(), prefs: sl()),
|
||||||
);
|
);
|
||||||
sl.registerFactory<OAuthCubit>(
|
sl.registerFactory<OAuthCubit>(
|
||||||
() => OAuthCubit(authRepository: sl(), firebaseApi: sl(), prefs: sl()),
|
() => OAuthCubit(
|
||||||
|
authRepository: sl(),
|
||||||
|
firebaseApi: sl(),
|
||||||
|
prefs: sl(),
|
||||||
|
sessionLifecycleService: sl(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
sl.registerFactory<RegistrationCubitV2>(
|
sl.registerFactory<RegistrationCubitV2>(
|
||||||
() =>
|
() => RegistrationCubitV2(
|
||||||
RegistrationCubitV2(registrationRepository: sl(), firebaseApi: sl()),
|
registrationRepository: sl(),
|
||||||
|
firebaseApi: sl(),
|
||||||
|
sessionLifecycleService: sl(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
// Feed related cubits
|
// Feed related cubits
|
||||||
sl.registerFactory<FeedCubit>(() => FeedCubit(feedRepository: sl()));
|
|
||||||
sl.registerFactory<RecipesCubit>(
|
sl.registerFactory<RecipesCubit>(
|
||||||
() => RecipesCubit(
|
() => RecipesCubit(
|
||||||
feedRepository: sl(),
|
feedRepository: sl(),
|
||||||
@@ -242,6 +256,7 @@ class CubitRegistrations {
|
|||||||
settingsRepository: sl(),
|
settingsRepository: sl(),
|
||||||
consultantRepository: sl(),
|
consultantRepository: sl(),
|
||||||
consultationsRepository: sl(),
|
consultationsRepository: sl(),
|
||||||
|
sessionLifecycleService: sl(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
sl.registerFactory<RegisterConsultantCubit>(
|
sl.registerFactory<RegisterConsultantCubit>(
|
||||||
@@ -263,7 +278,7 @@ class CubitRegistrations {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
sl.registerFactory<ConsultationsCubit>(
|
sl.registerFactory<ConsultationsCubit>(
|
||||||
() => ConsultationsCubit(consultationsRepository: sl()),
|
() => ConsultationsCubit(consultationsRepository: sl(), chatRepository: sl()),
|
||||||
);
|
);
|
||||||
sl.registerFactory<ConsultantCommentsCubit>(
|
sl.registerFactory<ConsultantCommentsCubit>(
|
||||||
() => ConsultantCommentsCubit(diaryRepository: sl()),
|
() => ConsultantCommentsCubit(diaryRepository: sl()),
|
||||||
@@ -297,7 +312,7 @@ class CubitRegistrations {
|
|||||||
sl.registerFactory<UserDetailsCubit>(
|
sl.registerFactory<UserDetailsCubit>(
|
||||||
() => UserDetailsCubit(profileRepository: sl()),
|
() => UserDetailsCubit(profileRepository: sl()),
|
||||||
);
|
);
|
||||||
sl.registerFactory<MenuCubit>(() => MenuCubit(sl()));
|
sl.registerFactory<MenuCubit>(() => MenuCubit(sl(), sl()));
|
||||||
sl.registerFactory<MarketingCubit>(() => MarketingCubit(sl()));
|
sl.registerFactory<MarketingCubit>(() => MarketingCubit(sl()));
|
||||||
sl.registerFactory<PersonalDietSuggestionCubit>(
|
sl.registerFactory<PersonalDietSuggestionCubit>(
|
||||||
() => PersonalDietSuggestionCubit(
|
() => PersonalDietSuggestionCubit(
|
||||||
@@ -305,5 +320,8 @@ class CubitRegistrations {
|
|||||||
personalDietSuggestionService: sl(),
|
personalDietSuggestionService: sl(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
sl.registerFactory<VideoCallRecordingsCubit>(
|
||||||
|
() => VideoCallRecordingsCubit(repository: sl()),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:eatvio_app/core/app_config.dart';
|
import 'package:eatvio_app/core/app_config.dart';
|
||||||
import 'package:eatvio_app/core/constants/app_constants.dart';
|
import 'package:eatvio_app/core/constants/app_constants.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/api_response_dio.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/api_response_error_reporter.dart';
|
||||||
import 'package:eatvio_app/core/error_reporting/error_reporter.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/error_reporting/sentry_error_reporter.dart';
|
||||||
import 'package:eatvio_app/core/interceptors/phone_verify_error_interceptor.dart';
|
import 'package:eatvio_app/core/interceptors/phone_verify_error_interceptor.dart';
|
||||||
@@ -18,14 +20,15 @@ class ExternalRegistrations {
|
|||||||
/// Регистрация всех внешних зависимостей
|
/// Регистрация всех внешних зависимостей
|
||||||
static void registerAll() {
|
static void registerAll() {
|
||||||
sl.registerLazySingleton<ErrorReporter>(SentryErrorReporter.new);
|
sl.registerLazySingleton<ErrorReporter>(SentryErrorReporter.new);
|
||||||
|
sl.registerLazySingleton(() => ApiResponseErrorReporter(sl()));
|
||||||
_registerDio();
|
_registerDio();
|
||||||
_registerPrefs();
|
_registerPrefs();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Регистрация Dio HTTP клиента
|
/// Регистрация Dio HTTP клиента
|
||||||
static void _registerDio() {
|
static void _registerDio() {
|
||||||
sl.registerLazySingleton(
|
sl.registerLazySingleton<Dio>(
|
||||||
() => Dio(
|
() => ApiResponseDio(
|
||||||
BaseOptions(
|
BaseOptions(
|
||||||
baseUrl: sl<AppConfig>().baseUrl,
|
baseUrl: sl<AppConfig>().baseUrl,
|
||||||
headers: {'accept': 'application/json', 'content-type': 'application/json'},
|
headers: {'accept': 'application/json', 'content-type': 'application/json'},
|
||||||
@@ -33,6 +36,7 @@ class ExternalRegistrations {
|
|||||||
receiveTimeout: AppConstants.pendingDelay,
|
receiveTimeout: AppConstants.pendingDelay,
|
||||||
sendTimeout: AppConstants.pendingDelay,
|
sendTimeout: AppConstants.pendingDelay,
|
||||||
),
|
),
|
||||||
|
sl(),
|
||||||
)..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor()])
|
)..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor()])
|
||||||
..addSentry(
|
..addSentry(
|
||||||
failedRequestStatusCodes: const [SentryStatusCode.defaultRange()],
|
failedRequestStatusCodes: const [SentryStatusCode.defaultRange()],
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ 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/feed/repositories/feed_repository.dart';
|
||||||
import 'package:eatvio_app/features/glossary/repositories/glossary_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/barcode/repositories/barcode_repository.dart';
|
||||||
|
import 'package:eatvio_app/features/insights/repositories/insights_repository.dart';
|
||||||
import 'package:eatvio_app/features/menu/presentation/repositories/blocked_users_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/menu/repositories/notification_settings_repository.dart';
|
||||||
import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
|
import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
|
||||||
@@ -35,6 +36,7 @@ import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.da
|
|||||||
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
|
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
|
||||||
import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
|
import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
|
||||||
import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
|
import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
|
import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
|
||||||
import 'package:get_it/get_it.dart';
|
import 'package:get_it/get_it.dart';
|
||||||
|
|
||||||
@@ -53,8 +55,15 @@ class RepositoryRegistrations {
|
|||||||
// Core repositories
|
// Core repositories
|
||||||
sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));
|
sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));
|
||||||
sl.registerLazySingleton<VideoCallRepository>(() => VideoCallRepository(videoCallService: sl()));
|
sl.registerLazySingleton<VideoCallRepository>(() => VideoCallRepository(videoCallService: sl()));
|
||||||
|
sl.registerLazySingleton<VideoCallRecordingsRepository>(
|
||||||
|
() => VideoCallRecordingsRepository(
|
||||||
|
videoCallService: sl(),
|
||||||
|
fileService: sl(),
|
||||||
|
),
|
||||||
|
);
|
||||||
sl.registerLazySingleton<FeedRepository>(() => FeedRepository(feedService: sl()));
|
sl.registerLazySingleton<FeedRepository>(() => FeedRepository(feedService: sl()));
|
||||||
sl.registerLazySingleton<ProfileRepository>(() => ProfileRepository(profileService: sl()));
|
sl.registerLazySingleton<ProfileRepository>(() => ProfileRepository(profileService: sl()));
|
||||||
|
sl.registerLazySingleton<InsightsRepository>(() => InsightsRepository(profileRepository: sl(), insightsService: sl()));
|
||||||
sl.registerLazySingleton<CalendarRepository>(() => CalendarRepository(calendarService: sl()));
|
sl.registerLazySingleton<CalendarRepository>(() => CalendarRepository(calendarService: sl()));
|
||||||
sl.registerLazySingleton<SettingsRepository>(() => SettingsRepository(settingsService: sl()));
|
sl.registerLazySingleton<SettingsRepository>(() => SettingsRepository(settingsService: sl()));
|
||||||
sl.registerLazySingleton<ConsultantRepository>(() => ConsultantRepository(consultantService: sl()));
|
sl.registerLazySingleton<ConsultantRepository>(() => ConsultantRepository(consultantService: sl()));
|
||||||
@@ -77,7 +86,9 @@ class RepositoryRegistrations {
|
|||||||
sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
|
sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
|
||||||
sl.registerLazySingleton<NotificationSettingsRepository>(() => NotificationSettingsRepository(sl()));
|
sl.registerLazySingleton<NotificationSettingsRepository>(() => NotificationSettingsRepository(sl()));
|
||||||
sl.registerLazySingleton<SbpRepository>(() => SbpRepository(sbpService: sl()));
|
sl.registerLazySingleton<SbpRepository>(() => SbpRepository(sbpService: sl()));
|
||||||
sl.registerLazySingleton<PaymentRepository>(() => PaymentRepository(chatService: sl()));
|
sl.registerLazySingleton<PaymentRepository>(
|
||||||
|
() => PaymentRepository(chatService: sl(), responseErrors: sl()),
|
||||||
|
);
|
||||||
sl.registerLazySingleton<PersonalDietSuggestionRepository>(() => PersonalDietSuggestionRepository(personalDietSuggestionService: sl()));
|
sl.registerLazySingleton<PersonalDietSuggestionRepository>(() => PersonalDietSuggestionRepository(personalDietSuggestionService: sl()));
|
||||||
sl.registerLazySingleton<RegistrationRepositoryV2>(() => RegistrationRepositoryV2(registrationService: sl()));
|
sl.registerLazySingleton<RegistrationRepositoryV2>(() => RegistrationRepositoryV2(registrationService: sl()));
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'package:eatvio_app/core/error_reporting/api_response_error_reporter.dart';
|
||||||
import 'package:eatvio_app/core/comments/services/comments_service.dart';
|
import 'package:eatvio_app/core/comments/services/comments_service.dart';
|
||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
import 'package:eatvio_app/core/firebase_api.dart';
|
||||||
import 'package:eatvio_app/core/views/service/views_service.dart';
|
import 'package:eatvio_app/core/views/service/views_service.dart';
|
||||||
@@ -19,6 +20,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/diets/services/diet_service.dart';
|
||||||
import 'package:eatvio_app/features/feed/services/feed_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/glossary/services/glossary_service.dart';
|
||||||
|
import 'package:eatvio_app/features/insights/services/insights_service.dart';
|
||||||
import 'package:eatvio_app/features/barcode/services/barcode_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/blocked_users_service.dart';
|
||||||
import 'package:eatvio_app/features/menu/services/notification_settings_service.dart';
|
import 'package:eatvio_app/features/menu/services/notification_settings_service.dart';
|
||||||
@@ -36,6 +38,8 @@ import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
|
|||||||
import 'package:eatvio_app/features/registration/services/registration_service.dart';
|
import 'package:eatvio_app/features/registration/services/registration_service.dart';
|
||||||
import 'package:eatvio_app/features/registration_v2/services/registration_service_v2.dart';
|
import 'package:eatvio_app/features/registration_v2/services/registration_service_v2.dart';
|
||||||
import 'package:eatvio_app/features/settings/services/settings_service.dart';
|
import 'package:eatvio_app/features/settings/services/settings_service.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/services/public_downloads_saver.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/services/video_call_recording_file_service.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/services/video_call_callkit_coordinator.dart';
|
import 'package:eatvio_app/features/video_calls/services/video_call_callkit_coordinator.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
|
import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
|
import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
|
||||||
@@ -53,30 +57,83 @@ class ServiceRegistrations {
|
|||||||
/// Регистрация Service как синглтонов
|
/// Регистрация Service как синглтонов
|
||||||
static void _registerSingletonServices() {
|
static void _registerSingletonServices() {
|
||||||
// Core services
|
// Core services
|
||||||
sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
|
sl.registerLazySingleton<ChatService>(
|
||||||
sl.registerLazySingleton<VideoCallService>(() => VideoCallService(sl()));
|
() => ChatService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<FeedService>(() => FeedService(sl()));
|
);
|
||||||
sl.registerLazySingleton<ProfileService>(() => ProfileService(sl()));
|
sl.registerLazySingleton<VideoCallService>(
|
||||||
sl.registerLazySingleton<CalendarService>(() => CalendarService(sl()));
|
() => VideoCallService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<SettingsService>(() => SettingsService(sl()));
|
);
|
||||||
sl.registerLazySingleton<ConsultantService>(() => ConsultantService(sl()));
|
sl.registerLazySingleton<PublicDownloadsSaver>(
|
||||||
sl.registerLazySingleton<DiaryService>(() => DiaryService(sl()));
|
() => const PublicDownloadsSaver(),
|
||||||
sl.registerLazySingleton<GlossaryService>(() => GlossaryService(sl()));
|
);
|
||||||
sl.registerLazySingleton<BarcodeService>(() => BarcodeService(sl()));
|
sl.registerLazySingleton<VideoCallRecordingFileService>(
|
||||||
sl.registerLazySingleton<DietService>(() => DietService(sl()));
|
() => VideoCallRecordingFileService(dio: sl(), downloadsSaver: sl()),
|
||||||
sl.registerLazySingleton<PlansService>(() => PlansService(sl()));
|
);
|
||||||
sl.registerLazySingleton<PlanService>(() => PlanService(sl()));
|
sl.registerLazySingleton<FeedService>(
|
||||||
sl.registerLazySingleton<MyDietsService>(() => MyDietsService(sl()));
|
() => FeedService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<MyPlansService>(() => MyPlansService(sl()));
|
);
|
||||||
sl.registerLazySingleton<WsService>(() => WsService(sl()));
|
sl.registerLazySingleton<ProfileService>(
|
||||||
sl.registerLazySingleton<AboutRecipeService>(() => AboutRecipeService(sl()));
|
() => ProfileService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<ComplainingService>(() => ComplainingService(sl()));
|
);
|
||||||
sl.registerLazySingleton<AuthService>(() => AuthService(sl()));
|
sl.registerLazySingleton<InsightsService>(
|
||||||
sl.registerLazySingleton<CardsService>(() => CardsService(sl()));
|
() => InsightsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<CalendarService>(
|
||||||
|
() => CalendarService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<SettingsService>(
|
||||||
|
() => SettingsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<ConsultantService>(
|
||||||
|
() => ConsultantService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<DiaryService>(
|
||||||
|
() => DiaryService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<GlossaryService>(
|
||||||
|
() => GlossaryService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<BarcodeService>(
|
||||||
|
() => BarcodeService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<DietService>(
|
||||||
|
() => DietService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<PlansService>(
|
||||||
|
() => PlansService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<PlanService>(
|
||||||
|
() => PlanService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<MyDietsService>(
|
||||||
|
() => MyDietsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<MyPlansService>(
|
||||||
|
() => MyPlansService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<WsService>(() => WsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()));
|
||||||
|
sl.registerLazySingleton<AboutRecipeService>(
|
||||||
|
() => AboutRecipeService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<ComplainingService>(
|
||||||
|
() => ComplainingService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<AuthService>(
|
||||||
|
() => AuthService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<CardsService>(
|
||||||
|
() => CardsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
sl.registerLazySingleton<ConsultationService>(() => ConsultationService(sl()));
|
sl.registerLazySingleton<ConsultationService>(() => ConsultationService(sl()));
|
||||||
sl.registerLazySingleton<CancelPlanService>(() => CancelPlanService(sl()));
|
sl.registerLazySingleton<CancelPlanService>(
|
||||||
sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
|
() => CancelPlanService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
|
);
|
||||||
|
sl.registerLazySingleton<CreatePlanService>(
|
||||||
|
() => CreatePlanService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<NotificationsService>(
|
||||||
|
() => NotificationsService(sl(), responseErrors: sl()),
|
||||||
|
);
|
||||||
sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi(errorReporter: sl()));
|
sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi(errorReporter: sl()));
|
||||||
sl.registerLazySingleton<VideoCallCallKitCoordinator>(
|
sl.registerLazySingleton<VideoCallCallKitCoordinator>(
|
||||||
() => VideoCallCallKitCoordinator(firebaseApi: sl()),
|
() => VideoCallCallKitCoordinator(firebaseApi: sl()),
|
||||||
@@ -84,23 +141,49 @@ class ServiceRegistrations {
|
|||||||
sl.registerLazySingleton<VideoCallSystemPipCoordinator>(
|
sl.registerLazySingleton<VideoCallSystemPipCoordinator>(
|
||||||
() => VideoCallSystemPipCoordinator(),
|
() => VideoCallSystemPipCoordinator(),
|
||||||
);
|
);
|
||||||
sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
|
sl.registerLazySingleton<ResetPasswordService>(
|
||||||
sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
|
() => ResetPasswordService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
|
);
|
||||||
sl.registerLazySingleton<MyRecipesService>(() => MyRecipesService(sl()));
|
sl.registerLazySingleton<BlockedUserService>(
|
||||||
sl.registerLazySingleton<ConsultantRatingService>(() => ConsultantRatingService(sl()));
|
() => BlockedUserService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<NotificationSettingsService>(() => NotificationSettingsService(sl()));
|
);
|
||||||
sl.registerLazySingleton<ViewsService>(() => ViewsService(sl()));
|
sl.registerLazySingleton<CommentsService>(
|
||||||
|
() => CommentsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<MyRecipesService>(
|
||||||
|
() => MyRecipesService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<ConsultantRatingService>(
|
||||||
|
() => ConsultantRatingService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<NotificationSettingsService>(
|
||||||
|
() => NotificationSettingsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<ViewsService>(
|
||||||
|
() => ViewsService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
sl.registerLazySingleton<SbpService>(() => const SbpServiceImpl());
|
sl.registerLazySingleton<SbpService>(() => const SbpServiceImpl());
|
||||||
sl.registerLazySingleton<PersonalDietSuggestionService>(() => PersonalDietSuggestionService(sl()));
|
sl.registerLazySingleton<PersonalDietSuggestionService>(
|
||||||
sl.registerLazySingleton<RegistrationServiceV2>(() => RegistrationServiceV2(sl()));
|
() => PersonalDietSuggestionService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<RegistrationServiceV2>(
|
||||||
|
() => RegistrationServiceV2(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
|
||||||
// Content services
|
// Content services
|
||||||
sl.registerLazySingleton<CreateRecipeService>(() => CreateRecipeService(sl()));
|
sl.registerLazySingleton<CreateRecipeService>(
|
||||||
sl.registerLazySingleton<BlogPostService>(() => BlogPostService(sl()));
|
() => CreateRecipeService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
sl.registerLazySingleton<CreateDietService>(() => CreateDietService(sl()));
|
);
|
||||||
|
sl.registerLazySingleton<BlogPostService>(
|
||||||
|
() => BlogPostService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
sl.registerLazySingleton<CreateDietService>(
|
||||||
|
() => CreateDietService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
|
|
||||||
// Auth services
|
// Auth services
|
||||||
sl.registerLazySingleton<RegistrationService>(() => RegistrationService(sl()));
|
sl.registerLazySingleton<RegistrationService>(
|
||||||
|
() => RegistrationService(sl(), errorLogger: sl<ApiResponseErrorReporter>()),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
15
lib/core/di/session_registrations.dart
Normal file
15
lib/core/di/session_registrations.dart
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||||
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
|
import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
|
||||||
|
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
||||||
|
|
||||||
|
class SessionRegistrations {
|
||||||
|
static void registerAll() {
|
||||||
|
sl.registerLazySingleton<SessionLifecycleService>(
|
||||||
|
() => SessionLifecycleService(
|
||||||
|
wsManager: sl<WsManager>(),
|
||||||
|
errorReporter: sl<ErrorReporter>(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
71
lib/core/error_reporting/api_response_dio.dart
Normal file
71
lib/core/error_reporting/api_response_dio.dart
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:dio/io.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/api_response_error_reporter.dart';
|
||||||
|
|
||||||
|
class ApiResponseDio extends DioForNative {
|
||||||
|
ApiResponseDio(BaseOptions super.options, this._responseErrors) {
|
||||||
|
transformer = _ApiResponseTransformer(
|
||||||
|
transformer,
|
||||||
|
_responseErrors,
|
||||||
|
_responseStatuses,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final ApiResponseErrorReporter _responseErrors;
|
||||||
|
final _responseStatuses = Expando<int>();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<Response<T>> fetch<T>(RequestOptions requestOptions) async {
|
||||||
|
try {
|
||||||
|
return await super.fetch<T>(requestOptions);
|
||||||
|
} on DioException catch (error) {
|
||||||
|
final cause = error.error;
|
||||||
|
final status = _responseStatuses[error.requestOptions];
|
||||||
|
// Dio приводит тип корневого значения до вызова fromJson в Retrofit.
|
||||||
|
if (error.type == DioExceptionType.unknown &&
|
||||||
|
error.requestOptions.responseType == ResponseType.json &&
|
||||||
|
cause is TypeError &&
|
||||||
|
status != null) {
|
||||||
|
_responseErrors.report(
|
||||||
|
error,
|
||||||
|
cause.stackTrace ?? error.stackTrace,
|
||||||
|
method: error.requestOptions.method,
|
||||||
|
statusCode: status,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ApiResponseTransformer implements Transformer {
|
||||||
|
_ApiResponseTransformer(this._delegate, this._responseErrors, this._statuses);
|
||||||
|
|
||||||
|
final Transformer _delegate;
|
||||||
|
final ApiResponseErrorReporter _responseErrors;
|
||||||
|
final Expando<int> _statuses;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<String> transformRequest(RequestOptions options) =>
|
||||||
|
_delegate.transformRequest(options);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<dynamic> transformResponse(
|
||||||
|
RequestOptions options,
|
||||||
|
ResponseBody response,
|
||||||
|
) async {
|
||||||
|
try {
|
||||||
|
final data = await _delegate.transformResponse(options, response);
|
||||||
|
_statuses[options] = response.statusCode;
|
||||||
|
return data;
|
||||||
|
} on FormatException catch (error, stackTrace) {
|
||||||
|
_responseErrors.report(
|
||||||
|
error,
|
||||||
|
stackTrace,
|
||||||
|
method: options.method,
|
||||||
|
statusCode: response.statusCode,
|
||||||
|
);
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
111
lib/core/error_reporting/api_response_error_reporter.dart
Normal file
111
lib/core/error_reporting/api_response_error_reporter.dart
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:developer';
|
||||||
|
|
||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||||
|
import 'package:retrofit/retrofit.dart';
|
||||||
|
|
||||||
|
class ApiResponseErrorReporter implements ParseErrorLogger {
|
||||||
|
ApiResponseErrorReporter(this._reporter);
|
||||||
|
|
||||||
|
final ErrorReporter _reporter;
|
||||||
|
static final _capturedErrors = Expando<bool>();
|
||||||
|
|
||||||
|
static bool wasCaptured(Object error) =>
|
||||||
|
_isCaptured(error) || (error is DioException && _isCaptured(error.error));
|
||||||
|
|
||||||
|
static bool _isCaptured(Object? error) =>
|
||||||
|
error != null &&
|
||||||
|
(error is Error || error is Exception) &&
|
||||||
|
_capturedErrors[error] == true;
|
||||||
|
|
||||||
|
static T decode<T>(
|
||||||
|
ApiResponseErrorReporter? reporter,
|
||||||
|
Response<dynamic> response,
|
||||||
|
String endpoint,
|
||||||
|
T Function() parse,
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
return parse();
|
||||||
|
} catch (error, stackTrace) {
|
||||||
|
reporter?.report(
|
||||||
|
error,
|
||||||
|
stackTrace,
|
||||||
|
method: response.requestOptions.method,
|
||||||
|
statusCode: response.statusCode,
|
||||||
|
endpoint: endpoint,
|
||||||
|
);
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void logError(
|
||||||
|
Object error,
|
||||||
|
StackTrace stackTrace,
|
||||||
|
RequestOptions options, {
|
||||||
|
Response<dynamic>? response,
|
||||||
|
}) {
|
||||||
|
report(
|
||||||
|
error,
|
||||||
|
stackTrace,
|
||||||
|
method: options.method,
|
||||||
|
statusCode: response?.statusCode,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void report(
|
||||||
|
Object error,
|
||||||
|
StackTrace stackTrace, {
|
||||||
|
required String method,
|
||||||
|
int? statusCode,
|
||||||
|
String? endpoint,
|
||||||
|
}) {
|
||||||
|
if (error is Error || error is Exception) {
|
||||||
|
_capturedErrors[error] = true;
|
||||||
|
}
|
||||||
|
// Сообщение исходного исключения может содержать значения из ответа API.
|
||||||
|
final cause = error is DioException ? error.error ?? error : error;
|
||||||
|
unawaited(
|
||||||
|
_send(
|
||||||
|
ApiResponseDecodeException(cause.runtimeType.toString()),
|
||||||
|
stackTrace,
|
||||||
|
{
|
||||||
|
'http_method': method,
|
||||||
|
'http_status_code': ?statusCode,
|
||||||
|
'endpoint': ?endpoint,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _send(
|
||||||
|
ApiResponseDecodeException error,
|
||||||
|
StackTrace stackTrace,
|
||||||
|
Map<String, Object?> context,
|
||||||
|
) async {
|
||||||
|
try {
|
||||||
|
await _reporter.report(
|
||||||
|
error,
|
||||||
|
stackTrace,
|
||||||
|
origin: 'api_response',
|
||||||
|
extras: context,
|
||||||
|
);
|
||||||
|
} catch (reportError, reportStackTrace) {
|
||||||
|
log(
|
||||||
|
'Не удалось записать ошибку разбора ответа API',
|
||||||
|
error: reportError.runtimeType,
|
||||||
|
stackTrace: reportStackTrace,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ApiResponseDecodeException implements Exception {
|
||||||
|
ApiResponseDecodeException(this.causeType);
|
||||||
|
|
||||||
|
final String causeType;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => 'Could not decode API response ($causeType)';
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/api_response_error_reporter.dart';
|
||||||
import 'package:eatvio_app/core/push/hms_client_error.dart';
|
import 'package:eatvio_app/core/push/hms_client_error.dart';
|
||||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||||
|
|
||||||
@@ -14,6 +15,7 @@ class ErrorReportPolicy {
|
|||||||
/// When `false`, the error is not sent via [ErrorReporter].
|
/// When `false`, the error is not sent via [ErrorReporter].
|
||||||
static bool shouldReport(Object? error) {
|
static bool shouldReport(Object? error) {
|
||||||
if (error == null) return false;
|
if (error == null) return false;
|
||||||
|
if (ApiResponseErrorReporter.wasCaptured(error)) return false;
|
||||||
if (error is String) return false;
|
if (error is String) return false;
|
||||||
if (error is SocketException) return false;
|
if (error is SocketException) return false;
|
||||||
if (isHmsClientUnavailable(error)) return false;
|
if (isHmsClientUnavailable(error)) return false;
|
||||||
@@ -34,11 +36,23 @@ class ErrorReportPolicy {
|
|||||||
final t = event.throwable;
|
final t = event.throwable;
|
||||||
if (t == null) return true;
|
if (t == null) return true;
|
||||||
if (t is DioException) {
|
if (t is DioException) {
|
||||||
return _allowSentrySdkDio(t);
|
return !ApiResponseErrorReporter.wasCaptured(t) && _allowSentrySdkDio(t);
|
||||||
}
|
}
|
||||||
return shouldReport(t);
|
return shouldReport(t);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static SentryEvent? prepareSentryEvent(SentryEvent event, Hint hint) {
|
||||||
|
if (!allowSentryEvent(event, hint)) return null;
|
||||||
|
if (event.throwable is ApiResponseDecodeException) {
|
||||||
|
// HTTP breadcrumbs могут содержать идентификаторы в пути и параметры запроса.
|
||||||
|
event.breadcrumbs = event.breadcrumbs
|
||||||
|
?.where((breadcrumb) => breadcrumb.category != 'http')
|
||||||
|
.toList();
|
||||||
|
event.request = null;
|
||||||
|
}
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
/// Cancel, timeouts, socket / connection errors — do not send (noisy, often user environment).
|
/// Cancel, timeouts, socket / connection errors — do not send (noisy, often user environment).
|
||||||
static bool _isTransientDioFailure(DioException e) {
|
static bool _isTransientDioFailure(DioException e) {
|
||||||
switch (e.type) {
|
switch (e.type) {
|
||||||
|
|||||||
@@ -21,10 +21,9 @@ class FirebaseApi {
|
|||||||
final _firebaseMessaging = FirebaseMessaging.instance;
|
final _firebaseMessaging = FirebaseMessaging.instance;
|
||||||
|
|
||||||
FirebaseApi({
|
FirebaseApi({
|
||||||
required ErrorReporter errorReporter,
|
required this._errorReporter,
|
||||||
NotificationPermissionRequester? notificationPermissionRequester,
|
NotificationPermissionRequester? notificationPermissionRequester,
|
||||||
}) : _errorReporter = errorReporter,
|
}) : _notificationPermissionRequester = notificationPermissionRequester ?? NotificationPermissionRequester();
|
||||||
_notificationPermissionRequester = notificationPermissionRequester ?? NotificationPermissionRequester();
|
|
||||||
|
|
||||||
Future<String?> getToken() async {
|
Future<String?> getToken() async {
|
||||||
final credentials = await _resolvePushCredentials();
|
final credentials = await _resolvePushCredentials();
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:eatvio_app/core/app_router.dart';
|
import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
|
||||||
import 'package:eatvio_app/core/token_storage.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:eatvio_app/core/locator_service.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
|
||||||
|
|
||||||
class TokenInterceptor extends Interceptor {
|
class TokenInterceptor extends Interceptor {
|
||||||
@override
|
@override
|
||||||
@@ -14,6 +12,7 @@ class TokenInterceptor extends Interceptor {
|
|||||||
final token = await TokenStorage.getTokenFromStorage();
|
final token = await TokenStorage.getTokenFromStorage();
|
||||||
if (token != null && token.isNotEmpty) {
|
if (token != null && token.isNotEmpty) {
|
||||||
options.headers['Authorization'] = 'Bearer $token';
|
options.headers['Authorization'] = 'Bearer $token';
|
||||||
|
options.extra['authToken'] = token;
|
||||||
}
|
}
|
||||||
|
|
||||||
super.onRequest(options, handler);
|
super.onRequest(options, handler);
|
||||||
@@ -25,9 +24,18 @@ class TokenInterceptor extends Interceptor {
|
|||||||
ErrorInterceptorHandler handler,
|
ErrorInterceptorHandler handler,
|
||||||
) async {
|
) async {
|
||||||
if (err.response?.statusCode == 401) {
|
if (err.response?.statusCode == 401) {
|
||||||
await sl<WsManager>().clear();
|
final requestCarriedAuth = err.requestOptions.headers.containsKey(
|
||||||
await TokenStorage.removeTokenInStorage();
|
'Authorization',
|
||||||
AppRouter.navigatorKey.currentContext?.go('/auth-screen');
|
);
|
||||||
|
final requestToken = err.requestOptions.extra['authToken'];
|
||||||
|
final currentToken = await TokenStorage.getTokenFromStorage();
|
||||||
|
if (requestCarriedAuth &&
|
||||||
|
requestToken != null &&
|
||||||
|
requestToken == currentToken) {
|
||||||
|
await sl<SessionLifecycleService>().endSession(
|
||||||
|
reason: SessionEndReason.unauthorized,
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
super.onError(err, handler);
|
super.onError(err, handler);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import 'package:connectivity_plus/connectivity_plus.dart';
|
|||||||
import 'package:eatvio_app/core/env_config.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/internet_connection_cubit/internet_connection_state.dart';
|
||||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:eatvio_app/core/di/cubit_registrations.dart';
|
|||||||
import 'package:eatvio_app/core/di/external_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/repository_registrations.dart';
|
||||||
import 'package:eatvio_app/core/di/service_registrations.dart';
|
import 'package:eatvio_app/core/di/service_registrations.dart';
|
||||||
|
import 'package:eatvio_app/core/di/session_registrations.dart';
|
||||||
import 'package:eatvio_app/core/prefs.dart';
|
import 'package:eatvio_app/core/prefs.dart';
|
||||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
||||||
import 'package:get_it/get_it.dart';
|
import 'package:get_it/get_it.dart';
|
||||||
@@ -38,4 +39,6 @@ Future<void> init({required AppBuildType buildType}) async {
|
|||||||
sl.registerLazySingleton<WsManager>(
|
sl.registerLazySingleton<WsManager>(
|
||||||
() => WsManager(wsService: sl(), errorReporter: sl()),
|
() => WsManager(wsService: sl(), errorReporter: sl()),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
SessionRegistrations.registerAll();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import 'dart:io';
|
|||||||
|
|
||||||
import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
|
import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:cupertino_ui/cupertino_ui.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
|
|
||||||
class PermissionHandler {
|
class PermissionHandler {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/routing/route_constants.dart';
|
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_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_nav_scope.dart';
|
||||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.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/chat/presentation/pages/chats_screen.dart';
|
||||||
@@ -12,7 +11,7 @@ import 'package:eatvio_app/features/notifications/presentation/notifications_scr
|
|||||||
import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
|
import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
|
||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'dart:developer';
|
import 'dart:developer';
|
||||||
@@ -24,14 +23,10 @@ class MainNavigationRoutes {
|
|||||||
return [
|
return [
|
||||||
ShellRoute(
|
ShellRoute(
|
||||||
builder: (context, state, child) {
|
builder: (context, state, child) {
|
||||||
// Инициализация ProfileAvatarCubit при первом использовании ShellRoute
|
|
||||||
final profileAvatarCubit = context.read<ProfileAvatarCubit>();
|
final profileAvatarCubit = context.read<ProfileAvatarCubit>();
|
||||||
if (profileAvatarCubit.state is ProfileAvatarStateLoading) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
// Вызываем getMyProfile() только если состояние loading (первый запуск)
|
profileAvatarCubit.ensureFreshForCurrentSession();
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
});
|
||||||
profileAvatarCubit.getMyProfile();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return _MainShellWithNavScope(currentLocation: state.matchedLocation, child: child);
|
return _MainShellWithNavScope(currentLocation: state.matchedLocation, child: child);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:eatvio_app/core/app_config.dart';
|
import 'package:eatvio_app/core/app_config.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/api_response_error_reporter.dart';
|
||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
import 'package:eatvio_app/core/firebase_api.dart';
|
||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
import 'package:eatvio_app/core/prefs.dart';
|
import 'package:eatvio_app/core/prefs.dart';
|
||||||
@@ -16,6 +17,9 @@ import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart'
|
|||||||
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
|
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
|
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
|
||||||
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
|
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/video_call_recording_player_screen.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart';
|
||||||
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
|
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
|
||||||
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
|
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
|
||||||
import 'package:eatvio_app/features/consultant_rating/presentation/consultant_rating_screen.dart';
|
import 'package:eatvio_app/features/consultant_rating/presentation/consultant_rating_screen.dart';
|
||||||
@@ -100,7 +104,7 @@ class OtherRoutes {
|
|||||||
redirect: (context, state) async {
|
redirect: (context, state) async {
|
||||||
try {
|
try {
|
||||||
// Проверка версии с таймаутом, чтобы не блокировать запуск приложения
|
// Проверка версии с таймаутом, чтобы не блокировать запуск приложения
|
||||||
final versions = await sl<Dio>()
|
final response = await sl<Dio>()
|
||||||
.get('${sl<AppConfig>().baseUrl}/api/app_versions')
|
.get('${sl<AppConfig>().baseUrl}/api/app_versions')
|
||||||
.timeout(
|
.timeout(
|
||||||
const Duration(seconds: 5),
|
const Duration(seconds: 5),
|
||||||
@@ -108,12 +112,8 @@ class OtherRoutes {
|
|||||||
// При таймауте пропускаем проверку и идем дальше
|
// При таймауте пропускаем проверку и идем дальше
|
||||||
throw TimeoutException('Version check timeout');
|
throw TimeoutException('Version check timeout');
|
||||||
},
|
},
|
||||||
)
|
);
|
||||||
.then((response) => response.data)
|
final versions = response.data;
|
||||||
.catchError((e) {
|
|
||||||
// При любой ошибке пропускаем проверку версии
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (versions == null) {
|
if (versions == null) {
|
||||||
// Если проверка не удалась, пропускаем экран обновления
|
// Если проверка не удалась, пропускаем экран обновления
|
||||||
@@ -123,7 +123,15 @@ class OtherRoutes {
|
|||||||
PackageInfo packageInfo = await PackageInfo.fromPlatform();
|
PackageInfo packageInfo = await PackageInfo.fromPlatform();
|
||||||
String version = packageInfo.version;
|
String version = packageInfo.version;
|
||||||
Version currentVersion = Version.parse(version);
|
Version currentVersion = Version.parse(version);
|
||||||
Version latestVersion = Version.parse(versions['min_version']);
|
final responseErrors = sl.isRegistered<ApiResponseErrorReporter>()
|
||||||
|
? sl<ApiResponseErrorReporter>()
|
||||||
|
: null;
|
||||||
|
final latestVersion = ApiResponseErrorReporter.decode(
|
||||||
|
responseErrors,
|
||||||
|
response,
|
||||||
|
'/api/app_versions',
|
||||||
|
() => Version.parse(versions['min_version']),
|
||||||
|
);
|
||||||
if (latestVersion > currentVersion) {
|
if (latestVersion > currentVersion) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
@@ -140,6 +148,18 @@ class OtherRoutes {
|
|||||||
GoRoute(path: ConsultationsArchiveScreen.path, name: ConsultationsArchiveScreen.name, builder: (context, state) => const ConsultationsArchiveScreen()),
|
GoRoute(path: ConsultationsArchiveScreen.path, name: ConsultationsArchiveScreen.name, builder: (context, state) => const ConsultationsArchiveScreen()),
|
||||||
GoRoute(path: ConsultantFinancesScreen.path, name: ConsultantFinancesScreen.name, builder: (context, state) => const ConsultantFinancesScreen()),
|
GoRoute(path: ConsultantFinancesScreen.path, name: ConsultantFinancesScreen.name, builder: (context, state) => const ConsultantFinancesScreen()),
|
||||||
GoRoute(path: UserPurchasesScreen.path, name: UserPurchasesScreen.name, builder: (context, state) => const UserPurchasesScreen()),
|
GoRoute(path: UserPurchasesScreen.path, name: UserPurchasesScreen.name, builder: (context, state) => const UserPurchasesScreen()),
|
||||||
|
GoRoute(
|
||||||
|
path: VideoCallRecordingsScreen.path,
|
||||||
|
name: VideoCallRecordingsScreen.name,
|
||||||
|
builder: (context, state) => const VideoCallRecordingsScreen(),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: VideoCallRecordingPlayerScreen.path,
|
||||||
|
name: VideoCallRecordingPlayerScreen.name,
|
||||||
|
builder: (context, state) => VideoCallRecordingPlayerScreen(
|
||||||
|
recording: _videoCallRecordingFromRouteExtra(state.extra),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
// Finance routes
|
// Finance routes
|
||||||
GoRoute(path: RouteConstants.userFinanceScreen, name: 'userFinanceScreen', builder: (context, state) => const UserFinanceScreen()),
|
GoRoute(path: RouteConstants.userFinanceScreen, name: 'userFinanceScreen', builder: (context, state) => const UserFinanceScreen()),
|
||||||
@@ -192,7 +212,18 @@ class OtherRoutes {
|
|||||||
return CreatePlanScreen(plan: plan);
|
return CreatePlanScreen(plan: plan);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => const MyDietsScreen()),
|
GoRoute(
|
||||||
|
path: MyDietsScreen.path,
|
||||||
|
name: MyDietsScreen.name,
|
||||||
|
builder: (context, state) {
|
||||||
|
final initialTabIndex = int.tryParse(
|
||||||
|
state.uri.queryParameters['initialTabIndex'] ?? '',
|
||||||
|
);
|
||||||
|
return MyDietsScreen(
|
||||||
|
initialTabIndex: initialTabIndex ?? 0,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
|
GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
|
||||||
GoRoute(path: MyRecipesScreen.path, name: MyRecipesScreen.name, builder: (context, state) => const MyRecipesScreen()),
|
GoRoute(path: MyRecipesScreen.path, name: MyRecipesScreen.name, builder: (context, state) => const MyRecipesScreen()),
|
||||||
|
|
||||||
@@ -354,9 +385,10 @@ class OtherRoutes {
|
|||||||
path: UserDiaryScreen.path,
|
path: UserDiaryScreen.path,
|
||||||
name: UserDiaryScreen.name,
|
name: UserDiaryScreen.name,
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
final data = state.extra as Map<String, int>;
|
final data = state.extra as Map<String, Object?>;
|
||||||
final diaryId = data['diaryId'] as int;
|
final diaryId = data['diaryId'] as int;
|
||||||
return UserDiaryScreen(diaryId: diaryId);
|
final ownerSlug = data['ownerSlug'] as String?;
|
||||||
|
return UserDiaryScreen(diaryId: diaryId, ownerSlug: ownerSlug);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
@@ -368,6 +400,17 @@ class OtherRoutes {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VideoCallRecordingModel? _videoCallRecordingFromRouteExtra(Object? extra) {
|
||||||
|
if (extra is! Map) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return VideoCallRecordingModel.fromJson(Map<String, dynamic>.from(extra));
|
||||||
|
} on Object {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
VideoCallEntryMode _videoCallEntryModeFromRouteExtra(Object? raw) {
|
VideoCallEntryMode _videoCallEntryModeFromRouteExtra(Object? raw) {
|
||||||
if (raw is VideoCallEntryMode) return raw;
|
if (raw is VideoCallEntryMode) return raw;
|
||||||
if (raw == VideoCallEntryMode.incomingAccepted.name) {
|
if (raw == VideoCallEntryMode.incomingAccepted.name) {
|
||||||
|
|||||||
121
lib/core/session/session_lifecycle_service.dart
Normal file
121
lib/core/session/session_lifecycle_service.dart
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:appmetrica_plugin/appmetrica_plugin.dart';
|
||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:eatvio_app/core/app_config.dart';
|
||||||
|
import 'package:eatvio_app/core/app_router.dart';
|
||||||
|
import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
|
||||||
|
import 'package:eatvio_app/core/firebase_api.dart';
|
||||||
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
|
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/core/websockets/ws_manager.dart';
|
||||||
|
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
|
||||||
|
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
|
enum SessionEndReason { logout, unauthorized, accountDeleted }
|
||||||
|
|
||||||
|
class SessionLifecycleService {
|
||||||
|
SessionLifecycleService({
|
||||||
|
required this._wsManager,
|
||||||
|
required this._errorReporter,
|
||||||
|
});
|
||||||
|
|
||||||
|
final WsManager _wsManager;
|
||||||
|
final ErrorReporter _errorReporter;
|
||||||
|
|
||||||
|
int? _authenticatedFingerprint;
|
||||||
|
bool _endingSession = false;
|
||||||
|
|
||||||
|
Future<void> endSession({required SessionEndReason reason}) async {
|
||||||
|
if (_endingSession) return;
|
||||||
|
_endingSession = true;
|
||||||
|
try {
|
||||||
|
await _run(() => _wsManager.clear());
|
||||||
|
await _run(TokenStorage.removeTokenInStorage);
|
||||||
|
await _run(SocketIdStorage.removeSocketIdInStorage);
|
||||||
|
await _run(() => sl<ProfileAvatarCubit>().reset());
|
||||||
|
await _run(() => sl<ChatsCubit>().reset());
|
||||||
|
await _run(() => sl<NotificationsCubit>().reset());
|
||||||
|
await _run(() => sl<NewMessagesCubit>().reset());
|
||||||
|
await _run(() => sl<FeedCubit>().reset());
|
||||||
|
await _run(() async => ProfileCubit.clearMyProfileReference());
|
||||||
|
await _run(() => sl<VideoCallSessionCubit>().endCall());
|
||||||
|
await _run(() async => AppMetrica.setUserProfileID(null));
|
||||||
|
await _run(
|
||||||
|
() => sl<Prefs>().remove(PrefsKeys.isEmailVerificationSkipped),
|
||||||
|
);
|
||||||
|
await _run(() => sl<Prefs>().remove(PrefsKeys.registrationDate));
|
||||||
|
_authenticatedFingerprint = null;
|
||||||
|
await _run(() async {
|
||||||
|
final context = AppRouter.navigatorKey.currentContext;
|
||||||
|
if (context == null) return;
|
||||||
|
final path =
|
||||||
|
AppRouter.appRouter.routeInformationProvider.value.uri.path;
|
||||||
|
if (path != RouteConstants.authScreen) {
|
||||||
|
context.go(RouteConstants.authScreen);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
_endingSession = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> onAuthenticated() async {
|
||||||
|
String? token;
|
||||||
|
try {
|
||||||
|
token = await TokenStorage.getTokenFromStorage();
|
||||||
|
} catch (e, st) {
|
||||||
|
await _report(e, st);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (token == null || token.isEmpty) return;
|
||||||
|
final fingerprint = token.hashCode;
|
||||||
|
if (_authenticatedFingerprint == fingerprint) return;
|
||||||
|
_authenticatedFingerprint = fingerprint;
|
||||||
|
|
||||||
|
await _run(() async {
|
||||||
|
await _wsManager.clear();
|
||||||
|
await _wsManager.initialize();
|
||||||
|
});
|
||||||
|
await _run(() => sl<ProfileAvatarCubit>().getMyProfile());
|
||||||
|
await _run(() => sl<ChatsCubit>().getChatRoomsWithLoading());
|
||||||
|
await _run(() => sl<NotificationsCubit>().getNotifications());
|
||||||
|
await _run(() => sl<FirebaseApi>().registerPushToken());
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> logout() async {
|
||||||
|
try {
|
||||||
|
await _run(() => sl<FirebaseApi>().unregisterPushTokens());
|
||||||
|
await _run(
|
||||||
|
() => sl<Dio>().post('${sl<AppConfig>().baseUrl}/api/profile/logout'),
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
await endSession(reason: SessionEndReason.logout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _run(FutureOr<void> Function() action) async {
|
||||||
|
try {
|
||||||
|
await action();
|
||||||
|
} catch (e, st) {
|
||||||
|
await _report(e, st);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _report(Object error, StackTrace stackTrace) {
|
||||||
|
return _errorReporter.report(
|
||||||
|
error,
|
||||||
|
stackTrace,
|
||||||
|
origin: 'SessionLifecycleService',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class AppDecoration {
|
class AppDecoration {
|
||||||
// Fill decorations
|
// Fill decorations
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// A class that offers pre-defined button styles for customizing button appearance.
|
/// A class that offers pre-defined button styles for customizing button appearance.
|
||||||
class CustomButtonStyles {
|
class CustomButtonStyles {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
/// A collection of pre-defined text styles for customizing text appearance,
|
/// A collection of pre-defined text styles for customizing text appearance,
|
||||||
/// categorized by different font families and weights.
|
/// categorized by different font families and weights.
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
/// Helper class for managing themes and colors.
|
/// Helper class for managing themes and colors.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/const.dart';
|
import 'package:eatvio_app/core/const.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
void loadNewContent(ScrollNotification notification, Future<void> Function() load) {
|
void loadNewContent(ScrollNotification notification, Future<void> Function() load) {
|
||||||
if (notification.metrics.pixels >= notification.metrics.maxScrollExtent - thresholdForPagination && !notification.metrics.outOfRange) {
|
if (notification.metrics.pixels >= notification.metrics.maxScrollExtent - thresholdForPagination && !notification.metrics.outOfRange) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:fluttertoast/fluttertoast.dart';
|
import 'package:fluttertoast/fluttertoast.dart';
|
||||||
|
|
||||||
const int _toastDuration = 2;
|
const int _toastDuration = 2;
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ part 'views_service.g.dart';
|
|||||||
|
|
||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class ViewsService {
|
abstract class ViewsService {
|
||||||
factory ViewsService(Dio dio, {String baseUrl}) = _ViewsService;
|
factory ViewsService(
|
||||||
|
Dio dio, {
|
||||||
|
String baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _ViewsService;
|
||||||
|
|
||||||
@POST('/api/views')
|
@POST('/api/views')
|
||||||
Future<void> viewContent({
|
Future<void> viewContent({
|
||||||
|
|||||||
@@ -17,8 +17,7 @@ class WsManager {
|
|||||||
final WsService wsService;
|
final WsService wsService;
|
||||||
final ErrorReporter _errorReporter;
|
final ErrorReporter _errorReporter;
|
||||||
|
|
||||||
WsManager({required this.wsService, required ErrorReporter errorReporter})
|
WsManager({required this.wsService, required this._errorReporter});
|
||||||
: _errorReporter = errorReporter;
|
|
||||||
|
|
||||||
PusherChannelsClient? client;
|
PusherChannelsClient? client;
|
||||||
int? userId;
|
int? userId;
|
||||||
@@ -48,6 +47,7 @@ class WsManager {
|
|||||||
|
|
||||||
Stream<ChannelReadEvent>? _directChatStream;
|
Stream<ChannelReadEvent>? _directChatStream;
|
||||||
Stream<ChannelReadEvent>? _clientTypingStream;
|
Stream<ChannelReadEvent>? _clientTypingStream;
|
||||||
|
Stream<ChannelReadEvent>? _chosenPlanStateChangedStream;
|
||||||
|
|
||||||
Stream<ChannelReadEvent>? get newMessagesStream =>
|
Stream<ChannelReadEvent>? get newMessagesStream =>
|
||||||
_privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
|
_privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
|
||||||
@@ -74,6 +74,9 @@ class WsManager {
|
|||||||
|
|
||||||
Stream<ChannelReadEvent>? get clientTypingStream => _clientTypingStream;
|
Stream<ChannelReadEvent>? get clientTypingStream => _clientTypingStream;
|
||||||
|
|
||||||
|
Stream<ChannelReadEvent>? get chosenPlanStateChangedStream =>
|
||||||
|
_chosenPlanStateChangedStream;
|
||||||
|
|
||||||
/// Сигнал о реконнекте сокета: эмитится после повторной подписки на каналы.
|
/// Сигнал о реконнекте сокета: эмитится после повторной подписки на каналы.
|
||||||
///
|
///
|
||||||
/// Подписчики используют его, чтобы догрузить пропущенные за время обрыва
|
/// Подписчики используют его, чтобы догрузить пропущенные за время обрыва
|
||||||
@@ -222,6 +225,9 @@ class WsManager {
|
|||||||
'App\\Events\\ChatMessageUpdated',
|
'App\\Events\\ChatMessageUpdated',
|
||||||
);
|
);
|
||||||
_clientTypingStream = _privateDirectChatChannel?.bind('client-typing');
|
_clientTypingStream = _privateDirectChatChannel?.bind('client-typing');
|
||||||
|
_chosenPlanStateChangedStream = _privateDirectChatChannel?.bind(
|
||||||
|
'chosen-plan-state-changed',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> initPresenceDirectChatChannel(String chatId) async {
|
Future<void> initPresenceDirectChatChannel(String chatId) async {
|
||||||
@@ -367,6 +373,7 @@ class WsManager {
|
|||||||
_privateDirectChatChannel?.unsubscribe();
|
_privateDirectChatChannel?.unsubscribe();
|
||||||
_directChatStream = null;
|
_directChatStream = null;
|
||||||
_clientTypingStream = null;
|
_clientTypingStream = null;
|
||||||
|
_chosenPlanStateChangedStream = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
void unsubscribePresenceDirectChatChannel() {
|
void unsubscribePresenceDirectChatChannel() {
|
||||||
@@ -401,6 +408,7 @@ class WsManager {
|
|||||||
_privateNotificationChannel = null;
|
_privateNotificationChannel = null;
|
||||||
_directChatStream = null;
|
_directChatStream = null;
|
||||||
_clientTypingStream = null;
|
_clientTypingStream = null;
|
||||||
|
_chosenPlanStateChangedStream = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,11 @@ part 'ws_service.g.dart';
|
|||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class WsService {
|
abstract class WsService {
|
||||||
|
|
||||||
factory WsService(Dio dio, {String baseUrl}) = _WsService;
|
factory WsService(
|
||||||
|
Dio dio, {
|
||||||
|
String baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _WsService;
|
||||||
|
|
||||||
@GET('/api/profile/ws/params')
|
@GET('/api/profile/ws/params')
|
||||||
Future<WebsocketInfoModel> getWebsocket();
|
Future<WebsocketInfoModel> getWebsocket();
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
class AddItemButton extends StatelessWidget {
|
class AddItemButton extends StatelessWidget {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class AnimatedOptionButton extends StatelessWidget {
|
class AnimatedOptionButton extends StatelessWidget {
|
||||||
const AnimatedOptionButton({super.key, required this.text, required this.isSelected, required this.onTap, this.textStyle});
|
const AnimatedOptionButton({super.key, required this.text, required this.isSelected, required this.onTap, this.textStyle});
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class BaseButton extends StatelessWidget {
|
class BaseButton extends StatelessWidget {
|
||||||
const BaseButton({
|
const BaseButton({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class BookmarkButton extends StatelessWidget {
|
class BookmarkButton extends StatelessWidget {
|
||||||
const BookmarkButton({
|
const BookmarkButton({
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
class BottomSheetActionWidget extends StatelessWidget {
|
class BottomSheetActionWidget extends StatelessWidget {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class BottomSheetHandlerBar extends StatelessWidget {
|
class BottomSheetHandlerBar extends StatelessWidget {
|
||||||
const BottomSheetHandlerBar({super.key});
|
const BottomSheetHandlerBar({super.key});
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
import 'dart:ui';
|
import 'dart:ui';
|
||||||
|
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
Future<void> showBottomSheetWithBlur({
|
/// Показывает modal bottom sheet с blur-фоном.
|
||||||
|
///
|
||||||
|
/// Дженерик [T] пробрасывает значение, переданное в `Navigator.pop(T)`
|
||||||
|
/// внутри шита (по умолчанию `null`).
|
||||||
|
Future<T?> showBottomSheetWithBlur<T>({
|
||||||
required BuildContext context,
|
required BuildContext context,
|
||||||
required Widget child,
|
required Widget child,
|
||||||
double? height = 200,
|
double? height = 200,
|
||||||
@@ -11,7 +15,7 @@ Future<void> showBottomSheetWithBlur({
|
|||||||
bool enableDrag = true,
|
bool enableDrag = true,
|
||||||
bool userRootNavigator = false,
|
bool userRootNavigator = false,
|
||||||
}) {
|
}) {
|
||||||
return showModalBottomSheet(
|
return showModalBottomSheet<T>(
|
||||||
context: context,
|
context: context,
|
||||||
isScrollControlled: true,
|
isScrollControlled: true,
|
||||||
barrierColor: appTheme.transparentBlack,
|
barrierColor: appTheme.transparentBlack,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class CpfcContainer extends StatelessWidget {
|
class CpfcContainer extends StatelessWidget {
|
||||||
const CpfcContainer({super.key, required this.calories, required this.proteins, required this.fats, required this.carbohydrates});
|
const CpfcContainer({super.key, required this.calories, required this.proteins, required this.fats, required this.carbohydrates});
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class CustomDivider extends StatelessWidget {
|
class CustomDivider extends StatelessWidget {
|
||||||
const CustomDivider({super.key});
|
const CustomDivider({super.key});
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
|
import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class CustomDropDown extends StatelessWidget {
|
class CustomDropDown extends StatelessWidget {
|
||||||
const CustomDropDown({
|
const CustomDropDown({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
class CustomDropDownButton<T> extends StatelessWidget {
|
class CustomDropDownButton<T> extends StatelessWidget {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/widgets/base_button.dart';
|
import 'package:eatvio_app/core/widgets/base_button.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class CustomOutlinedButton extends BaseButton {
|
class CustomOutlinedButton extends BaseButton {
|
||||||
const CustomOutlinedButton({super.key,
|
const CustomOutlinedButton({super.key,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
|
|||||||
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
|
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
|
||||||
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
|
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class CustomSearchBar extends StatelessWidget {
|
class CustomSearchBar extends StatelessWidget {
|
||||||
const CustomSearchBar({super.key, required this.searchController, required this.onChanged, this.backgroundColor, this.borderRadius, this.enableIcon = true, this.width});
|
const CustomSearchBar({super.key, required this.searchController, required this.onChanged, this.backgroundColor, this.borderRadius, this.enableIcon = true, this.width});
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
class CustomTextFormField extends StatelessWidget {
|
class CustomTextFormField extends StatelessWidget {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
|
|||||||
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
||||||
import 'package:eatvio_app/core/widgets/loader.dart';
|
import 'package:eatvio_app/core/widgets/loader.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
class DataErrorWidget extends StatefulWidget {
|
class DataErrorWidget extends StatefulWidget {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
class FeedIconButton extends StatelessWidget {
|
class FeedIconButton extends StatelessWidget {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
|
|||||||
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
|
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
|
|
||||||
class InfoRow extends StatelessWidget {
|
class InfoRow extends StatelessWidget {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
|
||||||
class ItemWidget extends StatelessWidget {
|
class ItemWidget extends StatelessWidget {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:lottie/lottie.dart';
|
import 'package:lottie/lottie.dart';
|
||||||
|
|
||||||
class Loader extends StatelessWidget {
|
class Loader extends StatelessWidget {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class MainBackgroundBouble extends StatelessWidget {
|
class MainBackgroundBouble extends StatelessWidget {
|
||||||
const MainBackgroundBouble({
|
const MainBackgroundBouble({
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_html/flutter_html.dart';
|
import 'package:flutter_html/flutter_html.dart';
|
||||||
import 'package:markdown/markdown.dart' as md;
|
import 'package:markdown/markdown.dart' as md;
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
|||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
import 'package:share_plus/share_plus.dart';
|
import 'package:share_plus/share_plus.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import 'package:eatvio_app/core/utils/inline_svg_css.dart';
|
import 'package:eatvio_app/core/utils/inline_svg_css.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
|
|||||||
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
|
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
|
||||||
import 'package:eatvio_app/core/widgets/item_widget.dart';
|
import 'package:eatvio_app/core/widgets/item_widget.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
|
||||||
class OptionWidget extends StatelessWidget {
|
class OptionWidget extends StatelessWidget {
|
||||||
const OptionWidget({super.key, required this.option, this.disableDuration = false, required this.duration});
|
const OptionWidget({super.key, required this.option, this.disableDuration = false, required this.duration});
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
import 'package:eatvio_app/core/theme/custom_text_style.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
|
|
||||||
Future<void> showErrorDialog(BuildContext context, {String? title, String? description, String? buttonTitle, bool? needToOpenSettings}) async {
|
Future<void> showErrorDialog(BuildContext context, {String? title, String? description, String? buttonTitle, bool? needToOpenSettings}) async {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
|
|||||||
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
|
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
class SuccessPublishedDietOrPlanBottomSheet extends StatelessWidget {
|
class SuccessPublishedDietOrPlanBottomSheet extends StatelessWidget {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
|
|||||||
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
|
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
|
class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import 'dart:developer';
|
|||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
import 'package:eatvio_app/core/firebase_api.dart';
|
||||||
import 'package:eatvio_app/core/prefs.dart';
|
import 'package:eatvio_app/core/prefs.dart';
|
||||||
import 'package:eatvio_app/core/prefs_keys.dart';
|
import 'package:eatvio_app/core/prefs_keys.dart';
|
||||||
|
import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
|
||||||
import 'package:eatvio_app/core/token_storage.dart';
|
import 'package:eatvio_app/core/token_storage.dart';
|
||||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||||
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_state.dart';
|
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_state.dart';
|
||||||
@@ -17,15 +18,26 @@ class AuthCubit extends Cubit<AuthState> {
|
|||||||
final ProfileRepository profileRepository;
|
final ProfileRepository profileRepository;
|
||||||
final FirebaseApi firebaseApi;
|
final FirebaseApi firebaseApi;
|
||||||
final Prefs prefs;
|
final Prefs prefs;
|
||||||
|
final SessionLifecycleService sessionLifecycleService;
|
||||||
|
|
||||||
AuthCubit({required this.authRepository, required this.prefs, required this.profileRepository, required this.firebaseApi}) : super(const AuthState());
|
AuthCubit({
|
||||||
|
required this.authRepository,
|
||||||
|
required this.prefs,
|
||||||
|
required this.profileRepository,
|
||||||
|
required this.firebaseApi,
|
||||||
|
required this.sessionLifecycleService,
|
||||||
|
}) : super(const AuthState());
|
||||||
|
|
||||||
Future<bool> getTokenByCredentials(String email, String password) async {
|
Future<bool> getTokenByCredentials(String email, String password) async {
|
||||||
emit(const AuthState.loading());
|
emit(const AuthState.loading());
|
||||||
try {
|
try {
|
||||||
final token = (await authRepository.getTokenByCredentials(email, password)).token;
|
final token = (await authRepository.getTokenByCredentials(
|
||||||
|
email,
|
||||||
|
password,
|
||||||
|
)).token;
|
||||||
emit(AuthState.loaded(token: token));
|
emit(AuthState.loaded(token: token));
|
||||||
await TokenStorage.saveTokenInStorage(token);
|
await TokenStorage.saveTokenInStorage(token);
|
||||||
|
await sessionLifecycleService.onAuthenticated();
|
||||||
return true;
|
return true;
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
await reportFrom(e, st, this);
|
await reportFrom(e, st, this);
|
||||||
@@ -48,7 +60,8 @@ class AuthCubit extends Cubit<AuthState> {
|
|||||||
|
|
||||||
Future<void> registerAnonymousPushToken() async {
|
Future<void> registerAnonymousPushToken() async {
|
||||||
try {
|
try {
|
||||||
final hasAnonymousTokenBeenSent = prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
|
final hasAnonymousTokenBeenSent =
|
||||||
|
prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
|
||||||
if (!hasAnonymousTokenBeenSent) {
|
if (!hasAnonymousTokenBeenSent) {
|
||||||
await firebaseApi.registerAnonymousPushToken();
|
await firebaseApi.registerAnonymousPushToken();
|
||||||
prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);
|
prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import 'package:dio/dio.dart';
|
|||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
import 'package:eatvio_app/core/firebase_api.dart';
|
||||||
import 'package:eatvio_app/core/mixins/registration_date_cache_mixin.dart';
|
import 'package:eatvio_app/core/mixins/registration_date_cache_mixin.dart';
|
||||||
import 'package:eatvio_app/core/prefs.dart';
|
import 'package:eatvio_app/core/prefs.dart';
|
||||||
|
import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
|
||||||
import 'package:eatvio_app/core/token_storage.dart';
|
import 'package:eatvio_app/core/token_storage.dart';
|
||||||
import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart';
|
import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart';
|
||||||
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
|
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
|
||||||
@@ -13,10 +14,12 @@ import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
|||||||
class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
|
class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
|
||||||
final AuthRepository authRepository;
|
final AuthRepository authRepository;
|
||||||
final FirebaseApi firebaseApi;
|
final FirebaseApi firebaseApi;
|
||||||
|
final SessionLifecycleService sessionLifecycleService;
|
||||||
|
|
||||||
OAuthCubit({
|
OAuthCubit({
|
||||||
required this.authRepository,
|
required this.authRepository,
|
||||||
required this.firebaseApi,
|
required this.firebaseApi,
|
||||||
|
required this.sessionLifecycleService,
|
||||||
required Prefs prefs,
|
required Prefs prefs,
|
||||||
}) : super(const OAuthState()) {
|
}) : super(const OAuthState()) {
|
||||||
this.prefs = prefs;
|
this.prefs = prefs;
|
||||||
@@ -40,6 +43,7 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
|
|||||||
|
|
||||||
log('OAuthCubit: Got token model: ${tokenModel.token}');
|
log('OAuthCubit: Got token model: ${tokenModel.token}');
|
||||||
await TokenStorage.saveTokenInStorage(tokenModel.token);
|
await TokenStorage.saveTokenInStorage(tokenModel.token);
|
||||||
|
await sessionLifecycleService.onAuthenticated();
|
||||||
emit(OAuthState.loaded(token: tokenModel.token));
|
emit(OAuthState.loaded(token: tokenModel.token));
|
||||||
} on DioException catch (e, st) {
|
} on DioException catch (e, st) {
|
||||||
await reportFrom(e, st, this);
|
await reportFrom(e, st, this);
|
||||||
@@ -122,7 +126,7 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
|
|||||||
clientId: clientId,
|
clientId: clientId,
|
||||||
);
|
);
|
||||||
await TokenStorage.saveTokenInStorage(token);
|
await TokenStorage.saveTokenInStorage(token);
|
||||||
await firebaseApi.registerPushToken();
|
await sessionLifecycleService.onAuthenticated();
|
||||||
cacheRegistrationDate(DateTime.now());
|
cacheRegistrationDate(DateTime.now());
|
||||||
emit(OAuthState.loaded(token: token));
|
emit(OAuthState.loaded(token: token));
|
||||||
} on DioException catch (e, st) {
|
} on DioException catch (e, st) {
|
||||||
@@ -241,7 +245,7 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
|
|||||||
'OAuthCubit: OAuth verification confirmed successfully, token received',
|
'OAuthCubit: OAuth verification confirmed successfully, token received',
|
||||||
);
|
);
|
||||||
await TokenStorage.saveTokenInStorage(response.token);
|
await TokenStorage.saveTokenInStorage(response.token);
|
||||||
await firebaseApi.registerPushToken();
|
await sessionLifecycleService.onAuthenticated();
|
||||||
emit(OAuthState.loaded(token: response.token));
|
emit(OAuthState.loaded(token: response.token));
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
await reportFrom(e, st, this);
|
await reportFrom(e, st, this);
|
||||||
|
|||||||
@@ -4,12 +4,10 @@ import 'package:eatvio_app/app_keys.dart';
|
|||||||
import 'package:eatvio_app/core/app_config.dart';
|
import 'package:eatvio_app/core/app_config.dart';
|
||||||
import 'package:eatvio_app/core/app_router.dart';
|
import 'package:eatvio_app/core/app_router.dart';
|
||||||
import 'package:eatvio_app/core/const.dart';
|
import 'package:eatvio_app/core/const.dart';
|
||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
|
||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:eatvio_app/core/utils/image_constant.dart';
|
import 'package:eatvio_app/core/utils/image_constant.dart';
|
||||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
|
||||||
import 'package:eatvio_app/core/widgets/custom_divider.dart';
|
import 'package:eatvio_app/core/widgets/custom_divider.dart';
|
||||||
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
||||||
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
|
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
|
||||||
@@ -18,13 +16,11 @@ import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_cub
|
|||||||
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
|
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
|
||||||
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
||||||
import 'package:eatvio_app/core/di/cubit_registrations.dart';
|
import 'package:eatvio_app/core/di/cubit_registrations.dart';
|
||||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
|
|
||||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
|
||||||
import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
|
import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
|
||||||
import 'package:flutter/gestures.dart';
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
|
import 'package:cupertino_ui/cupertino_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
|
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
|
||||||
import 'package:flutter_svg/flutter_svg.dart';
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
@@ -68,23 +64,8 @@ class _AuthScreenState extends State<AuthScreen> {
|
|||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _reconnectWebSocket(BuildContext context) async {
|
Future<void> _reconnectWebSocket() async {
|
||||||
try {
|
showSuccessToast('Успешный вход');
|
||||||
await sl<WsManager>().clear();
|
|
||||||
await sl<WsManager>().initialize();
|
|
||||||
} catch (e) {
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
if (context.mounted) {
|
|
||||||
try {
|
|
||||||
await sl<ProfileAvatarCubit>().getMyProfile();
|
|
||||||
await sl<ChatsCubit>().getChatRoomsWithLoading();
|
|
||||||
await sl<FirebaseApi>().registerPushToken();
|
|
||||||
showSuccessToast('Успешный вход');
|
|
||||||
} catch (e) {
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,18 +183,7 @@ class _AuthScreenState extends State<AuthScreen> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _reconnectAfterAuth() async {
|
Future<void> _reconnectAfterAuth() async {
|
||||||
final context = AppRouter.navigatorKey.currentContext;
|
showSuccessToast('Успешный вход');
|
||||||
if (context == null) return;
|
|
||||||
try {
|
|
||||||
await sl<WsManager>().clear();
|
|
||||||
await sl<WsManager>().initialize();
|
|
||||||
await sl<ProfileAvatarCubit>().getMyProfile();
|
|
||||||
await sl<ChatsCubit>().getChatRoomsWithLoading();
|
|
||||||
await sl<FirebaseApi>().registerPushToken();
|
|
||||||
showSuccessToast('Успешный вход');
|
|
||||||
} catch (e) {
|
|
||||||
log(e.toString());
|
|
||||||
}
|
|
||||||
AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,7 +365,7 @@ class _AuthScreenState extends State<AuthScreen> {
|
|||||||
final isAuthenticated = await authCubit.getTokenByCredentials(emailController.text, passwordController.text);
|
final isAuthenticated = await authCubit.getTokenByCredentials(emailController.text, passwordController.text);
|
||||||
if (isAuthenticated) {
|
if (isAuthenticated) {
|
||||||
if (context.mounted) {
|
if (context.mounted) {
|
||||||
await _reconnectWebSocket(context);
|
await _reconnectWebSocket();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setState(() {
|
setState(() {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/utils/toasts.dart';
|
|||||||
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
|
||||||
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
|
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
|
||||||
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_state.dart';
|
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_state.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|||||||
@@ -9,15 +9,11 @@ import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_sta
|
|||||||
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
||||||
import 'package:eatvio_app/core/app_router.dart';
|
import 'package:eatvio_app/core/app_router.dart';
|
||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
|
||||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
|
|
||||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
|
||||||
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
|
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
|
||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
|
||||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||||
import 'package:eatvio_app/core/utils/validation_utils.dart';
|
import 'package:eatvio_app/core/utils/validation_utils.dart';
|
||||||
import 'package:flutter/gestures.dart';
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
|
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
@@ -62,23 +58,8 @@ class _RegisterViaSocialScreenState extends State<RegisterViaSocialScreen> {
|
|||||||
_initializeFieldsFromAuthResult();
|
_initializeFieldsFromAuthResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _reconnectWebSocket(BuildContext context) async {
|
Future<void> _reconnectWebSocket() async {
|
||||||
try {
|
showSuccessToast('Успешная регистрация');
|
||||||
await sl<WsManager>().clear();
|
|
||||||
await sl<WsManager>().initialize();
|
|
||||||
} catch (e) {
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
if (context.mounted) {
|
|
||||||
try {
|
|
||||||
await sl<ProfileAvatarCubit>().getMyProfile();
|
|
||||||
await sl<ChatsCubit>().getChatRoomsWithLoading();
|
|
||||||
await sl<FirebaseApi>().registerPushToken();
|
|
||||||
showSuccessToast('Успешная регистрация');
|
|
||||||
} catch (e) {
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
AppRouter.appRouter.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
AppRouter.appRouter.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,7 +432,7 @@ class _RegisterViaSocialScreenState extends State<RegisterViaSocialScreen> {
|
|||||||
Builder(
|
Builder(
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
_reconnectWebSocket(context);
|
_reconnectWebSocket();
|
||||||
});
|
});
|
||||||
return const SizedBox.shrink();
|
return const SizedBox.shrink();
|
||||||
},
|
},
|
||||||
@@ -795,7 +776,7 @@ class _RegisterViaSocialScreenState extends State<RegisterViaSocialScreen> {
|
|||||||
|
|
||||||
// Перезагружаем веб-сокет и переходим на главный экран
|
// Перезагружаем веб-сокет и переходим на главный экран
|
||||||
if (widgetContext.mounted) {
|
if (widgetContext.mounted) {
|
||||||
_reconnectWebSocket(widgetContext);
|
_reconnectWebSocket();
|
||||||
}
|
}
|
||||||
} catch (e, stackTrace) {
|
} catch (e, stackTrace) {
|
||||||
log('OAuth Verification Confirm Error: $e', error: e, stackTrace: stackTrace);
|
log('OAuth Verification Confirm Error: $e', error: e, stackTrace: stackTrace);
|
||||||
|
|||||||
@@ -3,14 +3,11 @@ import 'dart:io';
|
|||||||
import 'package:dio/dio.dart';
|
import 'package:dio/dio.dart';
|
||||||
import 'package:eatvio_app/core/app_config.dart';
|
import 'package:eatvio_app/core/app_config.dart';
|
||||||
import 'package:eatvio_app/core/app_router.dart';
|
import 'package:eatvio_app/core/app_router.dart';
|
||||||
import 'package:eatvio_app/core/firebase_api.dart';
|
|
||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
|
import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
|
||||||
import 'package:eatvio_app/core/token_storage.dart';
|
import 'package:eatvio_app/core/token_storage.dart';
|
||||||
import 'package:eatvio_app/core/utils/toasts.dart';
|
import 'package:eatvio_app/core/utils/toasts.dart';
|
||||||
import 'package:eatvio_app/core/websockets/ws_manager.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
|
|
||||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
|
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
|
||||||
|
|
||||||
@@ -39,7 +36,10 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(title: const Text('Сканирование QR-кода'), centerTitle: true),
|
appBar: AppBar(
|
||||||
|
title: const Text('Сканирование QR-кода'),
|
||||||
|
centerTitle: true,
|
||||||
|
),
|
||||||
body: Column(
|
body: Column(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Expanded(
|
Expanded(
|
||||||
@@ -60,30 +60,33 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
|
|||||||
try {
|
try {
|
||||||
final scannedUrl = scanData.code;
|
final scannedUrl = scanData.code;
|
||||||
final uri = Uri.parse(scannedUrl ?? '');
|
final uri = Uri.parse(scannedUrl ?? '');
|
||||||
final scannedBaseUrl = (uri.hasAuthority) ? '${uri.scheme}://${uri.host}' : '';
|
final scannedBaseUrl = (uri.hasAuthority)
|
||||||
|
? '${uri.scheme}://${uri.host}'
|
||||||
|
: '';
|
||||||
sl<AppConfig>().setBaseUrl(scannedBaseUrl);
|
sl<AppConfig>().setBaseUrl(scannedBaseUrl);
|
||||||
sl<Dio>().options.baseUrl = scannedBaseUrl;
|
sl<Dio>().options.baseUrl = scannedBaseUrl;
|
||||||
final response = await Dio().getUri(uri, options: Options(headers: {'accept': 'application/json', 'content-type': 'application/json'}));
|
final response = await Dio().getUri(
|
||||||
|
uri,
|
||||||
|
options: Options(
|
||||||
|
headers: {
|
||||||
|
'accept': 'application/json',
|
||||||
|
'content-type': 'application/json',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
final token = response.data['token'];
|
final token = response.data['token'];
|
||||||
await TokenStorage.saveTokenInStorage(token);
|
await TokenStorage.saveTokenInStorage(token);
|
||||||
try {
|
await sl<SessionLifecycleService>().onAuthenticated();
|
||||||
await sl<WsManager>().clear();
|
AppRouter.navigatorKey.currentContext?.go(
|
||||||
await sl<WsManager>().initialize();
|
'/feed-screen',
|
||||||
} catch (e) {
|
extra: {'needToInitializeWebSocket': false},
|
||||||
rethrow;
|
);
|
||||||
}
|
|
||||||
try {
|
|
||||||
await sl<ProfileAvatarCubit>().getMyProfile();
|
|
||||||
await sl<ChatsCubit>().getChatRoomsWithLoading();
|
|
||||||
await sl<FirebaseApi>().registerPushToken();
|
|
||||||
} catch (e) {
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
|
|
||||||
showSuccessToast('Добро пожаловать!');
|
showSuccessToast('Добро пожаловать!');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
await controller.resumeCamera();
|
await controller.resumeCamera();
|
||||||
showErrorToast('Что-то пошло не так. Попробуйте обновить страницу с QR-кодом или войдите с помощью логина и пароля.');
|
showErrorToast(
|
||||||
|
'Что-то пошло не так. Попробуйте обновить страницу с QR-кодом или войдите с помощью логина и пароля.',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import 'dart:io';
|
|||||||
|
|
||||||
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
|
||||||
import 'package:eatvio_app/features/auth/models/yandex_profile_model.dart';
|
import 'package:eatvio_app/features/auth/models/yandex_profile_model.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:eatvio_app/core/app_router.dart';
|
import 'package:eatvio_app/core/app_router.dart';
|
||||||
import 'package:eatvio_app/core/env_config.dart';
|
import 'package:eatvio_app/core/env_config.dart';
|
||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
|
|||||||
@@ -12,7 +12,11 @@ part 'auth_service.g.dart';
|
|||||||
|
|
||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class AuthService {
|
abstract class AuthService {
|
||||||
factory AuthService(Dio dio, {String? baseUrl}) = _AuthService;
|
factory AuthService(
|
||||||
|
Dio dio, {
|
||||||
|
String? baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _AuthService;
|
||||||
|
|
||||||
@POST('/api/login')
|
@POST('/api/login')
|
||||||
Future<TokenModel> getTokenByCredentials({@Body() required CredentialsModel credentials});
|
Future<TokenModel> getTokenByCredentials({@Body() required CredentialsModel credentials});
|
||||||
|
|||||||
@@ -5,7 +5,11 @@ part 'reset_password_service.g.dart';
|
|||||||
|
|
||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class ResetPasswordService {
|
abstract class ResetPasswordService {
|
||||||
factory ResetPasswordService(Dio dio, {String baseUrl}) = _ResetPasswordService;
|
factory ResetPasswordService(
|
||||||
|
Dio dio, {
|
||||||
|
String baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _ResetPasswordService;
|
||||||
|
|
||||||
@POST('/api/send_password_reset_code')
|
@POST('/api/send_password_reset_code')
|
||||||
Future<HttpResponse> sendEmailCodeForPasswordChange({
|
Future<HttpResponse> sendEmailCodeForPasswordChange({
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ part 'barcode_service.g.dart';
|
|||||||
|
|
||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class BarcodeService {
|
abstract class BarcodeService {
|
||||||
factory BarcodeService(Dio dio, {String baseUrl}) = _BarcodeService;
|
factory BarcodeService(
|
||||||
|
Dio dio, {
|
||||||
|
String baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _BarcodeService;
|
||||||
|
|
||||||
@GET('/api/gsone/barcode/{barcode}')
|
@GET('/api/gsone/barcode/{barcode}')
|
||||||
Future<BarcodeProductModel> getProductByBarcode({@Path('barcode') required String barcode});
|
Future<BarcodeProductModel> getProductByBarcode({@Path('barcode') required String barcode});
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.da
|
|||||||
import 'package:eatvio_app/core/locator_service.dart';
|
import 'package:eatvio_app/core/locator_service.dart';
|
||||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:share_plus/share_plus.dart';
|
import 'package:share_plus/share_plus.dart';
|
||||||
|
|||||||
@@ -21,8 +21,8 @@ import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart'
|
|||||||
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
|
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
|
||||||
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
|
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
|
||||||
import 'package:eatvio_app/generated/l10n.dart';
|
import 'package:eatvio_app/generated/l10n.dart';
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:material_ui/material_ui.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:cupertino_ui/cupertino_ui.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
|
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
@@ -614,10 +614,6 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
|
|||||||
|
|
||||||
void _onReorderGallery(int oldIndex, int newIndex) {
|
void _onReorderGallery(int oldIndex, int newIndex) {
|
||||||
setState(() {
|
setState(() {
|
||||||
if (newIndex > oldIndex) {
|
|
||||||
newIndex -= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldIndex < savedImages.length && newIndex < savedImages.length) {
|
if (oldIndex < savedImages.length && newIndex < savedImages.length) {
|
||||||
final item = savedImages.removeAt(oldIndex);
|
final item = savedImages.removeAt(oldIndex);
|
||||||
savedImages.insert(newIndex, item);
|
savedImages.insert(newIndex, item);
|
||||||
@@ -988,7 +984,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
|
|||||||
child: ReorderableListView.builder(
|
child: ReorderableListView.builder(
|
||||||
scrollDirection: Axis.horizontal,
|
scrollDirection: Axis.horizontal,
|
||||||
buildDefaultDragHandles: false,
|
buildDefaultDragHandles: false,
|
||||||
onReorder: _onReorderGallery,
|
onReorderItem: _onReorderGallery,
|
||||||
itemCount: _galleryCount + (_remainingSlots > 0 ? 1 : 0),
|
itemCount: _galleryCount + (_remainingSlots > 0 ? 1 : 0),
|
||||||
itemBuilder: (context, index) {
|
itemBuilder: (context, index) {
|
||||||
if (index == _galleryCount) {
|
if (index == _galleryCount) {
|
||||||
|
|||||||
@@ -5,7 +5,11 @@ part 'blog_post_service.g.dart';
|
|||||||
|
|
||||||
@RestApi()
|
@RestApi()
|
||||||
abstract class BlogPostService {
|
abstract class BlogPostService {
|
||||||
factory BlogPostService(Dio dio, {String baseUrl}) = _BlogPostService;
|
factory BlogPostService(
|
||||||
|
Dio dio, {
|
||||||
|
String baseUrl,
|
||||||
|
ParseErrorLogger? errorLogger,
|
||||||
|
}) = _BlogPostService;
|
||||||
|
|
||||||
@POST('/api/v2/blogPosts/create/published')
|
@POST('/api/v2/blogPosts/create/published')
|
||||||
@MultiPart()
|
@MultiPart()
|
||||||
|
|||||||
@@ -6,6 +6,13 @@ class NewMessagesCubit extends Cubit<NewMessagesState> {
|
|||||||
|
|
||||||
NewMessagesCubit() : super(const NewMessagesState.empty());
|
NewMessagesCubit() : super(const NewMessagesState.empty());
|
||||||
|
|
||||||
|
void reset() {
|
||||||
|
_messagesCount = 0;
|
||||||
|
if (!isClosed) {
|
||||||
|
emit(const NewMessagesState.empty());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void incrementCounter() {
|
void incrementCounter() {
|
||||||
_messagesCount++;
|
_messagesCount++;
|
||||||
emit(NewMessagesState.loaded(messagesCount: _messagesCount));
|
emit(NewMessagesState.loaded(messagesCount: _messagesCount));
|
||||||
|
|||||||
@@ -1,18 +1,22 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:appmetrica_plugin/appmetrica_plugin.dart';
|
import 'package:appmetrica_plugin/appmetrica_plugin.dart';
|
||||||
import 'package:eatvio_app/core/app_router.dart';
|
import 'package:eatvio_app/core/token_storage.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/bloc/profile_avatar_cubit/profile_avatar_state.dart';
|
||||||
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
|
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
import 'package:eatvio_app/core/error_reporting/report_from.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
|
|
||||||
class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
|
class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
|
||||||
final ProfileRepository profileRepository;
|
final ProfileRepository profileRepository;
|
||||||
|
|
||||||
ProfileAvatarCubit({required this.profileRepository}) : super(const ProfileAvatarState.loading());
|
ProfileAvatarCubit({required this.profileRepository})
|
||||||
|
: super(const ProfileAvatarState.loading());
|
||||||
|
|
||||||
|
int _requestId = 0;
|
||||||
|
int? _sessionFingerprint;
|
||||||
|
bool _ensuring = false;
|
||||||
|
|
||||||
int _calculateAge(String birthdate) {
|
int _calculateAge(String birthdate) {
|
||||||
try {
|
try {
|
||||||
@@ -25,7 +29,8 @@ class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
|
|||||||
final now = DateTime.now();
|
final now = DateTime.now();
|
||||||
int age = now.year - birthYear;
|
int age = now.year - birthYear;
|
||||||
|
|
||||||
if (now.month < birthMonth || (now.month == birthMonth && now.day < birthDay)) {
|
if (now.month < birthMonth ||
|
||||||
|
(now.month == birthMonth && now.day < birthDay)) {
|
||||||
age--;
|
age--;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,30 +43,82 @@ class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void reset() {
|
||||||
|
_requestId++;
|
||||||
|
_sessionFingerprint = null;
|
||||||
|
unawaited(AppMetrica.setUserProfileID(null).catchError((Object _) {}));
|
||||||
|
if (!isClosed) emit(const ProfileAvatarState.loading());
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> ensureFreshForCurrentSession() async {
|
||||||
|
final token = await TokenStorage.getTokenFromStorage();
|
||||||
|
if (token == null || token.isEmpty) {
|
||||||
|
reset();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final fingerprint = token.hashCode;
|
||||||
|
if (_sessionFingerprint == fingerprint &&
|
||||||
|
state is ProfileAvatarStateLoaded) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_ensuring) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_ensuring = true;
|
||||||
|
try {
|
||||||
|
await getMyProfile();
|
||||||
|
} finally {
|
||||||
|
_ensuring = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> getMyProfile() async {
|
Future<void> getMyProfile() async {
|
||||||
|
final requestId = ++_requestId;
|
||||||
|
final token = await TokenStorage.getTokenFromStorage();
|
||||||
|
final fingerprint = token?.hashCode;
|
||||||
|
if (isClosed || requestId != _requestId) return;
|
||||||
|
|
||||||
emit(const ProfileAvatarState.loading());
|
emit(const ProfileAvatarState.loading());
|
||||||
try {
|
try {
|
||||||
final profile = await profileRepository.getMyProfile();
|
final profile = await profileRepository.getMyProfile();
|
||||||
|
if (isClosed || requestId != _requestId) return;
|
||||||
|
|
||||||
final profileDetails = await profileRepository.getMyProfileDetails();
|
final profileDetails = await profileRepository.getMyProfileDetails();
|
||||||
|
if (isClosed || requestId != _requestId) return;
|
||||||
|
|
||||||
|
_sessionFingerprint = fingerprint;
|
||||||
emit(ProfileAvatarState.loaded(profile: profile));
|
emit(ProfileAvatarState.loaded(profile: profile));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final notificationStatus = await Permission.notification.status;
|
final notificationStatus = await Permission.notification.status;
|
||||||
|
if (isClosed || requestId != _requestId) return;
|
||||||
final isNotificationEnabled = notificationStatus.isGranted;
|
final isNotificationEnabled = notificationStatus.isGranted;
|
||||||
AppMetricaUserProfile userProfile = AppMetricaUserProfile([
|
AppMetricaUserProfile userProfile = AppMetricaUserProfile([
|
||||||
AppMetricaNameAttribute.withValue(profile.name),
|
AppMetricaNameAttribute.withValue(profile.name),
|
||||||
AppMetricaGenderAttribute.withValue(profileDetails.gender == 'male' ? AppMetricaGender.male : AppMetricaGender.female),
|
AppMetricaGenderAttribute.withValue(
|
||||||
AppMetricaBirthDateAttribute.withAge(_calculateAge(profileDetails.birthdate)),
|
profileDetails.gender == 'male'
|
||||||
AppMetricaNotificationEnabledAttribute.withValue(isNotificationEnabled),
|
? AppMetricaGender.male
|
||||||
|
: AppMetricaGender.female,
|
||||||
|
),
|
||||||
|
AppMetricaBirthDateAttribute.withAge(
|
||||||
|
_calculateAge(profileDetails.birthdate),
|
||||||
|
),
|
||||||
|
AppMetricaNotificationEnabledAttribute.withValue(
|
||||||
|
isNotificationEnabled,
|
||||||
|
),
|
||||||
]);
|
]);
|
||||||
AppMetrica.setUserProfileID(profile.slug);
|
AppMetrica.setUserProfileID(profile.slug);
|
||||||
AppMetrica.reportUserProfile(userProfile);
|
AppMetrica.reportUserProfile(userProfile);
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
await reportFrom(e, st, this);
|
await reportFrom(e, st, this);
|
||||||
// Игнорируем ошибки плагинов, профиль уже загружен
|
|
||||||
}
|
}
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
|
if (isClosed || requestId != _requestId) return;
|
||||||
await reportFrom(e, st, this);
|
await reportFrom(e, st, this);
|
||||||
AppRouter.navigatorKey.currentContext?.go('/auth-screen');
|
if (isClosed || requestId != _requestId) return;
|
||||||
emit(ProfileAvatarState.error(errorMessage: e.toString()));
|
emit(ProfileAvatarState.error(errorMessage: e.toString()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user