diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml
index 9d810d8e..c9649f0e 100644
--- a/.gitea/workflows/test-flight-cd.yaml
+++ b/.gitea/workflows/test-flight-cd.yaml
@@ -11,6 +11,29 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
+ - name: Checkout env repository
+ uses: actions/checkout@v2
+ with:
+ repository: mso7nueh/eatvio_app_env
+ path: env_repo
+ token: ${{ vars.MSO7NUEH_TOKEN }}
+ ref: main
+
+ - name: Copy .env file
+ run: |
+ cp env_repo/.env .env
+
+ - name: Load environment variables from .env
+ run: |
+ set -a
+ source .env
+ set +a
+ # Export all variables to GITHUB_ENV
+ while IFS= read -r line; do
+ if [[ $line =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+ echo "$line" >> $GITHUB_ENV
+ fi
+ done < .env
- name: Unlock login keychain
run: |
@@ -18,12 +41,25 @@ jobs:
env:
KEYCHAIN_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }}
+ - name: Setup API key
+ run: |
+ echo "${API_APPSTORE_KEY}" | tr -d '\n' | base64 --decode > ios/AuthKey.p8
+ chmod 600 ios/AuthKey.p8
+ ls -la ios/AuthKey.p8
+ echo "File size: $(wc -c < ios/AuthKey.p8) bytes"
+ echo "Contents of ios directory:"
+ ls -la ios/
+ env:
+ API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}
+
- name: Flutter build
run: |
flutter clean
flutter pub get
flutter pub upgrade
flutter pub run build_runner build --delete-conflicting-outputs
+ # Configure Flutter for release mode
+ flutter build ios --config-only --release
cd ios
pod update
fastlane beta
@@ -31,6 +67,8 @@ jobs:
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
MATCH_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }}
+ FASTLANE_PASSWORD: ${{ vars.FASTLANE_PASSWORD }}
MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane
FASTLANE_USER: eatvio2023@icloud.com
- FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
\ No newline at end of file
+ FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+ API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 75372b09..f1f63162 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -3,7 +3,7 @@ name: Eatvio App Android Test
on: [ pull_request ]
env:
- flutter_version: "3.32.5"
+ flutter_version: "3.35.1"
java_version: "21.x"
flutter_channel: "stable"
my_local_cache_dir: "/opt/hostedtoolcache/"
@@ -16,6 +16,30 @@ jobs:
steps:
- uses: actions/checkout@v3
+ - name: Checkout env repository
+ uses: actions/checkout@v3
+ with:
+ repository: mso7nueh/eatvio_app_env
+ path: env_repo
+ token: ${{ vars.MSO7NUEH_TOKEN }}
+ ref: main
+
+ - name: Copy .env file
+ run: |
+ cp env_repo/.env .env
+
+ - name: Load environment variables from .env
+ run: |
+ set -a
+ source .env
+ set +a
+ # Export all variables to GITHUB_ENV
+ while IFS= read -r line; do
+ if [[ $line =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+ echo "$line" >> $GITHUB_ENV
+ fi
+ done < .env
+
- name: Create key.properties file
run: |
cat > android/key.properties <
+
+
+
diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
index f21ab9cc..4921e6e4 100644
--- a/android/build/reports/problems/problems-report.html
+++ b/android/build/reports/problems/problems-report.html
@@ -650,12 +650,12 @@ code + .copy-button {
diff --git a/android/gradle.properties b/android/gradle.properties
index 25971708..f018a618 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index f587a472..e603bd33 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 833c476b..e173b2c9 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,11 +18,11 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
- id "com.android.application" version "8.7.3" apply false
+ id "com.android.application" version "8.12.0" apply false
// START: FlutterFire Configuration
- id "com.google.gms.google-services" version "4.4.2" apply false
+ id "com.google.gms.google-services" version "4.4.3" apply false
// END: FlutterFire Configuration
- id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+ id "org.jetbrains.kotlin.android" version "2.2.10" apply false
}
include ":app"
diff --git a/assets/icons/reply.svg b/assets/icons/reply.svg
new file mode 100644
index 00000000..b62c76ae
--- /dev/null
+++ b/assets/icons/reply.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/resend.svg b/assets/icons/resend.svg
new file mode 100644
index 00000000..245a03be
--- /dev/null
+++ b/assets/icons/resend.svg
@@ -0,0 +1,3 @@
+
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 8c6e5614..86343d86 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
CFBundleVersion
1.0
MinimumOSVersion
- 12.0
+ 16.0
diff --git a/ios/Gemfile b/ios/Gemfile
index 7a118b49..791ac593 100644
--- a/ios/Gemfile
+++ b/ios/Gemfile
@@ -1,3 +1,3 @@
source "https://rubygems.org"
-gem "fastlane"
+gem "fastlane", "~> 2.217"
diff --git a/ios/Podfile b/ios/Podfile
index 53a8d390..4fe34ec9 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-platform :ios, '14.0'
+platform :ios, '16.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -39,7 +39,7 @@ post_install do |installer|
flutter_additional_ios_build_settings(target)
target.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
- config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+ config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
'$(inherited)',
## dart: PermissionGroup.camera
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 65f4f4f7..7d740632 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -370,7 +370,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -388,7 +388,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 38;
+ CURRENT_PROJECT_VERSION = 71;
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -406,7 +406,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 1.0.50;
+ MARKETING_VERSION = 1.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
@@ -466,7 +466,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -518,7 +518,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -538,7 +538,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 38;
+ CURRENT_PROJECT_VERSION = 71;
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -556,7 +556,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 1.0.50;
+ MARKETING_VERSION = 1.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
@@ -576,7 +576,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
CODE_SIGN_STYLE = Manual;
- CURRENT_PROJECT_VERSION = 38;
+ CURRENT_PROJECT_VERSION = 71;
DEVELOPMENT_TEAM = VL68C36HYS;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -594,7 +594,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- MARKETING_VERSION = 1.0.50;
+ MARKETING_VERSION = 1.2.3;
PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 9c12df59..1a6f2553 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -41,7 +41,7 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- eatvio_app
+ Итвио
CFBundlePackageType
APPL
CFBundleShortVersionString
@@ -21,7 +21,7 @@
CFBundleSignature
????
CFBundleVersion
- 38
+ 71
ITSAppUsesNonExemptEncryption
LSRequiresIPhoneOS
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 4073b355..3a74adf3 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -18,9 +18,69 @@ default_platform(:ios)
platform :ios do
desc "Push a new beta build to TestFlight"
lane :beta do
- match(type: "appstore")
+ UI.message "Current working directory: #{Dir.pwd}"
+ UI.message "Checking API key file..."
+
+ possible_paths = [
+ "../AuthKey.p8",
+ "./AuthKey.p8",
+ "../../AuthKey.p8",
+ File.expand_path("../AuthKey.p8"),
+ File.expand_path("./AuthKey.p8")
+ ]
+
+ auth_key_path = nil
+ possible_paths.each do |path|
+ if File.exist?(path)
+ UI.message "Found AuthKey.p8 at: #{path}"
+ auth_key_path = File.expand_path(path)
+ break
+ end
+ end
+
+ if auth_key_path.nil?
+ UI.user_error!("API key file not found. Tried paths: #{possible_paths.join(', ')}")
+ end
+
+ UI.message "Using auth_key_path: #{auth_key_path}"
+
+ # Configure Flutter for release mode
+ UI.message "Configuring Flutter for release mode..."
+ sh("cd .. && flutter build ios --config-only --release")
+
+ match(type: "appstore", readonly: true)
increment_build_number(xcodeproj: "Runner.xcodeproj")
- build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store", codesigning_identity: "Apple Distribution")
- upload_to_testflight
+
+ build_app(
+ workspace: "Runner.xcworkspace",
+ scheme: "Runner",
+ export_method: "app-store",
+ codesigning_identity: "Apple Distribution",
+ )
+
+
+
+ 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
+ upload_to_testflight(
+ skip_waiting_for_build_processing: true,
+ skip_submission: true,
+ distribute_external: false,
+ notify_external_testers: false,
+ changelog: "TestFlight build #{get_build_number(xcodeproj: 'Runner.xcodeproj')}",
+ verbose: true
+ )
+ rescue => ex
+ UI.error "Upload to TestFlight failed: #{ex.message}"
+ UI.error "Full error: #{ex.backtrace.join("\n")}"
+ raise ex
+ end
end
end
diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
index c86e2b65..0d039029 100644
--- a/ios/fastlane/report.xml
+++ b/ios/fastlane/report.xml
@@ -5,22 +5,24 @@
-
+
-
+
-
+
-
+
+
+
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index 70107e0a..cc028255 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-import 'package:device_info_plus/device_info_plus.dart';
import 'package:dio/dio.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/firebase_api.dart';
@@ -26,6 +24,7 @@ import 'package:eatvio_app/features/consultations/presentation/pages/consultatio
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
import 'package:eatvio_app/features/menu/presentation/pages/blocked_users_screen.dart';
+import 'package:eatvio_app/features/menu/presentation/pages/notifications_settings_screen.dart';
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
import 'package:eatvio_app/features/create_diet/presentation/diet_preview_screen.dart';
@@ -113,21 +112,13 @@ class AppRouter {
name: 'authScreen',
builder: (context, state) => const AuthScreen(),
routes: [
- GoRoute(
- path: 'registration-screen',
- name: 'registrationScreen',
- builder: (context, state) => const RegistrationScreen(),
- ),
+ GoRoute(path: 'registration-screen', name: 'registrationScreen', builder: (context, state) => const RegistrationScreen()),
GoRoute(
path: 'forget-password-screen',
name: 'forgetPasswordScreen',
- builder: (context, state) => const ForgetPasswordScreen(),
- ),
- GoRoute(
- path: 'scan-qr-code-screen',
- name: 'scanQRCodeScreen',
- builder: (context, state) => const ScanQRCodeScreen(),
+ builder: (context, state) => ForgetPasswordScreen(isAuth: state.extra as bool),
),
+ GoRoute(path: 'scan-qr-code-screen', name: 'scanQRCodeScreen', builder: (context, state) => const ScanQRCodeScreen()),
],
),
ShellRoute(
@@ -165,19 +156,23 @@ class AppRouter {
GoRoute(
path: '/diary-screen',
name: 'diaryScreen',
- pageBuilder: (context, state) => const NoTransitionPage(
- child: DiaryScreen(),
- ),
+ pageBuilder: (context, state) => const NoTransitionPage(child: DiaryScreen()),
),
GoRoute(
- path: ConsultationsScreen.path,
- name: ConsultationsScreen.name,
- pageBuilder: (context, state) => const NoTransitionPage(child: ConsultationsScreen())),
- GoRoute(path: '/chat-select-screen', name: 'chatSelectScreen', pageBuilder: (context, state) => const NoTransitionPage(child: ChatsScreen())),
+ path: ConsultationsScreen.path,
+ name: ConsultationsScreen.name,
+ pageBuilder: (context, state) => const NoTransitionPage(child: ConsultationsScreen()),
+ ),
GoRoute(
- path: '/notifications-screen',
- name: 'notificationsScreen',
- pageBuilder: (context, state) => const NoTransitionPage(child: NotificationsScreen())),
+ path: '/chat-select-screen',
+ name: 'chatSelectScreen',
+ pageBuilder: (context, state) => const NoTransitionPage(child: ChatsScreen()),
+ ),
+ GoRoute(
+ path: '/notifications-screen',
+ name: 'notificationsScreen',
+ pageBuilder: (context, state) => const NoTransitionPage(child: NotificationsScreen()),
+ ),
GoRoute(
path: '/menu-screen',
name: 'menuScreen',
@@ -194,32 +189,16 @@ class AppRouter {
),
],
),
- GoRoute(
- name: 'blockedUsersScreen',
- path: '/blocked-users-screen',
- builder: (context, state) => const BlockedUsersScreen(),
- ),
+ GoRoute(name: 'blockedUsersScreen', path: '/blocked-users-screen', builder: (context, state) => const BlockedUsersScreen()),
GoRoute(
path: '/welcome-screen',
name: 'welcomeScreen',
builder: (context, state) => const WelcomeScreen(),
redirect: (context, state) async {
try {
- if (await TokenStorage.haveTokenInStorage()) {
- final firebaseApi = sl();
- final fbToken = await firebaseApi.getToken();
- final deviceInfo = DeviceInfoPlugin();
- await sl().post(
- '/api/profile/notification/token/register',
- data: {
- 'platform': Platform.isIOS ? 'ios' : 'android',
- 'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
- 'token': fbToken,
- },
- );
- }
final sharedPreferences = await SharedPreferences.getInstance();
final welcomeScreenWasShowed = sharedPreferences.getBool('welcomeScreenWasShowed') ?? false;
+ await sl().registerPushToken();
if (welcomeScreenWasShowed == false) {
return null;
} else if (await TokenStorage.haveTokenInStorage()) {
@@ -228,7 +207,7 @@ class AppRouter {
return '/auth-screen';
}
} catch (e) {
- rethrow;
+ return '/feed-screen';
}
},
),
@@ -253,26 +232,10 @@ class AppRouter {
}
},
),
- 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: UserPurchasesScreen.path,
- name: UserPurchasesScreen.name,
- builder: (context, state) => const UserPurchasesScreen(),
- ),
- GoRoute(
- path: '/user-finance-screen',
- name: 'userFinanceScreen',
- builder: (context, state) => const UserFinanceScreen(),
- ),
+ 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: UserPurchasesScreen.path, name: UserPurchasesScreen.name, builder: (context, state) => const UserPurchasesScreen()),
+ GoRoute(path: '/user-finance-screen', name: 'userFinanceScreen', builder: (context, state) => const UserFinanceScreen()),
GoRoute(
path: CardSettingsScreen.path,
name: CardSettingsScreen.name,
@@ -287,11 +250,7 @@ class AppRouter {
builder: (context, state) {
final slug = state.uri.queryParameters['slug'];
if (slug != null) {
- return AboutPlanScreen(
- slug: slug,
- navigateToComments: false,
- index: null,
- );
+ return AboutPlanScreen(slug: slug, navigateToComments: false, index: null);
}
final data = state.extra as Map;
@@ -305,29 +264,23 @@ class AppRouter {
builder: (context, state) {
final slug = state.uri.queryParameters['slug'];
if (slug != null) {
- return AboutRecipeScreen(
- recipeSlug: slug,
- navigateToComments: false,
- index: null,
- );
+ return AboutRecipeScreen(recipeSlug: slug, navigateToComments: false, index: null);
}
final data = state.extra as Map;
- return AboutRecipeScreen(
- recipeSlug: data['recipe'] as String,
- index: data['index'] as int?,
- navigateToComments: data['navigateToComments'] as bool,
- );
+ return AboutRecipeScreen(recipeSlug: data['recipe'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
},
),
GoRoute(
path: RecipeCreateScreen.path,
name: RecipeCreateScreen.name,
- builder: (context, state) => RecipeCreateScreen(
- recipe: state.extra != null ? state.extra as Recipe : null,
- ),
+ builder: (context, state) => RecipeCreateScreen(recipe: state.extra != null ? state.extra as Recipe : null),
+ ),
+ GoRoute(
+ path: '/profile-screen',
+ name: 'profileScreen',
+ builder: (context, state) => ProfileScreen(author: state.extra as Author),
),
- GoRoute(path: '/profile-screen', name: 'profileScreen', builder: (context, state) => ProfileScreen(author: state.extra as Author)),
GoRoute(
path: '/subs-screen/:slug',
name: 'subsScreen',
@@ -339,11 +292,7 @@ class AppRouter {
builder: (context, state) {
final slug = state.uri.queryParameters['slug'];
if (slug != null) {
- return AboutDietScreen(
- slug: slug,
- index: null,
- navigateToComments: false,
- );
+ return AboutDietScreen(slug: slug, index: null, navigateToComments: false);
}
final data = state.extra as Map;
return AboutDietScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
@@ -355,30 +304,26 @@ class AppRouter {
builder: (context, state) => BlogPostCreateScreen(feedBlogPostModel: state.extra != null ? state.extra as FeedBlogPostModel : null),
),
GoRoute(
- path: '/blog-post-screen',
- name: 'blogPostScreen',
- builder: (context, state) {
- final id = state.uri.queryParameters['id'];
- final parsedId = int.tryParse(id ?? '');
- if (parsedId != null) {
- return BlogPostScreen(
- id: parsedId,
- );
- }
+ path: '/blog-post-screen',
+ name: 'blogPostScreen',
+ builder: (context, state) {
+ final id = state.uri.queryParameters['id'];
+ final parsedId = int.tryParse(id ?? '');
+ if (parsedId != null) {
+ return BlogPostScreen(id: parsedId);
+ }
- return BlogPostScreen(id: state.extra as int);
- }),
+ return BlogPostScreen(id: state.extra as int);
+ },
+ ),
GoRoute(
path: '/chat-screen',
name: 'chatScreen',
builder: (context, state) {
final data = state.extra as Map;
- final chatId = data['chatId'] as String;
+ final uuid = data['uuid'] as String;
final sendInitialMessage = data['sendInitialMessage'] as bool?;
- return ChatScreen(
- chatId: chatId,
- sendInitialMessage: sendInitialMessage,
- );
+ return ChatScreen(uuid: uuid, sendInitialMessage: sendInitialMessage);
},
),
GoRoute(
@@ -411,7 +356,11 @@ class AppRouter {
name: 'physicalFormScreen',
builder: (context, state) => PhysicalFormScreen(settingsEntity: state.extra as SettingsEntity),
),
- GoRoute(path: 'pressure-screen', name: 'pressureScreen', builder: (context, state) => PressureScreen(settingsEntity: state.extra as SettingsEntity)),
+ GoRoute(
+ path: 'pressure-screen',
+ name: 'pressureScreen',
+ builder: (context, state) => PressureScreen(settingsEntity: state.extra as SettingsEntity),
+ ),
GoRoute(
path: 'change-password-screen',
name: 'changePasswordScreen',
@@ -428,9 +377,7 @@ class AppRouter {
GoRoute(
path: '/stepper-become-consultant-screen',
name: 'stepperBecomeConsultantScreen',
- builder: (context, state) => StepperBecomeConsultantScreen(
- slug: state.extra == null ? null : state.extra as String,
- ),
+ builder: (context, state) => StepperBecomeConsultantScreen(slug: state.extra == null ? null : state.extra as String),
),
GoRoute(path: '/calendar-screen', name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
GoRoute(path: '/support-screen', name: 'supportScreen', builder: (context, state) => const SupportScreen()),
@@ -458,7 +405,11 @@ class AppRouter {
GoRoute(path: CreatePlanScreen.path, name: CreatePlanScreen.name, builder: (context, state) => const CreatePlanScreen()),
GoRoute(path: MyDietsScreen.path, name: MyDietsScreen.name, builder: (context, state) => const MyDietsScreen()),
GoRoute(path: MyPlansScreen.path, name: MyPlansScreen.name, builder: (context, state) => const MyPlansScreen()),
- GoRoute(path: UserDetailsScreen.path, name: UserDetailsScreen.name, builder: (context, state) => UserDetailsScreen(slug: state.extra as String)),
+ GoRoute(
+ path: UserDetailsScreen.path,
+ name: UserDetailsScreen.name,
+ builder: (context, state) => UserDetailsScreen(slug: state.extra as String),
+ ),
GoRoute(path: DevToolsScreen.path, name: DevToolsScreen.name, builder: (context, state) => const DevToolsScreen()),
GoRoute(path: ConsultantRatingScreen.path, name: ConsultantRatingScreen.name, builder: (context, state) => const ConsultantRatingScreen()),
GoRoute(
@@ -468,10 +419,7 @@ class AppRouter {
final data = state.extra as Map;
final planId = data['planId'] as int;
final successfulPayment = data['successfulPayment'] as bool?;
- return InfoByOrderScreen(
- planId: planId,
- successfulPayment: successfulPayment,
- );
+ return InfoByOrderScreen(planId: planId, successfulPayment: successfulPayment);
},
),
GoRoute(
@@ -481,10 +429,7 @@ class AppRouter {
final data = state.extra as Map;
final planId = data['planId'] as int;
final url = data['url'] as String;
- return PaymentScreen(
- url: url,
- planId: planId,
- );
+ return PaymentScreen(url: url, planId: planId);
},
),
GoRoute(
@@ -494,10 +439,7 @@ class AppRouter {
final data = state.extra as Map;
final diaryId = data['diaryId'] as int;
final currentPlanDay = data['currentDiaryDay'] as int;
- return UserDiaryScreen(
- diaryId: diaryId,
- currentPlanDay: currentPlanDay,
- );
+ return UserDiaryScreen(diaryId: diaryId, currentPlanDay: currentPlanDay);
},
),
GoRoute(
@@ -505,16 +447,9 @@ class AppRouter {
name: 'verifyScreen',
builder: (context, state) => VerifyScreen(passKey: state.extra as String),
),
- GoRoute(
- path: '/verify-email-screen',
- name: 'verifyEmailScreen',
- builder: (context, state) => const VerifyEmailScreen(),
- ),
- GoRoute(
- path: MyRecipesScreen.path,
- name: MyRecipesScreen.name,
- builder: (context, state) => const MyRecipesScreen(),
- ),
+ GoRoute(path: '/verify-email-screen', name: 'verifyEmailScreen', builder: (context, state) => const VerifyEmailScreen()),
+ GoRoute(path: MyRecipesScreen.path, name: MyRecipesScreen.name, builder: (context, state) => const MyRecipesScreen()),
+ GoRoute(path: '/notifications-settings-screen', name: 'notificationsSettingsScreen', builder: (context, state) => const NotificationsSettingsScreen()),
],
);
}
diff --git a/lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart b/lib/core/comments/comments_cubit/comments_cubit.dart
similarity index 62%
rename from lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart
rename to lib/core/comments/comments_cubit/comments_cubit.dart
index 5bb62317..7e5df141 100644
--- a/lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart
+++ b/lib/core/comments/comments_cubit/comments_cubit.dart
@@ -1,20 +1,25 @@
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'dart:developer';
+
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class CommentsCubit extends Cubit {
final FeedRepository feedRepository;
+ final CommentsRepository commentsRepository;
CommentsCubit({
required this.feedRepository,
+ required this.commentsRepository,
}) : super(const CommentsState());
void setReplyId(int? replyId) {
emit((state as CommentsStateLoaded).copyWith(replyId: replyId));
}
- Future getComments(String id, CommentSourceType commentSourceType, [bool isFirstFetch = false]) async {
+ Future getComments(String id, CommentSourceType commentSourceType, [bool isFirstFetch = false]) async {
if (isFirstFetch) emit(const CommentsState.loading());
try {
switch (commentSourceType) {
@@ -27,7 +32,7 @@ class CommentsCubit extends Cubit {
case CommentSourceType.recipe:
emit(CommentsState.loaded(comment: await feedRepository.getRecipesComments(id: id)));
break;
- case CommentSourceType.plan:
+ case CommentSourceType.plan:
emit(CommentsState.loaded(comment: await feedRepository.getPlansComments(slug: id)));
break;
}
@@ -78,4 +83,34 @@ class CommentsCubit extends Cubit {
emit(CommentsState.error(errorMessage: e.toString()));
}
}
+
+ Future deleteComment({required int id}) async {
+ if (state is! CommentsStateLoaded) return false;
+ final commentModel = (state as CommentsStateLoaded).comment;
+ final updatedCommentModel = commentModel.copyWith(data: commentModel.data.where((comment) => comment.id != id).toList());
+ try {
+ await commentsRepository.deleteComment(id: id);
+ emit(CommentsState.loaded(comment: updatedCommentModel));
+ return true;
+ } catch (e, st) {
+ emit(CommentsState.loaded(comment: commentModel));
+ log(e.toString(), stackTrace: st);
+ }
+ return false;
+ }
+
+ Future updateComment({required int id, required String body}) async {
+ final commentModel = (state as CommentsStateLoaded).comment;
+ final updatedCommentModel =
+ commentModel.copyWith(data: commentModel.data.map((comment) => comment.id == id ? comment.copyWith(body: body) : comment).toList());
+ try {
+ await commentsRepository.updateComment(id: id, body: body);
+ emit(CommentsState.loaded(comment: updatedCommentModel));
+ return true;
+ } catch (e, st) {
+ emit(CommentsState.loaded(comment: commentModel));
+ log(e.toString(), stackTrace: st);
+ }
+ return false;
+ }
}
diff --git a/lib/features/feed/presentation/bloc/comments_cubit/comments_state.dart b/lib/core/comments/comments_cubit/comments_state.dart
similarity index 95%
rename from lib/features/feed/presentation/bloc/comments_cubit/comments_state.dart
rename to lib/core/comments/comments_cubit/comments_state.dart
index 0f9c49ea..79fed119 100644
--- a/lib/features/feed/presentation/bloc/comments_cubit/comments_state.dart
+++ b/lib/core/comments/comments_cubit/comments_state.dart
@@ -12,6 +12,7 @@ abstract class CommentsState with _$CommentsState {
const factory CommentsState.loaded({
required CommentModel comment,
int? replyId,
+ int? editedCommentId,
}) = CommentsStateLoaded;
const factory CommentsState.error({
diff --git a/lib/core/comments/models/comment_update_model.dart b/lib/core/comments/models/comment_update_model.dart
new file mode 100644
index 00000000..dfe26dfe
--- /dev/null
+++ b/lib/core/comments/models/comment_update_model.dart
@@ -0,0 +1,12 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'comment_update_model.freezed.dart';
+part 'comment_update_model.g.dart';
+
+@freezed
+abstract class CommentUpdateModel with _$CommentUpdateModel {
+
+ factory CommentUpdateModel({required String body}) = _CommentUpdateModel;
+
+ factory CommentUpdateModel.fromJson(Map json) => _$CommentUpdateModelFromJson(json);
+}
\ No newline at end of file
diff --git a/lib/core/comments/presentation/comments_actions_bottom_sheet.dart b/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
new file mode 100644
index 00000000..3c1c3859
--- /dev/null
+++ b/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
@@ -0,0 +1,173 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_action_widget.dart';
+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_text_form_field.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+void showCommentsActionsBottomSheet(
+ BuildContext context, {
+ required void Function()? reply,
+ required void Function() copy,
+ required void Function(String text) edit,
+ required void Function() delete,
+ required void Function() complain,
+ required String commentText,
+ required bool isMyComment,
+}) {
+ showModalBottomSheet(
+ context: context,
+ isScrollControlled: true,
+ backgroundColor: Colors.transparent,
+ builder: (context) => Container(
+ margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).padding.bottom + 20),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(12),
+ color: appTheme.whiteA700,
+ ),
+ child: CommentsActionsBottomSheet(
+ isMyComment: isMyComment,
+ reply: reply,
+ copy: copy,
+ edit: edit,
+ delete: delete,
+ complain: complain,
+ commentText: commentText,
+ ),
+ ));
+}
+
+class CommentsActionsBottomSheet extends StatefulWidget {
+ const CommentsActionsBottomSheet({
+ super.key,
+ required this.isMyComment,
+ required this.reply,
+ required this.copy,
+ required this.edit,
+ required this.delete,
+ required this.complain,
+ required this.commentText,
+ });
+ final bool isMyComment;
+ final void Function()? reply;
+ final void Function() copy;
+ final void Function(String text) edit;
+ final void Function() delete;
+ final void Function() complain;
+ final String commentText;
+
+ @override
+ State createState() => _CommentsActionsBottomSheetState();
+}
+
+class _CommentsActionsBottomSheetState extends State {
+ bool isUserEditingComment = false;
+ final controller = TextEditingController();
+ @override
+ void initState() {
+ super.initState();
+ controller.text = widget.commentText;
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final s = S.of(context);
+ return Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16),
+ child: isUserEditingComment
+ ? Padding(
+ padding: const EdgeInsets.symmetric(vertical: 16.0),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Row(children: [
+ Expanded(
+ child: CustomTextFormField(
+ autofocus: true,
+ controller: controller,
+ onChanged: (value) => setState(() {}),
+ ),
+ ),
+ const SizedBox(width: 8),
+ GestureDetector(
+ onTap: () {
+ widget.edit(controller.text);
+ GoRouter.of(context).pop();
+ },
+ child: Container(
+ decoration: BoxDecoration(
+ color: controller.text.length > 2 ? appTheme.blueA400 : appTheme.gray50,
+ shape: BoxShape.circle,
+ ),
+ height: 32,
+ width: 32,
+ child: Icon(
+ Icons.send_rounded,
+ size: 18,
+ color: controller.text.length > 2 ? appTheme.whiteA700 : appTheme.black,
+ ),
+ ),
+ )
+ ])
+ ],
+ ),
+ )
+ : Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const SizedBox(
+ height: 7,
+ ),
+ const BottomSheetHandlerBar(),
+ if (widget.isMyComment)
+ BottomSheetActionWidget(
+ text: s.edit,
+ iconPath: 'assets/icons/edit_paint.svg',
+ needToPop: false,
+ onTap: () => setState(() {
+ isUserEditingComment = true;
+ }),
+ )
+ else if (widget.reply != null)
+ BottomSheetActionWidget(
+ text: s.reply,
+ iconPath: 'assets/icons/reply.svg',
+ onTap: widget.reply!,
+ ),
+ if (widget.reply != null) const CustomDivider(),
+ BottomSheetActionWidget(
+ text: s.copy,
+ iconPath: 'assets/icons/copy2.svg',
+ onTap: widget.copy,
+ ),
+ if (widget.isMyComment) ...[
+ if (widget.reply != null) ...[
+ const CustomDivider(),
+ BottomSheetActionWidget(
+ text: s.reply,
+ iconPath: 'assets/icons/reply.svg',
+ onTap: widget.reply!,
+ ),
+ ],
+ const CustomDivider(),
+ BottomSheetActionWidget(
+ text: s.deleteComment,
+ iconPath: 'assets/icons/red_trash.svg',
+ onTap: widget.delete,
+ ),
+ ] else ...[
+ const CustomDivider(),
+ BottomSheetActionWidget(
+ text: s.complain,
+ iconPath: 'assets/icons/complain.svg',
+ onTap: widget.complain,
+ ),
+ ]
+ ],
+ ),
+ );
+ }
+}
+
diff --git a/lib/core/comments/repositories/comments_repository.dart b/lib/core/comments/repositories/comments_repository.dart
new file mode 100644
index 00000000..096c3690
--- /dev/null
+++ b/lib/core/comments/repositories/comments_repository.dart
@@ -0,0 +1,24 @@
+import 'package:eatvio_app/core/comments/models/comment_update_model.dart';
+import 'package:eatvio_app/core/comments/services/comments_service.dart';
+
+class CommentsRepository {
+ final CommentsService service;
+
+ CommentsRepository({required this.service});
+
+ Future deleteComment({required int id}) async {
+ try {
+ return service.deleteComment(id);
+ } catch (e) {
+ rethrow;
+ }
+ }
+
+ Future updateComment({required int id, required String body}) async {
+ try {
+ return service.updateComment(id, CommentUpdateModel(body: body));
+ } catch (e) {
+ rethrow;
+ }
+ }
+}
diff --git a/lib/core/comments/services/comments_service.dart b/lib/core/comments/services/comments_service.dart
new file mode 100644
index 00000000..606f61bd
--- /dev/null
+++ b/lib/core/comments/services/comments_service.dart
@@ -0,0 +1,16 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/comments/models/comment_update_model.dart';
+import 'package:retrofit/retrofit.dart';
+
+part 'comments_service.g.dart';
+
+@RestApi()
+abstract class CommentsService {
+ factory CommentsService(Dio dio, {String baseUrl}) = _CommentsService;
+
+ @DELETE('/api/comments/{id}')
+ Future deleteComment(@Path('id') int id);
+
+ @PATCH('/api/comments/{id}')
+ Future updateComment(@Path('id') int id, @Body() CommentUpdateModel body);
+}
diff --git a/lib/core/const.dart b/lib/core/const.dart
index 618a9866..98f7bc4a 100644
--- a/lib/core/const.dart
+++ b/lib/core/const.dart
@@ -1,4 +1,8 @@
-String baseUrl = 'https://eatvio.ru';
+import 'package:eatvio_app/core/env_config.dart';
+
+String baseUrl = EnvConfig.baseUrl;
+bool hidePlans = const bool.fromEnvironment('HIDE_PLANS', defaultValue: false);
+const buildDate = String.fromEnvironment('BUILD_DATE', defaultValue: '');
const List durationValues = [7, 14, 21];
diff --git a/lib/core/credentials_storage.dart b/lib/core/credentials_storage.dart
deleted file mode 100644
index 6e9870e5..00000000
--- a/lib/core/credentials_storage.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-abstract class CredentialsStorage {
- static Future haveCredentialsInStorage() async {
- try {
- if (await const FlutterSecureStorage().read(key: 'email') == null || await const FlutterSecureStorage().read(key: 'password') == null) {
- return false;
- } else {
- return true;
- }
- } catch (e) {
- return false;
- }
- }
-
- static Future> getCredentialsFromStorage() async {
- return {
- 'email': (await const FlutterSecureStorage().read(key: 'email'))!,
- 'password': (await const FlutterSecureStorage().read(key: 'password'))!,
- };
- }
-
- static Future saveCredentials(String email, String password) async {
- await const FlutterSecureStorage().write(key: 'email', value: email);
- await const FlutterSecureStorage().write(key: 'password', value: password);
- }
-
- static Future removeCredentials() async {
- await const FlutterSecureStorage().delete(key: 'email');
- await const FlutterSecureStorage().delete(key: 'password');
- }
-}
diff --git a/lib/core/enums/complained_content.dart b/lib/core/enums/complained_content.dart
index 66fe8ee1..4df54a33 100644
--- a/lib/core/enums/complained_content.dart
+++ b/lib/core/enums/complained_content.dart
@@ -1,7 +1 @@
-enum ComplainedContent {
- diet,
- plan,
- recipe,
- profile,
- posts
-}
\ No newline at end of file
+enum ComplainedContent { diet, plan, recipe, profile, posts, comment }
diff --git a/lib/core/env_config.dart b/lib/core/env_config.dart
new file mode 100644
index 00000000..a3404aeb
--- /dev/null
+++ b/lib/core/env_config.dart
@@ -0,0 +1,46 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+class EnvConfig {
+ static String get baseUrl => dotenv.env['BASE_URL'] ?? '';
+ static String get devBaseUrl => dotenv.env['DEV_BASE_URL'] ?? '';
+
+ // Sentry Configuration
+ static String get sentryDsn => dotenv.env['SENTRY_DSN'] ?? '';
+
+ // AppMetrica Configuration
+ static String get appMetricaApiKey => dotenv.env['APPMETRICA_KEY'] ?? '';
+
+ // Firebase Configuration
+ static String get firebaseProjectId => dotenv.env['FIREBASE_PROJECT_ID'] ?? '';
+ static String get firebaseDatabaseUrl => dotenv.env['FIREBASE_DATABASE_URL'] ?? '';
+ static String get firebaseStorageBucket => dotenv.env['FIREBASE_STORAGE_BUCKET'] ?? '';
+ static String get firebaseMessagingSenderId => dotenv.env['FIREBASE_MESSAGING_SENDER_ID'] ?? '';
+
+ // Firebase Android Configuration
+ static String get firebaseAndroidApiKey => dotenv.env['FIREBASE_ANDROID_API_KEY'] ?? '';
+ static String get firebaseAndroidAppId => dotenv.env['FIREBASE_ANDROID_APP_ID'] ?? '';
+
+ // Firebase iOS Configuration
+ static String get firebaseIosApiKey => dotenv.env['FIREBASE_IOS_API_KEY'] ?? '';
+ static String get firebaseIosAppId => dotenv.env['FIREBASE_IOS_APP_ID'] ?? '';
+ static String get firebaseIosBundleId => dotenv.env['FIREBASE_IOS_BUNDLE_ID'] ?? '';
+
+ // App Store URLs
+ static String get appStoreUrl => dotenv.env['APP_STORE_URL'] ?? '';
+ static String get rustoreUrl => dotenv.env['RUSTORE_URL'] ?? '';
+
+ // Telegram Support
+ static String get telegramSupportUrl => dotenv.env['TELEGRAM_SUPPORT_URL'] ?? '';
+ static String get supportEmail => dotenv.env['SUPPORT_EMAIL'] ?? '';
+
+ // Test Credentials (for development only)
+ static String get testEmail => dotenv.env['TEST_EMAIL'] ?? '';
+ static String get testPassword => dotenv.env['TEST_PASSWORD'] ?? '';
+
+ // Email Validation API
+ static String get emailValidationApiUrl => dotenv.env['EMAIL_VALIDATION_API_URL'] ?? '';
+
+ // Connection Check URLs
+ static String get googleCheckUrl => dotenv.env['GOOGLE_CHECK_URL'] ?? '';
+ static String get yandexCheckUrl => dotenv.env['YANDEX_CHECK_URL'] ?? '';
+}
diff --git a/lib/core/firebase_api.dart b/lib/core/firebase_api.dart
index fbf8e5c1..572b56f6 100644
--- a/lib/core/firebase_api.dart
+++ b/lib/core/firebase_api.dart
@@ -1,3 +1,10 @@
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/token_storage.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
class FirebaseApi {
@@ -7,4 +14,22 @@ class FirebaseApi {
await _firebaseMessaging.requestPermission();
return await _firebaseMessaging.getToken();
}
+
+ Future registerPushToken() async {
+ if (await TokenStorage.haveTokenInStorage()) {
+ try {
+ final deviceInfo = DeviceInfoPlugin();
+ await sl().post(
+ '/api/profile/notification/token/register',
+ data: {
+ 'platform': Platform.isIOS ? 'ios' : 'android',
+ 'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
+ 'token': await getToken(),
+ },
+ );
+ } catch (e, st) {
+ log(e.toString(), stackTrace: st);
+ }
+ }
+ }
}
diff --git a/lib/core/locator_service.dart b/lib/core/locator_service.dart
index 9036809a..971ebb2c 100644
--- a/lib/core/locator_service.dart
+++ b/lib/core/locator_service.dart
@@ -1,4 +1,6 @@
import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
+import 'package:eatvio_app/core/comments/services/comments_service.dart';
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/dio/phone_verify_error_interceptor.dart';
import 'package:eatvio_app/core/firebase_api.dart';
@@ -18,6 +20,9 @@ import 'package:eatvio_app/features/cancel_plan_bottom_sheet/service/cancel_plan
import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_cubit.dart';
import 'package:eatvio_app/features/complaining/repositories/complaining_repository.dart';
import 'package:eatvio_app/features/complaining/services/complaining_service.dart';
+import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_cubit.dart';
+import 'package:eatvio_app/features/consultant_rating/repositories/consultant_rating_repository.dart';
+import 'package:eatvio_app/features/consultant_rating/services/consultant_rating_service.dart';
import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart';
import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart';
import 'package:eatvio_app/features/consultations/services/consultation_service.dart';
@@ -38,8 +43,11 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_
import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_cubit.dart';
import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_cubit.dart';
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.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/services/blocked_users_service.dart';
+import 'package:eatvio_app/features/menu/services/notification_settings_service.dart';
import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart';
@@ -56,7 +64,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
import 'package:eatvio_app/features/diary/services/diary_service.dart';
import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
@@ -105,7 +113,6 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
import 'package:eatvio_app/features/settings/services/settings_service.dart';
import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:get_it/get_it.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
@@ -128,18 +135,20 @@ Future init() async {
sl.registerFactory(() => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl()));
sl.registerFactory(() => profile_plans.PlansCubit(plansRepository: sl()));
sl.registerFactory(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
- sl.registerFactory(() => CommentsCubit(feedRepository: sl()));
+ sl.registerFactory(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl()));
sl.registerFactory(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
sl.registerFactory(() => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl()));
sl.registerFactory(() => RegisterConsultantCubit(consultantRepository: sl()));
- sl.registerFactory(() => DiaryCubit(
- chatRepository: sl(),
- diaryRepository: sl(),
- glossaryRepository: sl(),
- profileRepository: sl(),
- dietRepository: sl(),
- settingsRepository: sl(),
- ));
+ sl.registerFactory(
+ () => DiaryCubit(
+ chatRepository: sl(),
+ diaryRepository: sl(),
+ glossaryRepository: sl(),
+ profileRepository: sl(),
+ dietRepository: sl(),
+ settingsRepository: sl(),
+ ),
+ );
sl.registerFactory(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()));
sl.registerFactory(() => BlogPostCreateCubit(blogPostRepository: sl()));
sl.registerFactory(() => SubCubit(profileRepository: sl()));
@@ -168,6 +177,8 @@ Future init() async {
sl.registerFactory(() => ResetPasswordCubit(resetPasswordRepository: sl()));
sl.registerFactory(() => BlogPostCubit(sl()));
sl.registerFactory(() => BlockedUsersCubit(blockedUsersRepository: sl()));
+ sl.registerFactory(() => NotificationSettingsCubit(notificationSettingsRepository: sl()));
+ sl.registerFactory(() => ConsultantRatingCubit(sl()));
// Repository
sl.registerLazySingleton(() => ChatRepository(chatService: sl()));
@@ -198,6 +209,9 @@ Future init() async {
sl.registerFactory(() => MyRecipesRepository(myRecipesService: sl()));
sl.registerFactory(() => ResetPasswordRepository(resetPasswordService: sl()));
sl.registerLazySingleton(() => BlockedUsersRepository(blockedUserService: sl()));
+ sl.registerLazySingleton(() => CommentsRepository(service: sl()));
+ sl.registerLazySingleton(() => NotificationSettingsRepository(sl()));
+ sl.registerFactory(() => ConsultantRatingRepository(sl()));
// Services
sl.registerLazySingleton(() => ChatService(sl()));
@@ -226,28 +240,18 @@ Future init() async {
sl.registerLazySingleton(() => CancelPlanService(sl()));
sl.registerLazySingleton(() => CreatePlanService(sl()));
sl.registerLazySingleton(() => NotificationsService(sl()));
- sl.registerLazySingleton(() => MyRecipesService(sl()));
sl.registerLazySingleton(() => FirebaseApi());
sl.registerLazySingleton(() => ResetPasswordService(sl()));
sl.registerLazySingleton(() => BlockedUserService(sl()));
+ sl.registerLazySingleton(() => CommentsService(sl()));
+ sl.registerLazySingleton(() => MyRecipesService(sl()));
+ sl.registerLazySingleton(() => ConsultantRatingService(sl()));
+ sl.registerLazySingleton(() => NotificationSettingsService(sl()));
// External
sl.registerLazySingleton(
- () => Dio(
- BaseOptions(
- baseUrl: baseUrl,
- headers: {
- 'accept': 'application/json',
- 'content-type': 'application/json',
- },
- validateStatus: (status) => status != null && status < 500,
- ),
- )..interceptors.addAll(
- [
- TokenInterceptor(),
- PhoneVerifyErrorInterceptor(),
- ],
- ),
+ () =>
+ Dio(BaseOptions(baseUrl: baseUrl, headers: {'accept': 'application/json', 'content-type': 'application/json'}))
+ ..interceptors.addAll([TokenInterceptor(), PhoneVerifyErrorInterceptor()]),
);
- sl.registerLazySingleton(() async => const FlutterSecureStorage());
}
diff --git a/lib/core/permission_handler/permission_handler.dart b/lib/core/permission_handler/permission_handler.dart
index a311e84d..f107c2c0 100644
--- a/lib/core/permission_handler/permission_handler.dart
+++ b/lib/core/permission_handler/permission_handler.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter/cupertino.dart';
@@ -11,6 +13,10 @@ class PermissionHandler {
required Future Function() onGranted,
required BuildContext context,
}) async {
+ if (Platform.isAndroid) {
+ await onGranted();
+ return;
+ }
final permissionState = await permission.request();
if (permissionState.isGranted) {
await onGranted();
diff --git a/lib/core/token_storage.dart b/lib/core/token_storage.dart
index cbfb8abb..f67e919c 100644
--- a/lib/core/token_storage.dart
+++ b/lib/core/token_storage.dart
@@ -1,9 +1,10 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
abstract class TokenStorage {
static Future haveTokenInStorage() async {
+ final sharedPreferences = await SharedPreferences.getInstance();
try {
- if (await const FlutterSecureStorage().read(key: 'token') == null) {
+ if (sharedPreferences.getString('token') == null) {
return false;
} else {
return true;
@@ -13,11 +14,48 @@ abstract class TokenStorage {
}
}
- static Future getTokenFromStorage() async => await const FlutterSecureStorage().read(key: 'token');
-
- static Future saveTokenInStorage(String token) async {
- await const FlutterSecureStorage().write(key: 'token', value: token);
+ static Future getTokenFromStorage() async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ return sharedPreferences.getString('token');
}
- static Future removeTokenInStorage() async => (await const FlutterSecureStorage().delete(key: 'token'));
+ static Future saveTokenInStorage(String token) async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ await sharedPreferences.setString('token', token);
+ }
+
+ static Future removeTokenInStorage() async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ await sharedPreferences.remove('token');
+ }
+}
+
+abstract class SocketIdStorage {
+ static Future haveSocketIdInStorage() async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ try {
+ if (sharedPreferences.getString('socketId') == null) {
+ return false;
+ } else {
+ return true;
+ }
+ } catch (e) {
+ return false;
+ }
+ }
+
+ static Future getSocketIdFromStorage() async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ return sharedPreferences.getString('socketId');
+ }
+
+ static Future saveSocketIdInStorage(String socketId) async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ await sharedPreferences.setString('socketId', socketId);
+ }
+
+ static Future removeSocketIdInStorage() async {
+ final sharedPreferences = await SharedPreferences.getInstance();
+ await sharedPreferences.remove('socketId');
+ }
}
diff --git a/lib/core/utils/date_time_utils.dart b/lib/core/utils/date_time_utils.dart
index bcc82aeb..701fa80e 100644
--- a/lib/core/utils/date_time_utils.dart
+++ b/lib/core/utils/date_time_utils.dart
@@ -3,11 +3,30 @@ import 'package:intl/intl.dart';
const String dateTimeFormatPattern = 'dd/MM/yyyy';
+/// Преобразует дату из формата гггг-мм-дд чч:мм:сс в дд.мм.гггг
+String formatBuildDate(String dateString) {
+ if (dateString.isEmpty) return '';
+
+ try {
+ final dateTimeParts = dateString.split(' ');
+ if (dateTimeParts.isNotEmpty) {
+ final datePart = dateTimeParts[0];
+ final dateParts = datePart.split('-');
+ if (dateParts.length == 3) {
+ final year = dateParts[0];
+ final month = dateParts[1];
+ final day = dateParts[2];
+ return '$day.$month.$year';
+ }
+ }
+ } catch (e) {
+ return dateString;
+ }
+ return dateString;
+}
+
extension DateTimeExtension on DateTime {
- String format([
- String pattern = dateTimeFormatPattern,
- String? locale,
- ]) {
+ String format([String pattern = dateTimeFormatPattern, String? locale]) {
final localDate = isUtc ? toLocal() : this;
if (locale != null && locale.isNotEmpty) {
initializeDateFormatting(locale);
@@ -19,17 +38,13 @@ extension DateTimeExtension on DateTime {
final localDate = isUtc ? toLocal() : this;
final now = DateTime.now();
final yesterday = DateTime(now.year, now.month, now.day).subtract(const Duration(days: 1));
- return localDate.year == yesterday.year &&
- localDate.month == yesterday.month &&
- localDate.day == yesterday.day;
+ return localDate.year == yesterday.year && localDate.month == yesterday.month && localDate.day == yesterday.day;
}
bool isToday() {
final localDate = isUtc ? toLocal() : this;
final now = DateTime.now();
- return now.year == localDate.year &&
- now.month == localDate.month &&
- now.day == localDate.day;
+ return now.year == localDate.year && now.month == localDate.month && now.day == localDate.day;
}
}
diff --git a/lib/core/websockets/ws_manager.dart b/lib/core/websockets/ws_manager.dart
index 73431542..528f2ae9 100644
--- a/lib/core/websockets/ws_manager.dart
+++ b/lib/core/websockets/ws_manager.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
import 'dart:developer';
import 'package:dart_pusher_channels/dart_pusher_channels.dart';
@@ -59,6 +60,24 @@ class WsManager {
),
);
+ String? extractSocketId(String? data) {
+ if (data == null) return null;
+ try {
+ final decoded = jsonDecode(data);
+ return decoded['socket_id'] as String?;
+ } catch (_) {
+ return null;
+ }
+ }
+
+ client?.eventStream.listen((event) async {
+ if (event.name == 'pusher:connection_established') {
+ final data = event.data;
+ final socketId = extractSocketId(data);
+ await SocketIdStorage.saveSocketIdInStorage(socketId!);
+ }
+ });
+
await client?.connect();
client = client;
@@ -77,9 +96,8 @@ class WsManager {
EasyDebounce.debounce(
'searchChatRoom',
const Duration(milliseconds: 300),
- () => sl().getChatRooms(),
+ () => sl().getChatRooms(),
);
- log(event.rootObject.toString());
});
_subscribe();
} catch (e, st) {
diff --git a/lib/core/widgets/bottom_sheet_action_widget.dart b/lib/core/widgets/bottom_sheet_action_widget.dart
new file mode 100644
index 00000000..004b5567
--- /dev/null
+++ b/lib/core/widgets/bottom_sheet_action_widget.dart
@@ -0,0 +1,33 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+
+class BottomSheetActionWidget extends StatelessWidget {
+ const BottomSheetActionWidget({super.key, required this.text, required this.iconPath, required this.onTap, this.needToPop = true, this.color});
+ final String text;
+ final String iconPath;
+ final void Function() onTap;
+ final bool needToPop;
+ final Color? color;
+ @override
+ Widget build(BuildContext context) {
+ return GestureDetector(
+ onTap: () {
+ if (needToPop) Navigator.pop(context);
+ onTap();
+ },
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 12),
+ child: Row(
+ children: [
+ Expanded(
+ child: Text(text, style: TextStyles.textLMedium.copyWith(color: appTheme.black)),
+ ),
+ SvgPicture.asset(iconPath, colorFilter: color != null ? ColorFilter.mode(color!, BlendMode.srcIn) : null),
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/core/widgets/custom_drop_down.dart b/lib/core/widgets/custom_drop_down.dart
index aca39b44..9580afe7 100644
--- a/lib/core/widgets/custom_drop_down.dart
+++ b/lib/core/widgets/custom_drop_down.dart
@@ -2,7 +2,8 @@ import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.d
import 'package:flutter/material.dart';
class CustomDropDown extends StatelessWidget {
- const CustomDropDown({super.key,
+ const CustomDropDown({
+ super.key,
this.alignment,
this.width,
this.focusNode,
@@ -48,12 +49,7 @@ class CustomDropDown extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return alignment != null
- ? Align(
- alignment: alignment ?? Alignment.center,
- child: _buildDropDownWidget(context),
- )
- : _buildDropDownWidget(context);
+ return alignment != null ? Align(alignment: alignment ?? Alignment.center, child: _buildDropDownWidget(context)) : _buildDropDownWidget(context);
}
DropdownButtonFormField _buildDropDownWidget(BuildContext context) {
@@ -61,7 +57,7 @@ class CustomDropDown extends StatelessWidget {
focusNode: focusNode ?? FocusNode(),
icon: const Icon(Icons.keyboard_arrow_down_rounded),
autofocus: autofocus!,
- value: value,
+ initialValue: value,
isDense: true,
isExpanded: true,
items: items?.map((SelectionPopupModel item) {
@@ -69,12 +65,7 @@ class CustomDropDown extends StatelessWidget {
value: item,
child: Text(
item.title,
- style: hintStyle ??
- const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w400,
- color: Colors.black,
- ),
+ style: hintStyle ?? const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black),
),
);
}).toList(),
@@ -90,19 +81,9 @@ class CustomDropDown extends StatelessWidget {
InputDecoration _buildInputDecoration(BuildContext context) {
return InputDecoration(
- labelStyle: const TextStyle(
- fontSize: 16,
- color: Colors.black,
- fontWeight: FontWeight.w400,
- ),
+ labelStyle: const TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w400),
hintText: hintText ?? "",
- hintStyle: hintStyle ??
- TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w400,
- color: Colors.grey.shade400,
- height: 1,
- ),
+ hintStyle: hintStyle ?? TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.grey.shade400, height: 1),
prefixIcon: prefix,
prefixIconConstraints: prefixConstraints,
suffixIcon: suffix,
@@ -111,18 +92,9 @@ class CustomDropDown extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
fillColor: const Color(0xFFF6F6F6),
filled: filled,
- border: const OutlineInputBorder(
- borderRadius: BorderRadius.all(Radius.circular(20)),
- borderSide: BorderSide.none,
- ),
- enabledBorder: const OutlineInputBorder(
- borderRadius: BorderRadius.all(Radius.circular(20)),
- borderSide: BorderSide.none,
- ),
- focusedBorder: const OutlineInputBorder(
- borderRadius: BorderRadius.all(Radius.circular(20)),
- borderSide: BorderSide.none,
- ),
+ border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
+ enabledBorder: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
+ focusedBorder: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
);
}
}
diff --git a/lib/core/widgets/custom_drop_down_button.dart b/lib/core/widgets/custom_drop_down_button.dart
index 714382e7..ac8f3c2b 100644
--- a/lib/core/widgets/custom_drop_down_button.dart
+++ b/lib/core/widgets/custom_drop_down_button.dart
@@ -3,14 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
class CustomDropDownButton extends StatelessWidget {
- const CustomDropDownButton({
- super.key,
- required this.items,
- required this.onChanged,
- this.value,
- this.hint,
- this.hasError = false,
- });
+ const CustomDropDownButton({super.key, required this.items, required this.onChanged, this.value, this.hint, this.hasError = false});
final T? value;
final List> items;
final void Function(T?)? onChanged;
@@ -20,11 +13,7 @@ class CustomDropDownButton extends StatelessWidget {
Widget build(BuildContext context) {
return DropdownButtonFormField(
hint: hint,
- icon: SvgPicture.asset(
- 'assets/icons/arrow_down2.svg',
- width: 12,
- height: 8,
- ),
+ icon: SvgPicture.asset('assets/icons/arrow_down2.svg', width: 12, height: 8),
borderRadius: BorderRadius.circular(20),
dropdownColor: appTheme.lightGray0,
decoration: InputDecoration(
@@ -43,7 +32,7 @@ class CustomDropDownButton extends StatelessWidget {
fillColor: appTheme.lightGray0,
filled: true,
),
- value: value,
+ initialValue: value,
items: items,
onChanged: onChanged,
);
diff --git a/lib/core/widgets/success_published_recipe_bottom_sheet.dart b/lib/core/widgets/success_published_recipe_bottom_sheet.dart
index 9fb1ddeb..796e7d91 100644
--- a/lib/core/widgets/success_published_recipe_bottom_sheet.dart
+++ b/lib/core/widgets/success_published_recipe_bottom_sheet.dart
@@ -26,9 +26,13 @@ class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
s.recipe_publishing,
style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
),
- Text(
- '"$title" ${s.successfully_published}',
- style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 12),
+ child: Text(
+ '"$title" ${s.successfully_published}',
+ textAlign: TextAlign.center,
+ style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+ ),
),
const SizedBox(
height: 20,
diff --git a/lib/features/auth/presentation/pages/auth_screen.dart b/lib/features/auth/presentation/pages/auth_screen.dart
index 31028059..73162bd2 100644
--- a/lib/features/auth/presentation/pages/auth_screen.dart
+++ b/lib/features/auth/presentation/pages/auth_screen.dart
@@ -1,6 +1,7 @@
import 'dart:async';
import 'package:eatvio_app/core/app_router.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/theme/theme_helper.dart';
import 'package:eatvio_app/core/utils/image_constant.dart';
@@ -46,12 +47,20 @@ class _AuthScreenState extends State {
super.initState();
var keyboardVisibilityController = KeyboardVisibilityController();
keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) {
- setState(() {
- isFocused = visible;
- });
+ if (mounted) {
+ setState(() {
+ isFocused = visible;
+ });
+ }
});
}
+ @override
+ void dispose() {
+ keyboardSubscription.cancel();
+ super.dispose();
+ }
+
Future _reconnectWebSocket(BuildContext context) async {
try {
await sl().clear();
@@ -66,19 +75,20 @@ class _AuthScreenState extends State {
await sl().connectToWebSocket();
await sl().getNotifications();
await sl().connectToWebSocket();
+ await sl().registerPushToken();
showSuccessToast('Успешный вход');
} catch (e) {
rethrow;
}
}
- AppRouter.navigatorKey.currentContext?.go(
- '/feed-screen',
- extra: {'needToInitializeWebSocket': false},
- );
+ AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
}
@override
Widget build(BuildContext context) {
+ var shortestSide = MediaQuery.sizeOf(context).shortestSide;
+ final bool useMobileLayout = shortestSide < 600;
+ if (!useMobileLayout) isFocused = true;
final s = S.of(context);
FlutterNativeSplash.remove();
return BlocProvider(
@@ -97,11 +107,7 @@ class _AuthScreenState extends State {
GoRouter.of(context).pushNamed(DevToolsScreen.name);
}
},
- child: SvgPicture.asset(
- ImageConstant.imgLogoEatvio,
- height: isFocused ? 64 : MediaQuery.of(context).size.width - 64,
- fit: BoxFit.contain,
- ),
+ child: SvgPicture.asset(ImageConstant.imgLogoEatvio, height: isFocused ? 64 : MediaQuery.of(context).size.width - 64, fit: BoxFit.contain),
),
),
body: SafeArea(
@@ -132,23 +138,16 @@ class _AuthScreenState extends State {
hidePassword = !hidePassword;
});
},
- icon: Icon(
- hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined,
- color: Colors.grey,
- ),
+ icon: Icon(hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined, color: Colors.grey),
),
),
const SizedBox(height: 16),
Center(
child: GestureDetector(
- onTap: () => GoRouter.of(context).goNamed('forgetPasswordScreen'),
+ onTap: () => GoRouter.of(context).goNamed('forgetPasswordScreen', extra: false),
child: Text(
'Забыли пароль?',
- style: TextStyle(
- color: appTheme.blueA400,
- decorationColor: appTheme.blueA400,
- decoration: TextDecoration.underline,
- ),
+ style: TextStyle(color: appTheme.blueA400, decorationColor: appTheme.blueA400, decoration: TextDecoration.underline),
),
),
),
@@ -161,11 +160,7 @@ class _AuthScreenState extends State {
onTap: () => GoRouter.of(context).goNamed('registrationScreen'),
child: Text(
'Зарегистрироваться',
- style: TextStyle(
- color: appTheme.blueA400,
- decorationColor: appTheme.blueA400,
- decoration: TextDecoration.underline,
- ),
+ style: TextStyle(color: appTheme.blueA400, decorationColor: appTheme.blueA400, decoration: TextDecoration.underline),
),
),
],
@@ -176,23 +171,22 @@ class _AuthScreenState extends State {
textAlign: TextAlign.center,
text: TextSpan(
text: 'Нажимая "Войти" или "Зарегистрироваться", Вы соглашаетесь \n',
- style: const TextStyle(
- fontSize: 12,
- color: Colors.black,
- ),
+ style: const TextStyle(fontSize: 12, color: Colors.black),
children: [
const TextSpan(text: 'c '),
- TextSpan(
- text: ' Публичной офертой',
- style: TextStyle(
- fontSize: 12,
- color: appTheme.blueA400,
- decorationColor: appTheme.blueA400,
- decoration: TextDecoration.underline,
+ if (!hidePlans) ...[
+ TextSpan(
+ text: ' Публичной офертой',
+ style: TextStyle(
+ fontSize: 12,
+ color: appTheme.blueA400,
+ decorationColor: appTheme.blueA400,
+ decoration: TextDecoration.underline,
+ ),
+ recognizer: TapGestureRecognizer()..onTap = () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
),
- recognizer: TapGestureRecognizer()..onTap = () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
- ),
- const TextSpan(text: ' и '),
+ const TextSpan(text: ' и '),
+ ],
TextSpan(
text: 'Политикой конфиденциальности\nи защитой персональных данных',
style: TextStyle(
@@ -218,17 +212,12 @@ class _AuthScreenState extends State {
highlightElevation: 0,
elevation: 0,
focusElevation: 0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(20),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
backgroundColor: state is AuthStateLoading ? Colors.black.withAlpha(50) : appTheme.blueA400,
onPressed: state is AuthStateLoading
? null
: () async {
- final isAuthenticated = await authCubit.getTokenByCredentials(
- emailController.text,
- passwordController.text,
- );
+ final isAuthenticated = await authCubit.getTokenByCredentials(emailController.text, passwordController.text);
if (isAuthenticated) {
if (context.mounted) {
_reconnectWebSocket(context);
@@ -237,10 +226,7 @@ class _AuthScreenState extends State {
},
label: state is AuthStateLoading
? const CupertinoActivityIndicator()
- : Text(
- 'Войти',
- style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
- ),
+ : Text('Войти', style: theme.textTheme.titleSmall!.copyWith(color: Colors.white)),
),
),
const SizedBox(width: 8),
@@ -252,21 +238,71 @@ class _AuthScreenState extends State {
highlightElevation: 0,
elevation: 0,
focusElevation: 0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(16),
- ),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
backgroundColor: state is AuthStateLoading ? Colors.black.withAlpha(50) : appTheme.blueA400,
onPressed: state is AuthStateLoading
? null
- : () {
- GoRouter.of(context).pushNamed('scanQRCodeScreen');
+ : () async {
+ await showDialog(
+ context: context,
+ builder: (BuildContext context) {
+ return Dialog(
+ child: Padding(
+ padding: const EdgeInsets.all(24),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ const Text('Где взять QR-код?\n', style: TextStyle(fontSize: 18)),
+ Text(
+ '1. Войдите на сайте $baseUrl в свой аккаунт\n\n2. Перейдите в настройки профиля\n\n3. В разделе "Доп информация" перейдите на "QR Login"',
+ ),
+ const SizedBox(height: 12),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.end,
+ children: [
+ InkWell(
+ borderRadius: BorderRadius.circular(8),
+ onTap: () {
+ AppRouter.navigatorKey.currentContext?.pop();
+ },
+ child: Ink(
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+ decoration: BoxDecoration(borderRadius: BorderRadius.circular(8)),
+ child: const Text(
+ 'Отмена',
+ style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400),
+ ),
+ ),
+ ),
+ const SizedBox(width: 8),
+ InkWell(
+ borderRadius: BorderRadius.circular(8),
+ onTap: () {
+ AppRouter.navigatorKey.currentContext?.pop();
+ AppRouter.navigatorKey.currentContext?.pushNamed('scanQRCodeScreen');
+ },
+ child: Ink(
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+ decoration: BoxDecoration(borderRadius: BorderRadius.circular(8)),
+ child: Text(
+ 'Перейти',
+ style: TextStyle(color: appTheme.blueA400, fontWeight: FontWeight.w600),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ );
+ },
+ );
},
label: state is AuthStateLoading
? const CupertinoActivityIndicator()
- : const Icon(
- Icons.qr_code_scanner_rounded,
- color: Colors.white,
- ),
+ : const Icon(Icons.qr_code_scanner_rounded, color: Colors.white),
),
),
],
diff --git a/lib/features/auth/presentation/pages/forget_password_screen.dart b/lib/features/auth/presentation/pages/forget_password_screen.dart
index 78313a15..d842fcfc 100644
--- a/lib/features/auth/presentation/pages/forget_password_screen.dart
+++ b/lib/features/auth/presentation/pages/forget_password_screen.dart
@@ -9,7 +9,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
class ForgetPasswordScreen extends StatefulWidget {
- const ForgetPasswordScreen({super.key});
+ final bool isAuth;
+ const ForgetPasswordScreen({super.key, required this.isAuth});
@override
State createState() => _ForgetPasswordScreenState();
@@ -29,7 +30,7 @@ class _ForgetPasswordScreenState extends State {
builder: (BuildContext context, ResetPasswordState state) {
return Scaffold(
appBar: AppBar(
- title: const Text('Смена пароля'),
+ title: widget.isAuth ? const Text('Смена пароля') : const Text('Восстановление пароля'),
centerTitle: false,
),
body: state is ResetPasswordStateLoadingResetPassword || state is ResetPasswordStateLoadingSendEmailCode
@@ -42,9 +43,9 @@ class _ForgetPasswordScreenState extends State {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (state is ResetPasswordStateCodeSendError || state is ResetPasswordStateEmpty) ...[
- const Text(
- 'Забыли пароль? Укажите свой email,\nи мы пришлём код для сброса.',
- style: TextStyle(
+ Text(
+ '${widget.isAuth ? '' : 'Забыли пароль? '}Укажите свой email,\nи мы пришлём код для сброса.',
+ style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
),
@@ -156,7 +157,7 @@ class _ForgetPasswordScreenState extends State {
}
if (state is ResetPasswordStateResetPassowrdSuccess) {
GoRouter.of(context).pop();
- showSuccessToast('Пароль успешно сменён. Войдите в аккаунт');
+ showSuccessToast('Пароль успешно сменён. ${widget.isAuth ? '' : 'Войдите в аккаунт'}');
}
},
),
diff --git a/lib/features/auth/presentation/pages/scan_qr_code_screen.dart b/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
index 411cb3a5..83296f0e 100644
--- a/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
+++ b/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
@@ -3,6 +3,7 @@ import 'dart:io';
import 'package:dio/dio.dart';
import 'package:eatvio_app/core/app_router.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/token_storage.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
@@ -92,6 +93,7 @@ class _ScanQRCodeScreenState extends State {
await sl().connectToWebSocket();
await sl().getNotifications();
await sl().connectToWebSocket();
+ await sl().registerPushToken();
} catch (e) {
rethrow;
}
diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
index aa4c82c2..25636a57 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -7,8 +7,8 @@ import 'package:eatvio_app/core/widgets/custom_popup.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart';
import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_state.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
import 'package:eatvio_app/core/locator_service.dart';
diff --git a/lib/features/chat/models/chat_message_model.dart b/lib/features/chat/models/chat_message_model.dart
index 7224912a..8dd8545a 100644
--- a/lib/features/chat/models/chat_message_model.dart
+++ b/lib/features/chat/models/chat_message_model.dart
@@ -15,7 +15,11 @@ abstract class ChatMessageModel with _$ChatMessageModel {
@JsonKey(name: 'read_by_to_user', defaultValue: false) required bool isRead,
@JsonKey(name: 'is_author_message_auth_user') required bool? isCurrentUserAuthor,
@JsonKey(name: 'room_id') required String? roomId,
+ @Default(MessageState.sent) @JsonKey(includeToJson: false, includeFromJson: false) MessageState messageState,
+ @Default(null) @JsonKey(includeToJson: false, includeFromJson: false) String? uuid,
}) = _ChatMessageModel;
factory ChatMessageModel.fromJson(Map json) => _$ChatMessageModelFromJson(json);
}
+
+enum MessageState { loading, sent, error }
diff --git a/lib/features/chat/models/chat_room_model.dart b/lib/features/chat/models/chat_room_model.dart
index d7bf450a..c5ee559f 100644
--- a/lib/features/chat/models/chat_room_model.dart
+++ b/lib/features/chat/models/chat_room_model.dart
@@ -22,13 +22,9 @@ abstract class ChatRoomModel with _$ChatRoomModel {
@freezed
abstract class Users with _$Users {
const factory Users({
-
@JsonKey(name: 'from_chat_user') required ChatUserModel sender,
@JsonKey(name: 'to_chat_user') required ChatUserModel receiver,
-
}) = _Users;
factory Users.fromJson(Map json) => _$UsersFromJson(json);
}
-
-
diff --git a/lib/features/chat/models/chat_room_pagination_model.dart b/lib/features/chat/models/chat_room_pagination_model.dart
index 7bb8ceb5..19de28c3 100644
--- a/lib/features/chat/models/chat_room_pagination_model.dart
+++ b/lib/features/chat/models/chat_room_pagination_model.dart
@@ -1,3 +1,4 @@
+import 'package:eatvio_app/core/models/pagination_model.dart';
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
@@ -8,29 +9,18 @@ part 'chat_room_pagination_model.g.dart';
@freezed
abstract class ChatRoomPaginationModel with _$ChatRoomPaginationModel {
const factory ChatRoomPaginationModel({
- @JsonKey(name: "chatRooms") required ChatRooms chatRooms,
+ @JsonKey(name: "data") required List data,
@JsonKey(name: "number_of_unread_chat_rooms") required int unreadChatsCount,
+ required Meta meta,
}) = _ChatRoomPreviewModel;
factory ChatRoomPaginationModel.fromJson(Map json) => _$ChatRoomPaginationModelFromJson(json);
}
-@freezed
-abstract class ChatRooms with _$ChatRooms {
- const factory ChatRooms({
- @JsonKey(name: "data") required List data,
- @JsonKey(name: "last_page") required int lastPage,
- @JsonKey(name: "current_page") required int currentPage,
- }) = _ChatRooms;
-
- factory ChatRooms.fromJson(Map json) => _$ChatRoomsFromJson(json);
-}
-
@freezed
abstract class ChatRoom with _$ChatRoom {
const factory ChatRoom({
@JsonKey(name: "id") required String id,
- @JsonKey(name: "room_name") required String roomName,
@JsonKey(name: "last_message", fromJson: parseLastMessage) required ChatMessageModel? lastMessage,
@JsonKey(name: "users") required Users users,
@JsonKey(name: "unread_messages_count") required int unreadMessagesCount,
diff --git a/lib/features/chat/models/chat_room_settings_model.dart b/lib/features/chat/models/chat_room_settings_model.dart
index 5298d3d9..737d0c82 100644
--- a/lib/features/chat/models/chat_room_settings_model.dart
+++ b/lib/features/chat/models/chat_room_settings_model.dart
@@ -6,11 +6,8 @@ part 'chat_room_settings_model.g.dart';
@freezed
abstract class ChatRoomSettingsModel with _$ChatRoomSettingsModel {
const factory ChatRoomSettingsModel({
- required int id,
- @JsonKey(name: 'room_name') required String roomName,
+ @JsonKey(name: 'room_name') required String name,
required String state,
- @JsonKey(name: 'access_level') required String accessLevel,
- @JsonKey(name: 'updated_at') required String updatedAt,
}) = _ChatRoomSettingsModel;
factory ChatRoomSettingsModel.fromJson(Map json) => _$ChatRoomSettingsModelFromJson(json);
diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
index 63bf9e19..5206889b 100644
--- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
@@ -4,6 +4,7 @@ import 'dart:developer';
import 'dart:io';
import 'package:audioplayers/audioplayers.dart';
+import 'package:collection/collection.dart';
import 'package:dart_pusher_channels/dart_pusher_channels.dart';
import 'package:easy_debounce/easy_debounce.dart';
import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
@@ -19,6 +20,7 @@ import 'package:eatvio_app/features/my_finance/models/card_model.dart';
import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:uuid/uuid.dart';
class ChatRoomCubit extends Cubit {
final ChatRepository chatRepository;
@@ -31,12 +33,9 @@ class ChatRoomCubit extends Cubit {
late int lastPage;
bool isLoading = false;
Timer? _timer;
+ var uuid = const Uuid();
- ChatRoomCubit({
- required this.chatRepository,
- required this.wsManager,
- required this.cardsRepository,
- }) : super(const ChatRoomState.loading());
+ ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(const ChatRoomState.loading());
void setTimer() {
_timer?.cancel();
@@ -47,14 +46,14 @@ class ChatRoomCubit extends Cubit {
_timer?.cancel();
}
- Future loadNextPage(String chatId) async {
+ Future loadNextPage(String uuid) async {
if (currentPage < lastPage && !isLoading) {
isLoading = true;
emit((state as ChatRoomStateLoaded).copyWith(isLoading: isLoading));
try {
- final chatMessages = await chatRepository.getChatMessages(chatId, currentPage + 1);
+ final chatMessages = await chatRepository.getChatMessages(uuid, currentPage + 1);
isLoading = false;
emit(
@@ -89,17 +88,16 @@ class ChatRoomCubit extends Cubit {
}
}
- Future initChat(String chatId, {bool sendInitialMessage = false}) async {
+ Future initChat(String uuid, {bool sendInitialMessage = false}) async {
try {
- final chatRoom = await chatRepository.getChatRoom(chatId);
+ final chatRoom = await chatRepository.getChatRoom(uuid);
ChosenPlanModel? chosenPlan;
if (chatRoom.chosenPlanId != null) {
chosenPlan = await chatRepository.getChosenPlan(id: chatRoom.chosenPlanId!);
}
- final chatMessages = await chatRepository.getChatMessages(chatId, currentPage);
+ final chatMessages = await chatRepository.getChatMessages(uuid, currentPage);
lastPage = chatMessages.meta.lastPage;
-
- await _subscribeToChatChannel(chatId: chatId);
+ await _subscribeToChatChannel(uuid: uuid, chatId: chatRoom.id);
emit(
ChatRoomState.loaded(
chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
@@ -158,43 +156,80 @@ class ChatRoomCubit extends Cubit {
}
}
- Future _subscribeToChatChannel({required String chatId}) async {
+ Future _subscribeToChatChannel({required String uuid, required String chatId}) async {
final client = wsManager.client;
if (client == null) return;
await wsManager.initPrivateDirectChatChannel(chatId);
wsManager.subscribeDirectChatChannel();
messagesSubscription = wsManager.directChatStream?.listen((event) {
AudioPlayer().play((AssetSource('audio/recive_message.wav')));
- final message = ChatMessageModel.fromJson(jsonDecode(event.data)['message']);
+ final message = ChatMessageModel.fromJson(jsonDecode(event.data));
List messagesList = [message, ...(state as ChatRoomStateLoaded).chatMessages];
chatRepository.emitNewMessageToChats(message);
emit((state as ChatRoomStateLoaded).copyWith(chatMessages: messagesList, isLoading: isLoading));
- EasyDebounce.debounce(
- 'searchChatRoom',
- const Duration(milliseconds: 300),
- () => sl().getChatRooms(),
- );
+ EasyDebounce.debounce('searchChatRoom', const Duration(milliseconds: 300), () => sl().getChatRooms());
});
typingSubscription = wsManager.clientTypingStream?.listen((event) {
emit((state as ChatRoomStateLoaded).copyWith(isTyping: true, isLoading: isLoading));
EasyDebounce.debounce(
- 'client-typing', const Duration(seconds: 3), () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)));
+ 'client-typing',
+ const Duration(seconds: 3),
+ () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)),
+ );
});
}
- Future sendMessage({
- String? data,
- List? files,
- required String userSlug,
- }) async {
+ Future sendMessage({String? data, List? files, required String userSlug}) async {
try {
- await chatRepository.sendMessage(
- data: data,
- files: files != null ? await ImageCompressUtility.compressFilesList(List.from(files)) : null,
- slug: userSlug,
- );
+ final messageUuid = uuid.v4();
+ final compressedFiles = files != null ? await ImageCompressUtility.compressFilesList(List.from(files)) : null;
AudioPlayer().play((AssetSource('audio/send_message.wav')));
+ emit(
+ (state as ChatRoomStateLoaded).copyWith(
+ chatMessages: [
+ ChatMessageModel(
+ id: 1,
+ data: data ?? '',
+ mediaData: compressedFiles,
+ authorId: 1,
+ updatedAt: DateTime.now(),
+ isRead: true,
+ isCurrentUserAuthor: true,
+ roomId: '',
+ messageState: MessageState.loading,
+ uuid: messageUuid,
+ ),
+ ...(state as ChatRoomStateLoaded).chatMessages,
+ ],
+ ),
+ );
+
+ try {
+ await chatRepository.sendMessage(data: data, files: compressedFiles, slug: userSlug);
+ emit(
+ (state as ChatRoomStateLoaded).copyWith(
+ chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+ if (elem.uuid == messageUuid) {
+ return elem.copyWith(messageState: MessageState.sent);
+ }
+ return elem;
+ }).toList(),
+ ),
+ );
+ } catch (e) {
+ emit(
+ (state as ChatRoomStateLoaded).copyWith(
+ chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+ if (elem.uuid == messageUuid) {
+ return elem.copyWith(messageState: MessageState.error);
+ }
+ return elem;
+ }).toList(),
+ ),
+ );
+ }
+ sl().getChatRooms();
return true;
} catch (e, st) {
log(e.toString(), stackTrace: st);
@@ -239,7 +274,10 @@ class ChatRoomCubit extends Cubit {
try {
final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
if (planId == null) return false;
- await chatRepository.complainAboutConsultation(id: planId, body: PlanComplainModel(description: description));
+ await chatRepository.complainAboutConsultation(
+ id: planId,
+ body: PlanComplainModel(description: description),
+ );
return true;
} catch (e) {
log(e.toString());
@@ -267,4 +305,70 @@ class ChatRoomCubit extends Cubit {
typingSubscription?.cancel();
super.close();
}
+
+ void deleteMessage(String uuid) {
+ final currentState = state;
+ if (currentState is ChatRoomStateLoaded) {
+ emit(currentState.copyWith(chatMessages: currentState.chatMessages.where((message) => message.uuid != uuid).toList()));
+ }
+ }
+
+ Future resendMessage({required String uuid, required String userSlug}) async {
+ final currentState = state;
+ if (currentState is ChatRoomStateLoaded) {
+ final message = currentState.chatMessages.firstWhereOrNull((message) => message.uuid == uuid);
+ if (message != null) {
+ try {
+ AudioPlayer().play((AssetSource('audio/send_message.wav')));
+ emit(
+ (state as ChatRoomStateLoaded).copyWith(
+ chatMessages: [
+ ChatMessageModel(
+ id: 1,
+ data: message.data,
+ mediaData: message.mediaData,
+ authorId: 1,
+ updatedAt: DateTime.now(),
+ isRead: true,
+ isCurrentUserAuthor: true,
+ roomId: '',
+ messageState: MessageState.loading,
+ uuid: uuid,
+ ),
+ ...(state as ChatRoomStateLoaded).chatMessages.where((message) => message.uuid != uuid),
+ ],
+ ),
+ );
+
+ try {
+ await chatRepository.sendMessage(data: message.data, files: message.mediaData as List?, slug: userSlug);
+ emit(
+ (state as ChatRoomStateLoaded).copyWith(
+ chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+ if (elem.uuid == uuid) {
+ return elem.copyWith(messageState: MessageState.sent);
+ }
+ return elem;
+ }).toList(),
+ ),
+ );
+ } catch (e) {
+ emit(
+ (state as ChatRoomStateLoaded).copyWith(
+ chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+ if (elem.uuid == uuid) {
+ return elem.copyWith(messageState: MessageState.error);
+ }
+ return elem;
+ }).toList(),
+ ),
+ );
+ }
+ sl().getChatRooms();
+ } catch (e, st) {
+ log(e.toString(), stackTrace: st);
+ }
+ }
+ }
+ }
}
diff --git a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
index 3b50c995..174108b3 100644
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
@@ -21,7 +21,7 @@ class ChatsCubit extends Cubit {
required this.chatRepository,
required this.wsManager,
required this.profileRepository,
- }) : super(ChatsState()) {
+ }) : super(ChatsState()) {
newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((message) {
_setNewLastMessage(message);
});
@@ -29,6 +29,7 @@ class ChatsCubit extends Cubit {
String? _query;
int page = 1;
late int lastPage;
+
Future connectToWebSocket() async {
await newIncomingMessagesSubscription?.cancel();
newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((event) {
@@ -43,10 +44,10 @@ class ChatsCubit extends Cubit {
try {
final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
- lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
+ lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
emit(
state.copyWith(
- chatRooms: chatRoomsPaginationModel.chatRooms.data,
+ chatRooms: chatRoomsPaginationModel.data,
chatsWithUnreadMessagesCount: unreadChats,
state: BaseState.success,
),
@@ -65,10 +66,10 @@ class ChatsCubit extends Cubit {
try {
final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
- lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
+ lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
emit(
state.copyWith(
- chatRooms: chatRoomsPaginationModel.chatRooms.data,
+ chatRooms: chatRoomsPaginationModel.data,
chatsWithUnreadMessagesCount: unreadChats,
state: BaseState.success,
),
@@ -90,7 +91,7 @@ class ChatsCubit extends Cubit {
final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
emit(
state.copyWith(
- chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.chatRooms.data],
+ chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.data],
chatsWithUnreadMessagesCount: unreadChats,
state: BaseState.success,
isLoadingMoreChats: false,
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 55f74d70..97a574ee 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -13,6 +13,8 @@ import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.da
import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
@@ -32,10 +34,10 @@ import 'package:intl/intl.dart';
import 'package:visibility_detector/visibility_detector.dart';
class ChatScreen extends StatefulWidget {
- final String chatId;
+ final String uuid;
final bool? sendInitialMessage;
- const ChatScreen({required this.chatId, super.key, required this.sendInitialMessage});
+ const ChatScreen({required this.uuid, super.key, required this.sendInitialMessage});
@override
State createState() => _ChatScreenState();
@@ -64,14 +66,14 @@ class _ChatScreenState extends State {
void initState() {
super.initState();
scrollController.addListener(_onScroll);
- chatRoomCubit.initChat(widget.chatId, sendInitialMessage: widget.sendInitialMessage ?? false);
+ chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
chatRoomCubit.setTimer();
_listener = AppLifecycleListener(onHide: _onHide, onResume: _onResume);
}
void _onScroll() {
if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
- chatRoomCubit.loadNextPage(widget.chatId);
+ chatRoomCubit.loadNextPage(widget.uuid);
}
}
@@ -93,7 +95,10 @@ class _ChatScreenState extends State {
if (state is ChatRoomStateLoaded) {
return _buildChat(context, state);
} else if (state is ChatRoomStateError) {
- return Scaffold(appBar: AppBar(), body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.chatId)));
+ return Scaffold(
+ appBar: AppBar(),
+ body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.uuid)),
+ );
} else {
return const Scaffold(body: Loader());
}
@@ -168,34 +173,19 @@ class _ChatScreenState extends State {
width: 40,
height: 40,
alignment: Alignment.center,
- decoration: const BoxDecoration(
- color: Color(0xFFEBF4FF),
- shape: BoxShape.circle,
- ),
+ decoration: const BoxDecoration(color: Color(0xFFEBF4FF), shape: BoxShape.circle),
child: Text(
state.chatRoom.users.receiver.name.split(' ').first[0] + state.chatRoom.users.receiver.name.split(' ')[1][0],
- style: const TextStyle(
- color: Color(0xFF7F9CF5),
- fontWeight: FontWeight.w400,
- fontSize: 20,
- ),
+ style: const TextStyle(color: Color(0xFF7F9CF5), fontWeight: FontWeight.w400, fontSize: 20),
),
),
const SizedBox(width: 16),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Text(
- state.chatRoom.users.receiver.name,
- style: CustomTextStyles.titleSmallBold.copyWith(
- color: PrimaryColors().black,
- ),
- ),
+ Text(state.chatRoom.users.receiver.name, style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black)),
AnimatedCrossFade(
- firstChild: Text(
- 'Печатает...',
- style: CustomTextStyles.bodySmallMulishPrimary,
- ),
+ firstChild: Text('Печатает...', style: CustomTextStyles.bodySmallMulishPrimary),
firstCurve: Curves.easeIn,
secondCurve: Curves.easeOut,
secondChild: const SizedBox.shrink(),
@@ -251,9 +241,9 @@ class _ChatScreenState extends State {
if (!result) return;
if (!context.mounted) return;
context.read().reduceUnreadMessagesCount(
- chatId: state.chatRoom.id,
- count: unreadMessagesIdsCopy.length,
- );
+ chatId: state.chatRoom.id,
+ count: unreadMessagesIdsCopy.length,
+ );
unreadMessagesIdsCopy.clear();
});
}
@@ -264,6 +254,9 @@ class _ChatScreenState extends State {
text: state.chatMessages[index].data.trim(),
isCurrentUser: isCurrentUserAuthor,
mediaData: state.chatMessages[index].mediaData ?? [],
+ messageState: state.chatMessages[index].messageState,
+ messageUuid: state.chatMessages[index].uuid ?? '',
+ userSlug: state.chatRoom.users.receiver.slug,
),
),
],
@@ -290,6 +283,9 @@ class _ChatScreenState extends State {
text: state.chatMessages[index].data.trim(),
isCurrentUser: isCurrentUserAuthor,
mediaData: state.chatMessages[index].mediaData ?? [],
+ messageState: state.chatMessages[index].messageState,
+ messageUuid: state.chatMessages[index].uuid ?? '',
+ userSlug: state.chatRoom.users.receiver.slug,
),
);
},
@@ -361,11 +357,7 @@ class _ChatScreenState extends State {
final imageIndex = _imageIndexAt(pickedFiles, i);
context.pushTransparentRoute(
- PhotoViewScreen(
- imageUrls: imageFiles.map((e) => e.path).toList(),
- isLocal: true,
- index: imageIndex,
- ),
+ PhotoViewScreen(imageUrls: imageFiles.map((e) => e.path).toList(), isLocal: true, index: imageIndex),
);
},
child: Hero(
@@ -373,14 +365,7 @@ class _ChatScreenState extends State {
transitionOnUserGestures: true,
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
- child: SizedBox(
- height: 104,
- width: 104,
- child: Image.file(
- pickedFiles[i],
- fit: BoxFit.cover,
- ),
- ),
+ child: SizedBox(height: 104, width: 104, child: Image.file(pickedFiles[i], fit: BoxFit.cover)),
),
),
)
@@ -397,15 +382,8 @@ class _ChatScreenState extends State {
},
child: Container(
padding: const EdgeInsets.all(4),
- decoration: BoxDecoration(
- color: appTheme.gray50,
- shape: BoxShape.circle,
- ),
- child: const Icon(
- size: 20,
- Icons.close,
- color: Colors.black,
- ),
+ decoration: BoxDecoration(color: appTheme.gray50, shape: BoxShape.circle),
+ child: const Icon(size: 20, Icons.close, color: Colors.black),
),
),
),
@@ -427,7 +405,10 @@ class _ChatScreenState extends State {
child: Ink(
height: 40,
width: 40,
- child: Transform.rotate(angle: pi / 4, child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99))),
+ child: Transform.rotate(
+ angle: pi / 4,
+ child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99)),
+ ),
),
),
const SizedBox(width: 8),
@@ -449,7 +430,9 @@ class _ChatScreenState extends State {
hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
filled: true,
border: OutlineInputBorder(
- borderRadius: BorderRadius.circular(100), borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1)),
+ borderRadius: BorderRadius.circular(100),
+ borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+ ),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(100),
borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
@@ -465,7 +448,27 @@ class _ChatScreenState extends State {
const SizedBox(width: 8),
InkWell(
customBorder: const CircleBorder(),
- onTap: () {
+ onTap: () async {
+ // Проверяем, заблокирован ли пользователь
+ final blockedUsersCubit = sl();
+ await blockedUsersCubit.getBlockedUsers();
+ final blockedState = blockedUsersCubit.state;
+
+ if (blockedState is BlockedUsersStateLoaded) {
+ final isBlocked = blockedState.profilesList.any((profile) => profile.slug == state.chatRoom.users.receiver.slug);
+ if (isBlocked) {
+ if (context.mounted) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(
+ content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+ backgroundColor: Colors.red,
+ ),
+ );
+ }
+ return;
+ }
+ }
+
if (textEditingController.text.isNotEmpty || pickedFiles.isNotEmpty) {
chatRoomCubit.sendMessage(
data: textEditingController.text.isEmpty ? null : textEditingController.text.trim(),
@@ -525,13 +528,7 @@ class _ChatScreenState extends State {
const Icon(Icons.attach_file, size: 32, color: Colors.black54),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4),
- child: Text(
- fileName,
- textAlign: TextAlign.center,
- maxLines: 2,
- overflow: TextOverflow.ellipsis,
- style: const TextStyle(fontSize: 12),
- ),
+ child: Text(fileName, textAlign: TextAlign.center, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontSize: 12)),
),
],
),
@@ -579,13 +576,7 @@ class _ChatScreenState extends State {
// await chatRoomCubit.sendMessage(files: [File(image.path)], userSlug: slug);
// }
},
- child: const Row(
- children: [
- Icon(Icons.photo_camera),
- SizedBox(width: 8),
- Text('Фото'),
- ],
- ),
+ child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
),
CupertinoActionSheetAction(
onPressed: () async {
@@ -600,13 +591,7 @@ class _ChatScreenState extends State {
// await chatRoomCubit.sendMessage(files: files, userSlug: slug);
}
},
- child: const Row(
- children: [
- Icon(Icons.photo_library_rounded),
- SizedBox(width: 8),
- Text('Галерея'),
- ],
- ),
+ child: const Row(children: [Icon(Icons.photo_library_rounded), SizedBox(width: 8), Text('Галерея')]),
),
CupertinoActionSheetAction(
onPressed: () async {
@@ -643,20 +628,10 @@ class _ChatScreenState extends State {
// await chatRoomCubit.sendMessage(files: files, userSlug: slug);
}
},
- child: const Row(
- children: [
- Icon(Icons.file_present_rounded),
- SizedBox(width: 8),
- Text('Файлы'),
- ],
- ),
+ child: const Row(children: [Icon(Icons.file_present_rounded), SizedBox(width: 8), Text('Файлы')]),
),
],
- cancelButton: CupertinoActionSheetAction(
- onPressed: () => Navigator.of(context).pop(),
- isDestructiveAction: true,
- child: const Text('Отмена'),
- ),
+ cancelButton: CupertinoActionSheetAction(onPressed: () => Navigator.of(context).pop(), isDestructiveAction: true, child: const Text('Отмена')),
),
);
}
@@ -665,7 +640,10 @@ class _ChatScreenState extends State {
return Center(
child: Padding(
padding: const EdgeInsets.only(top: 32),
- child: Text(DateFormat.yMMMMd('RU').format(date), style: const TextStyle(height: 1, color: Color(0xFF8393A1), fontWeight: FontWeight.w500)),
+ child: Text(
+ DateFormat.yMMMMd('RU').format(date),
+ style: const TextStyle(height: 1, color: Color(0xFF8393A1), fontWeight: FontWeight.w500),
+ ),
),
);
}
diff --git a/lib/features/chat/presentation/pages/empty_chat_screen.dart b/lib/features/chat/presentation/pages/empty_chat_screen.dart
index 3195888c..d6a87c46 100644
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -12,6 +12,8 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:image_picker/image_picker.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
class EmptyChatScreen extends StatefulWidget {
final Author author;
@@ -133,21 +135,45 @@ class _EmptyChatScreenState extends State {
InkWell(
customBorder: const CircleBorder(),
onTap: () async {
+ // Проверяем, заблокирован ли пользователь
+ final blockedUsersCubit = sl();
+ await blockedUsersCubit.getBlockedUsers();
+ final blockedState = blockedUsersCubit.state;
+
+ if (blockedState is BlockedUsersStateLoaded) {
+ final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+ if (isBlocked) {
+ if (context.mounted) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(
+ content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+ backgroundColor: Colors.red,
+ ),
+ );
+ }
+ return;
+ }
+ }
+
if (textEditingController.text.isNotEmpty) {
await sl().sendMessage(
data: textEditingController.text.trim(),
slug: widget.author.authorSlug,
);
- setState(() {
- textEditingController.clear();
- });
+ if (mounted) {
+ setState(() {
+ textEditingController.clear();
+ });
+ }
final chatIdOrError = await sl().getChatByUserSlug(widget.author.authorSlug);
- AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
- 'chatScreen',
- extra: {
- 'chatId': chatIdOrError,
- },
- );
+ if (context.mounted) {
+ AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+ 'chatScreen',
+ extra: {
+ 'uuid': chatIdOrError,
+ },
+ );
+ }
}
},
child: Ink(
@@ -175,20 +201,44 @@ class _EmptyChatScreenState extends State {
CupertinoActionSheetAction(
onPressed: () async {
Navigator.of(context).pop();
+
+ // Проверяем, заблокирован ли пользователь
+ final blockedUsersCubit = sl();
+ await blockedUsersCubit.getBlockedUsers();
+ final blockedState = blockedUsersCubit.state;
+
+ if (blockedState is BlockedUsersStateLoaded) {
+ final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+ if (isBlocked) {
+ if (context.mounted) {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(
+ content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+ backgroundColor: Colors.red,
+ ),
+ );
+ }
+ return;
+ }
+ }
+
final picker = ImagePicker();
- XFile? image = await picker.pickImage(source: ImageSource.camera);
- if (image != null) {
+ List? images = await picker.pickMultiImage();
+ if (images.isNotEmpty) {
+ List files = images.map((image) => File(image.path)).toList();
await sl().sendMessage(
- files: [File(image.path)],
+ files: files,
slug: widget.author.authorSlug,
);
final chatIdOrError = await sl().getChatByUserSlug(widget.author.authorSlug);
- AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
- 'chatScreen',
- extra: {
- 'chatId': chatIdOrError,
- },
- );
+ if (mounted) {
+ AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+ 'chatScreen',
+ extra: {
+ 'uuid': chatIdOrError,
+ },
+ );
+ }
}
},
child: const Row(
@@ -211,12 +261,14 @@ class _EmptyChatScreenState extends State {
slug: widget.author.authorSlug,
);
final chatIdOrError = await sl().getChatByUserSlug(widget.author.authorSlug);
- AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
- 'chatScreen',
- extra: {
- 'chatId': chatIdOrError,
- },
- );
+ if (mounted) {
+ AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+ 'chatScreen',
+ extra: {
+ 'uuid': chatIdOrError,
+ },
+ );
+ }
}
},
child: const Row(
@@ -261,12 +313,14 @@ class _EmptyChatScreenState extends State {
slug: widget.author.authorSlug,
);
final chatIdOrError = await sl().getChatByUserSlug(widget.author.authorSlug);
- AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
- 'chatScreen',
- extra: {
- 'chatId': chatIdOrError,
- },
- );
+ if (mounted) {
+ AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+ 'chatScreen',
+ extra: {
+ 'uuid': chatIdOrError,
+ },
+ );
+ }
}
},
child: const Row(
diff --git a/lib/features/chat/presentation/pages/photo_view_screen.dart b/lib/features/chat/presentation/pages/photo_view_screen.dart
index 260c051d..1c17d40e 100644
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
import 'package:cached_network_image/cached_network_image.dart';
import 'package:dismissible_page/dismissible_page.dart';
import 'package:eatvio_app/core/const.dart';
@@ -11,7 +9,7 @@ import 'package:photo_view/photo_view_gallery.dart';
import 'package:url_launcher/url_launcher.dart';
class PhotoViewScreen extends StatefulWidget {
- final List imageUrls;
+ final List imageUrls;
final int index;
final bool isLocal;
@@ -50,14 +48,12 @@ class _PhotoViewScreenState extends State {
),
scrollPhysics: const BouncingScrollPhysics(),
builder: (BuildContext context, int index) {
+ final imageProvider = widget.isLocal
+ ? FileImage(widget.imageUrls[index]) as ImageProvider