diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index db73bc05..3fc6cf0c 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -3,7 +3,7 @@ name: Eatvio App Android Test
on: [ pull_request ]
env:
- flutter_version: "3.41.2"
+ flutter_version: "3.50.0"
java_version: "21.x"
flutter_channel: "stable"
diff --git a/.gitea/workflows/docker-run-tests.yml b/.gitea/workflows/docker-run-tests.yml
index 17902e45..4df0a96f 100644
--- a/.gitea/workflows/docker-run-tests.yml
+++ b/.gitea/workflows/docker-run-tests.yml
@@ -3,7 +3,7 @@ name: Eatvio App Android Test on custom docker
on: [ pull_request ]
env:
- flutter_version: "3.41.2"
+ flutter_version: "3.50.0"
java_version: "21.x"
flutter_channel: "stable"
my_local_cache_dir: "/opt/hostedtoolcache/"
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 98882dbe..eeba6ed5 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -6,7 +6,7 @@ on:
- main
env:
- flutter_version: '3.41.2'
+ flutter_version: '3.50.0'
java_version: '21.x'
flutter_channel: 'stable'
my_local_cache_dir: '/opt/hostedtoolcache/'
@@ -74,7 +74,7 @@ jobs:
uses: 'https://github.com/actions/cache@v4'
with:
path: ${{ env.my_local_cache_dir }}
- key: ${{ runner.os }}-cache-sdk
+ key: ${{ runner.os }}-cache-sdk-flutter-${{ env.flutter_version }}
- name: Set up JDK
uses: https://github.com/actions/setup-java@v3
@@ -117,15 +117,22 @@ jobs:
- name: Set up Flutter
run: |
FLUTTER_DIR="${{ env.my_local_cache_dir }}flutter"
- if [ ! -f "$FLUTTER_DIR/bin/flutter" ]; then
- echo "Downloading Flutter ${{ env.flutter_version }}..."
- curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/${{ env.flutter_channel }}/linux/flutter_linux_${{ env.flutter_version }}-${{ env.flutter_channel }}.tar.xz"
+ EXPECTED_VERSION="${{ env.flutter_version }}"
+ CACHED_VERSION=""
+ if [ -x "$FLUTTER_DIR/bin/flutter" ]; then
+ CACHED_VERSION="$("$FLUTTER_DIR/bin/flutter" --version 2>/dev/null | head -n 1 | awk '{print $2}')"
+ fi
+ if [ "$CACHED_VERSION" != "$EXPECTED_VERSION" ]; then
+ echo "Flutter cache miss (have '${CACHED_VERSION:-none}', need '${EXPECTED_VERSION}')"
+ rm -rf "$FLUTTER_DIR"
+ echo "Downloading Flutter ${EXPECTED_VERSION}..."
+ curl -fsSL -o /tmp/flutter.tar.xz "https://storage.googleapis.com/flutter_infra_release/releases/${{ env.flutter_channel }}/linux/flutter_linux_${EXPECTED_VERSION}-${{ env.flutter_channel }}.tar.xz"
echo "Extracting Flutter..."
mkdir -p "${{ env.my_local_cache_dir }}"
tar xf /tmp/flutter.tar.xz -C "${{ env.my_local_cache_dir }}"
rm /tmp/flutter.tar.xz
else
- echo "Flutter already cached at $FLUTTER_DIR"
+ echo "Flutter ${EXPECTED_VERSION} already cached at $FLUTTER_DIR"
fi
echo "$FLUTTER_DIR/bin" >> $GITHUB_PATH
echo "$FLUTTER_DIR/bin/cache/dart-sdk/bin" >> $GITHUB_PATH
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 63d4f990..c4ab75c5 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -2,9 +2,9 @@ include: package:flutter_lints/flutter.yaml
linter:
rules:
- prefer_const_constructors: true
- prefer_const_declarations: true
- prefer_const_literals_to_create_immutables: true
+ prefer_const_constructors: true
+ prefer_const_declarations: true
+ prefer_const_literals_to_create_immutables: true
analyzer:
exclude:
@@ -13,36 +13,8 @@ analyzer:
- '**/messages_all.dart'
- '**/messages_en.dart'
- '**/messages_ru.dart'
+ - build/**
+ - android/**
+ - ios/**
errors:
invalid_annotation_target: ignore
- plugins:
- - dart_code_metrics
-
-dart_code_metrics:
- extends:
- - package:dart_code_metrics_presets/flutter_all.yaml
- - package:dart_code_metrics_presets/bloc.yaml
- metrics:
- cyclomatic-complexity: 20
- lines-of-executable-code: 50
- number-of-parameters: 4
- maximum-nesting-level: 5
- metrics-exclude:
- - test/**
-# extends:
-# - recommended
-# anti-patterns:
-# - long-method
-# - long-parameter-list
-# metrics:
-# cyclomatic-complexity: 20
-# lines-of-executable-code: 50
-# number-of-parameters: 4
-# maximum-nesting-level: 5
-# metrics-exclude:
-# - test/**
-# - newline-before-return
-# - no-boolean-literal-compare
-# - no-empty-block
-# - prefer-conditional-expressions
-# - no-equal-then-else
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 569cd689..afec45b2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,6 +22,13 @@ android {
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
+ // Flutter 3.50 + AGP drops assets matching default ignoreAssetsPattern
+ // (files starting with '.' like .env, and '_*'-prefixed folders).
+ // See https://github.com/flutter/flutter/issues/196444
+ androidResources {
+ ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
+ }
+
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c2b6f6e2..aaeef03e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,13 @@
-
+
+
@@ -16,7 +22,8 @@
android:label="Итвио"
android:usesCleartextTraffic="true"
android:name="${applicationName}"
- android:icon="@mipmap/ic_launcher">
+ android:icon="@mipmap/ic_launcher"
+ android:requestLegacyExternalStorage="true">
diff --git a/android/build.gradle b/android/build.gradle
index af06c34c..004f2cf7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.12.0'
+ classpath 'com.android.tools.build:gradle:9.3.1'
classpath 'com.huawei.agconnect:agcp:1.9.1.301'
}
}
@@ -53,6 +53,40 @@ subprojects { Project subproject ->
}
}
+// AGP 9 lint crashes in CommentDetector with NoSuchMethodError List.removeLast()
+// (image_picker_android:lintVitalAnalyzeRelease). That check is fatal for release.
+subprojects { Project subproject ->
+ subproject.tasks.configureEach { task ->
+ if (task.name.startsWith("lintVital")) {
+ task.enabled = false
+ }
+ }
+}
+
+// AGP 9 enforces AAR metadata: plugins that still declare compileSdk 31 fail the build.
+subprojects { Project subproject ->
+ def bumpCompileSdk = {
+ if (!subproject.plugins.hasPlugin('com.android.library')) {
+ return
+ }
+ def androidExt = subproject.extensions.findByName('android')
+ if (androidExt == null) {
+ return
+ }
+ try {
+ androidExt.compileSdk = 36
+ } catch (Throwable t) {
+ subproject.logger.warn("[compileSdk-fix] Failed for ${subproject.path}: ${t.message}")
+ }
+ }
+ // evaluationDependsOn(":app") can leave some projects already evaluated.
+ if (subproject.state.executed) {
+ bumpCompileSdk()
+ } else {
+ subproject.afterEvaluate { bumpCompileSdk() }
+ }
+}
+
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
diff --git a/android/gradle.properties b/android/gradle.properties
index f018a618..475a6280 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,7 @@
org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
android.useAndroidX=true
android.enableJetifier=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index e603bd33..76d4386d 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-9.0.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 76846d0d..06fe7eb2 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -12,18 +12,18 @@ pluginManagement {
repositories {
google()
mavenCentral()
- maven { url 'https://developer.huawei.com/repo/' }
+ maven { url = 'https://developer.huawei.com/repo/' }
gradlePluginPortal()
}
}
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
- id "com.android.application" version "8.12.0" apply false
+ id "com.android.application" version "9.3.1" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.4.3" apply false
// END: FlutterFire Configuration
- id "org.jetbrains.kotlin.android" version "2.2.10" apply false
+ id "org.jetbrains.kotlin.android" version "2.4.20" apply false
}
include ":app"
diff --git a/integration_test/create_recipe/create_recipe_helpers.dart b/integration_test/create_recipe/create_recipe_helpers.dart
index 3a7dbb3e..3dcc4115 100644
--- a/integration_test/create_recipe/create_recipe_helpers.dart
+++ b/integration_test/create_recipe/create_recipe_helpers.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/app_keys.dart';
import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.dart';
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
/// Helper функции для интеграционных тестов создания рецепта
diff --git a/ios/.gitignore b/ios/.gitignore
index e96ef602..61fa3c45 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -22,6 +22,7 @@ Flutter/app.flx
Flutter/app.zip
Flutter/flutter_assets/
Flutter/flutter_export_environment.sh
+Flutter/ephemeral/
ServiceDefinitions.json
Runner/GeneratedPluginRegistrant.*
diff --git a/ios/Podfile b/ios/Podfile
index 217b4ecc..ffecb8c6 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -38,19 +38,34 @@ post_install do |installer|
installer.pods_project.targets.each do |target|
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'] = '16.0'
- config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
- '$(inherited)',
+ # iOS 26+ Apple Silicon simulators require arm64. Do not exclude it.
+ excluded = config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]']
+ if excluded.is_a?(String)
+ cleaned = excluded.split(/\s+/).reject { |arch| arch == 'arm64' }.join(' ')
+ if cleaned.empty?
+ config.build_settings.delete('EXCLUDED_ARCHS[sdk=iphonesimulator*]')
+ else
+ config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = cleaned
+ end
+ end
+
+ # Old plugins (e.g. flutter_keyboard_visibility) pin simulator to x86_64 only.
+ valid_archs = config.build_settings['VALID_ARCHS[sdk=iphonesimulator*]']
+ if valid_archs == 'x86_64'
+ config.build_settings['VALID_ARCHS[sdk=iphonesimulator*]'] = '$(ARCHS_STANDARD)'
+ end
+
+ config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
+ config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+ '$(inherited)',
## dart: PermissionGroup.camera
'PERMISSION_CAMERA=1',
## dart: PermissionGroup.microphone
'PERMISSION_MICROPHONE=1',
## dart: PermissionGroup.photos
- 'PERMISSION_PHOTOS=1',
+ 'PERMISSION_PHOTOS=1',
'PERMISSION_NOTIFICATIONS=1',
]
-
end
end
end
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 76a8087f..48f00256 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
ACF3142BB74D6F5F3C98AD82 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EB9FE5381C3F532BD9A9456D /* GoogleService-Info.plist */; };
+ 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -54,6 +55,7 @@
DF0C4038A57E19D3ABA03C15 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; };
EB9FE5381C3F532BD9A9456D /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = ""; };
FEE92A0E2D772EA300E6E989 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; };
+ 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -61,6 +63,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
46B43B96F809CEC6058EFDD3 /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -81,6 +84,7 @@
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
+ 78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -139,6 +143,9 @@
/* Begin PBXNativeTarget section */
97C146ED1CF9000F007C117D /* Runner */ = {
+ packageProductDependencies = (
+ 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+ );
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
@@ -165,6 +172,9 @@
/* Begin PBXProject section */
97C146E61CF9000F007C117D /* Project object */ = {
+ packageReferences = (
+ 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+ );
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
@@ -639,6 +649,18 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
+/* Begin XCLocalSwiftPackageReference section */
+ 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+ isa = XCLocalSwiftPackageReference;
+ relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+ };
+/* End XCLocalSwiftPackageReference section */
+/* Begin XCSwiftPackageProductDependency section */
+ 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+ isa = XCSwiftPackageProductDependency;
+ productName = FlutterGeneratedPluginSwiftPackage;
+ };
+/* End XCSwiftPackageProductDependency section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
}
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..ae0588ef
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,221 @@
+{
+ "pins" : [
+ {
+ "identity" : "abseil-cpp-binary",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/abseil-cpp-binary.git",
+ "state" : {
+ "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+ "version" : "1.2024072200.0"
+ }
+ },
+ {
+ "identity" : "app-check",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/app-check.git",
+ "state" : {
+ "revision" : "97f7d74dd0e8f3d0fe5fc75cc8957aa73bdc948a",
+ "version" : "11.3.2"
+ }
+ },
+ {
+ "identity" : "appmetrica-sdk-ios",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/appmetrica/appmetrica-sdk-ios",
+ "state" : {
+ "revision" : "ed6c1a73eb2dae875a0d7801390eb6f0ee7bc12e",
+ "version" : "5.16.1"
+ }
+ },
+ {
+ "identity" : "cryptoswift",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/krzyzanowskim/CryptoSwift.git",
+ "state" : {
+ "revision" : "f2a627b84c1ff96f21ac2fcb623ab36142dd5512",
+ "version" : "1.10.0"
+ }
+ },
+ {
+ "identity" : "dkcamera",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/zhangao0086/DKCamera",
+ "state" : {
+ "branch" : "master",
+ "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+ }
+ },
+ {
+ "identity" : "dkimagepickercontroller",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/zhangao0086/DKImagePickerController",
+ "state" : {
+ "branch" : "4.3.9",
+ "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+ }
+ },
+ {
+ "identity" : "dkphotogallery",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+ "state" : {
+ "branch" : "master",
+ "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+ }
+ },
+ {
+ "identity" : "firebase-ios-sdk",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/firebase-ios-sdk",
+ "state" : {
+ "revision" : "42e81d245e30e49ea6a5830cf2842d44a1591270",
+ "version" : "12.15.0"
+ }
+ },
+ {
+ "identity" : "google-ads-on-device-conversion-ios-sdk",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+ "state" : {
+ "revision" : "dc39082d8881109d35b94b1c122164c0e8d08a55",
+ "version" : "3.6.1"
+ }
+ },
+ {
+ "identity" : "googleappmeasurement",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/GoogleAppMeasurement.git",
+ "state" : {
+ "revision" : "144855f40d8668927f256a3045f7fdc4c3f4338b",
+ "version" : "12.15.0"
+ }
+ },
+ {
+ "identity" : "googledatatransport",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/GoogleDataTransport.git",
+ "state" : {
+ "revision" : "ba3358d3c3dbae8ef230b58a46b97ad65e84e974",
+ "version" : "10.1.1"
+ }
+ },
+ {
+ "identity" : "googleutilities",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/GoogleUtilities.git",
+ "state" : {
+ "revision" : "5459ee5603def3db0fe14ca522185f42c48d978e",
+ "version" : "8.1.5"
+ }
+ },
+ {
+ "identity" : "grpc-binary",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/grpc-binary.git",
+ "state" : {
+ "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+ "version" : "1.69.1"
+ }
+ },
+ {
+ "identity" : "gtm-session-fetcher",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/gtm-session-fetcher.git",
+ "state" : {
+ "revision" : "724a52eea6329b7e12d3ad8300d76ca9f3895fcc",
+ "version" : "5.3.1"
+ }
+ },
+ {
+ "identity" : "interop-ios-for-google-sdks",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+ "state" : {
+ "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+ "version" : "101.0.0"
+ }
+ },
+ {
+ "identity" : "kscrash",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/kstenerud/KSCrash",
+ "state" : {
+ "revision" : "c0177658fc771ae833b6d3b8f5f3f5a14d59ec03",
+ "version" : "2.1.2"
+ }
+ },
+ {
+ "identity" : "leveldb",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/leveldb.git",
+ "state" : {
+ "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+ "version" : "1.22.5"
+ }
+ },
+ {
+ "identity" : "nanopb",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/firebase/nanopb.git",
+ "state" : {
+ "revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
+ "version" : "2.30910.1"
+ }
+ },
+ {
+ "identity" : "promises",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/google/promises.git",
+ "state" : {
+ "revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
+ "version" : "2.4.1"
+ }
+ },
+ {
+ "identity" : "sdwebimage",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/SDWebImage/SDWebImage",
+ "state" : {
+ "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+ "version" : "5.21.7"
+ }
+ },
+ {
+ "identity" : "sentry-cocoa",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/getsentry/sentry-cocoa",
+ "state" : {
+ "revision" : "9e193ac0b71760603aa666bad7e9e303dd7031a8",
+ "version" : "8.56.2"
+ }
+ },
+ {
+ "identity" : "swift-collections",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/apple/swift-collections.git",
+ "state" : {
+ "revision" : "88754449ab766a739610b660e117762115fabc9c",
+ "version" : "1.7.6"
+ }
+ },
+ {
+ "identity" : "swiftygif",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/kirualex/SwiftyGif.git",
+ "state" : {
+ "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+ "version" : "5.4.5"
+ }
+ },
+ {
+ "identity" : "tocropviewcontroller",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/TimOliver/TOCropViewController",
+ "state" : {
+ "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+ "version" : "2.8.0"
+ }
+ }
+ ],
+ "version" : 2
+}
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 1a6f2553..078f9dc2 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -5,6 +5,24 @@
+
+
+
+
+
+
+
+
+
+
$(FLUTTER_BUILD_NUMBER)
ITSAppUsesNonExemptEncryption
+ LSSupportsOpeningDocumentsInPlace
+
+ UIFileSharingEnabled
+
LSRequiresIPhoneOS
NSAppTransportSecurity
diff --git a/lib/app_keys.dart b/lib/app_keys.dart
index 912dab9b..2a69b798 100644
--- a/lib/app_keys.dart
+++ b/lib/app_keys.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class AppKeys {
// Auth Screen
diff --git a/lib/common/widgets/markdown_editor.dart b/lib/common/widgets/markdown_editor.dart
index 551f1449..145a43db 100644
--- a/lib/common/widgets/markdown_editor.dart
+++ b/lib/common/widgets/markdown_editor.dart
@@ -1,5 +1,5 @@
import 'dart:async';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
diff --git a/lib/core/app_config.dart b/lib/core/app_config.dart
index 6fdf4744..f4197e07 100644
--- a/lib/core/app_config.dart
+++ b/lib/core/app_config.dart
@@ -15,9 +15,8 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
/// Конфигурация приложения
class AppConfig {
@@ -97,12 +96,7 @@ class AppConfig {
];
/// Делегаты локализации
- List get localizationDelegates => [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ];
+ List get localizationDelegates => [S.delegate, ...GlobalMaterialLocalizations.delegates];
/// Поддерживаемые локали
List get supportedLocales => [
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index 9b6f9610..14701394 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/core/routing/route_constants.dart';
import 'package:eatvio_app/core/routing/settings_routes.dart';
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/core/comments/presentation/comments_actions_bottom_sheet.dart b/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
index c4f3e540..4d8aaec7 100644
--- a/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
+++ b/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
void showCommentsActionsBottomSheet(
diff --git a/lib/core/di/repository_registrations.dart b/lib/core/di/repository_registrations.dart
index 61e561fb..520c0671 100644
--- a/lib/core/di/repository_registrations.dart
+++ b/lib/core/di/repository_registrations.dart
@@ -55,7 +55,10 @@ class RepositoryRegistrations {
sl.registerLazySingleton(() => ChatRepository(chatService: sl()));
sl.registerLazySingleton(() => VideoCallRepository(videoCallService: sl()));
sl.registerLazySingleton(
- () => VideoCallRecordingsRepository(videoCallService: sl(), dio: sl()),
+ () => VideoCallRecordingsRepository(
+ videoCallService: sl(),
+ fileService: sl(),
+ ),
);
sl.registerLazySingleton(() => FeedRepository(feedService: sl()));
sl.registerLazySingleton(() => ProfileRepository(profileService: sl()));
diff --git a/lib/core/di/service_registrations.dart b/lib/core/di/service_registrations.dart
index 27152661..8848aadd 100644
--- a/lib/core/di/service_registrations.dart
+++ b/lib/core/di/service_registrations.dart
@@ -36,6 +36,8 @@ import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
import 'package:eatvio_app/features/registration/services/registration_service.dart';
import 'package:eatvio_app/features/registration_v2/services/registration_service_v2.dart';
import 'package:eatvio_app/features/settings/services/settings_service.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/public_downloads_saver.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/video_call_recording_file_service.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_callkit_coordinator.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
@@ -55,6 +57,12 @@ class ServiceRegistrations {
// Core services
sl.registerLazySingleton(() => ChatService(sl()));
sl.registerLazySingleton(() => VideoCallService(sl()));
+ sl.registerLazySingleton(
+ () => const PublicDownloadsSaver(),
+ );
+ sl.registerLazySingleton(
+ () => VideoCallRecordingFileService(dio: sl(), downloadsSaver: sl()),
+ );
sl.registerLazySingleton(() => FeedService(sl()));
sl.registerLazySingleton(() => ProfileService(sl()));
sl.registerLazySingleton(() => CalendarService(sl()));
diff --git a/lib/core/firebase_api.dart b/lib/core/firebase_api.dart
index 19c7cbc7..78e31519 100644
--- a/lib/core/firebase_api.dart
+++ b/lib/core/firebase_api.dart
@@ -21,10 +21,9 @@ class FirebaseApi {
final _firebaseMessaging = FirebaseMessaging.instance;
FirebaseApi({
- required ErrorReporter errorReporter,
+ required this._errorReporter,
NotificationPermissionRequester? notificationPermissionRequester,
- }) : _errorReporter = errorReporter,
- _notificationPermissionRequester = notificationPermissionRequester ?? NotificationPermissionRequester();
+ }) : _notificationPermissionRequester = notificationPermissionRequester ?? NotificationPermissionRequester();
Future getToken() async {
final credentials = await _resolvePushCredentials();
diff --git a/lib/core/internet_connection_cubit/internet_connection_cubit.dart b/lib/core/internet_connection_cubit/internet_connection_cubit.dart
index ef77c185..98da1724 100644
--- a/lib/core/internet_connection_cubit/internet_connection_cubit.dart
+++ b/lib/core/internet_connection_cubit/internet_connection_cubit.dart
@@ -5,7 +5,7 @@ import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:eatvio_app/core/env_config.dart';
import 'package:eatvio_app/core/internet_connection_cubit/internet_connection_state.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/core/error_reporting/report_from.dart';
diff --git a/lib/core/permission_handler/permission_handler.dart b/lib/core/permission_handler/permission_handler.dart
index f107c2c0..ece8c9c3 100644
--- a/lib/core/permission_handler/permission_handler.dart
+++ b/lib/core/permission_handler/permission_handler.dart
@@ -2,7 +2,7 @@ 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';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:permission_handler/permission_handler.dart';
class PermissionHandler {
diff --git a/lib/core/routing/main_navigation_routes.dart b/lib/core/routing/main_navigation_routes.dart
index 36ca1a71..67e20fc1 100644
--- a/lib/core/routing/main_navigation_routes.dart
+++ b/lib/core/routing/main_navigation_routes.dart
@@ -11,7 +11,7 @@ import 'package:eatvio_app/features/notifications/presentation/notifications_scr
import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/websockets/ws_manager.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'dart:developer';
diff --git a/lib/core/routing/other_routes.dart b/lib/core/routing/other_routes.dart
index 6a3ae191..4954a145 100644
--- a/lib/core/routing/other_routes.dart
+++ b/lib/core/routing/other_routes.dart
@@ -151,10 +151,9 @@ class OtherRoutes {
GoRoute(
path: VideoCallRecordingPlayerScreen.path,
name: VideoCallRecordingPlayerScreen.name,
- builder: (context, state) {
- final recording = state.extra as VideoCallRecordingModel;
- return VideoCallRecordingPlayerScreen(recording: recording);
- },
+ builder: (context, state) => VideoCallRecordingPlayerScreen(
+ recording: _videoCallRecordingFromRouteExtra(state.extra),
+ ),
),
// Finance routes
@@ -395,6 +394,17 @@ class OtherRoutes {
}
}
+VideoCallRecordingModel? _videoCallRecordingFromRouteExtra(Object? extra) {
+ if (extra is! Map) {
+ return null;
+ }
+ try {
+ return VideoCallRecordingModel.fromJson(Map.from(extra));
+ } on Object {
+ return null;
+ }
+}
+
VideoCallEntryMode _videoCallEntryModeFromRouteExtra(Object? raw) {
if (raw is VideoCallEntryMode) return raw;
if (raw == VideoCallEntryMode.incomingAccepted.name) {
diff --git a/lib/core/session/session_lifecycle_service.dart b/lib/core/session/session_lifecycle_service.dart
index 1019a338..1d3d83e9 100644
--- a/lib/core/session/session_lifecycle_service.dart
+++ b/lib/core/session/session_lifecycle_service.dart
@@ -25,10 +25,9 @@ enum SessionEndReason { logout, unauthorized, accountDeleted }
class SessionLifecycleService {
SessionLifecycleService({
- required WsManager wsManager,
- required ErrorReporter errorReporter,
- }) : _wsManager = wsManager,
- _errorReporter = errorReporter;
+ required this._wsManager,
+ required this._errorReporter,
+ });
final WsManager _wsManager;
final ErrorReporter _errorReporter;
diff --git a/lib/core/theme/app_decoration.dart b/lib/core/theme/app_decoration.dart
index 0eaf1bb5..3513c2e4 100644
--- a/lib/core/theme/app_decoration.dart
+++ b/lib/core/theme/app_decoration.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class AppDecoration {
// Fill decorations
diff --git a/lib/core/theme/custom_button_style.dart b/lib/core/theme/custom_button_style.dart
index 50b9d186..ceac006e 100644
--- a/lib/core/theme/custom_button_style.dart
+++ b/lib/core/theme/custom_button_style.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// A class that offers pre-defined button styles for customizing button appearance.
class CustomButtonStyles {
diff --git a/lib/core/theme/custom_text_style.dart b/lib/core/theme/custom_text_style.dart
index 1e09ba93..b1eb29d8 100644
--- a/lib/core/theme/custom_text_style.dart
+++ b/lib/core/theme/custom_text_style.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// A collection of pre-defined text styles for customizing text appearance,
/// categorized by different font families and weights.
diff --git a/lib/core/theme/theme_helper.dart b/lib/core/theme/theme_helper.dart
index 957ae616..df525351 100644
--- a/lib/core/theme/theme_helper.dart
+++ b/lib/core/theme/theme_helper.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
/// Helper class for managing themes and colors.
diff --git a/lib/core/utils/pagination_utils.dart b/lib/core/utils/pagination_utils.dart
index c6f6da95..4e255784 100644
--- a/lib/core/utils/pagination_utils.dart
+++ b/lib/core/utils/pagination_utils.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/const.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
void loadNewContent(ScrollNotification notification, Future Function() load) {
if (notification.metrics.pixels >= notification.metrics.maxScrollExtent - thresholdForPagination && !notification.metrics.outOfRange) {
diff --git a/lib/core/utils/toasts.dart b/lib/core/utils/toasts.dart
index 4683cb86..f0ec89f0 100644
--- a/lib/core/utils/toasts.dart
+++ b/lib/core/utils/toasts.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:fluttertoast/fluttertoast.dart';
const int _toastDuration = 2;
diff --git a/lib/core/websockets/ws_manager.dart b/lib/core/websockets/ws_manager.dart
index 893ca177..a78dcf94 100644
--- a/lib/core/websockets/ws_manager.dart
+++ b/lib/core/websockets/ws_manager.dart
@@ -17,8 +17,7 @@ class WsManager {
final WsService wsService;
final ErrorReporter _errorReporter;
- WsManager({required this.wsService, required ErrorReporter errorReporter})
- : _errorReporter = errorReporter;
+ WsManager({required this.wsService, required this._errorReporter});
PusherChannelsClient? client;
int? userId;
diff --git a/lib/core/widgets/add_item_button.dart b/lib/core/widgets/add_item_button.dart
index 5aa1b010..b8867122 100644
--- a/lib/core/widgets/add_item_button.dart
+++ b/lib/core/widgets/add_item_button.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class AddItemButton extends StatelessWidget {
diff --git a/lib/core/widgets/animated_option_button.dart b/lib/core/widgets/animated_option_button.dart
index 596c23ac..4c90cfc5 100644
--- a/lib/core/widgets/animated_option_button.dart
+++ b/lib/core/widgets/animated_option_button.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
class AnimatedOptionButton extends StatelessWidget {
const AnimatedOptionButton({super.key, required this.text, required this.isSelected, required this.onTap, this.textStyle});
diff --git a/lib/core/widgets/base_button.dart b/lib/core/widgets/base_button.dart
index 18c5f030..8e48fc34 100644
--- a/lib/core/widgets/base_button.dart
+++ b/lib/core/widgets/base_button.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class BaseButton extends StatelessWidget {
const BaseButton({
diff --git a/lib/core/widgets/bookmark_button.dart b/lib/core/widgets/bookmark_button.dart
index c9e939c4..42507019 100644
--- a/lib/core/widgets/bookmark_button.dart
+++ b/lib/core/widgets/bookmark_button.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class BookmarkButton extends StatelessWidget {
const BookmarkButton({
diff --git a/lib/core/widgets/bottom_sheet_action_widget.dart b/lib/core/widgets/bottom_sheet_action_widget.dart
index 004b5567..0c85802d 100644
--- a/lib/core/widgets/bottom_sheet_action_widget.dart
+++ b/lib/core/widgets/bottom_sheet_action_widget.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class BottomSheetActionWidget extends StatelessWidget {
diff --git a/lib/core/widgets/bottom_sheet_handler_bar.dart b/lib/core/widgets/bottom_sheet_handler_bar.dart
index ceaf2bca..a93422ec 100644
--- a/lib/core/widgets/bottom_sheet_handler_bar.dart
+++ b/lib/core/widgets/bottom_sheet_handler_bar.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class BottomSheetHandlerBar extends StatelessWidget {
const BottomSheetHandlerBar({super.key});
diff --git a/lib/core/widgets/bottom_sheet_with_blur.dart b/lib/core/widgets/bottom_sheet_with_blur.dart
index c5a5ec78..c27ea0a9 100644
--- a/lib/core/widgets/bottom_sheet_with_blur.dart
+++ b/lib/core/widgets/bottom_sheet_with_blur.dart
@@ -1,7 +1,7 @@
import 'dart:ui';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Показывает modal bottom sheet с blur-фоном.
///
diff --git a/lib/core/widgets/cpfc_container.dart b/lib/core/widgets/cpfc_container.dart
index f5026c9a..4406bb58 100644
--- a/lib/core/widgets/cpfc_container.dart
+++ b/lib/core/widgets/cpfc_container.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/generated/l10n.dart';
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:material_ui/material_ui.dart';
class CpfcContainer extends StatelessWidget {
const CpfcContainer({super.key, required this.calories, required this.proteins, required this.fats, required this.carbohydrates});
diff --git a/lib/core/widgets/custom_divider.dart b/lib/core/widgets/custom_divider.dart
index 7bf88514..1fe1e1ae 100644
--- a/lib/core/widgets/custom_divider.dart
+++ b/lib/core/widgets/custom_divider.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class CustomDivider extends StatelessWidget {
const CustomDivider({super.key});
diff --git a/lib/core/widgets/custom_drop_down.dart b/lib/core/widgets/custom_drop_down.dart
index 9580afe7..f9b63910 100644
--- a/lib/core/widgets/custom_drop_down.dart
+++ b/lib/core/widgets/custom_drop_down.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class CustomDropDown extends StatelessWidget {
const CustomDropDown({
diff --git a/lib/core/widgets/custom_drop_down_button.dart b/lib/core/widgets/custom_drop_down_button.dart
index d4c0e571..d7927a40 100644
--- a/lib/core/widgets/custom_drop_down_button.dart
+++ b/lib/core/widgets/custom_drop_down_button.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class CustomDropDownButton extends StatelessWidget {
diff --git a/lib/core/widgets/custom_outlined_button.dart b/lib/core/widgets/custom_outlined_button.dart
index cb396f56..864d8979 100644
--- a/lib/core/widgets/custom_outlined_button.dart
+++ b/lib/core/widgets/custom_outlined_button.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/widgets/base_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class CustomOutlinedButton extends BaseButton {
const CustomOutlinedButton({super.key,
diff --git a/lib/core/widgets/custom_popup.dart b/lib/core/widgets/custom_popup.dart
index e0abdefe..26033b3d 100644
--- a/lib/core/widgets/custom_popup.dart
+++ b/lib/core/widgets/custom_popup.dart
@@ -24,7 +24,7 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/core/widgets/custom_search_bar.dart b/lib/core/widgets/custom_search_bar.dart
index 4ce02f5b..71d3d6aa 100644
--- a/lib/core/widgets/custom_search_bar.dart
+++ b/lib/core/widgets/custom_search_bar.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class CustomSearchBar extends StatelessWidget {
const CustomSearchBar({super.key, required this.searchController, required this.onChanged, this.backgroundColor, this.borderRadius, this.enableIcon = true, this.width});
diff --git a/lib/core/widgets/custom_text_form_field.dart b/lib/core/widgets/custom_text_form_field.dart
index 041bee70..60de4ad8 100644
--- a/lib/core/widgets/custom_text_form_field.dart
+++ b/lib/core/widgets/custom_text_form_field.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
class CustomTextFormField extends StatelessWidget {
diff --git a/lib/core/widgets/data_error_widget.dart b/lib/core/widgets/data_error_widget.dart
index 7d8562ba..57428032 100644
--- a/lib/core/widgets/data_error_widget.dart
+++ b/lib/core/widgets/data_error_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class DataErrorWidget extends StatefulWidget {
diff --git a/lib/core/widgets/feed_icon_button.dart b/lib/core/widgets/feed_icon_button.dart
index ee96cd0b..421bd770 100644
--- a/lib/core/widgets/feed_icon_button.dart
+++ b/lib/core/widgets/feed_icon_button.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class FeedIconButton extends StatelessWidget {
diff --git a/lib/core/widgets/info_row.dart b/lib/core/widgets/info_row.dart
index fbf0b8bf..265d897f 100644
--- a/lib/core/widgets/info_row.dart
+++ b/lib/core/widgets/info_row.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class InfoRow extends StatelessWidget {
diff --git a/lib/core/widgets/item_widget.dart b/lib/core/widgets/item_widget.dart
index ac43f779..0fe167fb 100644
--- a/lib/core/widgets/item_widget.dart
+++ b/lib/core/widgets/item_widget.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
class ItemWidget extends StatelessWidget {
diff --git a/lib/core/widgets/loader.dart b/lib/core/widgets/loader.dart
index ae69e10f..31fcb57b 100644
--- a/lib/core/widgets/loader.dart
+++ b/lib/core/widgets/loader.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:lottie/lottie.dart';
class Loader extends StatelessWidget {
diff --git a/lib/core/widgets/main_background_bouble.dart b/lib/core/widgets/main_background_bouble.dart
index cec9c57b..ed64ea56 100644
--- a/lib/core/widgets/main_background_bouble.dart
+++ b/lib/core/widgets/main_background_bouble.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class MainBackgroundBouble extends StatelessWidget {
const MainBackgroundBouble({
diff --git a/lib/core/widgets/markdown_html_widget.dart b/lib/core/widgets/markdown_html_widget.dart
index 5361e840..e4f0c8b2 100644
--- a/lib/core/widgets/markdown_html_widget.dart
+++ b/lib/core/widgets/markdown_html_widget.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:markdown/markdown.dart' as md;
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/core/widgets/marketing_bottom_sheet.dart b/lib/core/widgets/marketing_bottom_sheet.dart
index 53b833ae..446b5d7e 100644
--- a/lib/core/widgets/marketing_bottom_sheet.dart
+++ b/lib/core/widgets/marketing_bottom_sheet.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
import 'package:share_plus/share_plus.dart';
diff --git a/lib/core/widgets/network_svg_picture.dart b/lib/core/widgets/network_svg_picture.dart
index fecd2748..52b35ac5 100644
--- a/lib/core/widgets/network_svg_picture.dart
+++ b/lib/core/widgets/network_svg_picture.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/utils/inline_svg_css.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:http/http.dart' as http;
diff --git a/lib/core/widgets/option_widget.dart b/lib/core/widgets/option_widget.dart
index bed09c27..9e8b5694 100644
--- a/lib/core/widgets/option_widget.dart
+++ b/lib/core/widgets/option_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/core/widgets/item_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class OptionWidget extends StatelessWidget {
const OptionWidget({super.key, required this.option, this.disableDuration = false, required this.duration});
diff --git a/lib/core/widgets/show_error_dialog.dart b/lib/core/widgets/show_error_dialog.dart
index c6acef34..cd58bf8f 100644
--- a/lib/core/widgets/show_error_dialog.dart
+++ b/lib/core/widgets/show_error_dialog.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:permission_handler/permission_handler.dart';
Future showErrorDialog(BuildContext context, {String? title, String? description, String? buttonTitle, bool? needToOpenSettings}) async {
diff --git a/lib/core/widgets/success_published_diet_bottom_sheet.dart b/lib/core/widgets/success_published_diet_bottom_sheet.dart
index 3794e5c0..138f07d8 100644
--- a/lib/core/widgets/success_published_diet_bottom_sheet.dart
+++ b/lib/core/widgets/success_published_diet_bottom_sheet.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class SuccessPublishedDietOrPlanBottomSheet extends StatelessWidget {
diff --git a/lib/core/widgets/success_published_recipe_bottom_sheet.dart b/lib/core/widgets/success_published_recipe_bottom_sheet.dart
index 796e7d91..0a028f3b 100644
--- a/lib/core/widgets/success_published_recipe_bottom_sheet.dart
+++ b/lib/core/widgets/success_published_recipe_bottom_sheet.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
diff --git a/lib/features/auth/presentation/pages/auth_screen.dart b/lib/features/auth/presentation/pages/auth_screen.dart
index 80442c1f..acd938bc 100644
--- a/lib/features/auth/presentation/pages/auth_screen.dart
+++ b/lib/features/auth/presentation/pages/auth_screen.dart
@@ -18,9 +18,9 @@ import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
import 'package:eatvio_app/core/di/cubit_registrations.dart';
import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/auth/presentation/pages/forget_password_screen.dart b/lib/features/auth/presentation/pages/forget_password_screen.dart
index 911805c8..b805d7e3 100644
--- a/lib/features/auth/presentation/pages/forget_password_screen.dart
+++ b/lib/features/auth/presentation/pages/forget_password_screen.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/auth/presentation/pages/register_via_social_screen.dart b/lib/features/auth/presentation/pages/register_via_social_screen.dart
index 9aed6116..57a50d47 100644
--- a/lib/features/auth/presentation/pages/register_via_social_screen.dart
+++ b/lib/features/auth/presentation/pages/register_via_social_screen.dart
@@ -13,7 +13,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/utils/validation_utils.dart';
import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
import 'package:url_launcher/url_launcher.dart';
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 f4a1dd56..3b9aeb2a 100644
--- a/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
+++ b/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
import 'package:eatvio_app/core/token_storage.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
diff --git a/lib/features/auth/sdk/social_auth_facade.dart b/lib/features/auth/sdk/social_auth_facade.dart
index 341e98a2..49cf2d1d 100644
--- a/lib/features/auth/sdk/social_auth_facade.dart
+++ b/lib/features/auth/sdk/social_auth_facade.dart
@@ -5,7 +5,7 @@ import 'dart:io';
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
import 'package:eatvio_app/features/auth/models/yandex_profile_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/env_config.dart';
import 'package:eatvio_app/core/locator_service.dart';
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 f79d9ef2..022259c3 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -18,7 +18,7 @@ import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.da
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:share_plus/share_plus.dart';
diff --git a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
index b0099417..f9b612c7 100644
--- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
+++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
@@ -21,8 +21,8 @@ import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart'
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:go_router/go_router.dart';
@@ -614,10 +614,6 @@ class _BlogPostCreateScreenState extends State {
void _onReorderGallery(int oldIndex, int newIndex) {
setState(() {
- if (newIndex > oldIndex) {
- newIndex -= 1;
- }
-
if (oldIndex < savedImages.length && newIndex < savedImages.length) {
final item = savedImages.removeAt(oldIndex);
savedImages.insert(newIndex, item);
@@ -988,7 +984,7 @@ class _BlogPostCreateScreenState extends State {
child: ReorderableListView.builder(
scrollDirection: Axis.horizontal,
buildDefaultDragHandles: false,
- onReorder: _onReorderGallery,
+ onReorderItem: _onReorderGallery,
itemCount: _galleryCount + (_remainingSlots > 0 ? 1 : 0),
itemBuilder: (context, index) {
if (index == _galleryCount) {
diff --git a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart
index 53ea8741..8404efd4 100644
--- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart
+++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class BottomNavController {
BottomNavController();
diff --git a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
index b46ae479..a651ab9f 100644
--- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
+++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart
@@ -14,7 +14,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/calendar/presentation/pages/calendar_screen.dart b/lib/features/calendar/presentation/pages/calendar_screen.dart
index 2ba9a0b7..d3bcca8b 100644
--- a/lib/features/calendar/presentation/pages/calendar_screen.dart
+++ b/lib/features/calendar/presentation/pages/calendar_screen.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_state.da
import 'package:eatvio_app/core/locator_service.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet.dart b/lib/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet.dart
index ceec1294..5bfaad28 100644
--- a/lib/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet.dart
+++ b/lib/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 5c8db98c..6714a27a 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -35,8 +35,8 @@ import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:file_picker/file_picker.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:image_picker/image_picker.dart';
diff --git a/lib/features/chat/presentation/pages/chats_screen.dart b/lib/features/chat/presentation/pages/chats_screen.dart
index 993bcfd3..1828c544 100644
--- a/lib/features/chat/presentation/pages/chats_screen.dart
+++ b/lib/features/chat/presentation/pages/chats_screen.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_entry_widget.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_search_bar_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ChatsScreen extends StatefulWidget {
diff --git a/lib/features/chat/presentation/pages/empty_chat_screen.dart b/lib/features/chat/presentation/pages/empty_chat_screen.dart
index 43f20390..75de1ffe 100644
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -8,8 +8,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:file_picker/file_picker.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.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';
diff --git a/lib/features/chat/presentation/pages/payment_screen.dart b/lib/features/chat/presentation/pages/payment_screen.dart
index 236827ad..012aea4b 100644
--- a/lib/features/chat/presentation/pages/payment_screen.dart
+++ b/lib/features/chat/presentation/pages/payment_screen.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
import 'package:webview_flutter/webview_flutter.dart';
diff --git a/lib/features/chat/presentation/pages/photo_view_screen.dart b/lib/features/chat/presentation/pages/photo_view_screen.dart
index b9910feb..445fc055 100644
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -3,7 +3,7 @@ import 'package:dismissible_page/dismissible_page.dart';
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/app_decoration.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
import 'package:photo_view/photo_view.dart';
import 'package:photo_view/photo_view_gallery.dart';
diff --git a/lib/features/chat/presentation/widgets/about_order_button.dart b/lib/features/chat/presentation/widgets/about_order_button.dart
index 26fe8b86..a4303562 100644
--- a/lib/features/chat/presentation/widgets/about_order_button.dart
+++ b/lib/features/chat/presentation/widgets/about_order_button.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class AboutOrderButton extends StatelessWidget {
diff --git a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
index 8d83e961..38213ad7 100644
--- a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/message_action_bottom_sheet.dart';
import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/chat/presentation/widgets/chat_consultation_header.dart b/lib/features/chat/presentation/widgets/chat_consultation_header.dart
index 718ef9f9..382a60d2 100644
--- a/lib/features/chat/presentation/widgets/chat_consultation_header.dart
+++ b/lib/features/chat/presentation/widgets/chat_consultation_header.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/consultations/models/consultation_progress.d
import 'package:eatvio_app/features/consultations/presentation/widgets/consultation_progress_plank.dart';
import 'package:eatvio_app/features/consultations/presentation/widgets/personal_diet_status_chip.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ChatConsultationHeader extends StatelessWidget {
const ChatConsultationHeader({
diff --git a/lib/features/chat/presentation/widgets/chat_entry_widget.dart b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
index dacff9cb..66094e87 100644
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
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:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class ChatEntryWidget extends StatefulWidget {
diff --git a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
index 8691beb3..e1bae3e3 100644
--- a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
class ChatSearchBarWidget extends StatelessWidget {
const ChatSearchBarWidget({
diff --git a/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart b/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart
index 8f851ab2..a486b5cc 100644
--- a/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart
+++ b/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ChatUserOnlineStatusLine extends StatelessWidget {
const ChatUserOnlineStatusLine({
diff --git a/lib/features/chat/presentation/widgets/chose_plan_date_widget.dart b/lib/features/chat/presentation/widgets/chose_plan_date_widget.dart
index 5b385a5c..344caccd 100644
--- a/lib/features/chat/presentation/widgets/chose_plan_date_widget.dart
+++ b/lib/features/chat/presentation/widgets/chose_plan_date_widget.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart b/lib/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart
index ef950bc9..84ddd193 100644
--- a/lib/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart
+++ b/lib/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class CompletePlanBottomSheet extends StatefulWidget {
diff --git a/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart b/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart
index 1f455764..4243f4c2 100644
--- a/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart
+++ b/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart
@@ -3,7 +3,7 @@ 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/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
void showMessageActionsBottomSheet(BuildContext context, {required void Function() resend, required void Function() delete}) {
showModalBottomSheet(
diff --git a/lib/features/chat/presentation/widgets/notification_banner.dart b/lib/features/chat/presentation/widgets/notification_banner.dart
index ab21fd5c..47e1c55c 100644
--- a/lib/features/chat/presentation/widgets/notification_banner.dart
+++ b/lib/features/chat/presentation/widgets/notification_banner.dart
@@ -11,7 +11,7 @@ import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
import 'package:eatvio_app/features/payment/presentation/payment_flow.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/chat/presentation/widgets/order_card.dart b/lib/features/chat/presentation/widgets/order_card.dart
index 2b7b50b2..5ff752da 100644
--- a/lib/features/chat/presentation/widgets/order_card.dart
+++ b/lib/features/chat/presentation/widgets/order_card.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/core/widgets/item_widget.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class OrderCard extends StatefulWidget {
final PlanModel plan;
diff --git a/lib/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart b/lib/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart
index 34f500f7..31637725 100644
--- a/lib/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart
+++ b/lib/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class PlanComplainBottomSheet extends StatefulWidget {
diff --git a/lib/features/chat/presentation/widgets/plan_order_message_widget.dart b/lib/features/chat/presentation/widgets/plan_order_message_widget.dart
index 73581f82..26ba903c 100644
--- a/lib/features/chat/presentation/widgets/plan_order_message_widget.dart
+++ b/lib/features/chat/presentation/widgets/plan_order_message_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class PlanOrderMessageWidget extends StatelessWidget {
diff --git a/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart b/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart
index 90930e1d..4598bcec 100644
--- a/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart
+++ b/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
class VideoCallChatMessageWidget extends StatelessWidget {
diff --git a/lib/features/complaining/presentation/complaining_bottom_sheet.dart b/lib/features/complaining/presentation/complaining_bottom_sheet.dart
index 185738c2..d65c34f4 100644
--- a/lib/features/complaining/presentation/complaining_bottom_sheet.dart
+++ b/lib/features/complaining/presentation/complaining_bottom_sheet.dart
@@ -11,7 +11,7 @@ import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_c
import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_state.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/consultant/become_consultant/entities/diploma_entity.dart b/lib/features/consultant/become_consultant/entities/diploma_entity.dart
index 0194a811..6a147bf8 100644
--- a/lib/features/consultant/become_consultant/entities/diploma_entity.dart
+++ b/lib/features/consultant/become_consultant/entities/diploma_entity.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class DiplomaEntity {
TextEditingController textEditingController;
diff --git a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
index 90b673a5..70fcdc13 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class AdditionalSettingsScreen extends StatefulWidget {
diff --git a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
index c147d12a..25d8554a 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class BecomeConsultantScreen extends StatefulWidget {
diff --git a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
index 33772eb5..e65361f6 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
@@ -2,8 +2,8 @@ import 'package:eatvio_app/features/consultant/become_consultant/entities/diplom
import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
index 5e87ba50..f1b8c067 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scor
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart';
import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart
index 4cde5a95..ff897e3f 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/bl
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
index 87269eb5..776981f9 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.da
import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_cert_photo_model.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:image_picker/image_picker.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
index e10fc74a..84ec5f08 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class RegistrationAsScreen extends StatefulWidget {
diff --git a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
index 1847ec60..2fcd8113 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
index 49e30959..f177d554 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
@@ -14,7 +14,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/pa
import 'package:eatvio_app/core/locator_service.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart b/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart
index 5e34fa79..be36105d 100644
--- a/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart
+++ b/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Wraps a form field with [ValidationErrorWidget] when [error] is present.
/// Pass [hasError] into [CustomTextFormField] from the parent.
diff --git a/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart b/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart
index 29abf8af..b3b5d376 100644
--- a/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart
+++ b/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
class PassportSectionTitle extends StatelessWidget {
const PassportSectionTitle({required this.title, super.key});
diff --git a/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart b/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart
index 764c803d..ed397976 100644
--- a/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart
+++ b/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scor
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ScoringStatusWidget extends StatelessWidget {
diff --git a/lib/features/consultant_rating/presentation/consultant_rating_screen.dart b/lib/features/consultant_rating/presentation/consultant_rating_screen.dart
index 000367e0..ce43cbab 100644
--- a/lib/features/consultant_rating/presentation/consultant_rating_screen.dart
+++ b/lib/features/consultant_rating/presentation/consultant_rating_screen.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/consultant_rating/presentation/widgets/ratin
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/rating_widget.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/statistic_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/consultant_rating/presentation/widgets/period_filter_widget.dart b/lib/features/consultant_rating/presentation/widgets/period_filter_widget.dart
index 3f15be8e..565ce940 100644
--- a/lib/features/consultant_rating/presentation/widgets/period_filter_widget.dart
+++ b/lib/features/consultant_rating/presentation/widgets/period_filter_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:collection/collection.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/consultant_rating/presentation/widgets/rating_history_item.dart b/lib/features/consultant_rating/presentation/widgets/rating_history_item.dart
index 4bafd1b3..a723a92d 100644
--- a/lib/features/consultant_rating/presentation/widgets/rating_history_item.dart
+++ b/lib/features/consultant_rating/presentation/widgets/rating_history_item.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class RatingHistoryItem extends StatelessWidget {
const RatingHistoryItem({super.key, required this.title, required this.amount, required this.date});
diff --git a/lib/features/consultant_rating/presentation/widgets/rating_history_widget.dart b/lib/features/consultant_rating/presentation/widgets/rating_history_widget.dart
index d6f8969b..cb227594 100644
--- a/lib/features/consultant_rating/presentation/widgets/rating_history_widget.dart
+++ b/lib/features/consultant_rating/presentation/widgets/rating_history_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/consultant_rating/models/rating_model.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/period_filter_widget.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/rating_history_item.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class RatingHistoryWidget extends StatelessWidget {
diff --git a/lib/features/consultant_rating/presentation/widgets/rating_widget.dart b/lib/features/consultant_rating/presentation/widgets/rating_widget.dart
index 4f7c8206..66d90950 100644
--- a/lib/features/consultant_rating/presentation/widgets/rating_widget.dart
+++ b/lib/features/consultant_rating/presentation/widgets/rating_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class RatingWidget extends StatelessWidget {
diff --git a/lib/features/consultant_rating/presentation/widgets/statistic_bouble.dart b/lib/features/consultant_rating/presentation/widgets/statistic_bouble.dart
index 2f28ee23..8ec819fe 100644
--- a/lib/features/consultant_rating/presentation/widgets/statistic_bouble.dart
+++ b/lib/features/consultant_rating/presentation/widgets/statistic_bouble.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
class StatisticBouble extends StatelessWidget {
const StatisticBouble({super.key, required this.number, required this.title});
diff --git a/lib/features/consultant_rating/presentation/widgets/statistic_widget.dart b/lib/features/consultant_rating/presentation/widgets/statistic_widget.dart
index ef148adf..82f6d50e 100644
--- a/lib/features/consultant_rating/presentation/widgets/statistic_widget.dart
+++ b/lib/features/consultant_rating/presentation/widgets/statistic_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/consultant_rating/models/statistics_model.da
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/period_filter_widget.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/statistic_bouble.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class StatisticWidget extends StatelessWidget {
diff --git a/lib/features/consultations/presentation/pages/consultations_screen.dart b/lib/features/consultations/presentation/pages/consultations_screen.dart
index 6f0021d9..ab9609b5 100644
--- a/lib/features/consultations/presentation/pages/consultations_screen.dart
+++ b/lib/features/consultations/presentation/pages/consultations_screen.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/consultations/presentation/cubit/consultatio
import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_state.dart';
import 'package:eatvio_app/features/consultations/presentation/widgets/consultation_card_widget.dart';
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart
index 8ad68bf8..d72a494a 100644
--- a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart
+++ b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/consultations/presentation/widgets/consultation_progress_plank.dart b/lib/features/consultations/presentation/widgets/consultation_progress_plank.dart
index 0ad10a62..64199f86 100644
--- a/lib/features/consultations/presentation/widgets/consultation_progress_plank.dart
+++ b/lib/features/consultations/presentation/widgets/consultation_progress_plank.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultations/models/consultation_progress.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ConsultationProgressPlank extends StatelessWidget {
const ConsultationProgressPlank({super.key, required this.progress});
diff --git a/lib/features/consultations/presentation/widgets/personal_diet_status_chip.dart b/lib/features/consultations/presentation/widgets/personal_diet_status_chip.dart
index 559d1f39..91464f41 100644
--- a/lib/features/consultations/presentation/widgets/personal_diet_status_chip.dart
+++ b/lib/features/consultations/presentation/widgets/personal_diet_status_chip.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultations/models/consultation_progress.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class PersonalDietStatusChip extends StatelessWidget {
const PersonalDietStatusChip({super.key, required this.progress});
diff --git a/lib/features/create_diet/presentation/create_diet_screen.dart b/lib/features/create_diet/presentation/create_diet_screen.dart
index c04f1e1c..504c57e5 100644
--- a/lib/features/create_diet/presentation/create_diet_screen.dart
+++ b/lib/features/create_diet/presentation/create_diet_screen.dart
@@ -21,7 +21,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/status_drop
import 'package:eatvio_app/features/create_diet/presentation/widgets/diet_type_choice_widget.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart b/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
index 9788c7ce..f175af6c 100644
--- a/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
+++ b/lib/features/create_diet/presentation/cubit/create_diet_cubit.dart
@@ -324,7 +324,8 @@ class CreateDietCubit extends Cubit {
final tempDir = await getTemporaryDirectory();
final filePath = '${tempDir.path}/${imageUrl.split('/').last}';
final file = File(filePath);
- return file.writeAsBytes(response.bodyBytes);
+ await file.writeAsBytes(response.bodyBytes);
+ return file;
} catch (e, st) {
await reportFrom(e, st, this);
return null;
diff --git a/lib/features/create_diet/presentation/diet_preview_screen.dart b/lib/features/create_diet/presentation/diet_preview_screen.dart
index fd5a2f3b..2106e900 100644
--- a/lib/features/create_diet/presentation/diet_preview_screen.dart
+++ b/lib/features/create_diet/presentation/diet_preview_screen.dart
@@ -16,7 +16,7 @@ import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class DietPreviewScreen extends StatefulWidget {
diff --git a/lib/features/create_diet/presentation/widgets/add_meal_widget.dart b/lib/features/create_diet/presentation/widgets/add_meal_widget.dart
index bfe5d823..ce3bb267 100644
--- a/lib/features/create_diet/presentation/widgets/add_meal_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/add_meal_widget.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class AddMealWidget extends StatefulWidget {
const AddMealWidget({
diff --git a/lib/features/create_diet/presentation/widgets/day_widget.dart b/lib/features/create_diet/presentation/widgets/day_widget.dart
index 9e5fe5fb..bedbe056 100644
--- a/lib/features/create_diet/presentation/widgets/day_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/day_widget.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/add_meal_wi
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/choice_chip_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/create_diet/presentation/widgets/diet_duration_drop_down_widget.dart b/lib/features/create_diet/presentation/widgets/diet_duration_drop_down_widget.dart
index 0c05c61f..e7dc76f2 100644
--- a/lib/features/create_diet/presentation/widgets/diet_duration_drop_down_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/diet_duration_drop_down_widget.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_s
import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:collection/collection.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/create_diet/presentation/widgets/diet_image_picker_widget.dart b/lib/features/create_diet/presentation/widgets/diet_image_picker_widget.dart
index 192df5d3..0b62df41 100644
--- a/lib/features/create_diet/presentation/widgets/diet_image_picker_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/diet_image_picker_widget.dart
@@ -9,8 +9,8 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_c
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_state.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/create_diet/presentation/widgets/diet_type_choice_widget.dart b/lib/features/create_diet/presentation/widgets/diet_type_choice_widget.dart
index b8db4b7a..3c0789f5 100644
--- a/lib/features/create_diet/presentation/widgets/diet_type_choice_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/diet_type_choice_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart';
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/create_diet/presentation/widgets/error_widget.dart b/lib/features/create_diet/presentation/widgets/error_widget.dart
index cab9324e..1c15057f 100644
--- a/lib/features/create_diet/presentation/widgets/error_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/error_widget.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class ValidationErrorWidget extends StatelessWidget {
diff --git a/lib/features/create_diet/presentation/widgets/status_drop_down_widget.dart b/lib/features/create_diet/presentation/widgets/status_drop_down_widget.dart
index 249e897a..665e423e 100644
--- a/lib/features/create_diet/presentation/widgets/status_drop_down_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/status_drop_down_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:collection/collection.dart';
diff --git a/lib/features/create_plan/presentation/create_plan_screen.dart b/lib/features/create_plan/presentation/create_plan_screen.dart
index c3076ed0..0914efee 100644
--- a/lib/features/create_plan/presentation/create_plan_screen.dart
+++ b/lib/features/create_plan/presentation/create_plan_screen.dart
@@ -19,7 +19,7 @@ import 'package:eatvio_app/features/create_plan/presentation/widgets/plan_image_
import 'package:eatvio_app/features/create_plan/presentation/widgets/plan_type_choice_widget.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/select_exact_option_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/create_plan/presentation/widgets/option_widget.dart b/lib/features/create_plan/presentation/widgets/option_widget.dart
index 29805d82..961ed21e 100644
--- a/lib/features/create_plan/presentation/widgets/option_widget.dart
+++ b/lib/features/create_plan/presentation/widgets/option_widget.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_s
import 'package:eatvio_app/features/create_plan/presentation/widgets/add_item_widget.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/create_plan/presentation/widgets/options_count_button.dart b/lib/features/create_plan/presentation/widgets/options_count_button.dart
index 09833c70..a4efe545 100644
--- a/lib/features/create_plan/presentation/widgets/options_count_button.dart
+++ b/lib/features/create_plan/presentation/widgets/options_count_button.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/widgets/animated_option_button.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class OptionsCountButton extends StatelessWidget {
diff --git a/lib/features/create_plan/presentation/widgets/plan_duration_drop_down_widget.dart b/lib/features/create_plan/presentation/widgets/plan_duration_drop_down_widget.dart
index ad4100c0..280e6428 100644
--- a/lib/features/create_plan/presentation/widgets/plan_duration_drop_down_widget.dart
+++ b/lib/features/create_plan/presentation/widgets/plan_duration_drop_down_widget.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:collection/collection.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/create_plan/presentation/widgets/plan_image_picker_widget.dart b/lib/features/create_plan/presentation/widgets/plan_image_picker_widget.dart
index 3083c8b6..2c945fd4 100644
--- a/lib/features/create_plan/presentation/widgets/plan_image_picker_widget.dart
+++ b/lib/features/create_plan/presentation/widgets/plan_image_picker_widget.dart
@@ -11,8 +11,8 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/create_plan/presentation/widgets/plan_type_choice_widget.dart b/lib/features/create_plan/presentation/widgets/plan_type_choice_widget.dart
index a50d461d..26b26fd4 100644
--- a/lib/features/create_plan/presentation/widgets/plan_type_choice_widget.dart
+++ b/lib/features/create_plan/presentation/widgets/plan_type_choice_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class PlanTypeChoiceWidget extends StatefulWidget {
diff --git a/lib/features/create_plan/presentation/widgets/select_exact_option_widget.dart b/lib/features/create_plan/presentation/widgets/select_exact_option_widget.dart
index ba428c3e..6479350b 100644
--- a/lib/features/create_plan/presentation/widgets/select_exact_option_widget.dart
+++ b/lib/features/create_plan/presentation/widgets/select_exact_option_widget.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class SelectExactOptionWidget extends StatefulWidget {
diff --git a/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart b/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
index e65fe5ef..aadcbf18 100644
--- a/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
+++ b/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
@@ -213,7 +213,8 @@ class CreateRecipeCubit extends Cubit {
final tempDir = await getTemporaryDirectory();
final filePath = '${tempDir.path}/${imageUrl.split('/').last}';
final file = File(filePath);
- return file.writeAsBytes(response.bodyBytes);
+ await file.writeAsBytes(response.bodyBytes);
+ return file;
} catch (e, st) {
await reportFrom(e, st, this);
return null;
diff --git a/lib/features/create_recipe/presentation/pages/recipe_create_screen.dart b/lib/features/create_recipe/presentation/pages/recipe_create_screen.dart
index d4b622aa..1131c8df 100644
--- a/lib/features/create_recipe/presentation/pages/recipe_create_screen.dart
+++ b/lib/features/create_recipe/presentation/pages/recipe_create_screen.dart
@@ -13,7 +13,7 @@ import 'package:eatvio_app/features/create_recipe/presentation/widgets/ingredien
import 'package:eatvio_app/features/create_recipe/presentation/widgets/steps_widget.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/create_recipe/presentation/widgets/add_portion_widget.dart b/lib/features/create_recipe/presentation/widgets/add_portion_widget.dart
index 9fd0a25d..43928d4b 100644
--- a/lib/features/create_recipe/presentation/widgets/add_portion_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/add_portion_widget.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class AddPortionWidget extends StatefulWidget {
const AddPortionWidget({super.key, required this.createRecipeCubit, this.portionIndex, this.productNameControllerText, this.quantityControllerText});
diff --git a/lib/features/create_recipe/presentation/widgets/image_widget.dart b/lib/features/create_recipe/presentation/widgets/image_widget.dart
index bbb93c35..8dffd6eb 100644
--- a/lib/features/create_recipe/presentation/widgets/image_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/image_widget.dart
@@ -4,8 +4,8 @@ import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/permission_handler/permission_handler.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart b/lib/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart
index 0eb609e4..3ce039c7 100644
--- a/lib/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/create_recipe/presentation/widgets/image_wid
import 'package:eatvio_app/features/create_recipe/presentation/widgets/portion_widget.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/tags_widget.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/time_of_cook_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class InfoAboutRecipeWidget extends StatefulWidget {
diff --git a/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart b/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart
index 6894c162..aa625597 100644
--- a/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/add_portion_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class IngredientsWidget extends StatefulWidget {
@@ -47,12 +47,7 @@ class _IngredientsWidgetState extends State {
ReorderableListView(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
- onReorder: (int oldIndex, int newIndex) {
- setState(() {
- if (oldIndex < newIndex) {
- newIndex -= 1;
- }
- });
+ onReorderItem: (int oldIndex, int newIndex) {
createRecipeCubit.replaceIngredientPosition(oldIndex, newIndex);
},
children: [
diff --git a/lib/features/create_recipe/presentation/widgets/portion_widget.dart b/lib/features/create_recipe/presentation/widgets/portion_widget.dart
index 608218b1..c122ccea 100644
--- a/lib/features/create_recipe/presentation/widgets/portion_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/portion_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class PortionWidget extends StatefulWidget {
diff --git a/lib/features/create_recipe/presentation/widgets/step_image_widget.dart b/lib/features/create_recipe/presentation/widgets/step_image_widget.dart
index 8c18b185..7520a2ba 100644
--- a/lib/features/create_recipe/presentation/widgets/step_image_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/step_image_widget.dart
@@ -4,8 +4,8 @@ import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/permission_handler/permission_handler.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
import 'package:image_picker/image_picker.dart';
diff --git a/lib/features/create_recipe/presentation/widgets/steps_widget.dart b/lib/features/create_recipe/presentation/widgets/steps_widget.dart
index 9beaa707..a4d9aebb 100644
--- a/lib/features/create_recipe/presentation/widgets/steps_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/steps_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/step_image_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class StepsWidget extends StatefulWidget {
diff --git a/lib/features/create_recipe/presentation/widgets/tags_widget.dart b/lib/features/create_recipe/presentation/widgets/tags_widget.dart
index 5356132e..d15f3fa3 100644
--- a/lib/features/create_recipe/presentation/widgets/tags_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/tags_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class TagsWidget extends StatefulWidget {
diff --git a/lib/features/create_recipe/presentation/widgets/time_of_cook_widget.dart b/lib/features/create_recipe/presentation/widgets/time_of_cook_widget.dart
index 78403de1..d0253dff 100644
--- a/lib/features/create_recipe/presentation/widgets/time_of_cook_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/time_of_cook_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class TimeOfCookWidget extends StatefulWidget {
diff --git a/lib/features/dev_tools/presentation/dev_tools_screen.dart b/lib/features/dev_tools/presentation/dev_tools_screen.dart
index a21f9282..c6c2ace9 100644
--- a/lib/features/dev_tools/presentation/dev_tools_screen.dart
+++ b/lib/features/dev_tools/presentation/dev_tools_screen.dart
@@ -13,7 +13,7 @@ import 'package:eatvio_app/core/env_config.dart';
import 'package:eatvio_app/features/diary/presentation/pages/barcode_scanner_screen.dart';
import 'package:eatvio_app/features/barcode/repositories/barcode_repository.dart';
import 'package:eatvio_app/features/barcode/models/barcode_product_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'dart:async';
diff --git a/lib/features/diary/presentation/pages/barcode_scanner_screen.dart b/lib/features/diary/presentation/pages/barcode_scanner_screen.dart
index dde46894..561680b5 100644
--- a/lib/features/diary/presentation/pages/barcode_scanner_screen.dart
+++ b/lib/features/diary/presentation/pages/barcode_scanner_screen.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:mobile_scanner/mobile_scanner.dart';
class BarcodeScannerScreen extends StatefulWidget {
diff --git a/lib/features/diary/presentation/pages/diary_screen.dart b/lib/features/diary/presentation/pages/diary_screen.dart
index b91bcba7..c2e3bba6 100644
--- a/lib/features/diary/presentation/pages/diary_screen.dart
+++ b/lib/features/diary/presentation/pages/diary_screen.dart
@@ -21,7 +21,7 @@ import 'package:eatvio_app/features/diary/presentation/widgets/finish_day_button
import 'package:eatvio_app/features/diary/presentation/widgets/meal_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/wakeup_and_retire_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class DiaryScreen extends StatelessWidget {
diff --git a/lib/features/diary/presentation/widgets/add_product_button_widget.dart b/lib/features/diary/presentation/widgets/add_product_button_widget.dart
index b804989a..59427b9d 100644
--- a/lib/features/diary/presentation/widgets/add_product_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/add_product_button_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/add_product_modal.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class AddProductButtonWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/add_product_modal.dart b/lib/features/diary/presentation/widgets/add_product_modal.dart
index 611652cf..1247b0ff 100644
--- a/lib/features/diary/presentation/widgets/add_product_modal.dart
+++ b/lib/features/diary/presentation/widgets/add_product_modal.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class AddProductModal extends StatefulWidget {
final PortionModel? portion;
diff --git a/lib/features/diary/presentation/widgets/calendar_widget.dart b/lib/features/diary/presentation/widgets/calendar_widget.dart
index 56361371..0ad135f4 100644
--- a/lib/features/diary/presentation/widgets/calendar_widget.dart
+++ b/lib/features/diary/presentation/widgets/calendar_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:table_calendar/table_calendar.dart';
diff --git a/lib/features/diary/presentation/widgets/calories_chart_widget.dart b/lib/features/diary/presentation/widgets/calories_chart_widget.dart
index 4aca0334..884f208b 100644
--- a/lib/features/diary/presentation/widgets/calories_chart_widget.dart
+++ b/lib/features/diary/presentation/widgets/calories_chart_widget.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncfusion_flutter_gauges/gauges.dart';
diff --git a/lib/features/diary/presentation/widgets/chosen_diet_widget.dart b/lib/features/diary/presentation/widgets/chosen_diet_widget.dart
index 19411307..97af2ba4 100644
--- a/lib/features/diary/presentation/widgets/chosen_diet_widget.dart
+++ b/lib/features/diary/presentation/widgets/chosen_diet_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/diary/presentation/widgets/chosen_plan_widget.dart b/lib/features/diary/presentation/widgets/chosen_plan_widget.dart
index d8c51ba9..a9018a6e 100644
--- a/lib/features/diary/presentation/widgets/chosen_plan_widget.dart
+++ b/lib/features/diary/presentation/widgets/chosen_plan_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ChosenPlanWidget extends StatelessWidget {
diff --git a/lib/features/diary/presentation/widgets/comment_container.dart b/lib/features/diary/presentation/widgets/comment_container.dart
index 24f7ff38..7faade3d 100644
--- a/lib/features/diary/presentation/widgets/comment_container.dart
+++ b/lib/features/diary/presentation/widgets/comment_container.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
class CommentContainer extends StatelessWidget {
const CommentContainer({super.key, required this.comment});
diff --git a/lib/features/diary/presentation/widgets/comment_for_consultant_widget.dart b/lib/features/diary/presentation/widgets/comment_for_consultant_widget.dart
index bf73970a..7b437ce9 100644
--- a/lib/features/diary/presentation/widgets/comment_for_consultant_widget.dart
+++ b/lib/features/diary/presentation/widgets/comment_for_consultant_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class CommentForConsultantWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/day_comment_widget.dart b/lib/features/diary/presentation/widgets/day_comment_widget.dart
index fa6d3ffa..087d0aaf 100644
--- a/lib/features/diary/presentation/widgets/day_comment_widget.dart
+++ b/lib/features/diary/presentation/widgets/day_comment_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class DayCommentWidget extends StatelessWidget {
diff --git a/lib/features/diary/presentation/widgets/finish_day_button_widget.dart b/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
index d38e32e3..684ffb20 100644
--- a/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/finish_day_button_widget.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_with_blur.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class FinishDayButtonWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
index 1c93bb8f..eabec23b 100644
--- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
+++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:lottie/lottie.dart';
class GlossaryModerationRequestModalWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/meal_button_widget.dart b/lib/features/diary/presentation/widgets/meal_button_widget.dart
index 9e17c217..c12dd567 100644
--- a/lib/features/diary/presentation/widgets/meal_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/meal_button_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_summary_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class MealButtonWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/meal_comment_widget.dart b/lib/features/diary/presentation/widgets/meal_comment_widget.dart
index da5f3b11..e5f971aa 100644
--- a/lib/features/diary/presentation/widgets/meal_comment_widget.dart
+++ b/lib/features/diary/presentation/widgets/meal_comment_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class MealCommentWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/meal_summary_widget.dart b/lib/features/diary/presentation/widgets/meal_summary_widget.dart
index 934786bf..23a5e69b 100644
--- a/lib/features/diary/presentation/widgets/meal_summary_widget.dart
+++ b/lib/features/diary/presentation/widgets/meal_summary_widget.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class MealSummaryWidget extends StatelessWidget {
final List portions;
diff --git a/lib/features/diary/presentation/widgets/meal_widget.dart b/lib/features/diary/presentation/widgets/meal_widget.dart
index 21b7fe20..3f0807b9 100644
--- a/lib/features/diary/presentation/widgets/meal_widget.dart
+++ b/lib/features/diary/presentation/widgets/meal_widget.dart
@@ -15,7 +15,7 @@ import 'package:eatvio_app/features/diary/presentation/widgets/products_list_wid
import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/time_of_meal_picker_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class MealWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/mood_rating_widget.dart b/lib/features/diary/presentation/widgets/mood_rating_widget.dart
index c6057764..cf30163b 100644
--- a/lib/features/diary/presentation/widgets/mood_rating_widget.dart
+++ b/lib/features/diary/presentation/widgets/mood_rating_widget.dart
@@ -1,7 +1,7 @@
import 'package:easy_debounce/easy_debounce.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/diary/presentation/widgets/photo_gallery_widget.dart b/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
index cbd65add..3fb612a5 100644
--- a/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
+++ b/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
@@ -10,8 +10,8 @@ import 'package:eatvio_app/features/diary/entities/diary_day_entity.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/diary/presentation/widgets/portion_comment_widget.dart b/lib/features/diary/presentation/widgets/portion_comment_widget.dart
index 8c4c1b13..09b7fc5d 100644
--- a/lib/features/diary/presentation/widgets/portion_comment_widget.dart
+++ b/lib/features/diary/presentation/widgets/portion_comment_widget.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/comment_container.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class PortionCommentWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/product_loader_widget.dart b/lib/features/diary/presentation/widgets/product_loader_widget.dart
index 7b679354..dbfeda02 100644
--- a/lib/features/diary/presentation/widgets/product_loader_widget.dart
+++ b/lib/features/diary/presentation/widgets/product_loader_widget.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
class ProductLoaderWidget extends StatefulWidget {
const ProductLoaderWidget({
diff --git a/lib/features/diary/presentation/widgets/product_widget.dart b/lib/features/diary/presentation/widgets/product_widget.dart
index ccf0d0dd..0f28b580 100644
--- a/lib/features/diary/presentation/widgets/product_widget.dart
+++ b/lib/features/diary/presentation/widgets/product_widget.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/add_product_modal.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/portion_comment_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/diary/presentation/widgets/products_list_widget.dart b/lib/features/diary/presentation/widgets/products_list_widget.dart
index d3d7ac10..6aa53c9a 100644
--- a/lib/features/diary/presentation/widgets/products_list_widget.dart
+++ b/lib/features/diary/presentation/widgets/products_list_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_summary_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/product_loader_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/product_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ProductsListWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/satiety_rating_widget.dart b/lib/features/diary/presentation/widgets/satiety_rating_widget.dart
index a463196d..2231674d 100644
--- a/lib/features/diary/presentation/widgets/satiety_rating_widget.dart
+++ b/lib/features/diary/presentation/widgets/satiety_rating_widget.dart
@@ -1,7 +1,7 @@
import 'package:easy_debounce/easy_debounce.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart b/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart
index eb85f711..4919ccc6 100644
--- a/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart
+++ b/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart
@@ -2,8 +2,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class TimeOfMealPickerWidget extends StatefulWidget {
diff --git a/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart b/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart
index 6e74f5ec..7421cf2f 100644
--- a/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart
+++ b/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/diets/presentation/pages/about_diet_screen.dart b/lib/features/diets/presentation/pages/about_diet_screen.dart
index 1eb81593..6e3bcd2c 100644
--- a/lib/features/diets/presentation/pages/about_diet_screen.dart
+++ b/lib/features/diets/presentation/pages/about_diet_screen.dart
@@ -27,7 +27,7 @@ import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/diets/presentation/widgets/author_card.dart b/lib/features/diets/presentation/widgets/author_card.dart
index 69a92966..705c717f 100644
--- a/lib/features/diets/presentation/widgets/author_card.dart
+++ b/lib/features/diets/presentation/widgets/author_card.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/core/utils/url_utils.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/diets/presentation/widgets/calendar_widget.dart b/lib/features/diets/presentation/widgets/calendar_widget.dart
index 1daace4b..b88a78d8 100644
--- a/lib/features/diets/presentation/widgets/calendar_widget.dart
+++ b/lib/features/diets/presentation/widgets/calendar_widget.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/utils/string_extentions.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:intl/intl.dart';
import 'package:table_calendar/table_calendar.dart';
diff --git a/lib/features/diets/presentation/widgets/cancel_diet_bottom_sheet.dart b/lib/features/diets/presentation/widgets/cancel_diet_bottom_sheet.dart
index 3a324c19..4c455812 100644
--- a/lib/features/diets/presentation/widgets/cancel_diet_bottom_sheet.dart
+++ b/lib/features/diets/presentation/widgets/cancel_diet_bottom_sheet.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diets/presentation/widgets/start_diet_bottom
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class CancelDietBottomSheet extends StatelessWidget {
const CancelDietBottomSheet({super.key, required this.aboutDietCubit, this.title, this.dietName});
diff --git a/lib/features/diets/presentation/widgets/expandable_text.dart b/lib/features/diets/presentation/widgets/expandable_text.dart
index bb2bb9e7..4f4eee93 100644
--- a/lib/features/diets/presentation/widgets/expandable_text.dart
+++ b/lib/features/diets/presentation/widgets/expandable_text.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/svg.dart';
class ExpandableText extends StatefulWidget {
diff --git a/lib/features/diets/presentation/widgets/info_bouble.dart b/lib/features/diets/presentation/widgets/info_bouble.dart
index 1cb12f9d..3ca8027d 100644
--- a/lib/features/diets/presentation/widgets/info_bouble.dart
+++ b/lib/features/diets/presentation/widgets/info_bouble.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class InfoBouble extends StatelessWidget {
const InfoBouble({
diff --git a/lib/features/diets/presentation/widgets/more_options.dart b/lib/features/diets/presentation/widgets/more_options.dart
index cb3e33b2..fa8b089a 100644
--- a/lib/features/diets/presentation/widgets/more_options.dart
+++ b/lib/features/diets/presentation/widgets/more_options.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/generated/l10n.dart';
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:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:share_plus/share_plus.dart';
diff --git a/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart b/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
index d05dc121..c53ee80f 100644
--- a/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
+++ b/lib/features/diets/presentation/widgets/start_diet_bottom_sheet.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class StartDietBottomSheet extends StatefulWidget {
const StartDietBottomSheet({super.key, required this.aboutDietCubit});
diff --git a/lib/features/diets/presentation/widgets/type_badges.dart b/lib/features/diets/presentation/widgets/type_badges.dart
index e852b084..d5e0673e 100644
--- a/lib/features/diets/presentation/widgets/type_badges.dart
+++ b/lib/features/diets/presentation/widgets/type_badges.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/feed/presentation/pages/feed_screen.dart b/lib/features/feed/presentation/pages/feed_screen.dart
index 0dfb28e8..74c21b49 100644
--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -25,7 +25,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cub
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/blog_post_media_content.dart b/lib/features/feed/presentation/widgets/blog_post_media_content.dart
index 03dd10a4..476dd4a1 100644
--- a/lib/features/feed/presentation/widgets/blog_post_media_content.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_media_content.dart
@@ -5,7 +5,7 @@ import 'package:carousel_slider_plus/carousel_slider_plus.dart';
import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Gallery + optional embed video for feed card and blog post detail.
class BlogPostMediaContent extends StatefulWidget {
diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart
index 98de8abc..3a62316b 100644
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -13,7 +13,7 @@ import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/subscribe_button_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/blog_posts.dart b/lib/features/feed/presentation/widgets/blog_posts.dart
index afae31c7..70ff0e4a 100644
--- a/lib/features/feed/presentation/widgets/blog_posts.dart
+++ b/lib/features/feed/presentation/widgets/blog_posts.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state
import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:visibility_detector/visibility_detector.dart';
diff --git a/lib/features/feed/presentation/widgets/choice_chip_widget.dart b/lib/features/feed/presentation/widgets/choice_chip_widget.dart
index a2e7fc30..4e127074 100644
--- a/lib/features/feed/presentation/widgets/choice_chip_widget.dart
+++ b/lib/features/feed/presentation/widgets/choice_chip_widget.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ChoiceChipWidget extends StatelessWidget {
const ChoiceChipWidget({
diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart
index e1383e9a..5e19991d 100644
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/feed/models/comment_model.dart';
import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/consultant_widget.dart b/lib/features/feed/presentation/widgets/consultant_widget.dart
index 686b1244..fcb31dc5 100644
--- a/lib/features/feed/presentation/widgets/consultant_widget.dart
+++ b/lib/features/feed/presentation/widgets/consultant_widget.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/utils/url_utils.dart';
import 'package:eatvio_app/core/widgets/network_svg_picture.dart';
import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
import 'package:eatvio_app/features/profile/models/badge_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/consultants.dart b/lib/features/feed/presentation/widgets/consultants.dart
index 4aed497c..f1c5abd7 100644
--- a/lib/features/feed/presentation/widgets/consultants.dart
+++ b/lib/features/feed/presentation/widgets/consultants.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/consultant_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class Consultants extends StatelessWidget {
diff --git a/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart b/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
index 2a7c17a8..289cf21d 100644
--- a/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
+++ b/lib/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.d
import 'package:eatvio_app/generated/l10n.dart';
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:material_ui/material_ui.dart';
class DietFilterBottomSheet extends StatelessWidget {
const DietFilterBottomSheet({super.key, this.dietsCubit, this.myDietsCubit});
diff --git a/lib/features/feed/presentation/widgets/diets.dart b/lib/features/feed/presentation/widgets/diets.dart
index 080b1a14..c528bc9d 100644
--- a/lib/features/feed/presentation/widgets/diets.dart
+++ b/lib/features/feed/presentation/widgets/diets.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/diet_filter_bottom_sheet.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/diets_widget.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/filter_badge.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:visibility_detector/visibility_detector.dart';
diff --git a/lib/features/feed/presentation/widgets/diets_widget.dart b/lib/features/feed/presentation/widgets/diets_widget.dart
index 93268f27..6281e779 100644
--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -11,7 +11,7 @@ import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart
index 2f850923..dfe3696c 100644
--- a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart
+++ b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/
import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
diff --git a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart
index 1721e45b..c3541f74 100644
--- a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart
+++ b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart
@@ -1,5 +1,5 @@
import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class FeedVideoPreviewPlaceholder extends StatelessWidget {
const FeedVideoPreviewPlaceholder({
diff --git a/lib/features/feed/presentation/widgets/filter_badge.dart b/lib/features/feed/presentation/widgets/filter_badge.dart
index 5778dfe6..78d3c41a 100644
--- a/lib/features/feed/presentation/widgets/filter_badge.dart
+++ b/lib/features/feed/presentation/widgets/filter_badge.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
class FilterBadge extends StatelessWidget {
diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart
index 13f57367..a8a05179 100644
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -15,7 +15,7 @@ import 'package:eatvio_app/core/utils/url_utils.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/plans.dart b/lib/features/feed/presentation/widgets/plans.dart
index 42e107e5..78bd3f65 100644
--- a/lib/features/feed/presentation/widgets/plans.dart
+++ b/lib/features/feed/presentation/widgets/plans.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/filter_badge.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/plan_widget.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/plans_filter_bottom_sheet.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:visibility_detector/visibility_detector.dart';
diff --git a/lib/features/feed/presentation/widgets/plans_filter_bottom_sheet.dart b/lib/features/feed/presentation/widgets/plans_filter_bottom_sheet.dart
index c5ab32ba..118995ce 100644
--- a/lib/features/feed/presentation/widgets/plans_filter_bottom_sheet.dart
+++ b/lib/features/feed/presentation/widgets/plans_filter_bottom_sheet.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.d
import 'package:eatvio_app/generated/l10n.dart';
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:material_ui/material_ui.dart';
class PlansFilterBottomSheet extends StatelessWidget {
const PlansFilterBottomSheet({super.key, this.plansCubit, this.myPlansCubit});
diff --git a/lib/features/feed/presentation/widgets/price_choice_filter_widget.dart b/lib/features/feed/presentation/widgets/price_choice_filter_widget.dart
index ce7e43cf..68ec0237 100644
--- a/lib/features/feed/presentation/widgets/price_choice_filter_widget.dart
+++ b/lib/features/feed/presentation/widgets/price_choice_filter_widget.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cub
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_state.dart';
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class PriceChoiceFilterWidget extends StatefulWidget {
diff --git a/lib/features/feed/presentation/widgets/recipes.dart b/lib/features/feed/presentation/widgets/recipes.dart
index 1271a493..af981a14 100644
--- a/lib/features/feed/presentation/widgets/recipes.dart
+++ b/lib/features/feed/presentation/widgets/recipes.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/recipes_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:visibility_detector/visibility_detector.dart';
diff --git a/lib/features/feed/presentation/widgets/recipes_widget.dart b/lib/features/feed/presentation/widgets/recipes_widget.dart
index 01438f7d..8e4ddd7b 100644
--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -14,7 +14,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart b/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
index f77a14c8..b106624b 100644
--- a/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
+++ b/lib/features/feed/presentation/widgets/sorting_drop_down_filter.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.d
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:collection/collection.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/feed/presentation/widgets/subscribe_button_widget.dart b/lib/features/feed/presentation/widgets/subscribe_button_widget.dart
index c927d810..de5103fb 100644
--- a/lib/features/feed/presentation/widgets/subscribe_button_widget.dart
+++ b/lib/features/feed/presentation/widgets/subscribe_button_widget.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class SubscribeButtonWidget extends StatefulWidget {
final String slug;
diff --git a/lib/features/feed/presentation/widgets/tags_modal_widget.dart b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
index 640f5ac0..794d1116 100644
--- a/lib/features/feed/presentation/widgets/tags_modal_widget.dart
+++ b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/features/create_recipe/models/recipe_tag_model.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class TagsModalWidget extends StatefulWidget {
diff --git a/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart b/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart
index 085e9fa6..1cf4c1fa 100644
--- a/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/period_en
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart b/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
index c356e9fb..f00b858e 100644
--- a/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
@@ -11,7 +11,7 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/period_en
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ConsultationsArchiveScreen extends StatefulWidget {
diff --git a/lib/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart b/lib/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart
index 67d4652f..8466d83e 100644
--- a/lib/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart
@@ -11,7 +11,7 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/period_en
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class UserPurchasesScreen extends StatefulWidget {
diff --git a/lib/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart b/lib/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart
index fab1fc21..dc701f23 100644
--- a/lib/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class StatusWidget extends StatelessWidget {
const StatusWidget({super.key, required this.status});
diff --git a/lib/features/glossary/presentation/pages/glossary_screen.dart b/lib/features/glossary/presentation/pages/glossary_screen.dart
index 3df941cb..3ec38953 100644
--- a/lib/features/glossary/presentation/pages/glossary_screen.dart
+++ b/lib/features/glossary/presentation/pages/glossary_screen.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:webview_flutter/webview_flutter.dart';
const _passKeyLoginPath = 'login_with_pass_key';
diff --git a/lib/features/internet_connection_checker/internet_connection_checker_screen.dart b/lib/features/internet_connection_checker/internet_connection_checker_screen.dart
index 576eb891..646e1988 100644
--- a/lib/features/internet_connection_checker/internet_connection_checker_screen.dart
+++ b/lib/features/internet_connection_checker/internet_connection_checker_screen.dart
@@ -5,7 +5,7 @@ import 'package:easy_debounce/easy_debounce.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart b/lib/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart
index 2c8a5fc5..e9ced3b0 100644
--- a/lib/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart
+++ b/lib/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart
@@ -9,9 +9,8 @@ class NotificationSettingsCubit extends Cubit {
final NotificationSettingsRepository _notificationSettingsRepository;
int _alertSeq = 0;
- NotificationSettingsCubit({required NotificationSettingsRepository notificationSettingsRepository})
- : _notificationSettingsRepository = notificationSettingsRepository,
- super(const NotificationSettingsStateLoading());
+ NotificationSettingsCubit({required this._notificationSettingsRepository})
+ : super(const NotificationSettingsStateLoading());
Future getNotificationSettings() async {
emit(const NotificationSettingsStateLoading());
diff --git a/lib/features/menu/presentation/pages/blocked_users_screen.dart b/lib/features/menu/presentation/pages/blocked_users_screen.dart
index 2f632026..37a8da6b 100644
--- a/lib/features/menu/presentation/pages/blocked_users_screen.dart
+++ b/lib/features/menu/presentation/pages/blocked_users_screen.dart
@@ -2,7 +2,7 @@ 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/features/menu/presentation/widgets/blocked_user_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class BlockedUsersScreen extends StatefulWidget {
diff --git a/lib/features/menu/presentation/pages/menu_screen.dart b/lib/features/menu/presentation/pages/menu_screen.dart
index 29f7ed28..cfa52fd4 100644
--- a/lib/features/menu/presentation/pages/menu_screen.dart
+++ b/lib/features/menu/presentation/pages/menu_screen.dart
@@ -15,8 +15,8 @@ import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
import 'package:eatvio_app/features/recipe/presentation/pages/my_recipes_screen.dart';
import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/menu/presentation/pages/notifications_settings_screen.dart b/lib/features/menu/presentation/pages/notifications_settings_screen.dart
index 2bce5518..b57cb600 100644
--- a/lib/features/menu/presentation/pages/notifications_settings_screen.dart
+++ b/lib/features/menu/presentation/pages/notifications_settings_screen.dart
@@ -4,8 +4,8 @@ import 'package:eatvio_app/features/menu/models/notification_settings_model.dart
import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_cubit.dart';
import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings_cubit/notification_settings_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/lib/features/menu/presentation/widgets/blocked_user_widget.dart b/lib/features/menu/presentation/widgets/blocked_user_widget.dart
index c2971def..830c253c 100644
--- a/lib/features/menu/presentation/widgets/blocked_user_widget.dart
+++ b/lib/features/menu/presentation/widgets/blocked_user_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/utils/url_utils.dart';
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/my_diets/presentation/my_diets_screen.dart b/lib/features/my_diets/presentation/my_diets_screen.dart
index 223f8eec..e00fe433 100644
--- a/lib/features/my_diets/presentation/my_diets_screen.dart
+++ b/lib/features/my_diets/presentation/my_diets_screen.dart
@@ -14,7 +14,7 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.d
import 'package:eatvio_app/features/my_diets/presentation/widgets/my_diet_widget.dart';
import 'package:eatvio_app/features/my_diets/presentation/widgets/my_diets_tab.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet.dart b/lib/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet.dart
index 46fb0a57..6d6a697a 100644
--- a/lib/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet.dart
+++ b/lib/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class DietDeletedBottomSheet extends StatelessWidget {
diff --git a/lib/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart b/lib/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart
index a1bd11b3..e52dad87 100644
--- a/lib/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart
+++ b/lib/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class DietDraftedBottomSheet extends StatelessWidget {
diff --git a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
index e2236b96..454e6ec3 100644
--- a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
+++ b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
@@ -19,7 +19,7 @@ import 'package:eatvio_app/features/my_diets/presentation/widgets/diet_deleted_b
import 'package:eatvio_app/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart';
import 'package:eatvio_app/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/my_finance/presentation/pages/card_settings.dart b/lib/features/my_finance/presentation/pages/card_settings.dart
index fa271da6..e6d56c04 100644
--- a/lib/features/my_finance/presentation/pages/card_settings.dart
+++ b/lib/features/my_finance/presentation/pages/card_settings.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cub
import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_state.dart';
import 'package:eatvio_app/features/my_finance/presentation/widgets/card_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:collection/collection.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/my_finance/presentation/pages/user_finance_screen.dart b/lib/features/my_finance/presentation/pages/user_finance_screen.dart
index d9f56ef6..5179f19d 100644
--- a/lib/features/my_finance/presentation/pages/user_finance_screen.dart
+++ b/lib/features/my_finance/presentation/pages/user_finance_screen.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/prof
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
import 'package:eatvio_app/features/my_finance/entities/consultant_finance_entity.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/my_finance/presentation/widgets/card_widget.dart b/lib/features/my_finance/presentation/widgets/card_widget.dart
index 58c4b1b8..5b86fc91 100644
--- a/lib/features/my_finance/presentation/widgets/card_widget.dart
+++ b/lib/features/my_finance/presentation/widgets/card_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/my_plans/presentation/my_plans_screen.dart b/lib/features/my_plans/presentation/my_plans_screen.dart
index f7bdb456..09a94a55 100644
--- a/lib/features/my_plans/presentation/my_plans_screen.dart
+++ b/lib/features/my_plans/presentation/my_plans_screen.dart
@@ -13,7 +13,7 @@ import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.d
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_state.dart';
import 'package:eatvio_app/features/my_plans/presentation/widgets/my_plan_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/my_plans/presentation/widgets/my_plan_widget.dart b/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
index 6c006f34..9c80da75 100644
--- a/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
+++ b/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
// Removed SVG icon usage after switching to text buttons
diff --git a/lib/features/notifications/presentation/notifications_screen.dart b/lib/features/notifications/presentation/notifications_screen.dart
index 33a8a634..022da95f 100644
--- a/lib/features/notifications/presentation/notifications_screen.dart
+++ b/lib/features/notifications/presentation/notifications_screen.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/notifications/presentation/notifications_cub
import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_state.dart';
import 'package:eatvio_app/features/notifications/presentation/widgets/notification_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class NotificationsScreen extends StatefulWidget {
diff --git a/lib/features/notifications/presentation/widgets/notification_widget.dart b/lib/features/notifications/presentation/widgets/notification_widget.dart
index 2c6dfd2e..9fb822e0 100644
--- a/lib/features/notifications/presentation/widgets/notification_widget.dart
+++ b/lib/features/notifications/presentation/widgets/notification_widget.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.
import 'package:eatvio_app/features/notifications/models/notification_model.dart';
import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class NotificationWidget extends StatelessWidget {
diff --git a/lib/features/order_info/presentation/info_by_order_screen.dart b/lib/features/order_info/presentation/info_by_order_screen.dart
index f6fd1771..2b237340 100644
--- a/lib/features/order_info/presentation/info_by_order_screen.dart
+++ b/lib/features/order_info/presentation/info_by_order_screen.dart
@@ -17,7 +17,7 @@ import 'package:eatvio_app/features/order_info/presentation/widgets/plan_status_
import 'package:eatvio_app/core/widgets/option_widget.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/order_info/presentation/widgets/collect_charge_banner.dart b/lib/features/order_info/presentation/widgets/collect_charge_banner.dart
index cb1eaf1d..3d5f4901 100644
--- a/lib/features/order_info/presentation/widgets/collect_charge_banner.dart
+++ b/lib/features/order_info/presentation/widgets/collect_charge_banner.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class CollectChargeBanner extends StatelessWidget {
diff --git a/lib/features/order_info/presentation/widgets/payment_banner.dart b/lib/features/order_info/presentation/widgets/payment_banner.dart
index 5dc56d90..997baa05 100644
--- a/lib/features/order_info/presentation/widgets/payment_banner.dart
+++ b/lib/features/order_info/presentation/widgets/payment_banner.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/order_info/presentation/widgets/plan_info.dart b/lib/features/order_info/presentation/widgets/plan_info.dart
index d8f91880..3755fb40 100644
--- a/lib/features/order_info/presentation/widgets/plan_info.dart
+++ b/lib/features/order_info/presentation/widgets/plan_info.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class PlanInfo extends StatelessWidget {
const PlanInfo({super.key, required this.title, required this.description, required this.imagePath});
diff --git a/lib/features/order_info/presentation/widgets/plan_props.dart b/lib/features/order_info/presentation/widgets/plan_props.dart
index 05c5145e..a638bd7c 100644
--- a/lib/features/order_info/presentation/widgets/plan_props.dart
+++ b/lib/features/order_info/presentation/widgets/plan_props.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/utils/localization_utils.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/plan_status_box.dart';
diff --git a/lib/features/order_info/presentation/widgets/plan_state.dart b/lib/features/order_info/presentation/widgets/plan_state.dart
index f65b82bb..7e792509 100644
--- a/lib/features/order_info/presentation/widgets/plan_state.dart
+++ b/lib/features/order_info/presentation/widgets/plan_state.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class PlanState extends StatefulWidget {
const PlanState({super.key, required this.state, required this.hasPersonalDiet});
diff --git a/lib/features/order_info/presentation/widgets/plan_status_box.dart b/lib/features/order_info/presentation/widgets/plan_status_box.dart
index 70801b41..777fd37a 100644
--- a/lib/features/order_info/presentation/widgets/plan_status_box.dart
+++ b/lib/features/order_info/presentation/widgets/plan_status_box.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
enum PlanStatusValues {
paid,
diff --git a/lib/features/payment/presentation/payment_flow.dart b/lib/features/payment/presentation/payment_flow.dart
index 95ba1cd4..1ae71989 100644
--- a/lib/features/payment/presentation/payment_flow.dart
+++ b/lib/features/payment/presentation/payment_flow.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_gate
import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
import 'package:eatvio_app/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart';
import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Оркестрирует флоу оплаты консультации:
/// applied rehydrate → (или гейт → форма) → apply при необходимости → SbpBanks.
diff --git a/lib/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart b/lib/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart
index b72a3f13..885ede54 100644
--- a/lib/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart
+++ b/lib/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Показывает bottom sheet «У вас есть промокод?» с кнопками Да/Нет.
///
diff --git a/lib/features/payment/presentation/widgets/promo_code_modal.dart b/lib/features/payment/presentation/widgets/promo_code_modal.dart
index 7de3eecf..0d349096 100644
--- a/lib/features/payment/presentation/widgets/promo_code_modal.dart
+++ b/lib/features/payment/presentation/widgets/promo_code_modal.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Результат работы модалки промокода.
class PromoCodeResult {
diff --git a/lib/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart b/lib/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart
index 8bced0b2..9f6d149b 100644
--- a/lib/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart
+++ b/lib/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/payment/presentation/cubit/consultation_paym
import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
import 'package:eatvio_app/features/payment/presentation/widgets/sbp_qr_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:sbp/models/c2bmembers_model.dart';
diff --git a/lib/features/payment/presentation/widgets/sbp_qr_bottom_sheet.dart b/lib/features/payment/presentation/widgets/sbp_qr_bottom_sheet.dart
index 8a759319..804892d5 100644
--- a/lib/features/payment/presentation/widgets/sbp_qr_bottom_sheet.dart
+++ b/lib/features/payment/presentation/widgets/sbp_qr_bottom_sheet.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:qr_flutter/qr_flutter.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart b/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart
index 9244f588..adc65456 100644
--- a/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart
+++ b/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/consultations/models/consultation_model.dart';
import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:intl/intl.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart b/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart
index 0821f978..c02a0942 100644
--- a/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart
+++ b/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet
import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart';
import 'package:eatvio_app/features/personal_diet_suggestion/presentation/consultation_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class PersonalDietSuggestionScreen extends StatelessWidget {
diff --git a/lib/features/plans/presentation/pages/about_plan_screen.dart b/lib/features/plans/presentation/pages/about_plan_screen.dart
index 77a98c2c..2771aa83 100644
--- a/lib/features/plans/presentation/pages/about_plan_screen.dart
+++ b/lib/features/plans/presentation/pages/about_plan_screen.dart
@@ -26,7 +26,7 @@ import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet.dart b/lib/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet.dart
index f7ae5a64..c8e33c6e 100644
--- a/lib/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet.dart
+++ b/lib/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ConfirmStartPlanBottomSheet extends StatelessWidget {
const ConfirmStartPlanBottomSheet({super.key, required this.onConfirm});
diff --git a/lib/features/plans/presentation/widgets/options_tab.dart b/lib/features/plans/presentation/widgets/options_tab.dart
index 912183d7..d4547000 100644
--- a/lib/features/plans/presentation/widgets/options_tab.dart
+++ b/lib/features/plans/presentation/widgets/options_tab.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/animated_option_button.dart';
import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class OptionsTab extends StatelessWidget {
diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart
index b35733f0..bd279be2 100644
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -36,8 +36,8 @@ import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_wi
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/pages/subs_screen.dart b/lib/features/profile/presentation/pages/subs_screen.dart
index 6de5194e..0cb0132c 100644
--- a/lib/features/profile/presentation/pages/subs_screen.dart
+++ b/lib/features/profile/presentation/pages/subs_screen.dart
@@ -4,8 +4,8 @@ import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_state.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/sub_widget.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
enum SubType { subscribers, subscriptions }
diff --git a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
index 99d674e5..c198675a 100644
--- a/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/circumference_chart_widget.dart
@@ -1,8 +1,8 @@
import 'package:eatvio_app/features/profile/models/circumference_model.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:intl/intl.dart';
import 'package:syncfusion_flutter_charts/charts.dart';
diff --git a/lib/features/profile/presentation/widgets/expandable_page_view.dart b/lib/features/profile/presentation/widgets/expandable_page_view.dart
index 99c9ef90..eb8ca4fe 100644
--- a/lib/features/profile/presentation/widgets/expandable_page_view.dart
+++ b/lib/features/profile/presentation/widgets/expandable_page_view.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ExpandablePageView extends StatefulWidget {
const ExpandablePageView({
diff --git a/lib/features/profile/presentation/widgets/imt_chart_widget.dart b/lib/features/profile/presentation/widgets/imt_chart_widget.dart
index e716c12d..e4f6f3b4 100644
--- a/lib/features/profile/presentation/widgets/imt_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/imt_chart_widget.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/features/profile/models/weight_model.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:syncfusion_flutter_charts/charts.dart';
import 'package:intl/intl.dart';
diff --git a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
index a6d3fa3a..0e266bdf 100644
--- a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
+++ b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
@@ -14,7 +14,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit
import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/widgets/sub_action_button_widget.dart b/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
index 0e3d0e50..a8af6956 100644
--- a/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
+++ b/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/widgets/sub_widget.dart b/lib/features/profile/presentation/widgets/sub_widget.dart
index 2423087c..47b44dac 100644
--- a/lib/features/profile/presentation/widgets/sub_widget.dart
+++ b/lib/features/profile/presentation/widgets/sub_widget.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/utils/url_utils.dart';
import 'package:eatvio_app/features/profile/models/sub_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/sub_action_button_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class SubWidget extends StatefulWidget {
diff --git a/lib/features/profile/presentation/widgets/toggle_cert_photo_bottom_sheet.dart b/lib/features/profile/presentation/widgets/toggle_cert_photo_bottom_sheet.dart
index 4b5bbc57..6b1c4fc5 100644
--- a/lib/features/profile/presentation/widgets/toggle_cert_photo_bottom_sheet.dart
+++ b/lib/features/profile/presentation/widgets/toggle_cert_photo_bottom_sheet.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class ToggleCertPhotoBottomSheet extends StatelessWidget {
diff --git a/lib/features/profile/presentation/widgets/weight_chart_widget.dart b/lib/features/profile/presentation/widgets/weight_chart_widget.dart
index 3084f882..7deb6813 100644
--- a/lib/features/profile/presentation/widgets/weight_chart_widget.dart
+++ b/lib/features/profile/presentation/widgets/weight_chart_widget.dart
@@ -1,8 +1,8 @@
import 'package:eatvio_app/features/profile/models/weight_model.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:intl/intl.dart';
import 'package:syncfusion_flutter_charts/charts.dart';
diff --git a/lib/features/recipe/presentation/pages/about_recipe_screen.dart b/lib/features/recipe/presentation/pages/about_recipe_screen.dart
index 61148644..07e63d87 100644
--- a/lib/features/recipe/presentation/pages/about_recipe_screen.dart
+++ b/lib/features/recipe/presentation/pages/about_recipe_screen.dart
@@ -26,7 +26,7 @@ import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
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:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/recipe/presentation/pages/my_recipes_screen.dart b/lib/features/recipe/presentation/pages/my_recipes_screen.dart
index 36359d0b..290dfeab 100644
--- a/lib/features/recipe/presentation/pages/my_recipes_screen.dart
+++ b/lib/features/recipe/presentation/pages/my_recipes_screen.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/m
import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recipes_state.dart';
import 'package:eatvio_app/features/recipe/presentation/widgets/my_recipe_widget.dart';
import 'package:eatvio_app/features/recipe/presentation/widgets/my_recipes_tab.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/recipe/presentation/widgets/ingredients_widget.dart b/lib/features/recipe/presentation/widgets/ingredients_widget.dart
index 87eea49d..6bca6aa0 100644
--- a/lib/features/recipe/presentation/widgets/ingredients_widget.dart
+++ b/lib/features/recipe/presentation/widgets/ingredients_widget.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class IngredientsWidget extends StatelessWidget {
const IngredientsWidget({super.key, required this.recipe});
diff --git a/lib/features/recipe/presentation/widgets/my_recipe_widget.dart b/lib/features/recipe/presentation/widgets/my_recipe_widget.dart
index ee6aa4ab..3c710795 100644
--- a/lib/features/recipe/presentation/widgets/my_recipe_widget.dart
+++ b/lib/features/recipe/presentation/widgets/my_recipe_widget.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes
import 'package:eatvio_app/features/recipe/models/my_recipe_model.dart';
import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recipes_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
diff --git a/lib/features/registration/presentation/pages/additional_information_screen.dart b/lib/features/registration/presentation/pages/additional_information_screen.dart
index 1bcdca97..f9ded2ef 100644
--- a/lib/features/registration/presentation/pages/additional_information_screen.dart
+++ b/lib/features/registration/presentation/pages/additional_information_screen.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/allergies_screen.dart b/lib/features/registration/presentation/pages/allergies_screen.dart
index d65bff5f..3f06507d 100644
--- a/lib/features/registration/presentation/pages/allergies_screen.dart
+++ b/lib/features/registration/presentation/pages/allergies_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class AllergiesScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/blood_pressure_screen.dart b/lib/features/registration/presentation/pages/blood_pressure_screen.dart
index b8c9d8fc..e7067be1 100644
--- a/lib/features/registration/presentation/pages/blood_pressure_screen.dart
+++ b/lib/features/registration/presentation/pages/blood_pressure_screen.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/body_circumferences_screen.dart b/lib/features/registration/presentation/pages/body_circumferences_screen.dart
index b5fba5d4..522864a9 100644
--- a/lib/features/registration/presentation/pages/body_circumferences_screen.dart
+++ b/lib/features/registration/presentation/pages/body_circumferences_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/city_of_living_screen.dart b/lib/features/registration/presentation/pages/city_of_living_screen.dart
index 507fc275..ffafd2c4 100644
--- a/lib/features/registration/presentation/pages/city_of_living_screen.dart
+++ b/lib/features/registration/presentation/pages/city_of_living_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart';
diff --git a/lib/features/registration/presentation/pages/credentials_screen.dart b/lib/features/registration/presentation/pages/credentials_screen.dart
index 26b8508f..6a4864ad 100644
--- a/lib/features/registration/presentation/pages/credentials_screen.dart
+++ b/lib/features/registration/presentation/pages/credentials_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class CredentialsScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/date_of_birth_screen.dart b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
index f97167fd..d58de762 100644
--- a/lib/features/registration/presentation/pages/date_of_birth_screen.dart
+++ b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
@@ -3,8 +3,8 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:intl/intl.dart';
diff --git a/lib/features/registration/presentation/pages/favorite_foods_screen.dart b/lib/features/registration/presentation/pages/favorite_foods_screen.dart
index ab6db46a..a5ba8f80 100644
--- a/lib/features/registration/presentation/pages/favorite_foods_screen.dart
+++ b/lib/features/registration/presentation/pages/favorite_foods_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class FavoriteFoodsScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/favorite_sports_screen.dart b/lib/features/registration/presentation/pages/favorite_sports_screen.dart
index b711f0ab..785748ac 100644
--- a/lib/features/registration/presentation/pages/favorite_sports_screen.dart
+++ b/lib/features/registration/presentation/pages/favorite_sports_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class FavoriteSportsScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/gender_screen.dart b/lib/features/registration/presentation/pages/gender_screen.dart
index e58df3d4..dfde39f7 100644
--- a/lib/features/registration/presentation/pages/gender_screen.dart
+++ b/lib/features/registration/presentation/pages/gender_screen.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class GenderScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/height_screen.dart b/lib/features/registration/presentation/pages/height_screen.dart
index 485cf838..66c0d9b5 100644
--- a/lib/features/registration/presentation/pages/height_screen.dart
+++ b/lib/features/registration/presentation/pages/height_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/pages/language_select_screen.dart b/lib/features/registration/presentation/pages/language_select_screen.dart
index cd396ea5..5642ef18 100644
--- a/lib/features/registration/presentation/pages/language_select_screen.dart
+++ b/lib/features/registration/presentation/pages/language_select_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class LanguageSelectScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/medicine_intake_screen.dart b/lib/features/registration/presentation/pages/medicine_intake_screen.dart
index 65560e87..03e1f8e5 100644
--- a/lib/features/registration/presentation/pages/medicine_intake_screen.dart
+++ b/lib/features/registration/presentation/pages/medicine_intake_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class MedicineIntakeScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/name_screen.dart b/lib/features/registration/presentation/pages/name_screen.dart
index d69e0ea9..06280533 100644
--- a/lib/features/registration/presentation/pages/name_screen.dart
+++ b/lib/features/registration/presentation/pages/name_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class NameScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/phone_screen.dart b/lib/features/registration/presentation/pages/phone_screen.dart
index e4f458cd..b5611ba9 100644
--- a/lib/features/registration/presentation/pages/phone_screen.dart
+++ b/lib/features/registration/presentation/pages/phone_screen.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
diff --git a/lib/features/registration/presentation/pages/registration_screen.dart b/lib/features/registration/presentation/pages/registration_screen.dart
index 759df201..e5ee24d7 100644
--- a/lib/features/registration/presentation/pages/registration_screen.dart
+++ b/lib/features/registration/presentation/pages/registration_screen.dart
@@ -21,7 +21,7 @@ import 'package:eatvio_app/features/registration/services/registration_analytics
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/registration/presentation/pages/verify_email_screen.dart b/lib/features/registration/presentation/pages/verify_email_screen.dart
index 1628886b..36a85496 100644
--- a/lib/features/registration/presentation/pages/verify_email_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_email_screen.dart
@@ -10,7 +10,7 @@ import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_
import 'package:eatvio_app/features/registration/presentation/widgets/change_email_dialog.dart';
import 'package:eatvio_app/features/registration/presentation/widgets/code_not_received_dialog.dart';
import 'package:eatvio_app/features/registration/services/registration_analytics_service.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/registration/presentation/pages/verify_screen.dart b/lib/features/registration/presentation/pages/verify_screen.dart
index 867af06f..9a2c5897 100644
--- a/lib/features/registration/presentation/pages/verify_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/registration/services/registration_analytics_service.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
import 'package:lottie/lottie.dart';
import 'package:webview_flutter/webview_flutter.dart';
diff --git a/lib/features/registration/presentation/pages/webview_registration_screen.dart b/lib/features/registration/presentation/pages/webview_registration_screen.dart
index 6cc777d2..272ce307 100644
--- a/lib/features/registration/presentation/pages/webview_registration_screen.dart
+++ b/lib/features/registration/presentation/pages/webview_registration_screen.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
import 'package:eatvio_app/features/registration/services/registration_analytics_service.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:webview_flutter/webview_flutter.dart';
class WebViewRegistrationScreen extends StatefulWidget {
diff --git a/lib/features/registration/presentation/pages/weight_screen.dart b/lib/features/registration/presentation/pages/weight_screen.dart
index 8c5cfd8a..65b290d6 100644
--- a/lib/features/registration/presentation/pages/weight_screen.dart
+++ b/lib/features/registration/presentation/pages/weight_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration/presentation/widgets/change_email_dialog.dart b/lib/features/registration/presentation/widgets/change_email_dialog.dart
index 266e9f04..8d3e8283 100644
--- a/lib/features/registration/presentation/widgets/change_email_dialog.dart
+++ b/lib/features/registration/presentation/widgets/change_email_dialog.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class ChangeEmailDialog extends StatefulWidget {
diff --git a/lib/features/registration/presentation/widgets/code_not_received_dialog.dart b/lib/features/registration/presentation/widgets/code_not_received_dialog.dart
index 3baa5742..ef69f6a4 100644
--- a/lib/features/registration/presentation/widgets/code_not_received_dialog.dart
+++ b/lib/features/registration/presentation/widgets/code_not_received_dialog.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/gestures.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
diff --git a/lib/features/registration_v2/presentation/pages/registration_v2_page.dart b/lib/features/registration_v2/presentation/pages/registration_v2_page.dart
index d69d27c4..b2d417a7 100644
--- a/lib/features/registration_v2/presentation/pages/registration_v2_page.dart
+++ b/lib/features/registration_v2/presentation/pages/registration_v2_page.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/registration_v2/presentation/widgets/first_s
import 'package:eatvio_app/features/registration_v2/presentation/widgets/second_step_content.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/step_progress.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/step_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
diff --git a/lib/features/registration_v2/presentation/widgets/first_step_content.dart b/lib/features/registration_v2/presentation/widgets/first_step_content.dart
index dbb22951..e290b1d6 100644
--- a/lib/features/registration_v2/presentation/widgets/first_step_content.dart
+++ b/lib/features/registration_v2/presentation/widgets/first_step_content.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/sex_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
diff --git a/lib/features/registration_v2/presentation/widgets/password_field.dart b/lib/features/registration_v2/presentation/widgets/password_field.dart
index b4fea946..46905fff 100644
--- a/lib/features/registration_v2/presentation/widgets/password_field.dart
+++ b/lib/features/registration_v2/presentation/widgets/password_field.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/registration_v2/presentation/widgets/phisical_activity.dart b/lib/features/registration_v2/presentation/widgets/phisical_activity.dart
index 86bb1fb8..650051f4 100644
--- a/lib/features/registration_v2/presentation/widgets/phisical_activity.dart
+++ b/lib/features/registration_v2/presentation/widgets/phisical_activity.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:collection/collection.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/registration_v2/presentation/widgets/second_step_content.dart b/lib/features/registration_v2/presentation/widgets/second_step_content.dart
index ab7163c1..93790b58 100644
--- a/lib/features/registration_v2/presentation/widgets/second_step_content.dart
+++ b/lib/features/registration_v2/presentation/widgets/second_step_content.dart
@@ -13,7 +13,7 @@ import 'package:eatvio_app/features/registration_v2/presentation/widgets/phisica
import 'package:eatvio_app/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/registration_v2/presentation/widgets/sex_widget.dart b/lib/features/registration_v2/presentation/widgets/sex_widget.dart
index 60f0944f..fadd5f61 100644
--- a/lib/features/registration_v2/presentation/widgets/sex_widget.dart
+++ b/lib/features/registration_v2/presentation/widgets/sex_widget.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widge
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class SexWidget extends StatelessWidget {
diff --git a/lib/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart b/lib/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart
index 7571a038..09aa045b 100644
--- a/lib/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart
+++ b/lib/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/password_field.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/registration_v2/presentation/widgets/step_progress.dart b/lib/features/registration_v2/presentation/widgets/step_progress.dart
index 7bb3497c..385accd1 100644
--- a/lib/features/registration_v2/presentation/widgets/step_progress.dart
+++ b/lib/features/registration_v2/presentation/widgets/step_progress.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class StepProgress extends StatelessWidget {
diff --git a/lib/features/settings/presentation/pages/change_email_screen.dart b/lib/features/settings/presentation/pages/change_email_screen.dart
index a71ef272..2a557a09 100644
--- a/lib/features/settings/presentation/pages/change_email_screen.dart
+++ b/lib/features/settings/presentation/pages/change_email_screen.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ChangeEmailScreen extends StatefulWidget {
final SettingsEntity settingsEntity;
diff --git a/lib/features/settings/presentation/pages/change_password_screen.dart b/lib/features/settings/presentation/pages/change_password_screen.dart
index a226ed81..905690a4 100644
--- a/lib/features/settings/presentation/pages/change_password_screen.dart
+++ b/lib/features/settings/presentation/pages/change_password_screen.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ChangePasswordScreen extends StatefulWidget {
final SettingsEntity settingsEntity;
diff --git a/lib/features/settings/presentation/pages/general_info_screen.dart b/lib/features/settings/presentation/pages/general_info_screen.dart
index 3fad0dc4..2396a54c 100644
--- a/lib/features/settings/presentation/pages/general_info_screen.dart
+++ b/lib/features/settings/presentation/pages/general_info_screen.dart
@@ -8,8 +8,8 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
class GeneralInfoScreen extends StatefulWidget {
final SettingsEntity settingsEntity;
diff --git a/lib/features/settings/presentation/pages/other_info_screen.dart b/lib/features/settings/presentation/pages/other_info_screen.dart
index 839c440d..588b6e50 100644
--- a/lib/features/settings/presentation/pages/other_info_screen.dart
+++ b/lib/features/settings/presentation/pages/other_info_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:go_router/go_router.dart';
class OtherInfoScreen extends StatefulWidget {
diff --git a/lib/features/settings/presentation/pages/physical_activity_screen.dart b/lib/features/settings/presentation/pages/physical_activity_screen.dart
index 74b6f971..86b66dd0 100644
--- a/lib/features/settings/presentation/pages/physical_activity_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_activity_screen.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/settings/presentation/pages/physical_form_screen.dart b/lib/features/settings/presentation/pages/physical_form_screen.dart
index f806b086..a7c612b9 100644
--- a/lib/features/settings/presentation/pages/physical_form_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_form_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/settings/presentation/pages/pressure_screen.dart b/lib/features/settings/presentation/pages/pressure_screen.dart
index b50d9a42..9f82b216 100644
--- a/lib/features/settings/presentation/pages/pressure_screen.dart
+++ b/lib/features/settings/presentation/pages/pressure_screen.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/settings/presentation/pages/settings_screen.dart b/lib/features/settings/presentation/pages/settings_screen.dart
index 1f110d2b..5051c4f8 100644
--- a/lib/features/settings/presentation/pages/settings_screen.dart
+++ b/lib/features/settings/presentation/pages/settings_screen.dart
@@ -14,8 +14,8 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/support/presentation/pages/support_screen.dart b/lib/features/support/presentation/pages/support_screen.dart
index a01a88af..a553029c 100644
--- a/lib/features/support/presentation/pages/support_screen.dart
+++ b/lib/features/support/presentation/pages/support_screen.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/update_screen/presentation/update_screen.dart b/lib/features/update_screen/presentation/update_screen.dart
index 68ec9640..78c453bb 100644
--- a/lib/features/update_screen/presentation/update_screen.dart
+++ b/lib/features/update_screen/presentation/update_screen.dart
@@ -1,6 +1,6 @@
import 'dart:io';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/features/user_details/presentation/user_details_screen.dart b/lib/features/user_details/presentation/user_details_screen.dart
index a5552802..4e0ad508 100644
--- a/lib/features/user_details/presentation/user_details_screen.dart
+++ b/lib/features/user_details/presentation/user_details_screen.dart
@@ -17,7 +17,7 @@ import 'package:eatvio_app/features/user_details/presentation/cubit/user_details
import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_state.dart';
import 'package:eatvio_app/features/user_details/presentation/widgets/expandable_bouble.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_svg/svg.dart';
diff --git a/lib/features/user_details/presentation/widgets/expandable_bouble.dart b/lib/features/user_details/presentation/widgets/expandable_bouble.dart
index 5689a563..df815263 100644
--- a/lib/features/user_details/presentation/widgets/expandable_bouble.dart
+++ b/lib/features/user_details/presentation/widgets/expandable_bouble.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class ExpandableBouble extends StatelessWidget {
const ExpandableBouble({super.key, required this.title, required this.children, this.initiallyExpanded = false});
diff --git a/lib/features/video_calls/managers/video_call_manager.dart b/lib/features/video_calls/managers/video_call_manager.dart
index ff814360..37d312e2 100644
--- a/lib/features/video_calls/managers/video_call_manager.dart
+++ b/lib/features/video_calls/managers/video_call_manager.dart
@@ -18,7 +18,7 @@ import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_
import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
@@ -29,15 +29,13 @@ typedef VideoCallManagerListener =
class VideoCallManager {
VideoCallManager({
- required VideoCallRepository videoCallRepository,
- ProfileRepository? profileRepository,
+ required this._videoCallRepository,
+ this._profileRepository,
VideoCallForegroundCoordinator? foregroundCoordinator,
VideoCallLifecycleBinding? lifecycleBinding,
VideoCallAudioSessionCoordinator? audioSessionCoordinator,
Future Function()? resolveHwId,
- }) : _videoCallRepository = videoCallRepository,
- _profileRepository = profileRepository,
- _foreground = foregroundCoordinator ?? VideoCallForegroundCoordinator(),
+ }) : _foreground = foregroundCoordinator ?? VideoCallForegroundCoordinator(),
_lifecycleBinding = lifecycleBinding ?? VideoCallLifecycleBinding(),
_audioSession =
audioSessionCoordinator ?? VideoCallAudioSessionCoordinator(),
@@ -48,7 +46,14 @@ class VideoCallManager {
// LiveKit rewrites the audio session whenever a remote audio track
// appears. That second configuration stops the microphone and does
// not start it again.
- lk.Hardware.instance.setAutomaticConfigurationEnabled(enable: false);
+
+ unawaited(
+ // ignore: experimental_member_use
+ lk.AudioManager.instance.setAudioSessionManagementMode(
+ // ignore: experimental_member_use
+ lk.AudioSessionManagementMode.manual,
+ ),
+ );
}
}
diff --git a/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart b/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart
index adb57bb0..39063c64 100644
--- a/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart
+++ b/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart
@@ -8,18 +8,17 @@ import 'package:eatvio_app/features/video_calls/services/video_call_notification
import 'package:eatvio_app/features/video_calls/services/video_call_peer_departure.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_screen_wake_lock_coordinator.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
import 'package:permission_handler/permission_handler.dart';
class VideoCallSessionCubit extends BaseCubit {
VideoCallSessionCubit({
- required VideoCallManager videoCallManager,
+ required this._videoCallManager,
VideoCallSystemPipCoordinator? systemPipCoordinator,
VideoCallScreenWakeLockCoordinator? screenWakeLockCoordinator,
- }) : _videoCallManager = videoCallManager,
- _systemPipCoordinator =
+ }) : _systemPipCoordinator =
systemPipCoordinator ?? VideoCallSystemPipCoordinator(),
_screenWakeLock =
screenWakeLockCoordinator ?? VideoCallScreenWakeLockCoordinator(),
diff --git a/lib/features/video_calls/presentation/pages/video_call_screen.dart b/lib/features/video_calls/presentation/pages/video_call_screen.dart
index 933863ab..a25f2cb7 100644
--- a/lib/features/video_calls/presentation/pages/video_call_screen.dart
+++ b/lib/features/video_calls/presentation/pages/video_call_screen.dart
@@ -14,7 +14,7 @@ import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_stage_layout.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart b/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart
index bf9d774a..41d3214f 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_system_pip_content.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart';
import 'package:floating/floating.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
/// Root overlay shell: system PiP on Android, in-app PiP fallback on iOS.
diff --git a/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart b/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart
index 9bdb2f40..24e410c4 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
/// Dedicated overlay layer above the app navigator for in-call banners.
abstract final class VideoCallBannerOverlay {
diff --git a/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart b/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart
index 7870eac8..44305d4c 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_user_online_status_line.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_controls.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
class VideoCallConnectingEntranceScreen extends StatelessWidget {
diff --git a/lib/features/video_calls/presentation/widgets/video_call_controls.dart b/lib/features/video_calls/presentation/widgets/video_call_controls.dart
index 4db0b713..552eadc1 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_controls.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_controls.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
typedef VideoCallControlLabels = ({String chat, String sound, String video, String leave});
diff --git a/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart b/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart
index 1207d56b..7eba10e0 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
const double _kVideoCallFlowBottomBarHeight = 132;
diff --git a/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart b/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart
index 9a1e4e55..461e3f73 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_ses
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart b/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart
index 389af26e..123d7a29 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart
@@ -3,7 +3,7 @@ import 'dart:ui';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class VideoCallParticipantNameLabel extends StatelessWidget {
const VideoCallParticipantNameLabel({
diff --git a/lib/features/video_calls/presentation/widgets/video_call_no_video_background.dart b/lib/features/video_calls/presentation/widgets/video_call_no_video_background.dart
index d08f5827..b5d5a7b1 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_no_video_background.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_no_video_background.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class VideoCallNoVideoBackground extends StatelessWidget {
const VideoCallNoVideoBackground({super.key, this.logoSize = 96});
diff --git a/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart b/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart
index c3baad4c..065d4da2 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
/// Shared compact preview for both in-app and Android system PiP.
diff --git a/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart b/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart
index 3f35cd61..4074e2b1 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
class VideoCallRemoteVideoStage extends StatelessWidget {
diff --git a/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart b/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart
index 131c7a55..360213fc 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
diff --git a/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart b/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart
index 3abcb415..cb95486d 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_ses
import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
/// Compact call UI rendered by [PiPSwitcher] while Android is in system PiP mode.
diff --git a/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart b/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart
index 7a0f8957..86565348 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_ses
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
import 'package:floating/floating.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
diff --git a/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart b/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart
index 8ea2ddb4..fe81000c 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_banner_overlay.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
abstract final class VideoCallTopOverlay {
diff --git a/lib/features/video_calls/recordings/models/recording_status.dart b/lib/features/video_calls/recordings/models/recording_status.dart
new file mode 100644
index 00000000..b29970ed
--- /dev/null
+++ b/lib/features/video_calls/recordings/models/recording_status.dart
@@ -0,0 +1,8 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+enum RecordingStatus {
+ @JsonValue('ready')
+ ready,
+ @JsonValue('in_progress')
+ inProgress,
+}
diff --git a/lib/features/video_calls/recordings/models/video_call_recording_model.dart b/lib/features/video_calls/recordings/models/video_call_recording_model.dart
index 69918629..674559c0 100644
--- a/lib/features/video_calls/recordings/models/video_call_recording_model.dart
+++ b/lib/features/video_calls/recordings/models/video_call_recording_model.dart
@@ -1,4 +1,5 @@
import 'package:eatvio_app/core/models/pagination_model.dart';
+import 'package:eatvio_app/features/video_calls/recordings/models/recording_status.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
part 'video_call_recording_model.freezed.dart';
@@ -20,9 +21,10 @@ abstract class VideoCallRecordingsPagination with _$VideoCallRecordingsPaginatio
abstract class VideoCallRecordingModel with _$VideoCallRecordingModel {
const VideoCallRecordingModel._();
+ @JsonSerializable(explicitToJson: true)
const factory VideoCallRecordingModel({
@JsonKey(name: 'id') required int id,
- @JsonKey(name: 'status') required String status,
+ @JsonKey(name: 'status') required RecordingStatus status,
@JsonKey(name: 'duration_seconds') int? durationSeconds,
@JsonKey(name: 'size_bytes') int? sizeBytes,
@JsonKey(name: 'created_at') required DateTime createdAt,
@@ -34,9 +36,9 @@ abstract class VideoCallRecordingModel with _$VideoCallRecordingModel {
factory VideoCallRecordingModel.fromJson(Map json) =>
_$VideoCallRecordingModelFromJson(json);
- bool get isReady => status == 'ready';
+ bool get isReady => status == RecordingStatus.ready;
- bool get isInProgress => status == 'in_progress';
+ bool get isInProgress => status == RecordingStatus.inProgress;
}
@freezed
diff --git a/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart b/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart
index 79a3c179..38071247 100644
--- a/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart
+++ b/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart
@@ -1,5 +1,4 @@
import 'dart:developer';
-import 'dart:io';
import 'package:eatvio_app/core/error_reporting/report_from.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/recording_period.dart';
@@ -7,20 +6,43 @@ import 'package:eatvio_app/features/video_calls/recordings/presentation/cubit/vi
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+sealed class RecordingDownloadResult {
+ const RecordingDownloadResult();
+}
+
+class RecordingDownloadSaved extends RecordingDownloadResult {
+ const RecordingDownloadSaved(this.path);
+
+ final String path;
+}
+
+class RecordingDownloadAlreadyInProgress extends RecordingDownloadResult {
+ const RecordingDownloadAlreadyInProgress();
+}
+
+class RecordingDownloadFailed extends RecordingDownloadResult {
+ const RecordingDownloadFailed();
+}
+
class VideoCallRecordingsCubit extends Cubit {
VideoCallRecordingsCubit({required this.repository})
: super(const VideoCallRecordingsState());
final VideoCallRecordingsRepository repository;
+ int _loadGeneration = 0;
Future load({bool refresh = false}) async {
if (state.isLoading && !refresh && state.recordings.isNotEmpty) {
return;
}
+ final generation = ++_loadGeneration;
+ final period = state.period;
+
emit(
state.copyWith(
isLoading: true,
+ isLoadingMore: false,
error: null,
currentPage: 1,
),
@@ -29,8 +51,11 @@ class VideoCallRecordingsCubit extends Cubit {
try {
final page = await repository.getRecordings(
page: 1,
- period: state.period == RecordingPeriod.all ? null : state.period,
+ period: period == RecordingPeriod.all ? null : period,
);
+ if (isClosed || generation != _loadGeneration) {
+ return;
+ }
emit(
state.copyWith(
@@ -42,6 +67,9 @@ class VideoCallRecordingsCubit extends Cubit {
),
);
} catch (error, stackTrace) {
+ if (isClosed || generation != _loadGeneration) {
+ return;
+ }
await reportFrom(error, stackTrace, this);
log(error.toString(), stackTrace: stackTrace);
emit(
@@ -67,14 +95,19 @@ class VideoCallRecordingsCubit extends Cubit {
return;
}
+ final generation = _loadGeneration;
+ final period = state.period;
final nextPage = state.currentPage + 1;
emit(state.copyWith(isLoadingMore: true, error: null));
try {
final page = await repository.getRecordings(
page: nextPage,
- period: state.period == RecordingPeriod.all ? null : state.period,
+ period: period == RecordingPeriod.all ? null : period,
);
+ if (isClosed || generation != _loadGeneration) {
+ return;
+ }
emit(
state.copyWith(
@@ -85,6 +118,9 @@ class VideoCallRecordingsCubit extends Cubit {
),
);
} catch (error, stackTrace) {
+ if (isClosed || generation != _loadGeneration) {
+ return;
+ }
await reportFrom(error, stackTrace, this);
log(error.toString(), stackTrace: stackTrace);
emit(
@@ -96,29 +132,60 @@ class VideoCallRecordingsCubit extends Cubit {
}
}
- Future downloadRecording({
+ /// Скачивает запись в «Загрузки»/Documents.
+ Future downloadRecording({
required int recordingId,
required String fileUrl,
}) async {
- emit(state.copyWith(isDownloading: true, downloadError: null));
+ if (state.downloadingRecordingId != null) {
+ return const RecordingDownloadAlreadyInProgress();
+ }
+
+ emit(
+ state.copyWith(
+ downloadingRecordingId: recordingId,
+ downloadProgress: 0,
+ downloadError: null,
+ ),
+ );
try {
- final file = await repository.downloadRecordingFile(
+ final savedPath = await repository.downloadRecordingFile(
fileUrl: fileUrl,
recordingId: recordingId,
+ onProgress: (received, total) {
+ if (isClosed || state.downloadingRecordingId != recordingId) {
+ return;
+ }
+ emit(
+ state.copyWith(
+ downloadProgress: total > 0 ? (received / total).clamp(0.0, 1.0) : null,
+ ),
+ );
+ },
);
- emit(state.copyWith(isDownloading: false));
- return file;
+ if (!isClosed) {
+ emit(
+ state.copyWith(
+ downloadingRecordingId: null,
+ downloadProgress: null,
+ ),
+ );
+ }
+ return RecordingDownloadSaved(savedPath);
} catch (error, stackTrace) {
await reportFrom(error, stackTrace, this);
log(error.toString(), stackTrace: stackTrace);
- emit(
- state.copyWith(
- isDownloading: false,
- downloadError: error.toString(),
- ),
- );
- return null;
+ if (!isClosed) {
+ emit(
+ state.copyWith(
+ downloadingRecordingId: null,
+ downloadProgress: null,
+ downloadError: error.toString(),
+ ),
+ );
+ }
+ return const RecordingDownloadFailed();
}
}
}
diff --git a/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_state.dart b/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_state.dart
index b6644b25..07e3beef 100644
--- a/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_state.dart
+++ b/lib/features/video_calls/recordings/presentation/cubit/video_call_recordings_state.dart
@@ -9,11 +9,13 @@ abstract class VideoCallRecordingsState with _$VideoCallRecordingsState {
const factory VideoCallRecordingsState({
@Default(true) bool isLoading,
@Default(false) bool isLoadingMore,
- @Default(false) bool isDownloading,
@Default([]) List recordings,
@Default(RecordingPeriod.all) RecordingPeriod period,
@Default(1) int currentPage,
@Default(1) int lastPage,
+ int? downloadingRecordingId,
+ /// `0..1` при известном размере; `null` — indeterminate / нет загрузки.
+ double? downloadProgress,
String? error,
String? downloadError,
}) = _VideoCallRecordingsState;
diff --git a/lib/features/video_calls/recordings/presentation/pages/video_call_recording_player_screen.dart b/lib/features/video_calls/recordings/presentation/pages/video_call_recording_player_screen.dart
index 2c41fbf4..14459725 100644
--- a/lib/features/video_calls/recordings/presentation/pages/video_call_recording_player_screen.dart
+++ b/lib/features/video_calls/recordings/presentation/pages/video_call_recording_player_screen.dart
@@ -1,42 +1,55 @@
-import 'package:eatvio_app/core/locator_service.dart';
+import 'dart:async';
+
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/token_storage.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
-import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:share_plus/share_plus.dart';
+import 'package:flutter/services.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:video_player/video_player.dart';
class VideoCallRecordingPlayerScreen extends StatefulWidget {
- const VideoCallRecordingPlayerScreen({super.key, required this.recording});
+ const VideoCallRecordingPlayerScreen({super.key, this.recording});
static const name = 'videoCallRecordingPlayerScreen';
static const path = '/video-call-recording-player-screen';
- final VideoCallRecordingModel recording;
+ final VideoCallRecordingModel? recording;
@override
State createState() => _VideoCallRecordingPlayerScreenState();
}
class _VideoCallRecordingPlayerScreenState extends State {
+ static const _background = Color(0xFF0B0B0F);
+ static const _chromeHideDelay = Duration(seconds: 5);
+ static const _darkOverlayStyle = SystemUiOverlayStyle(
+ statusBarColor: _background,
+ statusBarIconBrightness: Brightness.light,
+ statusBarBrightness: Brightness.dark,
+ systemNavigationBarColor: _background,
+ systemNavigationBarIconBrightness: Brightness.light,
+ );
+
VideoPlayerController? _controller;
bool _isInitializing = true;
bool _hasError = false;
- bool _isDownloading = false;
+ bool _isFullscreen = false;
+ bool _showChrome = true;
+ Timer? _hideChromeTimer;
@override
void initState() {
super.initState();
+ SystemChrome.setSystemUIOverlayStyle(_darkOverlayStyle);
+ _scheduleHideChrome();
_initPlayer();
}
Future _initPlayer() async {
- final fileUrl = widget.recording.fileUrl;
+ final fileUrl = widget.recording?.fileUrl;
if (fileUrl == null || fileUrl.isEmpty) {
setState(() {
_isInitializing = false;
@@ -45,6 +58,7 @@ class _VideoCallRecordingPlayerScreenState extends State _download() async {
- final fileUrl = widget.recording.fileUrl;
- if (fileUrl == null) {
+ void _scheduleHideChrome() {
+ _hideChromeTimer?.cancel();
+ if (!_showChrome) {
return;
}
-
- setState(() => _isDownloading = true);
- try {
- final file = await sl().downloadRecordingFile(
- fileUrl: fileUrl,
- recordingId: widget.recording.id,
- );
- if (!mounted) {
+ _hideChromeTimer = Timer(_chromeHideDelay, () {
+ if (!mounted || !_showChrome) {
return;
}
- await SharePlus.instance.share(
- ShareParams(
- files: [XFile(file.path)],
- text: S.of(context).video_call_recordings_card_title,
- ),
- );
- } catch (_) {
- if (mounted) {
- await Fluttertoast.showToast(msg: S.of(context).video_call_recordings_download_error);
- }
- } finally {
- if (mounted) {
- setState(() => _isDownloading = false);
- }
+ setState(() => _showChrome = false);
+ });
+ }
+
+ void _revealChrome() {
+ setState(() => _showChrome = true);
+ _scheduleHideChrome();
+ }
+
+ void _onPlayerTap() {
+ if (_showChrome) {
+ _hideChromeTimer?.cancel();
+ setState(() => _showChrome = false);
+ return;
}
+ _revealChrome();
+ }
+
+ Future _enterFullscreen() async {
+ _revealChrome();
+ setState(() => _isFullscreen = true);
+ await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+ await SystemChrome.setPreferredOrientations(const [
+ DeviceOrientation.landscapeLeft,
+ DeviceOrientation.landscapeRight,
+ ]);
+ }
+
+ Future _exitFullscreen() async {
+ _revealChrome();
+ setState(() => _isFullscreen = false);
+ await SystemChrome.setPreferredOrientations(const [
+ DeviceOrientation.portraitUp,
+ ]);
+ await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+ SystemChrome.setSystemUIOverlayStyle(_darkOverlayStyle);
+ }
+
+ Future _toggleFullscreen() async {
+ if (_isFullscreen) {
+ await _exitFullscreen();
+ } else {
+ await _enterFullscreen();
+ }
+ }
+
+ Future _restoreSystemUi() async {
+ await SystemChrome.setPreferredOrientations(const []);
+ await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
}
@override
void dispose() {
+ _hideChromeTimer?.cancel();
_controller?.dispose();
+ unawaited(_restoreSystemUi());
super.dispose();
}
+ double get _aspectRatio {
+ final controller = _controller;
+ if (controller == null || controller.value.aspectRatio == 0) {
+ return 16 / 9;
+ }
+ return controller.value.aspectRatio;
+ }
+
@override
Widget build(BuildContext context) {
final s = S.of(context);
- final title = widget.recording.counterpart?.name ?? s.video_call_recordings_title;
+ final title = widget.recording?.counterpart?.name ?? s.video_call_recordings_title;
final controller = _controller;
- return Scaffold(
- backgroundColor: appTheme.whiteA700,
- appBar: AppBar(
- centerTitle: true,
- title: Text(
- title,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
- ),
- ),
- body: Padding(
- padding: const EdgeInsets.fromLTRB(16, 8, 16, 24),
- child: Column(
- children: [
- Expanded(
- child: Center(
- child: _isInitializing
- ? const Loader()
- : _hasError || controller == null
- ? Text(
+ return PopScope(
+ canPop: !_isFullscreen,
+ onPopInvokedWithResult: (didPop, _) async {
+ if (!didPop && _isFullscreen) {
+ await _exitFullscreen();
+ }
+ },
+ child: AnnotatedRegion(
+ value: _darkOverlayStyle,
+ child: Scaffold(
+ backgroundColor: _background,
+ extendBodyBehindAppBar: true,
+ appBar: _isFullscreen || !_showChrome
+ ? null
+ : AppBar(
+ backgroundColor: _background,
+ foregroundColor: Colors.white,
+ elevation: 0,
+ scrolledUnderElevation: 0,
+ centerTitle: true,
+ systemOverlayStyle: _darkOverlayStyle,
+ iconTheme: const IconThemeData(color: Colors.white),
+ title: Text(
+ title,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: TextStyles.headingXLSemibold.copyWith(color: Colors.white),
+ ),
+ ),
+ body: ColoredBox(
+ color: _background,
+ child: _isInitializing
+ ? const Center(child: Loader())
+ : _hasError || controller == null
+ ? Center(
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 24),
+ child: Text(
s.video_call_recordings_player_error,
textAlign: TextAlign.center,
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
- )
- : AspectRatio(
- aspectRatio: controller.value.aspectRatio == 0
- ? 16 / 9
- : controller.value.aspectRatio,
- child: Stack(
- alignment: Alignment.bottomCenter,
- children: [
- VideoPlayer(controller),
- _PlayerControls(controller: controller),
- ],
- ),
),
- ),
- ),
- const SizedBox(height: 16),
- SizedBox(
- width: double.infinity,
- height: 44,
- child: ElevatedButton(
- onPressed: _isDownloading || widget.recording.fileUrl == null ? null : _download,
- style: ElevatedButton.styleFrom(
- backgroundColor: appTheme.blueA400,
- foregroundColor: Colors.white,
- elevation: 0,
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
- ),
- child: _isDownloading
- ? const SizedBox(
- width: 18,
- height: 18,
- child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
- )
- : Text(
- s.video_call_recordings_download,
- style: TextStyles.textSMedium.copyWith(
- color: Colors.white,
- fontWeight: FontWeight.w700,
),
+ )
+ : _VideoSurface(
+ controller: controller,
+ aspectRatio: _aspectRatio,
+ isFullscreen: _isFullscreen,
+ showControls: _showChrome,
+ onTap: _onPlayerTap,
+ onToggleFullscreen: _toggleFullscreen,
+ onUserInteraction: _revealChrome,
),
- ),
- ),
- ],
+ ),
),
),
);
}
}
-class _PlayerControls extends StatelessWidget {
- const _PlayerControls({required this.controller});
+class _VideoSurface extends StatelessWidget {
+ const _VideoSurface({
+ required this.controller,
+ required this.aspectRatio,
+ required this.isFullscreen,
+ required this.showControls,
+ required this.onTap,
+ required this.onToggleFullscreen,
+ required this.onUserInteraction,
+ });
final VideoPlayerController controller;
+ final double aspectRatio;
+ final bool isFullscreen;
+ final bool showControls;
+ final VoidCallback onTap;
+ final VoidCallback onToggleFullscreen;
+ final VoidCallback onUserInteraction;
+
+ @override
+ Widget build(BuildContext context) {
+ final player = ColoredBox(
+ color: Colors.black,
+ child: Center(
+ child: AspectRatio(
+ aspectRatio: aspectRatio,
+ child: VideoPlayer(controller),
+ ),
+ ),
+ );
+
+ final content = GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: onTap,
+ child: Stack(
+ fit: StackFit.expand,
+ children: [
+ if (isFullscreen)
+ player
+ else
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 16),
+ child: Center(
+ child: AspectRatio(
+ aspectRatio: aspectRatio,
+ child: ClipRRect(
+ borderRadius: BorderRadius.circular(12),
+ child: ColoredBox(
+ color: Colors.black,
+ child: VideoPlayer(controller),
+ ),
+ ),
+ ),
+ ),
+ ),
+ Positioned(
+ left: 0,
+ right: 0,
+ bottom: 0,
+ child: AnimatedOpacity(
+ opacity: showControls ? 1 : 0,
+ duration: const Duration(milliseconds: 200),
+ child: IgnorePointer(
+ ignoring: !showControls,
+ child: SafeArea(
+ top: false,
+ child: Padding(
+ padding: EdgeInsets.fromLTRB(
+ isFullscreen ? 8 : 16,
+ 0,
+ isFullscreen ? 8 : 16,
+ isFullscreen ? 8 : 16,
+ ),
+ child: _PlayerControls(
+ controller: controller,
+ isFullscreen: isFullscreen,
+ onToggleFullscreen: onToggleFullscreen,
+ onUserInteraction: onUserInteraction,
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+
+ return content;
+ }
+}
+
+class _PlayerControls extends StatelessWidget {
+ const _PlayerControls({
+ required this.controller,
+ required this.isFullscreen,
+ required this.onToggleFullscreen,
+ required this.onUserInteraction,
+ });
+
+ final VideoPlayerController controller;
+ final bool isFullscreen;
+ final VoidCallback onToggleFullscreen;
+ final VoidCallback onUserInteraction;
@override
Widget build(BuildContext context) {
return AnimatedBuilder(
animation: controller,
builder: (context, _) {
- return ColoredBox(
- color: Colors.black.withValues(alpha: 0.35),
+ return Material(
+ color: Colors.black.withValues(alpha: 0.55),
+ borderRadius: BorderRadius.circular(10),
child: Row(
children: [
IconButton(
onPressed: () {
+ onUserInteraction();
if (controller.value.isPlaying) {
controller.pause();
} else {
@@ -214,7 +358,7 @@ class _PlayerControls extends StatelessWidget {
}
},
icon: Icon(
- controller.value.isPlaying ? Icons.pause : Icons.play_arrow,
+ controller.value.isPlaying ? Icons.pause_rounded : Icons.play_arrow_rounded,
color: Colors.white,
),
),
@@ -222,6 +366,7 @@ class _PlayerControls extends StatelessWidget {
child: VideoProgressIndicator(
controller,
allowScrubbing: true,
+ padding: const EdgeInsets.symmetric(vertical: 14, horizontal: 4),
colors: VideoProgressColors(
playedColor: appTheme.blueA400,
bufferedColor: Colors.white38,
@@ -229,7 +374,16 @@ class _PlayerControls extends StatelessWidget {
),
),
),
- const SizedBox(width: 8),
+ IconButton(
+ onPressed: () {
+ onUserInteraction();
+ onToggleFullscreen();
+ },
+ icon: Icon(
+ isFullscreen ? Icons.fullscreen_exit_rounded : Icons.fullscreen_rounded,
+ color: Colors.white,
+ ),
+ ),
],
),
);
diff --git a/lib/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart b/lib/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart
index e1ee1b07..1ec87312 100644
--- a/lib/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart
+++ b/lib/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart
@@ -1,6 +1,9 @@
+import 'dart:io';
+
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/core/widgets/data_error_widget.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
@@ -10,11 +13,9 @@ import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/vi
import 'package:eatvio_app/features/video_calls/recordings/presentation/widgets/recording_card.dart';
import 'package:eatvio_app/features/video_calls/recordings/presentation/widgets/recording_period_dropdown.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fluttertoast/fluttertoast.dart';
import 'package:go_router/go_router.dart';
-import 'package:share_plus/share_plus.dart';
class VideoCallRecordingsScreen extends StatelessWidget {
const VideoCallRecordingsScreen({super.key});
@@ -40,7 +41,6 @@ class _VideoCallRecordingsView extends StatefulWidget {
class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
final _scrollController = ScrollController();
- int? _downloadingId;
@override
void initState() {
@@ -72,27 +72,27 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
return;
}
- setState(() => _downloadingId = recording.id);
- final file = await context.read().downloadRecording(
+ final result = await context.read().downloadRecording(
recordingId: recording.id,
fileUrl: fileUrl,
);
if (!mounted) {
return;
}
- setState(() => _downloadingId = null);
- if (file == null) {
- final error = context.read().state.downloadError;
- await Fluttertoast.showToast(
- msg: error ?? S.of(context).video_call_recordings_download_error,
- );
- return;
+ final s = S.of(context);
+ switch (result) {
+ case RecordingDownloadSaved():
+ showSuccessToast(
+ Platform.isIOS
+ ? s.video_call_recordings_download_success_ios
+ : s.video_call_recordings_download_success,
+ );
+ case RecordingDownloadAlreadyInProgress():
+ return;
+ case RecordingDownloadFailed():
+ showErrorToast(s.video_call_recordings_download_error);
}
-
- await SharePlus.instance.share(
- ShareParams(files: [XFile(file.path)], text: S.of(context).video_call_recordings_card_title),
- );
}
void _openPlayer(VideoCallRecordingModel recording) {
@@ -102,7 +102,7 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
}
GoRouter.of(context).push(
VideoCallRecordingPlayerScreen.path,
- extra: recording,
+ extra: recording.toJson(),
);
}
@@ -198,9 +198,11 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
}
final recording = state.recordings[index];
+ final isDownloading = state.downloadingRecordingId == recording.id;
return RecordingCard(
recording: recording,
- isDownloading: _downloadingId == recording.id,
+ isDownloading: isDownloading,
+ downloadProgress: isDownloading ? state.downloadProgress : null,
onPlay: () => _openPlayer(recording),
onDownload: () => _download(recording),
);
diff --git a/lib/features/video_calls/recordings/presentation/widgets/recording_card.dart b/lib/features/video_calls/recordings/presentation/widgets/recording_card.dart
index 0de07b24..61b6ea39 100644
--- a/lib/features/video_calls/recordings/presentation/widgets/recording_card.dart
+++ b/lib/features/video_calls/recordings/presentation/widgets/recording_card.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/recording_duration_formatter.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class RecordingCard extends StatelessWidget {
const RecordingCard({
@@ -14,12 +14,15 @@ class RecordingCard extends StatelessWidget {
required this.onPlay,
required this.onDownload,
this.isDownloading = false,
+ this.downloadProgress,
});
final VideoCallRecordingModel recording;
final VoidCallback onPlay;
final VoidCallback onDownload;
final bool isDownloading;
+ /// `0..1` when total size is known; `null` while indeterminate.
+ final double? downloadProgress;
@override
Widget build(BuildContext context) {
@@ -161,7 +164,10 @@ class RecordingCard extends StatelessWidget {
),
),
Text(
- recording.createdAt.format('d MMMM yyyy, HH:mm', 'ru'),
+ recording.createdAt.format(
+ 'd MMMM yyyy, HH:mm',
+ Localizations.localeOf(context).languageCode,
+ ),
style: TextStyles.textSMedium.copyWith(
color: const Color(0xFF666666),
fontSize: 12,
@@ -171,44 +177,58 @@ class RecordingCard extends StatelessWidget {
),
if (isReady) ...[
const SizedBox(height: 12),
- SizedBox(
- width: double.infinity,
- height: 40,
- child: ElevatedButton(
- onPressed: isDownloading ? null : onDownload,
- style: ElevatedButton.styleFrom(
- backgroundColor: appTheme.blueA400,
- foregroundColor: Colors.white,
- elevation: 0,
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(8),
+ if (isDownloading) ...[
+ ClipRRect(
+ borderRadius: BorderRadius.circular(4),
+ child: LinearProgressIndicator(
+ value: downloadProgress,
+ minHeight: 6,
+ backgroundColor: appTheme.transparentBlue,
+ color: appTheme.blueA400,
+ ),
+ ),
+ const SizedBox(height: 8),
+ Text(
+ downloadProgress != null
+ ? s.video_call_recordings_downloading_percent(
+ (downloadProgress! * 100).round(),
+ )
+ : s.video_call_recordings_downloading,
+ style: TextStyles.textSMedium.copyWith(
+ color: appTheme.blueGray400,
+ fontSize: 12,
+ ),
+ ),
+ ] else
+ SizedBox(
+ width: double.infinity,
+ height: 40,
+ child: ElevatedButton(
+ onPressed: onDownload,
+ style: ElevatedButton.styleFrom(
+ backgroundColor: appTheme.blueA400,
+ foregroundColor: Colors.white,
+ elevation: 0,
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(8),
+ ),
+ ),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ s.video_call_recordings_download,
+ style: TextStyles.textSMedium.copyWith(
+ color: Colors.white,
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ const SizedBox(width: 8),
+ const Icon(Icons.download, size: 20),
+ ],
),
),
- child: isDownloading
- ? const SizedBox(
- width: 18,
- height: 18,
- child: CircularProgressIndicator(
- strokeWidth: 2,
- color: Colors.white,
- ),
- )
- : Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Text(
- s.video_call_recordings_download,
- style: TextStyles.textSMedium.copyWith(
- color: Colors.white,
- fontWeight: FontWeight.w700,
- ),
- ),
- const SizedBox(width: 8),
- const Icon(Icons.download, size: 20),
- ],
- ),
),
- ),
],
],
),
diff --git a/lib/features/video_calls/recordings/presentation/widgets/recording_period_dropdown.dart b/lib/features/video_calls/recordings/presentation/widgets/recording_period_dropdown.dart
index e18f8530..0bfe2cb6 100644
--- a/lib/features/video_calls/recordings/presentation/widgets/recording_period_dropdown.dart
+++ b/lib/features/video_calls/recordings/presentation/widgets/recording_period_dropdown.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/recording_period.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
class RecordingPeriodDropdown extends StatelessWidget {
const RecordingPeriodDropdown({
diff --git a/lib/features/video_calls/recordings/repositories/video_call_recordings_repository.dart b/lib/features/video_calls/recordings/repositories/video_call_recordings_repository.dart
index fb1abf2b..a669e2c7 100644
--- a/lib/features/video_calls/recordings/repositories/video_call_recordings_repository.dart
+++ b/lib/features/video_calls/recordings/repositories/video_call_recordings_repository.dart
@@ -1,20 +1,16 @@
-import 'dart:io';
-
-import 'package:dio/dio.dart';
-import 'package:eatvio_app/features/video_calls/recordings/models/recording_not_ready_exception.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/recording_period.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/video_call_recording_file_service.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
-import 'package:path_provider/path_provider.dart';
class VideoCallRecordingsRepository {
VideoCallRecordingsRepository({
required this.videoCallService,
- required this.dio,
+ required this.fileService,
});
final VideoCallService videoCallService;
- final Dio dio;
+ final VideoCallRecordingFileService fileService;
Future getRecordings({
required int page,
@@ -26,56 +22,16 @@ class VideoCallRecordingsRepository {
);
}
- /// Скачивает файл записи во временную директорию.
- ///
- /// [fileUrl] — абсолютный URL из `file_url` ответа списка.
- Future downloadRecordingFile({
+ /// Возвращает путь/URI сохранённого файла в пользовательском хранилище.
+ Future downloadRecordingFile({
required String fileUrl,
required int recordingId,
- }) async {
- try {
- final uri = Uri.parse(fileUrl).replace(
- queryParameters: {
- ...Uri.parse(fileUrl).queryParameters,
- 'download': '1',
- },
- );
-
- final directory = await getTemporaryDirectory();
- final targetPath = '${directory.path}/recording_$recordingId.mp4';
-
- await dio.download(
- uri.toString(),
- targetPath,
- options: Options(
- responseType: ResponseType.bytes,
- validateStatus: (status) => status != null && status < 400,
- ),
- );
-
- return File(targetPath);
- } on DioException catch (error) {
- _throwIfNotReady(error);
- rethrow;
- }
- }
-
- void _throwIfNotReady(DioException error) {
- if (error.response?.statusCode != 409) {
- return;
- }
-
- final data = error.response?.data;
- String? message;
- String? code;
-
- if (data is Map) {
- message = data['message']?.toString();
- code = data['code']?.toString();
- }
-
- if (code == RecordingNotReadyException.code || code == null) {
- throw RecordingNotReadyException(message: message);
- }
+ RecordingDownloadProgress? onProgress,
+ }) {
+ return fileService.downloadRecordingFile(
+ fileUrl: fileUrl,
+ recordingId: recordingId,
+ onProgress: onProgress,
+ );
}
}
diff --git a/lib/features/video_calls/recordings/services/public_downloads_saver.dart b/lib/features/video_calls/recordings/services/public_downloads_saver.dart
new file mode 100644
index 00000000..d0cda3ed
--- /dev/null
+++ b/lib/features/video_calls/recordings/services/public_downloads_saver.dart
@@ -0,0 +1,57 @@
+import 'dart:io';
+
+import 'package:file_saver/file_saver.dart';
+
+/// Сохраняет файл в публичную папку «Загрузки/{subfolder}» (Android)
+/// или в Documents приложения (iOS, видно в Files при UIFileSharingEnabled).
+class PublicDownloadsSaver {
+ const PublicDownloadsSaver();
+
+ /// Имя папки приложения в Загрузках / Files.
+ static const appFolderName = 'Itvio';
+
+ Future saveToDownloads({
+ required String sourcePath,
+ required String fileName,
+ String mimeType = 'video/mp4',
+ String subfolder = appFolderName,
+ }) async {
+ final nameWithoutExt = fileName.contains('.')
+ ? fileName.substring(0, fileName.lastIndexOf('.'))
+ : fileName;
+ final extension = fileName.contains('.')
+ ? fileName.substring(fileName.lastIndexOf('.') + 1)
+ : 'mp4';
+
+ final resolvedMime = MimeType.values.firstWhere(
+ (type) => type.type == mimeType,
+ orElse: () => MimeType.mp4Video,
+ );
+
+ if (Platform.isAndroid) {
+ final saved = await FileSaver.instance.saveToDownloads(
+ name: nameWithoutExt,
+ filePath: sourcePath,
+ fileExtension: extension,
+ mimeType: resolvedMime,
+ subfolder: subfolder,
+ );
+ if (saved == null || saved.isEmpty) {
+ throw StateError('Failed to save file to Downloads/$subfolder');
+ }
+ return saved;
+ }
+
+ // iOS: общего Downloads нет — saveFile кладёт в Documents (Files → On My iPhone).
+ final saved = await FileSaver.instance.saveFile(
+ name: nameWithoutExt,
+ file: File(sourcePath),
+ fileExtension: extension,
+ mimeType: resolvedMime,
+ );
+ if (saved.isEmpty) {
+ throw StateError('Failed to save file to app Documents');
+ }
+ return saved;
+ }
+}
diff --git a/lib/features/video_calls/recordings/services/video_call_recording_file_service.dart b/lib/features/video_calls/recordings/services/video_call_recording_file_service.dart
new file mode 100644
index 00000000..8bc1c751
--- /dev/null
+++ b/lib/features/video_calls/recordings/services/video_call_recording_file_service.dart
@@ -0,0 +1,140 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/video_calls/recordings/models/recording_not_ready_exception.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/public_downloads_saver.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+typedef RecordingDownloadProgress = void Function(int received, int total);
+
+class VideoCallRecordingFileService {
+ VideoCallRecordingFileService({
+ required this.dio,
+ required this.downloadsSaver,
+ });
+
+ final Dio dio;
+ final PublicDownloadsSaver downloadsSaver;
+
+ /// Скачивает запись и сохраняет в `Загрузки/Itvio` (Android)
+ /// или Documents приложения (iOS, видно в Files).
+ Future downloadRecordingFile({
+ required String fileUrl,
+ required int recordingId,
+ RecordingDownloadProgress? onProgress,
+ CancelToken? cancelToken,
+ }) async {
+ String? tempPath;
+ try {
+ await _ensureStoragePermissionIfNeeded();
+
+ final parsed = Uri.parse(fileUrl);
+ final uri = parsed.replace(
+ queryParameters: {
+ ...parsed.queryParameters,
+ 'download': '1',
+ },
+ );
+
+ final fileName = 'recording_$recordingId.mp4';
+ final tempDir = await getTemporaryDirectory();
+ final path = '${tempDir.path}/$fileName';
+ tempPath = path;
+
+ await dio.download(
+ uri.toString(),
+ path,
+ cancelToken: cancelToken,
+ onReceiveProgress: onProgress,
+ options: Options(
+ responseType: ResponseType.bytes,
+ validateStatus: (status) => status != null && status < 400,
+ ),
+ );
+
+ final tempFile = File(path);
+ try {
+ return await downloadsSaver.saveToDownloads(
+ sourcePath: path,
+ fileName: fileName,
+ );
+ } finally {
+ if (await tempFile.exists()) {
+ await tempFile.delete();
+ }
+ }
+ } on DioException catch (error) {
+ await _deleteIfExists(tempPath);
+ _throwIfNotReady(error);
+ rethrow;
+ }
+ }
+
+ Future _ensureStoragePermissionIfNeeded() async {
+ if (!Platform.isAndroid) {
+ return;
+ }
+
+ final androidInfo = await DeviceInfoPlugin().androidInfo;
+ if (androidInfo.version.sdkInt >= 29) {
+ return;
+ }
+
+ final status = await Permission.storage.request();
+ if (!status.isGranted) {
+ throw StateError('Storage permission denied');
+ }
+ }
+
+ Future _deleteIfExists(String? path) async {
+ if (path == null) {
+ return;
+ }
+ final file = File(path);
+ if (await file.exists()) {
+ await file.delete();
+ }
+ }
+
+ void _throwIfNotReady(DioException error) {
+ if (error.response?.statusCode != 409) {
+ return;
+ }
+
+ final payload = _jsonObject(error.response?.data);
+ final message = payload?['message']?.toString();
+ final code = payload?['code']?.toString();
+
+ if (code == RecordingNotReadyException.code || code == null) {
+ throw RecordingNotReadyException(message: message);
+ }
+ }
+
+ Map? _jsonObject(Object? data) {
+ if (data is Map) {
+ return Map.from(data);
+ }
+
+ final raw = switch (data) {
+ String value => value,
+ List value => utf8.decode(value),
+ _ => null,
+ };
+ if (raw == null || raw.isEmpty) {
+ return null;
+ }
+
+ try {
+ final decoded = jsonDecode(raw);
+ if (decoded is Map) {
+ return Map.from(decoded);
+ }
+ } on FormatException {
+ return null;
+ }
+ return null;
+ }
+}
diff --git a/lib/features/video_calls/services/video_call_callkit_coordinator.dart b/lib/features/video_calls/services/video_call_callkit_coordinator.dart
index ddfe654d..a93a611d 100644
--- a/lib/features/video_calls/services/video_call_callkit_coordinator.dart
+++ b/lib/features/video_calls/services/video_call_callkit_coordinator.dart
@@ -22,12 +22,10 @@ import 'package:sentry_flutter/sentry_flutter.dart';
class VideoCallCallKitCoordinator {
VideoCallCallKitCoordinator({
- required FirebaseApi firebaseApi,
- VideoCallManager? videoCallManager,
- VideoCallSessionCubit? videoCallSessionCubit,
- }) : _firebaseApi = firebaseApi,
- _videoCallManager = videoCallManager,
- _videoCallSessionCubit = videoCallSessionCubit;
+ required this._firebaseApi,
+ this._videoCallManager,
+ this._videoCallSessionCubit,
+ });
final FirebaseApi _firebaseApi;
final VideoCallManager? _videoCallManager;
diff --git a/lib/features/video_calls/services/video_call_notification_navigator.dart b/lib/features/video_calls/services/video_call_notification_navigator.dart
index 2ec1ce0b..5390b907 100644
--- a/lib/features/video_calls/services/video_call_notification_navigator.dart
+++ b/lib/features/video_calls/services/video_call_notification_navigator.dart
@@ -199,7 +199,7 @@ class VideoCallNotificationNavigator {
return false;
}
- return _waitForCallRouteVisible();
+ return await _waitForCallRouteVisible();
} finally {
_pushInFlight = false;
}
diff --git a/lib/features/welcome/presentation/pages/welcome_screen.dart b/lib/features/welcome/presentation/pages/welcome_screen.dart
index e6f48dc9..2cf27602 100644
--- a/lib/features/welcome/presentation/pages/welcome_screen.dart
+++ b/lib/features/welcome/presentation/pages/welcome_screen.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/prefs.dart';
import 'package:eatvio_app/core/prefs_keys.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/token_storage.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index b5e0c9b1..4fa3775d 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -65,7 +65,9 @@ class MessageLookup extends MessageLookupByLibrary {
static String m16(name, planName) =>
"Пользователь ${name} подписался на план «${planName}»";
- static String m17(planName) => "Вы отменили подписку на план «${planName}»";
+ static String m17(percent) => "Downloading… ${percent}%";
+
+ static String m18(planName) => "Вы отменили подписку на план «${planName}»";
final messages = _notInlinedMessages(_notInlinedMessages);
static Map _notInlinedMessages(_) => {
@@ -1047,6 +1049,18 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage(
"Could not download the recording. Please try again later.",
),
+ "video_call_recordings_download_success":
+ MessageLookupByLibrary.simpleMessage(
+ "Recording saved to Downloads/Itvio",
+ ),
+ "video_call_recordings_download_success_ios":
+ MessageLookupByLibrary.simpleMessage(
+ "Recording saved to the Files app",
+ ),
+ "video_call_recordings_downloading": MessageLookupByLibrary.simpleMessage(
+ "Downloading…",
+ ),
+ "video_call_recordings_downloading_percent": m17,
"video_call_recordings_empty": MessageLookupByLibrary.simpleMessage(
"No video consultations yet",
),
@@ -1140,7 +1154,7 @@ class MessageLookup extends MessageLookupByLibrary {
"youCanComplain": MessageLookupByLibrary.simpleMessage(
"Если вас что-то не устроило, вы можете подать жалобу",
),
- "youCanceledSubscriptionToPlan": m17,
+ "youCanceledSubscriptionToPlan": m18,
"youShureYouWantToCancelOrder": MessageLookupByLibrary.simpleMessage(
"Вы уверены, что хотите отменить заказ?",
),
diff --git a/lib/generated/intl/messages_ru.dart b/lib/generated/intl/messages_ru.dart
index f9675eb0..868d0d97 100644
--- a/lib/generated/intl/messages_ru.dart
+++ b/lib/generated/intl/messages_ru.dart
@@ -41,6 +41,8 @@ class MessageLookup extends MessageLookupByLibrary {
static String m10(date) => "Старт: ${date}";
+ static String m17(percent) => "Скачивание… ${percent}%";
+
final messages = _notInlinedMessages(_notInlinedMessages);
static Map _notInlinedMessages(_) => {
"Moscow": MessageLookupByLibrary.simpleMessage("Москва"),
@@ -544,6 +546,18 @@ class MessageLookup extends MessageLookupByLibrary {
MessageLookupByLibrary.simpleMessage(
"Не удалось скачать запись. Попробуйте позже.",
),
+ "video_call_recordings_download_success":
+ MessageLookupByLibrary.simpleMessage(
+ "Запись сохранена в Загрузки/Itvio",
+ ),
+ "video_call_recordings_download_success_ios":
+ MessageLookupByLibrary.simpleMessage(
+ "Запись сохранена в приложении «Файлы»",
+ ),
+ "video_call_recordings_downloading": MessageLookupByLibrary.simpleMessage(
+ "Скачивание…",
+ ),
+ "video_call_recordings_downloading_percent": m17,
"video_call_recordings_empty": MessageLookupByLibrary.simpleMessage(
"Пока нет видеоконсультаций",
),
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index e3842212..58028fd0 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -4747,6 +4747,26 @@ class S {
);
}
+ /// `Downloading…`
+ String get video_call_recordings_downloading {
+ return Intl.message(
+ 'Downloading…',
+ name: 'video_call_recordings_downloading',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `Downloading… {percent}%`
+ String video_call_recordings_downloading_percent(int percent) {
+ return Intl.message(
+ 'Downloading… $percent%',
+ name: 'video_call_recordings_downloading_percent',
+ desc: '',
+ args: [percent],
+ );
+ }
+
/// `Could not download the recording. Please try again later.`
String get video_call_recordings_download_error {
return Intl.message(
@@ -4757,6 +4777,26 @@ class S {
);
}
+ /// `Recording saved to Downloads/Itvio`
+ String get video_call_recordings_download_success {
+ return Intl.message(
+ 'Recording saved to Downloads/Itvio',
+ name: 'video_call_recordings_download_success',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `Recording saved to the Files app`
+ String get video_call_recordings_download_success_ios {
+ return Intl.message(
+ 'Recording saved to the Files app',
+ name: 'video_call_recordings_download_success_ios',
+ desc: '',
+ args: [],
+ );
+ }
+
/// `Could not play the recording`
String get video_call_recordings_player_error {
return Intl.message(
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 9d15bdb7..30676d0b 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -598,7 +598,16 @@
"video_call_recordings_empty": "No video consultations yet",
"video_call_recordings_processing": "Recording is being processed…",
"video_call_recordings_download": "Download",
+ "video_call_recordings_downloading": "Downloading…",
+ "video_call_recordings_downloading_percent": "Downloading… {percent}%",
+ "@video_call_recordings_downloading_percent": {
+ "placeholders": {
+ "percent": {"type": "int"}
+ }
+ },
"video_call_recordings_download_error": "Could not download the recording. Please try again later.",
+ "video_call_recordings_download_success": "Recording saved to Downloads/Itvio",
+ "video_call_recordings_download_success_ios": "Recording saved to the Files app",
"video_call_recordings_player_error": "Could not play the recording",
"video_call_recordings_card_title": "Video consultation with a nutrition specialist",
"video_call_recordings_period_today": "Today",
diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb
index fa0c8f6b..7ec79289 100644
--- a/lib/l10n/intl_ru.arb
+++ b/lib/l10n/intl_ru.arb
@@ -353,7 +353,16 @@
"video_call_recordings_empty": "Пока нет видеоконсультаций",
"video_call_recordings_processing": "Запись обрабатывается…",
"video_call_recordings_download": "Скачать",
+ "video_call_recordings_downloading": "Скачивание…",
+ "video_call_recordings_downloading_percent": "Скачивание… {percent}%",
+ "@video_call_recordings_downloading_percent": {
+ "placeholders": {
+ "percent": {"type": "int"}
+ }
+ },
"video_call_recordings_download_error": "Не удалось скачать запись. Попробуйте позже.",
+ "video_call_recordings_download_success": "Запись сохранена в Загрузки/Itvio",
+ "video_call_recordings_download_success_ios": "Запись сохранена в приложении «Файлы»",
"video_call_recordings_player_error": "Не удалось воспроизвести запись",
"video_call_recordings_card_title": "Видеоконсультация со специалистом по питанию",
"video_call_recordings_period_today": "Сегодня",
diff --git a/lib/main.dart b/lib/main.dart
index 2813a4d0..bbc8e5d4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/features/video_calls/services/video_call_foreground_b
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_app_shell.dart';
import 'dart:async';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_portal/flutter_portal.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index a2d657f9..dad171d6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
name: eatvio_app
description: A new Flutter project.
-version: 1.3.71+160
-publish_to: "none"
+version: 1.3.72+161
+publish_to: 'none'
environment:
- sdk: ^3.10.4
+ sdk: ^3.12.0
dependencies:
flutter:
@@ -27,7 +27,7 @@ dependencies:
flutter_typeahead: ^5.2.0
go_router: ^17.0.1
keyboard_dismisser: ^3.0.0
- retrofit: 4.7.2
+ retrofit: ^4.10.0
get_it: ^9.2.0
dio: ^5.10.0
dart_pusher_channels: ^1.2.3
@@ -82,10 +82,12 @@ dependencies:
rxdart: ^0.27.7
gpassword: ^1.0.0
webview_flutter_platform_interface: ^2.14.0
- flutter_inappwebview: ^6.1.5
+ # 6.1.x breaks on AGP 9 (proguard-android.txt removed); fixed in 6.2 beta.
+ flutter_inappwebview: ^6.2.0-beta.3
+
intl_utils: ^2.8.13
sentry_dio: ^9.10.0
- livekit_client: ^2.6.1
+ livekit_client: ^2.13.2
video_player: ^2.10.0
audio_session: ^0.1.25
flutter_foreground_task: ^9.2.1
@@ -94,8 +96,11 @@ dependencies:
wakelock_plus: ^1.5.2
sbp: 0.1.0
qr_flutter: ^4.1.0
+ file_saver: ^0.7.0
# html 0.15.7 removed top-level query_selector.matches used by flutter_html 3.0.0.
+ material_ui: ^1.11.0
+ cupertino_ui: ^1.1.6
dependency_overrides:
html: 0.15.6
@@ -103,7 +108,7 @@ dev_dependencies:
build_runner: ^2.10.4
freezed: ^3.2.0
json_serializable: ^6.11.2
- retrofit_generator: 10.0.6
+ retrofit_generator: ^10.2.3
mockito: ^5.6.1
mocktail: ^1.0.4
network_image_mock: ^2.1.1
@@ -115,6 +120,7 @@ dev_dependencies:
integration_test:
sdk: flutter
+ flutter_webrtc: 1.6.3
flutter:
uses-material-design: true
assets:
@@ -177,14 +183,14 @@ flutter_intl:
flutter_native_splash:
android: true
ios: true
- color: "#FFFFFF"
- image_android: "assets/splash/splash.png"
- image_dark_android: "assets/splash/splash.png"
- image_ios: "assets/splash/splash.png"
- image_dark_ios: "assets/splash/splash.png"
- branding_android: "assets/splash/branding.png"
- branding_dark_android: "assets/splash/branding.png"
+ color: '#FFFFFF'
+ image_android: 'assets/splash/splash.png'
+ image_dark_android: 'assets/splash/splash.png'
+ image_ios: 'assets/splash/splash.png'
+ image_dark_ios: 'assets/splash/splash.png'
+ branding_android: 'assets/splash/branding.png'
+ branding_dark_android: 'assets/splash/branding.png'
android_12:
- image: "assets/splash/splash.png"
- image_dark: "assets/splash/splash.png"
- branding: "assets/splash/branding.png"
+ image: 'assets/splash/splash.png'
+ image_dark: 'assets/splash/splash.png'
+ branding: 'assets/splash/branding.png'
diff --git a/test/common/widgets/markdown_editor_test.dart b/test/common/widgets/markdown_editor_test.dart
index 09d6fc4f..36517640 100644
--- a/test/common/widgets/markdown_editor_test.dart
+++ b/test/common/widgets/markdown_editor_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/common/widgets/markdown_editor.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/app_router_test.dart b/test/core/app_router_test.dart
index bdeef9c1..d803c3bf 100644
--- a/test/core/app_router_test.dart
+++ b/test/core/app_router_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/routing/route_constants.dart';
import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
diff --git a/test/core/comments/presentation/comments_actions_bottom_sheet_test.dart b/test/core/comments/presentation/comments_actions_bottom_sheet_test.dart
index 20663f6e..5d237728 100644
--- a/test/core/comments/presentation/comments_actions_bottom_sheet_test.dart
+++ b/test/core/comments/presentation/comments_actions_bottom_sheet_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/comments/presentation/comments_actions_bottom_sh
import 'package:eatvio_app/core/theme/theme_helper.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:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
@@ -25,12 +24,7 @@ void main() {
);
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
@@ -352,12 +346,7 @@ void main() {
);
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
diff --git a/test/core/permission_handler/permission_handler_test.dart b/test/core/permission_handler/permission_handler_test.dart
index e0084f2a..38f3eb6f 100644
--- a/test/core/permission_handler/permission_handler_test.dart
+++ b/test/core/permission_handler/permission_handler_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/permission_handler/permission_handler.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:permission_handler/permission_handler.dart';
diff --git a/test/core/theme/app_decoration_test.dart b/test/core/theme/app_decoration_test.dart
index 7b7033c2..05f70c9e 100644
--- a/test/core/theme/app_decoration_test.dart
+++ b/test/core/theme/app_decoration_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/app_decoration.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/theme/custom_text_style_test.dart b/test/core/theme/custom_text_style_test.dart
index 297344e1..b4fe1957 100644
--- a/test/core/theme/custom_text_style_test.dart
+++ b/test/core/theme/custom_text_style_test.dart
@@ -1,6 +1,6 @@
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:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/theme/theme_helper_test.dart b/test/core/theme/theme_helper_test.dart
index 75583933..ec4f3244 100644
--- a/test/core/theme/theme_helper_test.dart
+++ b/test/core/theme/theme_helper_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/utils/localization_utils_test.dart b/test/core/utils/localization_utils_test.dart
index f5ad7f7f..8e637ea4 100644
--- a/test/core/utils/localization_utils_test.dart
+++ b/test/core/utils/localization_utils_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/utils/localization_utils.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -98,12 +97,7 @@ void main() {
testWidgets('returns correct form for 1 minute', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -119,12 +113,7 @@ void main() {
testWidgets('returns correct form for 2-4 minutes', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -144,12 +133,7 @@ void main() {
testWidgets('returns correct form for 5+ minutes', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -165,12 +149,7 @@ void main() {
testWidgets('returns correct form for 11 minutes', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -188,12 +167,7 @@ void main() {
testWidgets('returns correct form for 1 hour', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -209,12 +183,7 @@ void main() {
testWidgets('returns correct form for 2-4 hours', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -234,12 +203,7 @@ void main() {
testWidgets('returns correct form for 5+ hours', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -255,12 +219,7 @@ void main() {
testWidgets('returns correct form for 11 hours', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -278,12 +237,7 @@ void main() {
testWidgets('returns correct form for 1 step', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -299,12 +253,7 @@ void main() {
testWidgets('returns correct form for 2-4 steps', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -324,12 +273,7 @@ void main() {
testWidgets('returns correct form for 5+ steps', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -345,12 +289,7 @@ void main() {
testWidgets('returns correct form for 11 steps', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -366,12 +305,7 @@ void main() {
testWidgets('returns correct form for 21-24 steps', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -419,12 +353,7 @@ void main() {
testWidgets('getMinuteForm handles 0 minutes', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -440,12 +369,7 @@ void main() {
testWidgets('getMinuteForm handles 100+ minutes', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -463,12 +387,7 @@ void main() {
testWidgets('getHourForm handles 0 hours', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -484,12 +403,7 @@ void main() {
testWidgets('getHourForm handles 100+ hours', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -507,12 +421,7 @@ void main() {
testWidgets('getStepForm handles 0 steps', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -528,12 +437,7 @@ void main() {
testWidgets('getStepForm handles 100+ steps', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
diff --git a/test/core/utils/pagination_utils_test.dart b/test/core/utils/pagination_utils_test.dart
index 8af3a7f9..e67655f5 100644
--- a/test/core/utils/pagination_utils_test.dart
+++ b/test/core/utils/pagination_utils_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/utils/pagination_utils.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/add_item_button_test.dart b/test/core/widgets/add_item_button_test.dart
index 720f4715..46fb86a1 100644
--- a/test/core/widgets/add_item_button_test.dart
+++ b/test/core/widgets/add_item_button_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/add_item_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
diff --git a/test/core/widgets/animated_option_button_test.dart b/test/core/widgets/animated_option_button_test.dart
index d5f27e02..91ba4932 100644
--- a/test/core/widgets/animated_option_button_test.dart
+++ b/test/core/widgets/animated_option_button_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/animated_option_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/base_button_test.dart b/test/core/widgets/base_button_test.dart
index d975e404..d53adb85 100644
--- a/test/core/widgets/base_button_test.dart
+++ b/test/core/widgets/base_button_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/core/widgets/base_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/bookmark_button_test.dart b/test/core/widgets/bookmark_button_test.dart
index e44383ad..2c19c468 100644
--- a/test/core/widgets/bookmark_button_test.dart
+++ b/test/core/widgets/bookmark_button_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bookmark_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/bottom_sheet_action_widget_test.dart b/test/core/widgets/bottom_sheet_action_widget_test.dart
index af9a861f..41333749 100644
--- a/test/core/widgets/bottom_sheet_action_widget_test.dart
+++ b/test/core/widgets/bottom_sheet_action_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_action_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/core/widgets/bottom_sheet_handler_bar_test.dart b/test/core/widgets/bottom_sheet_handler_bar_test.dart
index 7feff6da..1b22914a 100644
--- a/test/core/widgets/bottom_sheet_handler_bar_test.dart
+++ b/test/core/widgets/bottom_sheet_handler_bar_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/bottom_sheet_with_blur_test.dart b/test/core/widgets/bottom_sheet_with_blur_test.dart
index 7b9b7884..edc85a2b 100644
--- a/test/core/widgets/bottom_sheet_with_blur_test.dart
+++ b/test/core/widgets/bottom_sheet_with_blur_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_with_blur.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/cpfc_container_test.dart b/test/core/widgets/cpfc_container_test.dart
index 6babc283..e97fa116 100644
--- a/test/core/widgets/cpfc_container_test.dart
+++ b/test/core/widgets/cpfc_container_test.dart
@@ -1,59 +1,53 @@
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/core/widgets/cpfc_container.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
- group('CpfcContainer smoke', () {
- Widget wrap(Widget child) {
- return MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: const [Locale('ru')],
- home: Scaffold(body: child),
- );
- }
-
- testWidgets('renders cpfc container', (tester) async {
- await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
- await tester.pump();
-
- expect(find.byType(CpfcContainer), findsOneWidget);
- });
-
- testWidgets('displays calories value', (tester) async {
- await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
- await tester.pump();
-
- expect(find.text('2000.0'), findsOneWidget);
- });
-
- testWidgets('displays proteins value', (tester) async {
- await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
- await tester.pump();
-
- expect(find.text('150.0'), findsOneWidget);
- });
-
- testWidgets('displays fats value', (tester) async {
- await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
- await tester.pump();
-
- expect(find.text('80.0'), findsOneWidget);
- });
-
- testWidgets('displays carbohydrates value', (tester) async {
- await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
- await tester.pump();
-
- expect(find.text('250.0'), findsOneWidget);
- });
- });
-}
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/cpfc_container.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+ group('CpfcContainer smoke', () {
+ Widget wrap(Widget child) {
+ return MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: const [Locale('ru')],
+ home: Scaffold(body: child),
+ );
+ }
+
+ testWidgets('renders cpfc container', (tester) async {
+ await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
+ await tester.pump();
+
+ expect(find.byType(CpfcContainer), findsOneWidget);
+ });
+
+ testWidgets('displays calories value', (tester) async {
+ await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
+ await tester.pump();
+
+ expect(find.text('2000.0'), findsOneWidget);
+ });
+
+ testWidgets('displays proteins value', (tester) async {
+ await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
+ await tester.pump();
+
+ expect(find.text('150.0'), findsOneWidget);
+ });
+
+ testWidgets('displays fats value', (tester) async {
+ await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
+ await tester.pump();
+
+ expect(find.text('80.0'), findsOneWidget);
+ });
+
+ testWidgets('displays carbohydrates value', (tester) async {
+ await tester.pumpWidget(wrap(const CpfcContainer(calories: 2000.0, proteins: 150.0, fats: 80.0, carbohydrates: 250.0)));
+ await tester.pump();
+
+ expect(find.text('250.0'), findsOneWidget);
+ });
+ });
+}
diff --git a/test/core/widgets/custom_divider_test.dart b/test/core/widgets/custom_divider_test.dart
index 5bf9e0ec..313f2675 100644
--- a/test/core/widgets/custom_divider_test.dart
+++ b/test/core/widgets/custom_divider_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_divider.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/custom_drop_down_button_test.dart b/test/core/widgets/custom_drop_down_button_test.dart
index c456bcce..690ea9ae 100644
--- a/test/core/widgets/custom_drop_down_button_test.dart
+++ b/test/core/widgets/custom_drop_down_button_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/custom_drop_down_test.dart b/test/core/widgets/custom_drop_down_test.dart
index 50759f01..034e13c9 100644
--- a/test/core/widgets/custom_drop_down_test.dart
+++ b/test/core/widgets/custom_drop_down_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_drop_down.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/custom_outlined_button_test.dart b/test/core/widgets/custom_outlined_button_test.dart
index b2769b88..3b64de57 100644
--- a/test/core/widgets/custom_outlined_button_test.dart
+++ b/test/core/widgets/custom_outlined_button_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/custom_popup_test.dart b/test/core/widgets/custom_popup_test.dart
index a8434ece..18506e8d 100644
--- a/test/core/widgets/custom_popup_test.dart
+++ b/test/core/widgets/custom_popup_test.dart
@@ -9,9 +9,8 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class _FakeAssetBundle extends CachingAssetBundle {
@@ -67,12 +66,7 @@ void main() {
bundle: fakeBundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Scaffold(body: Center(child: child)),
),
diff --git a/test/core/widgets/custom_search_bar_test.dart b/test/core/widgets/custom_search_bar_test.dart
index 1923aa78..44ae8dc7 100644
--- a/test/core/widgets/custom_search_bar_test.dart
+++ b/test/core/widgets/custom_search_bar_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_search_bar.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/custom_text_form_field_test.dart b/test/core/widgets/custom_text_form_field_test.dart
index cda05148..ad0fc0b6 100644
--- a/test/core/widgets/custom_text_form_field_test.dart
+++ b/test/core/widgets/custom_text_form_field_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/core/widgets/data_error_widget_test.dart b/test/core/widgets/data_error_widget_test.dart
index d5e6fde6..7561b2c0 100644
--- a/test/core/widgets/data_error_widget_test.dart
+++ b/test/core/widgets/data_error_widget_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/data_error_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -10,12 +9,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/core/widgets/feed_icon_button_test.dart b/test/core/widgets/feed_icon_button_test.dart
index a978d554..9303939e 100644
--- a/test/core/widgets/feed_icon_button_test.dart
+++ b/test/core/widgets/feed_icon_button_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/info_row_test.dart b/test/core/widgets/info_row_test.dart
index 318c4280..24938528 100644
--- a/test/core/widgets/info_row_test.dart
+++ b/test/core/widgets/info_row_test.dart
@@ -5,8 +5,7 @@ import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -15,12 +14,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(child: Scaffold(body: child)),
);
diff --git a/test/core/widgets/item_widget_test.dart b/test/core/widgets/item_widget_test.dart
index 64f00960..bd643d16 100644
--- a/test/core/widgets/item_widget_test.dart
+++ b/test/core/widgets/item_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/item_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/core/widgets/loader_test.dart b/test/core/widgets/loader_test.dart
index 16132361..cf40c866 100644
--- a/test/core/widgets/loader_test.dart
+++ b/test/core/widgets/loader_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/main_background_bouble_test.dart b/test/core/widgets/main_background_bouble_test.dart
index 25bac88d..e22fe21f 100644
--- a/test/core/widgets/main_background_bouble_test.dart
+++ b/test/core/widgets/main_background_bouble_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/markdown_html_widget_test.dart b/test/core/widgets/markdown_html_widget_test.dart
index c7654a3f..ee1825a3 100644
--- a/test/core/widgets/markdown_html_widget_test.dart
+++ b/test/core/widgets/markdown_html_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/core/widgets/marketing_bottom_sheet_test.dart b/test/core/widgets/marketing_bottom_sheet_test.dart
index acff0214..ba04f299 100644
--- a/test/core/widgets/marketing_bottom_sheet_test.dart
+++ b/test/core/widgets/marketing_bottom_sheet_test.dart
@@ -1,139 +1,128 @@
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:eatvio_app/core/widgets/marketing_bottom_sheet.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
- group('MarketingBottomSheet', () {
- Widget createTestWidget(Widget child) {
- return MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: S.delegate.supportedLocales,
- home: Scaffold(
- body: child,
- ),
- );
- }
-
- testWidgets('displays marketing bottom sheet', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const MarketingBottomSheet(),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.byType(MarketingBottomSheet), findsOneWidget);
- });
-
- testWidgets('shows marketing bottom sheet via function', (tester) async {
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: S.delegate.supportedLocales,
- home: Builder(
- builder: (context) {
- return Scaffold(
- body: ElevatedButton(
- onPressed: () {
- showMarketingBottomSheet(context);
- },
- child: const Text('Show'),
- ),
- );
- },
- ),
- ),
- );
-
- await tester.pump();
- await tester.tap(find.text('Show'));
- await tester.pumpAndSettle();
-
- expect(find.byType(MarketingBottomSheet), findsOneWidget);
- });
-
- testWidgets('displays marketing bottom sheet with congratulations text', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const MarketingBottomSheet(),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.byType(MarketingBottomSheet), findsOneWidget);
- expect(find.textContaining('Поздравляем'), findsWidgets);
- });
-
- testWidgets('displays marketing bottom sheet with invite button', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const MarketingBottomSheet(),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.byType(MarketingBottomSheet), findsOneWidget);
- expect(find.byType(CustomOutlinedButton), findsOneWidget);
- });
-
- testWidgets('displays marketing bottom sheet with logo', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const MarketingBottomSheet(),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.byType(MarketingBottomSheet), findsOneWidget);
- expect(find.byType(ClipRRect), findsWidgets);
- });
- });
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
+import 'package:eatvio_app/core/widgets/marketing_bottom_sheet.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+ group('MarketingBottomSheet', () {
+ Widget createTestWidget(Widget child) {
+ return MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: S.delegate.supportedLocales,
+ home: Scaffold(
+ body: child,
+ ),
+ );
+ }
+
+ testWidgets('displays marketing bottom sheet', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const MarketingBottomSheet(),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.byType(MarketingBottomSheet), findsOneWidget);
+ });
+
+ testWidgets('shows marketing bottom sheet via function', (tester) async {
+ await tester.pumpWidget(
+ MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: S.delegate.supportedLocales,
+ home: Builder(
+ builder: (context) {
+ return Scaffold(
+ body: ElevatedButton(
+ onPressed: () {
+ showMarketingBottomSheet(context);
+ },
+ child: const Text('Show'),
+ ),
+ );
+ },
+ ),
+ ),
+ );
+
+ await tester.pump();
+ await tester.tap(find.text('Show'));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(MarketingBottomSheet), findsOneWidget);
+ });
+
+ testWidgets('displays marketing bottom sheet with congratulations text', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const MarketingBottomSheet(),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.byType(MarketingBottomSheet), findsOneWidget);
+ expect(find.textContaining('Поздравляем'), findsWidgets);
+ });
+
+ testWidgets('displays marketing bottom sheet with invite button', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const MarketingBottomSheet(),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.byType(MarketingBottomSheet), findsOneWidget);
+ expect(find.byType(CustomOutlinedButton), findsOneWidget);
+ });
+
+ testWidgets('displays marketing bottom sheet with logo', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const MarketingBottomSheet(),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.byType(MarketingBottomSheet), findsOneWidget);
+ expect(find.byType(ClipRRect), findsWidgets);
+ });
+ });
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/core/widgets/option_widget_test.dart b/test/core/widgets/option_widget_test.dart
index 12236ef6..68f9008b 100644
--- a/test/core/widgets/option_widget_test.dart
+++ b/test/core/widgets/option_widget_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/option_widget.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -11,12 +10,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Scaffold(body: child),
);
diff --git a/test/core/widgets/show_error_dialog_test.dart b/test/core/widgets/show_error_dialog_test.dart
index edab0e88..4f140b43 100644
--- a/test/core/widgets/show_error_dialog_test.dart
+++ b/test/core/widgets/show_error_dialog_test.dart
@@ -1,7 +1,6 @@
import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -9,12 +8,7 @@ void main() {
testWidgets('displays error dialog with default title and description', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -43,12 +37,7 @@ void main() {
testWidgets('displays error dialog with custom title and description', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -80,12 +69,7 @@ void main() {
testWidgets('displays error dialog with custom button title', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -115,12 +99,7 @@ void main() {
testWidgets('closes dialog when button is tapped', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
@@ -156,12 +135,7 @@ void main() {
testWidgets('displays error dialog with needToOpenSettings', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Builder(
builder: (context) {
diff --git a/test/core/widgets/success_published_diet_bottom_sheet_test.dart b/test/core/widgets/success_published_diet_bottom_sheet_test.dart
index 20b6b9c7..e8860467 100644
--- a/test/core/widgets/success_published_diet_bottom_sheet_test.dart
+++ b/test/core/widgets/success_published_diet_bottom_sheet_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/core/widgets/success_published_diet_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
@@ -38,12 +37,7 @@ void main() {
),
],
),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
);
}
diff --git a/test/core/widgets/success_published_recipe_bottom_sheet_test.dart b/test/core/widgets/success_published_recipe_bottom_sheet_test.dart
index e4903383..945c52ae 100644
--- a/test/core/widgets/success_published_recipe_bottom_sheet_test.dart
+++ b/test/core/widgets/success_published_recipe_bottom_sheet_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/core/widgets/success_published_recipe_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
@@ -38,12 +37,7 @@ void main() {
),
],
),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
);
}
diff --git a/test/features/auth/presentation/pages/auth_screen_smoke_test.dart b/test/features/auth/presentation/pages/auth_screen_smoke_test.dart
index 030613cd..522986fe 100644
--- a/test/features/auth/presentation/pages/auth_screen_smoke_test.dart
+++ b/test/features/auth/presentation/pages/auth_screen_smoke_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_state.dart';
import 'package:eatvio_app/features/auth/presentation/pages/auth_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -30,12 +29,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/auth/presentation/pages/forget_password_screen_smoke_test.dart b/test/features/auth/presentation/pages/forget_password_screen_smoke_test.dart
index 714f75c7..4704dfce 100644
--- a/test/features/auth/presentation/pages/forget_password_screen_smoke_test.dart
+++ b/test/features/auth/presentation/pages/forget_password_screen_smoke_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_state.dart';
import 'package:eatvio_app/features/auth/presentation/pages/forget_password_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/auth/presentation/pages/forget_password_screen_test.dart b/test/features/auth/presentation/pages/forget_password_screen_test.dart
index 4af21add..3789b846 100644
--- a/test/features/auth/presentation/pages/forget_password_screen_test.dart
+++ b/test/features/auth/presentation/pages/forget_password_screen_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart';
import 'package:eatvio_app/features/auth/presentation/pages/forget_password_screen.dart';
import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/auth/presentation/pages/register_via_social_screen_smoke_test.dart b/test/features/auth/presentation/pages/register_via_social_screen_smoke_test.dart
index 4696da59..add38e1a 100644
--- a/test/features/auth/presentation/pages/register_via_social_screen_smoke_test.dart
+++ b/test/features/auth/presentation/pages/register_via_social_screen_smoke_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
import 'package:eatvio_app/features/auth/presentation/pages/register_via_social_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/auth/presentation/pages/scan_qr_code_screen_smoke_test.dart b/test/features/auth/presentation/pages/scan_qr_code_screen_smoke_test.dart
index 116d2d85..844aa482 100644
--- a/test/features/auth/presentation/pages/scan_qr_code_screen_smoke_test.dart
+++ b/test/features/auth/presentation/pages/scan_qr_code_screen_smoke_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/auth/presentation/pages/scan_qr_code_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/auth/presentation/widgets/basic_widget_test.dart b/test/features/auth/presentation/widgets/basic_widget_test.dart
index 0fac7d35..a9410ac8 100644
--- a/test/features/auth/presentation/widgets/basic_widget_test.dart
+++ b/test/features/auth/presentation/widgets/basic_widget_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/auth/models/token_model.dart';
import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/auth/sdk/social_auth_facade_test.dart b/test/features/auth/sdk/social_auth_facade_test.dart
index 3c0ec83e..c5c555c9 100644
--- a/test/features/auth/sdk/social_auth_facade_test.dart
+++ b/test/features/auth/sdk/social_auth_facade_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/app_router.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/features/auth/sdk/social_auth_facade.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart b/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart
index f4253129..aff21487 100644
--- a/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart
+++ b/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart
@@ -10,10 +10,9 @@ import 'package:eatvio_app/features/blog_post/presentation/pages/blog_post_scree
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -72,12 +71,7 @@ void main() {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
diff --git a/test/features/blog_post_create/advanced_widget_test.dart b/test/features/blog_post_create/advanced_widget_test.dart
index aafb9aa8..97e62189 100644
--- a/test/features/blog_post_create/advanced_widget_test.dart
+++ b/test/features/blog_post_create/advanced_widget_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit
import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/blog_post_create/basic_widget_test.dart b/test/features/blog_post_create/basic_widget_test.dart
index 3cd4aa38..82a69068 100644
--- a/test/features/blog_post_create/basic_widget_test.dart
+++ b/test/features/blog_post_create/basic_widget_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/app_keys.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/blog_post_create/integration_widget_test.dart b/test/features/blog_post_create/integration_widget_test.dart
index 1eaad104..42cbed6f 100644
--- a/test/features/blog_post_create/integration_widget_test.dart
+++ b/test/features/blog_post_create/integration_widget_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit
import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart b/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart
index cd17183e..13b6f1e7 100644
--- a/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart
+++ b/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart
@@ -15,10 +15,9 @@ import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart'
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mocktail/mocktail.dart';
@@ -95,12 +94,7 @@ void main() {
return MaterialApp.router(
routerConfig: router,
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
);
diff --git a/test/features/bottom_navigation_bar/bottom_nav_scope_test.dart b/test/features/bottom_navigation_bar/bottom_nav_scope_test.dart
index de852443..4916fd51 100644
--- a/test/features/bottom_navigation_bar/bottom_nav_scope_test.dart
+++ b/test/features/bottom_navigation_bar/bottom_nav_scope_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget_test.dart b/test/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget_test.dart
index 85850c2e..864e3948 100644
--- a/test/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget_test.dart
+++ b/test/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget_test.dart
@@ -11,10 +11,9 @@ import 'package:eatvio_app/features/notifications/presentation/notifications_cub
import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_state.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -73,12 +72,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/calendar/presentation/pages/calendar_screen_smoke_test.dart b/test/features/calendar/presentation/pages/calendar_screen_smoke_test.dart
index 33719fee..82e06f54 100644
--- a/test/features/calendar/presentation/pages/calendar_screen_smoke_test.dart
+++ b/test/features/calendar/presentation/pages/calendar_screen_smoke_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/calendar/models/calendar_model.dart';
import 'package:eatvio_app/features/calendar/presentation/bloc/calendar_cubit.dart';
import 'package:eatvio_app/features/calendar/presentation/pages/calendar_screen.dart';
import 'package:eatvio_app/features/calendar/repositories/calendar_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:intl/date_symbol_data_local.dart';
diff --git a/test/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet_test.dart b/test/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet_test.dart
index 0449fbb6..76dc2a31 100644
--- a/test/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet_test.dart
+++ b/test/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet_test.dart
@@ -5,9 +5,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cancel_plan_bottom_sheet.dart';
import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -33,12 +32,7 @@ void main() {
}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
home: BlocProvider.value(
diff --git a/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart b/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart
index c3031f4b..8e7cc997 100644
--- a/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart
+++ b/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart
@@ -12,7 +12,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter/services.dart';
diff --git a/test/features/chat/presentation/pages/chat_screen_loading_smoke_test.dart b/test/features/chat/presentation/pages/chat_screen_loading_smoke_test.dart
index cf6d27cf..e94b1d30 100644
--- a/test/features/chat/presentation/pages/chat_screen_loading_smoke_test.dart
+++ b/test/features/chat/presentation/pages/chat_screen_loading_smoke_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/chat/presentation/pages/chats_screen_smoke_test.dart b/test/features/chat/presentation/pages/chats_screen_smoke_test.dart
index ac3953b7..4205b2da 100644
--- a/test/features/chat/presentation/pages/chats_screen_smoke_test.dart
+++ b/test/features/chat/presentation/pages/chats_screen_smoke_test.dart
@@ -4,9 +4,8 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -19,12 +18,7 @@ void main() {
Widget wrap(Widget child, ChatsCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(value: cubit, child: child),
);
diff --git a/test/features/chat/presentation/pages/chats_screen_test.dart b/test/features/chat/presentation/pages/chats_screen_test.dart
index 4a2ec4a6..d9c5c6e7 100644
--- a/test/features/chat/presentation/pages/chats_screen_test.dart
+++ b/test/features/chat/presentation/pages/chats_screen_test.dart
@@ -4,9 +4,8 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -39,12 +38,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (context) => mockChatsCubit,
diff --git a/test/features/chat/presentation/pages/empty_chat_screen_smoke_test.dart b/test/features/chat/presentation/pages/empty_chat_screen_smoke_test.dart
index df2d8889..13ac4a2f 100644
--- a/test/features/chat/presentation/pages/empty_chat_screen_smoke_test.dart
+++ b/test/features/chat/presentation/pages/empty_chat_screen_smoke_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/pages/empty_chat_screen.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:network_image_mock/network_image_mock.dart';
diff --git a/test/features/chat/presentation/pages/empty_chat_screen_test.dart b/test/features/chat/presentation/pages/empty_chat_screen_test.dart
index 87784474..c00439e7 100644
--- a/test/features/chat/presentation/pages/empty_chat_screen_test.dart
+++ b/test/features/chat/presentation/pages/empty_chat_screen_test.dart
@@ -8,9 +8,8 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -39,12 +38,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/chat/presentation/pages/payment_screen_test.dart b/test/features/chat/presentation/pages/payment_screen_test.dart
index b2b8810e..df79f2fc 100644
--- a/test/features/chat/presentation/pages/payment_screen_test.dart
+++ b/test/features/chat/presentation/pages/payment_screen_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import '../../../../helpers/webview_test_helper.dart';
diff --git a/test/features/chat/presentation/pages/photo_view_screen_smoke_test.dart b/test/features/chat/presentation/pages/photo_view_screen_smoke_test.dart
index 4381d1d7..158c6a1c 100644
--- a/test/features/chat/presentation/pages/photo_view_screen_smoke_test.dart
+++ b/test/features/chat/presentation/pages/photo_view_screen_smoke_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/chat/presentation/pages/photo_view_screen_test.dart b/test/features/chat/presentation/pages/photo_view_screen_test.dart
index 5b4f1347..4c709f6f 100644
--- a/test/features/chat/presentation/pages/photo_view_screen_test.dart
+++ b/test/features/chat/presentation/pages/photo_view_screen_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/chat/presentation/widgets/about_order_button_test.dart b/test/features/chat/presentation/widgets/about_order_button_test.dart
index 7dce9f00..cf652f3c 100644
--- a/test/features/chat/presentation/widgets/about_order_button_test.dart
+++ b/test/features/chat/presentation/widgets/about_order_button_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -10,12 +9,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/chat/presentation/widgets/basic_widget_test.dart b/test/features/chat/presentation/widgets/basic_widget_test.dart
index b34b6f6b..72641b90 100644
--- a/test/features/chat/presentation/widgets/basic_widget_test.dart
+++ b/test/features/chat/presentation/widgets/basic_widget_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -11,12 +10,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: SingleChildScrollView(child: child)),
);
diff --git a/test/features/chat/presentation/widgets/chat_bottom_sheets_smoke_test.dart b/test/features/chat/presentation/widgets/chat_bottom_sheets_smoke_test.dart
index 1646550f..1880dd75 100644
--- a/test/features/chat/presentation/widgets/chat_bottom_sheets_smoke_test.dart
+++ b/test/features/chat/presentation/widgets/chat_bottom_sheets_smoke_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/chat/presentation/widgets/chose_plan_date_wi
import 'package:eatvio_app/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:go_router/go_router.dart';
@@ -76,12 +75,7 @@ void main() {
child: Portal(
child: MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
),
@@ -144,12 +138,7 @@ void main() {
child: Portal(
child: MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
),
diff --git a/test/features/chat/presentation/widgets/chat_bubble_widget_smoke_test.dart b/test/features/chat/presentation/widgets/chat_bubble_widget_smoke_test.dart
index ba51e3c1..72530fac 100644
--- a/test/features/chat/presentation/widgets/chat_bubble_widget_smoke_test.dart
+++ b/test/features/chat/presentation/widgets/chat_bubble_widget_smoke_test.dart
@@ -4,7 +4,7 @@ import 'dart:io';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/chat/presentation/widgets/chat_consultation_header_test.dart b/test/features/chat/presentation/widgets/chat_consultation_header_test.dart
index 887e593e..e984ef15 100644
--- a/test/features/chat/presentation/widgets/chat_consultation_header_test.dart
+++ b/test/features/chat/presentation/widgets/chat_consultation_header_test.dart
@@ -6,19 +6,13 @@ import 'package:eatvio_app/features/consultations/presentation/widgets/personal_
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
Widget _wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: Center(child: child)),
);
diff --git a/test/features/chat/presentation/widgets/chat_entry_widget_test.dart b/test/features/chat/presentation/widgets/chat_entry_widget_test.dart
index cf12990a..b269803b 100644
--- a/test/features/chat/presentation/widgets/chat_entry_widget_test.dart
+++ b/test/features/chat/presentation/widgets/chat_entry_widget_test.dart
@@ -3,8 +3,7 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_entry_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:network_image_mock/network_image_mock.dart';
@@ -16,12 +15,7 @@ void main() {
Widget createTestWidget(ChatRoom chatRoom) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
routerConfig: GoRouter(
diff --git a/test/features/chat/presentation/widgets/chat_list_widgets_smoke_test.dart b/test/features/chat/presentation/widgets/chat_list_widgets_smoke_test.dart
index 06c4cd71..82b109a0 100644
--- a/test/features/chat/presentation/widgets/chat_list_widgets_smoke_test.dart
+++ b/test/features/chat/presentation/widgets/chat_list_widgets_smoke_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart'
import 'package:eatvio_app/features/chat/presentation/widgets/chat_entry_widget.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_search_bar_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:network_image_mock/network_image_mock.dart';
@@ -37,12 +36,7 @@ void main() {
);
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
diff --git a/test/features/chat/presentation/widgets/chat_misc_widgets_smoke_test.dart b/test/features/chat/presentation/widgets/chat_misc_widgets_smoke_test.dart
index 4b6a29b4..095ff770 100644
--- a/test/features/chat/presentation/widgets/chat_misc_widgets_smoke_test.dart
+++ b/test/features/chat/presentation/widgets/chat_misc_widgets_smoke_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button
import 'package:eatvio_app/features/chat/presentation/widgets/message_action_bottom_sheet.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
@@ -49,12 +48,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MediaQuery(
data: const MediaQueryData(size: Size(500, 900)),
@@ -153,12 +147,7 @@ void main() {
bundle: bundle,
child: MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
),
diff --git a/test/features/chat/presentation/widgets/chat_search_bar_widget_test.dart b/test/features/chat/presentation/widgets/chat_search_bar_widget_test.dart
index 672c1f7d..4c2db8e2 100644
--- a/test/features/chat/presentation/widgets/chat_search_bar_widget_test.dart
+++ b/test/features/chat/presentation/widgets/chat_search_bar_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chat_search_bar_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/chat/presentation/widgets/chose_plan_date_widget_test.dart b/test/features/chat/presentation/widgets/chose_plan_date_widget_test.dart
index 20850ab0..ed8f415a 100644
--- a/test/features/chat/presentation/widgets/chose_plan_date_widget_test.dart
+++ b/test/features/chat/presentation/widgets/chose_plan_date_widget_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/chose_plan_date_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -21,12 +20,7 @@ void main() {
Widget createTestWidget(Widget child, ChatRoomCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: BlocProvider(
diff --git a/test/features/chat/presentation/widgets/complete_plan_bottom_sheet_test.dart b/test/features/chat/presentation/widgets/complete_plan_bottom_sheet_test.dart
index a5b2e534..0cefb25e 100644
--- a/test/features/chat/presentation/widgets/complete_plan_bottom_sheet_test.dart
+++ b/test/features/chat/presentation/widgets/complete_plan_bottom_sheet_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -18,12 +17,7 @@ void main() {
Widget createTestWidget(Widget child, ChatRoomCubit cubit) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
routes: [
diff --git a/test/features/chat/presentation/widgets/message_action_bottom_sheet_test.dart b/test/features/chat/presentation/widgets/message_action_bottom_sheet_test.dart
index 1b90c35e..4de4260e 100644
--- a/test/features/chat/presentation/widgets/message_action_bottom_sheet_test.dart
+++ b/test/features/chat/presentation/widgets/message_action_bottom_sheet_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_action_widget.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/message_action_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -11,12 +10,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/chat/presentation/widgets/notification_banner_test.dart b/test/features/chat/presentation/widgets/notification_banner_test.dart
index 19dd3242..1d29f98f 100644
--- a/test/features/chat/presentation/widgets/notification_banner_test.dart
+++ b/test/features/chat/presentation/widgets/notification_banner_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -18,12 +17,7 @@ void main() {
Widget wrap(Widget child, ChatRoomCubit? cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: cubit != null ? BlocProvider.value(value: cubit, child: child) : child,
diff --git a/test/features/chat/presentation/widgets/order_card_smoke_test.dart b/test/features/chat/presentation/widgets/order_card_smoke_test.dart
index 459d3ee7..c3215509 100644
--- a/test/features/chat/presentation/widgets/order_card_smoke_test.dart
+++ b/test/features/chat/presentation/widgets/order_card_smoke_test.dart
@@ -9,9 +9,8 @@ import 'package:eatvio_app/features/chat/presentation/widgets/order_card.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class _FakeHttpClient implements HttpClient {
@@ -143,12 +142,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: SingleChildScrollView(child: child)),
);
diff --git a/test/features/chat/presentation/widgets/plan_complain_bottom_sheet_test.dart b/test/features/chat/presentation/widgets/plan_complain_bottom_sheet_test.dart
index 58153597..dffedc7b 100644
--- a/test/features/chat/presentation/widgets/plan_complain_bottom_sheet_test.dart
+++ b/test/features/chat/presentation/widgets/plan_complain_bottom_sheet_test.dart
@@ -4,9 +4,8 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -18,12 +17,7 @@ void main() {
Widget createTestWidget(Widget child, ChatRoomCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (_) => cubit,
diff --git a/test/features/chat/presentation/widgets/plan_order_message_widget_test.dart b/test/features/chat/presentation/widgets/plan_order_message_widget_test.dart
index 5540ac32..67cca5f7 100644
--- a/test/features/chat/presentation/widgets/plan_order_message_widget_test.dart
+++ b/test/features/chat/presentation/widgets/plan_order_message_widget_test.dart
@@ -1,7 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/chat/presentation/widgets/plan_order_message_widget.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:intl/date_symbol_data_local.dart';
@@ -25,7 +24,7 @@ void main() {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
routerConfig: router,
- localizationsDelegates: const [GlobalMaterialLocalizations.delegate, GlobalWidgetsLocalizations.delegate, GlobalCupertinoLocalizations.delegate],
+ localizationsDelegates: GlobalMaterialLocalizations.delegates,
supportedLocales: const [Locale('ru')],
);
}
diff --git a/test/features/complaining/presentation/complaining_bottom_sheet_smoke_test.dart b/test/features/complaining/presentation/complaining_bottom_sheet_smoke_test.dart
index b678c863..49e6f403 100644
--- a/test/features/complaining/presentation/complaining_bottom_sheet_smoke_test.dart
+++ b/test/features/complaining/presentation/complaining_bottom_sheet_smoke_test.dart
@@ -10,9 +10,8 @@ import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_
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/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -40,12 +39,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/consultant/become_consultant/entities/diploma_entity_test.dart b/test/features/consultant/become_consultant/entities/diploma_entity_test.dart
index 3604a737..f5fa3be5 100644
--- a/test/features/consultant/become_consultant/entities/diploma_entity_test.dart
+++ b/test/features/consultant/become_consultant/entities/diploma_entity_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/consultant/become_consultant/entities/diploma_entity.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart
index c4fc2eb9..be735884 100644
--- a/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/models/consulta
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/consultant/become_consultant/presentation/pages/become_consultant_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/become_consultant_screen_test.dart
index 5175b19a..a5b4b2db 100644
--- a/test/features/consultant/become_consultant/presentation/pages/become_consultant_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/become_consultant_screen_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart
index 5288e170..82234669 100644
--- a/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/bl
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -38,12 +37,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart
index 800f7430..a2bf3127 100644
--- a/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/models/consulta
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/last_step_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart
index 1385a5a7..972dcc28 100644
--- a/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/bl
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart';
import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
diff --git a/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart
index 5086cf86..4ec668c3 100644
--- a/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/bl
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:network_image_mock/network_image_mock.dart';
@@ -36,12 +35,7 @@ void main() {
Widget wrap(Widget child, RegisterConsultantCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: BlocProvider.value(
diff --git a/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart
index 28d432f6..05e78c3c 100644
--- a/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/bl
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart';
import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
diff --git a/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart
index 7db759e2..329a4414 100644
--- a/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/bl
import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -38,12 +37,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart
index d663ea7e..7297aa3b 100644
--- a/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart
@@ -9,9 +9,8 @@ import 'package:eatvio_app/features/consultant/become_consultant/presentation/pa
import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -38,12 +37,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/consultant_rating/presentation/consultant_rating_screen_test.dart b/test/features/consultant_rating/presentation/consultant_rating_screen_test.dart
index 16c8d613..0a591967 100644
--- a/test/features/consultant_rating/presentation/consultant_rating_screen_test.dart
+++ b/test/features/consultant_rating/presentation/consultant_rating_screen_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/consultant_rating/presentation/consultant_ra
import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_cubit.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/cubit/consultant_rating_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -35,12 +34,7 @@ void main() {
Widget wrap(Widget child, ConsultantRatingCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: BlocProvider.value(value: cubit, child: child),
diff --git a/test/features/consultant_rating/presentation/widgets/rating_history_item_test.dart b/test/features/consultant_rating/presentation/widgets/rating_history_item_test.dart
index 1382e529..1139fb64 100644
--- a/test/features/consultant_rating/presentation/widgets/rating_history_item_test.dart
+++ b/test/features/consultant_rating/presentation/widgets/rating_history_item_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/rating_history_item.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/consultant_rating/presentation/widgets/rating_history_widget_test.dart b/test/features/consultant_rating/presentation/widgets/rating_history_widget_test.dart
index 4095d408..6d238dc9 100644
--- a/test/features/consultant_rating/presentation/widgets/rating_history_widget_test.dart
+++ b/test/features/consultant_rating/presentation/widgets/rating_history_widget_test.dart
@@ -6,8 +6,7 @@ import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/consultant_rating/models/rating_model.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/rating_history_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -23,12 +22,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/consultant_rating/presentation/widgets/rating_widget_test.dart b/test/features/consultant_rating/presentation/widgets/rating_widget_test.dart
index cdcc7536..47b2b4c9 100644
--- a/test/features/consultant_rating/presentation/widgets/rating_widget_test.dart
+++ b/test/features/consultant_rating/presentation/widgets/rating_widget_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/rating_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -10,12 +9,7 @@ void main() {
Widget createTestWidget(int rating) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: RatingWidget(rating: rating),
diff --git a/test/features/consultant_rating/presentation/widgets/statistic_bouble_test.dart b/test/features/consultant_rating/presentation/widgets/statistic_bouble_test.dart
index a82c9750..bc59266b 100644
--- a/test/features/consultant_rating/presentation/widgets/statistic_bouble_test.dart
+++ b/test/features/consultant_rating/presentation/widgets/statistic_bouble_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/statistic_bouble.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/consultant_rating/presentation/widgets/statistic_widget_test.dart b/test/features/consultant_rating/presentation/widgets/statistic_widget_test.dart
index e85e4624..4cf9191f 100644
--- a/test/features/consultant_rating/presentation/widgets/statistic_widget_test.dart
+++ b/test/features/consultant_rating/presentation/widgets/statistic_widget_test.dart
@@ -6,8 +6,7 @@ import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/consultant_rating/models/statistics_model.dart';
import 'package:eatvio_app/features/consultant_rating/presentation/widgets/statistic_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -23,12 +22,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/consultations/presentation/pages/consultations_screen_smoke_test.dart b/test/features/consultations/presentation/pages/consultations_screen_smoke_test.dart
index 22e83fe7..456efe9c 100644
--- a/test/features/consultations/presentation/pages/consultations_screen_smoke_test.dart
+++ b/test/features/consultations/presentation/pages/consultations_screen_smoke_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart';
import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_state.dart';
import 'package:eatvio_app/features/consultations/presentation/pages/consultations_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/consultations/presentation/widgets/consultation_card_widget_test.dart b/test/features/consultations/presentation/widgets/consultation_card_widget_test.dart
index 6e1a6083..3809a3dd 100644
--- a/test/features/consultations/presentation/widgets/consultation_card_widget_test.dart
+++ b/test/features/consultations/presentation/widgets/consultation_card_widget_test.dart
@@ -9,11 +9,10 @@ import 'package:eatvio_app/features/consultations/presentation/cubit/consultatio
import 'package:eatvio_app/features/consultations/presentation/widgets/consultation_card_widget.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mocktail/mocktail.dart';
@@ -90,12 +89,7 @@ void main() {
final consultationsCubit = cubit ?? MockConsultationsCubit();
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/consultations/presentation/widgets/consultation_progress_plank_test.dart b/test/features/consultations/presentation/widgets/consultation_progress_plank_test.dart
index 6d50d483..364a1dc0 100644
--- a/test/features/consultations/presentation/widgets/consultation_progress_plank_test.dart
+++ b/test/features/consultations/presentation/widgets/consultation_progress_plank_test.dart
@@ -3,19 +3,13 @@ import 'package:eatvio_app/features/consultations/presentation/widgets/consultat
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
Widget _wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: Center(child: child)),
);
diff --git a/test/features/consultations/presentation/widgets/personal_diet_status_chip_test.dart b/test/features/consultations/presentation/widgets/personal_diet_status_chip_test.dart
index 68ea86e4..50786729 100644
--- a/test/features/consultations/presentation/widgets/personal_diet_status_chip_test.dart
+++ b/test/features/consultations/presentation/widgets/personal_diet_status_chip_test.dart
@@ -3,19 +3,13 @@ import 'package:eatvio_app/features/consultations/presentation/widgets/personal_
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
Widget _wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: Center(child: child)),
);
diff --git a/test/features/create_diet/advanced_widget_test.dart b/test/features/create_diet/advanced_widget_test.dart
index 838d9fa9..de3352c8 100644
--- a/test/features/create_diet/advanced_widget_test.dart
+++ b/test/features/create_diet/advanced_widget_test.dart
@@ -6,8 +6,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/status_drop
import 'package:eatvio_app/features/create_diet/repositories/create_diet_repository.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -41,12 +40,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (context) => createDietCubit,
@@ -181,12 +175,7 @@ void main() {
await tester.pumpWidget(
MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(create: (context) => createDietCubit, child: screenLayout),
),
diff --git a/test/features/create_diet/basic_widget_test.dart b/test/features/create_diet/basic_widget_test.dart
index 6812d414..e23f5e1a 100644
--- a/test/features/create_diet/basic_widget_test.dart
+++ b/test/features/create_diet/basic_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_diet/integration_widget_test.dart b/test/features/create_diet/integration_widget_test.dart
index 0d8c7b31..b96e3db9 100644
--- a/test/features/create_diet/integration_widget_test.dart
+++ b/test/features/create_diet/integration_widget_test.dart
@@ -8,7 +8,6 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/diet_type_c
import 'package:eatvio_app/features/create_diet/presentation/widgets/diet_image_picker_widget.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_cubit.dart';
import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
@@ -16,7 +15,7 @@ import 'package:eatvio_app/features/create_diet/repositories/create_diet_reposit
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -57,12 +56,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(create: (context) => createDietCubit, child: const CreateDietScreen()),
);
@@ -291,12 +285,7 @@ void main() {
Widget editWidget = MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (context) => createDietCubit,
diff --git a/test/features/create_diet/presentation/create_diet_screen_test.dart b/test/features/create_diet/presentation/create_diet_screen_test.dart
index 6f3de99c..a9e79599 100644
--- a/test/features/create_diet/presentation/create_diet_screen_test.dart
+++ b/test/features/create_diet/presentation/create_diet_screen_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_c
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_state.dart';
import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -36,12 +35,7 @@ void main() {
Widget wrap(Widget child, CreateDietCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(
diff --git a/test/features/create_diet/presentation/diet_preview_screen_smoke_test.dart b/test/features/create_diet/presentation/diet_preview_screen_smoke_test.dart
index b8b89a3b..1163a5f0 100644
--- a/test/features/create_diet/presentation/diet_preview_screen_smoke_test.dart
+++ b/test/features/create_diet/presentation/diet_preview_screen_smoke_test.dart
@@ -5,9 +5,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_diet/presentation/diet_preview_screen.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:network_image_mock/network_image_mock.dart';
@@ -25,12 +24,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_diet/presentation/widgets/add_meal_widget_test.dart b/test/features/create_diet/presentation/widgets/add_meal_widget_test.dart
index 83e81f50..f770be21 100644
--- a/test/features/create_diet/presentation/widgets/add_meal_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/add_meal_widget_test.dart
@@ -9,7 +9,7 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/add_meal_wi
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_diet/presentation/widgets/day_widget_test.dart b/test/features/create_diet/presentation/widgets/day_widget_test.dart
index 1e2ffbb9..e223de80 100644
--- a/test/features/create_diet/presentation/widgets/day_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/day_widget_test.dart
@@ -11,10 +11,9 @@ import 'package:eatvio_app/features/create_diet/presentation/widgets/day_widget.
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/choice_chip_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -36,12 +35,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_diet/presentation/widgets/diet_duration_drop_down_widget_test.dart b/test/features/create_diet/presentation/widgets/diet_duration_drop_down_widget_test.dart
index fc46e86f..6512d4bc 100644
--- a/test/features/create_diet/presentation/widgets/diet_duration_drop_down_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/diet_duration_drop_down_widget_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_c
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_state.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/diet_duration_drop_down_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_diet/presentation/widgets/diet_type_choice_widget_test.dart b/test/features/create_diet/presentation/widgets/diet_type_choice_widget_test.dart
index c3623f05..e1184296 100644
--- a/test/features/create_diet/presentation/widgets/diet_type_choice_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/diet_type_choice_widget_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_c
import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_state.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/diet_type_choice_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_diet/presentation/widgets/error_widget_test.dart b/test/features/create_diet/presentation/widgets/error_widget_test.dart
index 9c423e6a..61ace20a 100644
--- a/test/features/create_diet/presentation/widgets/error_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/error_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/create_diet/presentation/widgets/status_drop_down_widget_test.dart b/test/features/create_diet/presentation/widgets/status_drop_down_widget_test.dart
index 7c712f85..99e52e77 100644
--- a/test/features/create_diet/presentation/widgets/status_drop_down_widget_test.dart
+++ b/test/features/create_diet/presentation/widgets/status_drop_down_widget_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/create_diet/presentation/cubit/create_diet_s
import 'package:eatvio_app/features/create_diet/presentation/widgets/status_drop_down_widget.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -32,12 +31,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_plan/advanced_widget_test.dart b/test/features/create_plan/advanced_widget_test.dart
index 2a0530a7..b276b80f 100644
--- a/test/features/create_plan/advanced_widget_test.dart
+++ b/test/features/create_plan/advanced_widget_test.dart
@@ -1,5 +1,4 @@
import 'package:flutter_portal/flutter_portal.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/di/app_config_registration.dart';
@@ -9,7 +8,7 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/widgets/plan_duration_drop_down_widget.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/plan_type_choice_widget.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/option_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -34,12 +33,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: SizedBox(
width: 800,
diff --git a/test/features/create_plan/basic_widget_test.dart b/test/features/create_plan/basic_widget_test.dart
index 1c33d588..9f42963b 100644
--- a/test/features/create_plan/basic_widget_test.dart
+++ b/test/features/create_plan/basic_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_plan/integration_widget_test.dart b/test/features/create_plan/integration_widget_test.dart
index 9ec3b2ad..f5334496 100644
--- a/test/features/create_plan/integration_widget_test.dart
+++ b/test/features/create_plan/integration_widget_test.dart
@@ -3,8 +3,7 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/create_plan_screen.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -33,12 +32,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (context) => createPlanCubit,
@@ -275,12 +269,7 @@ void main() {
Widget editWidget = MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (context) => createPlanCubit,
diff --git a/test/features/create_plan/presentation/create_plan_screen_test.dart b/test/features/create_plan/presentation/create_plan_screen_test.dart
index 1fdea634..9d1f4b79 100644
--- a/test/features/create_plan/presentation/create_plan_screen_test.dart
+++ b/test/features/create_plan/presentation/create_plan_screen_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/features/create_plan/presentation/create_plan_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -36,12 +35,7 @@ void main() {
Widget wrap(Widget child, CreatePlanCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(
diff --git a/test/features/create_plan/presentation/widgets/add_item_widget_test.dart b/test/features/create_plan/presentation/widgets/add_item_widget_test.dart
index 9342356a..3f7f5799 100644
--- a/test/features/create_plan/presentation/widgets/add_item_widget_test.dart
+++ b/test/features/create_plan/presentation/widgets/add_item_widget_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/add_item_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_plan/presentation/widgets/option_widget_test.dart b/test/features/create_plan/presentation/widgets/option_widget_test.dart
index 782738a9..1fd42244 100644
--- a/test/features/create_plan/presentation/widgets/option_widget_test.dart
+++ b/test/features/create_plan/presentation/widgets/option_widget_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/create_plan/presentation/widgets/option_widg
import 'package:eatvio_app/features/create_plan/presentation/widgets/select_exact_option_widget.dart';
import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -28,12 +27,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(child: Scaffold(body: child)),
);
diff --git a/test/features/create_plan/presentation/widgets/options_count_button_test.dart b/test/features/create_plan/presentation/widgets/options_count_button_test.dart
index d03e16a7..c42af71e 100644
--- a/test/features/create_plan/presentation/widgets/options_count_button_test.dart
+++ b/test/features/create_plan/presentation/widgets/options_count_button_test.dart
@@ -3,10 +3,9 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/options_count_button.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -23,12 +22,7 @@ void main() {
Widget wrap(Widget child, CreatePlanCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Scaffold(
body: BlocProvider.value(value: cubit, child: child),
diff --git a/test/features/create_plan/presentation/widgets/plan_duration_drop_down_widget_test.dart b/test/features/create_plan/presentation/widgets/plan_duration_drop_down_widget_test.dart
index 9301d619..7377def8 100644
--- a/test/features/create_plan/presentation/widgets/plan_duration_drop_down_widget_test.dart
+++ b/test/features/create_plan/presentation/widgets/plan_duration_drop_down_widget_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/plan_duration_drop_down_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_plan/presentation/widgets/plan_type_choice_widget_test.dart b/test/features/create_plan/presentation/widgets/plan_type_choice_widget_test.dart
index a52e1901..ae62132e 100644
--- a/test/features/create_plan/presentation/widgets/plan_type_choice_widget_test.dart
+++ b/test/features/create_plan/presentation/widgets/plan_type_choice_widget_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_c
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_state.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/plan_type_choice_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/create_plan/presentation/widgets/select_exact_option_widget_test.dart b/test/features/create_plan/presentation/widgets/select_exact_option_widget_test.dart
index 238b13df..6bce4856 100644
--- a/test/features/create_plan/presentation/widgets/select_exact_option_widget_test.dart
+++ b/test/features/create_plan/presentation/widgets/select_exact_option_widget_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_plan/presentation/cubit/create_plan_cubit.dart';
import 'package:eatvio_app/features/create_plan/presentation/widgets/select_exact_option_widget.dart';
import 'package:eatvio_app/features/create_plan/repositories/create_plan_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/create_recipe/basic_widget_test.dart b/test/features/create_recipe/basic_widget_test.dart
index 385a17c8..62118978 100644
--- a/test/features/create_recipe/basic_widget_test.dart
+++ b/test/features/create_recipe/basic_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/create_recipe/presentation/pages/recipe_create_screen_test.dart b/test/features/create_recipe/presentation/pages/recipe_create_screen_test.dart
index 9b8825de..0f41392b 100644
--- a/test/features/create_recipe/presentation/pages/recipe_create_screen_test.dart
+++ b/test/features/create_recipe/presentation/pages/recipe_create_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recip
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -37,12 +36,7 @@ void main() {
Widget wrap(Widget child, CreateRecipeCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(
diff --git a/test/features/create_recipe/presentation/widgets/add_portion_widget_test.dart b/test/features/create_recipe/presentation/widgets/add_portion_widget_test.dart
index 28415699..5f2ca337 100644
--- a/test/features/create_recipe/presentation/widgets/add_portion_widget_test.dart
+++ b/test/features/create_recipe/presentation/widgets/add_portion_widget_test.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recip
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/add_portion_widget.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_recipe/presentation/widgets/info_about_recipe_widget_test.dart b/test/features/create_recipe/presentation/widgets/info_about_recipe_widget_test.dart
index c0c64155..cd6c41ff 100644
--- a/test/features/create_recipe/presentation/widgets/info_about_recipe_widget_test.dart
+++ b/test/features/create_recipe/presentation/widgets/info_about_recipe_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/info_about_recipe_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_recipe/presentation/widgets/portion_widget_test.dart b/test/features/create_recipe/presentation/widgets/portion_widget_test.dart
index 2c0dd822..7d43609b 100644
--- a/test/features/create_recipe/presentation/widgets/portion_widget_test.dart
+++ b/test/features/create_recipe/presentation/widgets/portion_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/portion_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_recipe/presentation/widgets/steps_widget_test.dart b/test/features/create_recipe/presentation/widgets/steps_widget_test.dart
index 450d56fd..f8d9ef9b 100644
--- a/test/features/create_recipe/presentation/widgets/steps_widget_test.dart
+++ b/test/features/create_recipe/presentation/widgets/steps_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/steps_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_recipe/presentation/widgets/tags_widget_test.dart b/test/features/create_recipe/presentation/widgets/tags_widget_test.dart
index 4e4ddbfd..37f83530 100644
--- a/test/features/create_recipe/presentation/widgets/tags_widget_test.dart
+++ b/test/features/create_recipe/presentation/widgets/tags_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/tags_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_recipe/presentation/widgets/time_of_cook_widget_test.dart b/test/features/create_recipe/presentation/widgets/time_of_cook_widget_test.dart
index d6d4cc0c..ef936c7e 100644
--- a/test/features/create_recipe/presentation/widgets/time_of_cook_widget_test.dart
+++ b/test/features/create_recipe/presentation/widgets/time_of_cook_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_recipe/entities/recipe_create_entity.
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_state.dart';
import 'package:eatvio_app/features/create_recipe/presentation/widgets/time_of_cook_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/create_recipe/simple_widget_test.dart b/test/features/create_recipe/simple_widget_test.dart
index 1cbced01..9ed893e0 100644
--- a/test/features/create_recipe/simple_widget_test.dart
+++ b/test/features/create_recipe/simple_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/create_recipe/presentation/widgets/ingredien
import 'package:eatvio_app/features/create_recipe/presentation/widgets/steps_widget.dart';
import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/create_recipe/widget_test.dart b/test/features/create_recipe/widget_test.dart
index 6a60b0b3..4261abd3 100644
--- a/test/features/create_recipe/widget_test.dart
+++ b/test/features/create_recipe/widget_test.dart
@@ -2,7 +2,6 @@
import 'package:eatvio_app/app_keys.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:flutter_portal/flutter_portal.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart';
@@ -14,7 +13,7 @@ import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -51,12 +50,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider(
create: (context) => createRecipeCubit,
diff --git a/test/features/dev_tools/presentation/dev_tools_screen_smoke_test.dart b/test/features/dev_tools/presentation/dev_tools_screen_smoke_test.dart
index 4f7e70ec..08a416f1 100644
--- a/test/features/dev_tools/presentation/dev_tools_screen_smoke_test.dart
+++ b/test/features/dev_tools/presentation/dev_tools_screen_smoke_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
import 'package:dio/dio.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/diary/presentation/pages/barcode_scanner_screen_smoke_test.dart b/test/features/diary/presentation/pages/barcode_scanner_screen_smoke_test.dart
index e3aacfeb..e43a54ea 100644
--- a/test/features/diary/presentation/pages/barcode_scanner_screen_smoke_test.dart
+++ b/test/features/diary/presentation/pages/barcode_scanner_screen_smoke_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/pages/barcode_scanner_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/diary/presentation/pages/diary_screen_smoke_test.dart b/test/features/diary/presentation/pages/diary_screen_smoke_test.dart
index cf2f669a..b0502bac 100644
--- a/test/features/diary/presentation/pages/diary_screen_smoke_test.dart
+++ b/test/features/diary/presentation/pages/diary_screen_smoke_test.dart
@@ -16,9 +16,8 @@ import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
import 'package:eatvio_app/core/widgets/data_error_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -49,12 +48,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/diary/presentation/widgets/add_product_button_widget_test.dart b/test/features/diary/presentation/widgets/add_product_button_widget_test.dart
index 9f161f48..f9574b4a 100644
--- a/test/features/diary/presentation/widgets/add_product_button_widget_test.dart
+++ b/test/features/diary/presentation/widgets/add_product_button_widget_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/add_product_button_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/add_product_modal_smoke_test.dart b/test/features/diary/presentation/widgets/add_product_modal_smoke_test.dart
index 78dbde4c..3f363364 100644
--- a/test/features/diary/presentation/widgets/add_product_modal_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/add_product_modal_smoke_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/add_product_modal.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/basic_widget_test.dart b/test/features/diary/presentation/widgets/basic_widget_test.dart
index aa9c23f5..d7fc2419 100644
--- a/test/features/diary/presentation/widgets/basic_widget_test.dart
+++ b/test/features/diary/presentation/widgets/basic_widget_test.dart
@@ -18,8 +18,7 @@ import 'package:eatvio_app/features/glossary/repositories/glossary_repository.da
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -108,12 +107,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MultiBlocProvider(
providers: [
diff --git a/test/features/diary/presentation/widgets/calendar_widget_smoke_test.dart b/test/features/diary/presentation/widgets/calendar_widget_smoke_test.dart
index 5bd61bda..874d2a29 100644
--- a/test/features/diary/presentation/widgets/calendar_widget_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/calendar_widget_smoke_test.dart
@@ -3,10 +3,9 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/calendar_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:table_calendar/table_calendar.dart';
@@ -33,12 +32,7 @@ void main() {
child: appChild!,
);
},
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(
value: cubit,
diff --git a/test/features/diary/presentation/widgets/calories_chart_widget_smoke_test.dart b/test/features/diary/presentation/widgets/calories_chart_widget_smoke_test.dart
index 93c430b0..d60093f5 100644
--- a/test/features/diary/presentation/widgets/calories_chart_widget_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/calories_chart_widget_smoke_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/calories_chart_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart b/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart
index 5481b27f..feaf2592 100644
--- a/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart
+++ b/test/features/diary/presentation/widgets/chosen_diet_widget_content_test.dart
@@ -1,104 +1,98 @@
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/diary/presentation/widgets/chosen_diet_widget.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
- group('ChosenDietWidgetContent', () {
- Widget createTestWidget(Widget child) {
- return MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: S.delegate.supportedLocales,
- home: Scaffold(
- body: child,
- ),
- );
- }
-
- testWidgets('displays chosen diet widget content', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const ChosenDietWidgetContent(
- dietName: 'Test Diet',
- dietId: 1,
- ),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.byType(ChosenDietWidgetContent), findsOneWidget);
- expect(find.text('Test Diet'), findsOneWidget);
- expect(find.textContaining('из 14'), findsNothing);
- });
-
- testWidgets('does not display current day and duration', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const ChosenDietWidgetContent(
- dietName: 'Test Diet',
- dietId: 1,
- ),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.byType(ChosenDietWidgetContent), findsOneWidget);
- expect(find.textContaining('из 21'), findsNothing);
- });
-
- testWidgets('displays diet name with underline', (tester) async {
- await tester.pumpWidget(
- createTestWidget(
- const ChosenDietWidgetContent(
- dietName: 'My Diet',
- dietId: 1,
- ),
- ),
- );
- await tester.pumpAndSettle();
-
- expect(find.text('My Diet'), findsOneWidget);
- expect(find.textContaining('из 7'), findsNothing);
- });
- });
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/diary/presentation/widgets/chosen_diet_widget.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+ group('ChosenDietWidgetContent', () {
+ Widget createTestWidget(Widget child) {
+ return MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: S.delegate.supportedLocales,
+ home: Scaffold(
+ body: child,
+ ),
+ );
+ }
+
+ testWidgets('displays chosen diet widget content', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const ChosenDietWidgetContent(
+ dietName: 'Test Diet',
+ dietId: 1,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.byType(ChosenDietWidgetContent), findsOneWidget);
+ expect(find.text('Test Diet'), findsOneWidget);
+ expect(find.textContaining('из 14'), findsNothing);
+ });
+
+ testWidgets('does not display current day and duration', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const ChosenDietWidgetContent(
+ dietName: 'Test Diet',
+ dietId: 1,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.byType(ChosenDietWidgetContent), findsOneWidget);
+ expect(find.textContaining('из 21'), findsNothing);
+ });
+
+ testWidgets('displays diet name with underline', (tester) async {
+ await tester.pumpWidget(
+ createTestWidget(
+ const ChosenDietWidgetContent(
+ dietName: 'My Diet',
+ dietId: 1,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(find.text('My Diet'), findsOneWidget);
+ expect(find.textContaining('из 7'), findsNothing);
+ });
+ });
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/features/diary/presentation/widgets/chosen_plan_widget_content_test.dart b/test/features/diary/presentation/widgets/chosen_plan_widget_content_test.dart
index 9050dcd3..fcde9462 100644
--- a/test/features/diary/presentation/widgets/chosen_plan_widget_content_test.dart
+++ b/test/features/diary/presentation/widgets/chosen_plan_widget_content_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/chosen_plan_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -14,12 +13,7 @@ void main() {
}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: ChosenPlanWidgetContent(
diff --git a/test/features/diary/presentation/widgets/comment_container_test.dart b/test/features/diary/presentation/widgets/comment_container_test.dart
index b71a1fb5..eec613b1 100644
--- a/test/features/diary/presentation/widgets/comment_container_test.dart
+++ b/test/features/diary/presentation/widgets/comment_container_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/comment_container.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/diary/presentation/widgets/comment_for_consultant_widget_test.dart b/test/features/diary/presentation/widgets/comment_for_consultant_widget_test.dart
index 4d222587..68119a98 100644
--- a/test/features/diary/presentation/widgets/comment_for_consultant_widget_test.dart
+++ b/test/features/diary/presentation/widgets/comment_for_consultant_widget_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/comment_for_consultant_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/comment_widgets_smoke_test.dart b/test/features/diary/presentation/widgets/comment_widgets_smoke_test.dart
index f24627c6..47eeb39f 100644
--- a/test/features/diary/presentation/widgets/comment_widgets_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/comment_widgets_smoke_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/comment_for_consultant_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/day_comment_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class FakeDiaryCubit extends Cubit implements DiaryCubit {
@@ -29,12 +28,7 @@ void main() {
Widget wrap(Widget child, {DiaryCubit? diaryCubit, ConsultantCommentsCubit? commentsCubit}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MultiBlocProvider(
providers: [
diff --git a/test/features/diary/presentation/widgets/day_comment_widget_test.dart b/test/features/diary/presentation/widgets/day_comment_widget_test.dart
index 4623d7b0..eb33b671 100644
--- a/test/features/diary/presentation/widgets/day_comment_widget_test.dart
+++ b/test/features/diary/presentation/widgets/day_comment_widget_test.dart
@@ -4,9 +4,8 @@ import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_
import 'package:eatvio_app/features/diary/presentation/widgets/day_comment_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -19,12 +18,7 @@ void main() {
Widget wrap(Widget child, ConsultantCommentsCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: BlocProvider.value(value: cubit, child: child),
diff --git a/test/features/diary/presentation/widgets/diary_chosen_widgets_smoke_test.dart b/test/features/diary/presentation/widgets/diary_chosen_widgets_smoke_test.dart
index a5cbfaa1..ecf40338 100644
--- a/test/features/diary/presentation/widgets/diary_chosen_widgets_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/diary_chosen_widgets_smoke_test.dart
@@ -10,9 +10,8 @@ import 'package:eatvio_app/features/diary/presentation/widgets/add_product_butto
import 'package:eatvio_app/features/diary/presentation/widgets/chosen_diet_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/chosen_plan_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
@@ -39,12 +38,7 @@ void main() {
);
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
diff --git a/test/features/diary/presentation/widgets/diary_ratings_and_time_widgets_smoke_test.dart b/test/features/diary/presentation/widgets/diary_ratings_and_time_widgets_smoke_test.dart
index 027e6026..11f44410 100644
--- a/test/features/diary/presentation/widgets/diary_ratings_and_time_widgets_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/diary_ratings_and_time_widgets_smoke_test.dart
@@ -15,10 +15,9 @@ import 'package:eatvio_app/features/diary/presentation/widgets/mood_rating_widge
import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/time_of_meal_picker_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class FakeDiaryCubit extends Cubit implements DiaryCubit {
@@ -105,12 +104,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MediaQuery(
data: const MediaQueryData(size: Size(500, 900)),
diff --git a/test/features/diary/presentation/widgets/diary_time_and_rating_interactions_test.dart b/test/features/diary/presentation/widgets/diary_time_and_rating_interactions_test.dart
index 0060ecb5..298cb6d8 100644
--- a/test/features/diary/presentation/widgets/diary_time_and_rating_interactions_test.dart
+++ b/test/features/diary/presentation/widgets/diary_time_and_rating_interactions_test.dart
@@ -14,10 +14,9 @@ import 'package:eatvio_app/features/diary/presentation/widgets/mood_rating_widge
import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/time_of_meal_picker_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -96,12 +95,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MediaQuery(
data: const MediaQueryData(size: Size(500, 900)),
diff --git a/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart b/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart
index 7b6f29bb..df50e452 100644
--- a/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart
+++ b/test/features/diary/presentation/widgets/finish_day_button_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/features/diary/presentation/widgets/finish_day_button_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/diary/presentation/widgets/glossary_moderation_request_modal_widget_test.dart b/test/features/diary/presentation/widgets/glossary_moderation_request_modal_widget_test.dart
index b1e8534b..f2245085 100644
--- a/test/features/diary/presentation/widgets/glossary_moderation_request_modal_widget_test.dart
+++ b/test/features/diary/presentation/widgets/glossary_moderation_request_modal_widget_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart';
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
diff --git a/test/features/diary/presentation/widgets/meal_button_widget_test.dart b/test/features/diary/presentation/widgets/meal_button_widget_test.dart
index 469ceeec..2f444778 100644
--- a/test/features/diary/presentation/widgets/meal_button_widget_test.dart
+++ b/test/features/diary/presentation/widgets/meal_button_widget_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_button_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/meal_comment_widget_test.dart b/test/features/diary/presentation/widgets/meal_comment_widget_test.dart
index eed20765..64b89124 100644
--- a/test/features/diary/presentation/widgets/meal_comment_widget_test.dart
+++ b/test/features/diary/presentation/widgets/meal_comment_widget_test.dart
@@ -5,10 +5,9 @@ import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_comment_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class FakeConsultantCommentsCubit extends Cubit implements ConsultantCommentsCubit {
@@ -61,12 +60,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(
value: cubit,
diff --git a/test/features/diary/presentation/widgets/meal_summary_widget_test.dart b/test/features/diary/presentation/widgets/meal_summary_widget_test.dart
index 8ddb9676..17515117 100644
--- a/test/features/diary/presentation/widgets/meal_summary_widget_test.dart
+++ b/test/features/diary/presentation/widgets/meal_summary_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/features/diary/models/diary_day_model.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_summary_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/diary/presentation/widgets/meal_widget_smoke_test.dart b/test/features/diary/presentation/widgets/meal_widget_smoke_test.dart
index 4ec58013..f3aa9d46 100644
--- a/test/features/diary/presentation/widgets/meal_widget_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/meal_widget_smoke_test.dart
@@ -12,10 +12,9 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class FakeDiaryCubit extends Cubit implements DiaryCubit {
@@ -71,12 +70,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MediaQuery(
data: const MediaQueryData(size: Size(500, 900)),
diff --git a/test/features/diary/presentation/widgets/mood_rating_widget_test.dart b/test/features/diary/presentation/widgets/mood_rating_widget_test.dart
index 868ba018..440d9d1a 100644
--- a/test/features/diary/presentation/widgets/mood_rating_widget_test.dart
+++ b/test/features/diary/presentation/widgets/mood_rating_widget_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/mood_rating_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/photo_gallery_widget_smoke_test.dart b/test/features/diary/presentation/widgets/photo_gallery_widget_smoke_test.dart
index 52ee9ca9..2093ef4c 100644
--- a/test/features/diary/presentation/widgets/photo_gallery_widget_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/photo_gallery_widget_smoke_test.dart
@@ -12,10 +12,9 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/photo_gallery_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_svg/flutter_svg.dart';
@@ -156,12 +155,7 @@ void main() {
Widget wrap(DiaryCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(
value: cubit,
diff --git a/test/features/diary/presentation/widgets/portion_comment_widget_test.dart b/test/features/diary/presentation/widgets/portion_comment_widget_test.dart
index 9e21550b..6f1501a5 100644
--- a/test/features/diary/presentation/widgets/portion_comment_widget_test.dart
+++ b/test/features/diary/presentation/widgets/portion_comment_widget_test.dart
@@ -5,10 +5,9 @@ import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_
import 'package:eatvio_app/features/diary/presentation/bloc/consultant_comments_cubit/consultant_comments_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/portion_comment_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class FakeConsultantCommentsCubit extends Cubit implements ConsultantCommentsCubit {
@@ -51,12 +50,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(
value: cubit,
diff --git a/test/features/diary/presentation/widgets/product_loader_widget_test.dart b/test/features/diary/presentation/widgets/product_loader_widget_test.dart
index e8c586f3..9809da43 100644
--- a/test/features/diary/presentation/widgets/product_loader_widget_test.dart
+++ b/test/features/diary/presentation/widgets/product_loader_widget_test.dart
@@ -1,66 +1,66 @@
-import 'package:eatvio_app/features/diary/presentation/widgets/product_loader_widget.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
- group('ProductLoaderWidget', () {
- testWidgets('displays product loader widget', (tester) async {
- await tester.pumpWidget(
- const MaterialApp(
- home: Scaffold(
- body: ProductLoaderWidget(),
- ),
- ),
- );
-
- expect(find.byType(ProductLoaderWidget), findsOneWidget);
- expect(find.byType(CupertinoActivityIndicator), findsOneWidget);
- });
-
- testWidgets('displays ListTile with activity indicator', (tester) async {
- await tester.pumpWidget(
- const MaterialApp(
- home: Scaffold(
- body: ProductLoaderWidget(),
- ),
- ),
- );
-
- expect(find.byType(ListTile), findsOneWidget);
- expect(find.byType(CupertinoActivityIndicator), findsOneWidget);
- });
- });
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+import 'package:eatvio_app/features/diary/presentation/widgets/product_loader_widget.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+ group('ProductLoaderWidget', () {
+ testWidgets('displays product loader widget', (tester) async {
+ await tester.pumpWidget(
+ const MaterialApp(
+ home: Scaffold(
+ body: ProductLoaderWidget(),
+ ),
+ ),
+ );
+
+ expect(find.byType(ProductLoaderWidget), findsOneWidget);
+ expect(find.byType(CupertinoActivityIndicator), findsOneWidget);
+ });
+
+ testWidgets('displays ListTile with activity indicator', (tester) async {
+ await tester.pumpWidget(
+ const MaterialApp(
+ home: Scaffold(
+ body: ProductLoaderWidget(),
+ ),
+ ),
+ );
+
+ expect(find.byType(ListTile), findsOneWidget);
+ expect(find.byType(CupertinoActivityIndicator), findsOneWidget);
+ });
+ });
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/features/diary/presentation/widgets/product_widget_smoke_test.dart b/test/features/diary/presentation/widgets/product_widget_smoke_test.dart
index 89ac08cd..31c17e6a 100644
--- a/test/features/diary/presentation/widgets/product_widget_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/product_widget_smoke_test.dart
@@ -14,10 +14,9 @@ import 'package:eatvio_app/features/diary/presentation/widgets/comment_container
import 'package:eatvio_app/features/diary/presentation/widgets/portion_comment_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/product_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
class FakeDiaryCubit extends Cubit implements DiaryCubit {
@@ -74,12 +73,7 @@ void main() {
bundle: bundle,
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MultiBlocProvider(
providers: [
diff --git a/test/features/diary/presentation/widgets/products_list_widget_smoke_test.dart b/test/features/diary/presentation/widgets/products_list_widget_smoke_test.dart
index ff25b5a8..79a0061c 100644
--- a/test/features/diary/presentation/widgets/products_list_widget_smoke_test.dart
+++ b/test/features/diary/presentation/widgets/products_list_widget_smoke_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/meal_summary_widget.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/products_list_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/diary/presentation/widgets/satiety_rating_widget_test.dart b/test/features/diary/presentation/widgets/satiety_rating_widget_test.dart
index 77a674af..c9f64885 100644
--- a/test/features/diary/presentation/widgets/satiety_rating_widget_test.dart
+++ b/test/features/diary/presentation/widgets/satiety_rating_widget_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/satiety_rating_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/time_of_meal_picker_widget_test.dart b/test/features/diary/presentation/widgets/time_of_meal_picker_widget_test.dart
index f08b109b..334d17a3 100644
--- a/test/features/diary/presentation/widgets/time_of_meal_picker_widget_test.dart
+++ b/test/features/diary/presentation/widgets/time_of_meal_picker_widget_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/time_of_meal_picker_widget.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/diary/presentation/widgets/wakeup_and_retire_widget_test.dart b/test/features/diary/presentation/widgets/wakeup_and_retire_widget_test.dart
index c93f7ccd..ce80265e 100644
--- a/test/features/diary/presentation/widgets/wakeup_and_retire_widget_test.dart
+++ b/test/features/diary/presentation/widgets/wakeup_and_retire_widget_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
import 'package:eatvio_app/features/diary/presentation/widgets/wakeup_and_retire_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/diets/presentation/pages/about_diet_screen_smoke_test.dart b/test/features/diets/presentation/pages/about_diet_screen_smoke_test.dart
index 18546734..3c9282ad 100644
--- a/test/features/diets/presentation/pages/about_diet_screen_smoke_test.dart
+++ b/test/features/diets/presentation/pages/about_diet_screen_smoke_test.dart
@@ -10,10 +10,9 @@ 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/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -67,12 +66,7 @@ void main() {
Widget wrap(AboutDietCubit cubit, FeedCubit feedCubit, CommentsCubit commentsCubit, Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: MultiBlocProvider(
providers: [
diff --git a/test/features/diets/presentation/widgets/basic_widget_test.dart b/test/features/diets/presentation/widgets/basic_widget_test.dart
index 5a780360..1d1e1b54 100644
--- a/test/features/diets/presentation/widgets/basic_widget_test.dart
+++ b/test/features/diets/presentation/widgets/basic_widget_test.dart
@@ -10,9 +10,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/diets.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/diets_widget.dart';
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -76,12 +75,7 @@ void main() {
);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: widget,
);
@@ -90,12 +84,7 @@ void main() {
Widget createDietsTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(
diff --git a/test/features/diets/presentation/widgets/cancel_diet_bottom_sheet_test.dart b/test/features/diets/presentation/widgets/cancel_diet_bottom_sheet_test.dart
index ae4b24e0..27c12014 100644
--- a/test/features/diets/presentation/widgets/cancel_diet_bottom_sheet_test.dart
+++ b/test/features/diets/presentation/widgets/cancel_diet_bottom_sheet_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/cancel_diet_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -28,12 +27,7 @@ void main() {
Widget createTestWidget(Widget child, AboutDietCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: BlocProvider(
diff --git a/test/features/diets/presentation/widgets/expandable_text_test.dart b/test/features/diets/presentation/widgets/expandable_text_test.dart
index 5e19d9c7..e93f3e39 100644
--- a/test/features/diets/presentation/widgets/expandable_text_test.dart
+++ b/test/features/diets/presentation/widgets/expandable_text_test.dart
@@ -1,9 +1,8 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/expandable_text.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -15,12 +14,7 @@ void main() {
Widget wrap(Widget child, {Size size = const Size(360, 800)}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: MediaQuery(
data: MediaQueryData(size: size),
diff --git a/test/features/diets/presentation/widgets/info_bouble_test.dart b/test/features/diets/presentation/widgets/info_bouble_test.dart
index 928f528f..63afcd3e 100644
--- a/test/features/diets/presentation/widgets/info_bouble_test.dart
+++ b/test/features/diets/presentation/widgets/info_bouble_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/diets/presentation/widgets/more_options_test.dart b/test/features/diets/presentation/widgets/more_options_test.dart
index 01a608f5..8000df01 100644
--- a/test/features/diets/presentation/widgets/more_options_test.dart
+++ b/test/features/diets/presentation/widgets/more_options_test.dart
@@ -5,8 +5,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/more_options.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -28,12 +27,7 @@ void main() {
}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
home: Scaffold(
diff --git a/test/features/diets/presentation/widgets/start_diet_bottom_sheet_test.dart b/test/features/diets/presentation/widgets/start_diet_bottom_sheet_test.dart
index 3ca05ee3..aee6fc30 100644
--- a/test/features/diets/presentation/widgets/start_diet_bottom_sheet_test.dart
+++ b/test/features/diets/presentation/widgets/start_diet_bottom_sheet_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/start_diet_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -28,12 +27,7 @@ void main() {
Widget createTestWidget(Widget child, AboutDietCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: BlocProvider(
diff --git a/test/features/diets/presentation/widgets/type_badges_test.dart b/test/features/diets/presentation/widgets/type_badges_test.dart
index a1a0eceb..5e9f7a5b 100644
--- a/test/features/diets/presentation/widgets/type_badges_test.dart
+++ b/test/features/diets/presentation/widgets/type_badges_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/diets/presentation/widgets/type_badges.dart'
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_svg/svg.dart';
import 'package:flutter_test/flutter_test.dart';
@@ -19,12 +18,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Portal(child: Scaffold(body: child)),
);
diff --git a/test/features/diets/presentation/widgets/widgets_test.dart b/test/features/diets/presentation/widgets/widgets_test.dart
index 5d57df51..d1f1d5f5 100644
--- a/test/features/diets/presentation/widgets/widgets_test.dart
+++ b/test/features/diets/presentation/widgets/widgets_test.dart
@@ -9,8 +9,7 @@ import 'package:eatvio_app/features/diets/presentation/widgets/type_badges.dart'
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -27,12 +26,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/feed/presentation/pages/feed_screen_smoke_test.dart b/test/features/feed/presentation/pages/feed_screen_smoke_test.dart
index b986e350..3e5e6f2e 100644
--- a/test/features/feed/presentation/pages/feed_screen_smoke_test.dart
+++ b/test/features/feed/presentation/pages/feed_screen_smoke_test.dart
@@ -20,10 +20,9 @@ import 'package:eatvio_app/core/views/service/views_service.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -64,12 +63,7 @@ void main() {
],
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
),
diff --git a/test/features/feed/presentation/widgets/basic_widget_test.dart b/test/features/feed/presentation/widgets/basic_widget_test.dart
index b9d7a80b..9cba74e1 100644
--- a/test/features/feed/presentation/widgets/basic_widget_test.dart
+++ b/test/features/feed/presentation/widgets/basic_widget_test.dart
@@ -11,9 +11,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/blog_posts.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/chip_group.dart';
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -86,12 +85,7 @@ void main() {
);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: widget,
);
@@ -131,12 +125,7 @@ void main() {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
routerConfig: router,
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
);
}
@@ -235,12 +224,7 @@ void main() {
MaterialApp.router(
theme: ThemeHelper().themeData(),
routerConfig: router,
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
),
);
diff --git a/test/features/feed/presentation/widgets/blog_post_media_content_test.dart b/test/features/feed/presentation/widgets/blog_post_media_content_test.dart
index 17a19a8e..4716b496 100644
--- a/test/features/feed/presentation/widgets/blog_post_media_content_test.dart
+++ b/test/features/feed/presentation/widgets/blog_post_media_content_test.dart
@@ -1,7 +1,7 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:network_image_mock/network_image_mock.dart';
diff --git a/test/features/feed/presentation/widgets/blog_post_widget_test.dart b/test/features/feed/presentation/widgets/blog_post_widget_test.dart
index ffc2b581..24c21935 100644
--- a/test/features/feed/presentation/widgets/blog_post_widget_test.dart
+++ b/test/features/feed/presentation/widgets/blog_post_widget_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/blog_posts_test.dart b/test/features/feed/presentation/widgets/blog_posts_test.dart
index 95ced332..0df2f2eb 100644
--- a/test/features/feed/presentation/widgets/blog_posts_test.dart
+++ b/test/features/feed/presentation/widgets/blog_posts_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/blog_posts.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/chip_group_test.dart b/test/features/feed/presentation/widgets/chip_group_test.dart
index 148dc8c6..19a8b8a8 100644
--- a/test/features/feed/presentation/widgets/chip_group_test.dart
+++ b/test/features/feed/presentation/widgets/chip_group_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/chip_group.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/choice_chip_widget_test.dart b/test/features/feed/presentation/widgets/choice_chip_widget_test.dart
index 971f97d2..75d19438 100644
--- a/test/features/feed/presentation/widgets/choice_chip_widget_test.dart
+++ b/test/features/feed/presentation/widgets/choice_chip_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/choice_chip_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/comments_widget_test.dart b/test/features/feed/presentation/widgets/comments_widget_test.dart
index 48974de6..3eebca97 100644
--- a/test/features/feed/presentation/widgets/comments_widget_test.dart
+++ b/test/features/feed/presentation/widgets/comments_widget_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/features/feed/models/comment_model.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:get_it/get_it.dart';
import 'package:mocktail/mocktail.dart';
@@ -66,12 +65,7 @@ void main() {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: const Scaffold(
body: CommentsWidget(id: '1', commentSourceType: CommentSourceType.blogPost, comment: commentModel),
@@ -124,12 +118,7 @@ void main() {
await mockNetworkImagesFor(() async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Scaffold(
body: CommentsWidget(id: '1', commentSourceType: CommentSourceType.blogPost, comment: commentModel),
diff --git a/test/features/feed/presentation/widgets/consultant_widget_test.dart b/test/features/feed/presentation/widgets/consultant_widget_test.dart
index 8b84cafa..dac448fe 100644
--- a/test/features/feed/presentation/widgets/consultant_widget_test.dart
+++ b/test/features/feed/presentation/widgets/consultant_widget_test.dart
@@ -7,8 +7,7 @@ import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/consultant_widget.dart';
import 'package:eatvio_app/features/profile/models/badge_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -34,12 +33,7 @@ void main() {
Widget createTestWidget(FeedConsultantModel consultant) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
routerConfig: GoRouter(
diff --git a/test/features/feed/presentation/widgets/consultants_test.dart b/test/features/feed/presentation/widgets/consultants_test.dart
index 81b65bb8..a9179477 100644
--- a/test/features/feed/presentation/widgets/consultants_test.dart
+++ b/test/features/feed/presentation/widgets/consultants_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/consultants.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/diet_filter_bottom_sheet_test.dart b/test/features/feed/presentation/widgets/diet_filter_bottom_sheet_test.dart
index edc18afd..d8fbe352 100644
--- a/test/features/feed/presentation/widgets/diet_filter_bottom_sheet_test.dart
+++ b/test/features/feed/presentation/widgets/diet_filter_bottom_sheet_test.dart
@@ -5,9 +5,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/diet_filter_bottom
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart';
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -20,12 +19,7 @@ void main() {
Widget wrap(Widget child, DietsCubit? dietsCubit, MyDietsCubit? myDietsCubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: MultiBlocProvider(
diff --git a/test/features/feed/presentation/widgets/diets_test.dart b/test/features/feed/presentation/widgets/diets_test.dart
index c80df8eb..e92fa661 100644
--- a/test/features/feed/presentation/widgets/diets_test.dart
+++ b/test/features/feed/presentation/widgets/diets_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/diets.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/duration_choice_filter_widget_test.dart b/test/features/feed/presentation/widgets/duration_choice_filter_widget_test.dart
index ecc1028a..1d4b3394 100644
--- a/test/features/feed/presentation/widgets/duration_choice_filter_widget_test.dart
+++ b/test/features/feed/presentation/widgets/duration_choice_filter_widget_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cub
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/duration_choice_filter_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -18,12 +17,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/feed/presentation/widgets/filter_badge_test.dart b/test/features/feed/presentation/widgets/filter_badge_test.dart
index 4bbbfc48..3bdfd828 100644
--- a/test/features/feed/presentation/widgets/filter_badge_test.dart
+++ b/test/features/feed/presentation/widgets/filter_badge_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/filter_badge.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/plan_widget_test.dart b/test/features/feed/presentation/widgets/plan_widget_test.dart
index d8112647..0ec492f4 100644
--- a/test/features/feed/presentation/widgets/plan_widget_test.dart
+++ b/test/features/feed/presentation/widgets/plan_widget_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/plan_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/plans_filter_bottom_sheet_test.dart b/test/features/feed/presentation/widgets/plans_filter_bottom_sheet_test.dart
index fbc7cf65..798ad4f6 100644
--- a/test/features/feed/presentation/widgets/plans_filter_bottom_sheet_test.dart
+++ b/test/features/feed/presentation/widgets/plans_filter_bottom_sheet_test.dart
@@ -5,9 +5,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/plans_filter_botto
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -20,12 +19,7 @@ void main() {
Widget wrap(Widget child, PlansCubit? plansCubit, MyPlansCubit? myPlansCubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: MultiBlocProvider(
diff --git a/test/features/feed/presentation/widgets/plans_test.dart b/test/features/feed/presentation/widgets/plans_test.dart
index d5c8ebb6..ba5d3c67 100644
--- a/test/features/feed/presentation/widgets/plans_test.dart
+++ b/test/features/feed/presentation/widgets/plans_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/plans.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/price_choice_filter_widget_test.dart b/test/features/feed/presentation/widgets/price_choice_filter_widget_test.dart
index a8bd07bb..c2c95af9 100644
--- a/test/features/feed/presentation/widgets/price_choice_filter_widget_test.dart
+++ b/test/features/feed/presentation/widgets/price_choice_filter_widget_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/plans_cubit/plans_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/price_choice_filter_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/feed/presentation/widgets/recipes_test.dart b/test/features/feed/presentation/widgets/recipes_test.dart
index 32e09164..06098ac4 100644
--- a/test/features/feed/presentation/widgets/recipes_test.dart
+++ b/test/features/feed/presentation/widgets/recipes_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/recipes.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/recipes_widget_test.dart b/test/features/feed/presentation/widgets/recipes_widget_test.dart
index ae2bbce9..2b57a1ed 100644
--- a/test/features/feed/presentation/widgets/recipes_widget_test.dart
+++ b/test/features/feed/presentation/widgets/recipes_widget_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/recipes_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/sorting_drop_down_filter_test.dart b/test/features/feed/presentation/widgets/sorting_drop_down_filter_test.dart
index 60df9ad5..18117ef3 100644
--- a/test/features/feed/presentation/widgets/sorting_drop_down_filter_test.dart
+++ b/test/features/feed/presentation/widgets/sorting_drop_down_filter_test.dart
@@ -5,9 +5,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/sorting_drop_down_
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart';
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
home: Scaffold(body: child),
diff --git a/test/features/feed/presentation/widgets/subscribe_button_widget_test.dart b/test/features/feed/presentation/widgets/subscribe_button_widget_test.dart
index 1c0824d3..2793037d 100644
--- a/test/features/feed/presentation/widgets/subscribe_button_widget_test.dart
+++ b/test/features/feed/presentation/widgets/subscribe_button_widget_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/subscribe_button_widget.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/feed/presentation/widgets/tags_modal_widget_test.dart b/test/features/feed/presentation/widgets/tags_modal_widget_test.dart
index e448aa2e..95abadaa 100644
--- a/test/features/feed/presentation/widgets/tags_modal_widget_test.dart
+++ b/test/features/feed/presentation/widgets/tags_modal_widget_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/create_recipe/models/recipe_tag_model.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/tags_modal_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/feed/presentation/widgets/type_choice_filter_widget_test.dart b/test/features/feed/presentation/widgets/type_choice_filter_widget_test.dart
index 33224b2e..1279e00a 100644
--- a/test/features/feed/presentation/widgets/type_choice_filter_widget_test.dart
+++ b/test/features/feed/presentation/widgets/type_choice_filter_widget_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cub
import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_state.dart';
import 'package:eatvio_app/features/feed/presentation/widgets/type_choice_filter_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -18,12 +17,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/finances_and_consultations_archive/presentation/consultant_finances_screen_smoke_test.dart b/test/features/finances_and_consultations_archive/presentation/consultant_finances_screen_smoke_test.dart
index d62431ab..382ed394 100644
--- a/test/features/finances_and_consultations_archive/presentation/consultant_finances_screen_smoke_test.dart
+++ b/test/features/finances_and_consultations_archive/presentation/consultant_finances_screen_smoke_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/cubit/con
import 'package:eatvio_app/features/finances_and_consultations_archive/models/consultant_finance_model.dart';
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -44,12 +43,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/finances_and_consultations_archive/presentation/consultations_archive_screen_smoke_test.dart b/test/features/finances_and_consultations_archive/presentation/consultations_archive_screen_smoke_test.dart
index a9e159f2..0f8ff4f0 100644
--- a/test/features/finances_and_consultations_archive/presentation/consultations_archive_screen_smoke_test.dart
+++ b/test/features/finances_and_consultations_archive/presentation/consultations_archive_screen_smoke_test.dart
@@ -9,9 +9,8 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/models/st
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -55,12 +54,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/finances_and_consultations_archive/presentation/user_purchases_screen_smoke_test.dart b/test/features/finances_and_consultations_archive/presentation/user_purchases_screen_smoke_test.dart
index da71783a..499b09f0 100644
--- a/test/features/finances_and_consultations_archive/presentation/user_purchases_screen_smoke_test.dart
+++ b/test/features/finances_and_consultations_archive/presentation/user_purchases_screen_smoke_test.dart
@@ -8,9 +8,8 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/models/us
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -44,12 +43,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart b/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart
index af8b6c2f..685a5e7d 100644
--- a/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart
+++ b/test/features/finances_and_consultations_archive/presentation/widgets/status_widget_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/widgets/status_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/glossary/presentation/pages/glossary_screen_test.dart b/test/features/glossary/presentation/pages/glossary_screen_test.dart
index a6e33666..a243583c 100644
--- a/test/features/glossary/presentation/pages/glossary_screen_test.dart
+++ b/test/features/glossary/presentation/pages/glossary_screen_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/widgets/loader.dart';
import 'package:eatvio_app/features/glossary/presentation/pages/glossary_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
diff --git a/test/features/menu/presentation/pages/blocked_users_screen_smoke_test.dart b/test/features/menu/presentation/pages/blocked_users_screen_smoke_test.dart
index eb2fb68c..04cbb298 100644
--- a/test/features/menu/presentation/pages/blocked_users_screen_smoke_test.dart
+++ b/test/features/menu/presentation/pages/blocked_users_screen_smoke_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
import 'package:eatvio_app/features/menu/presentation/pages/blocked_users_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -30,12 +29,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/menu/presentation/pages/menu_screen_smoke_test.dart b/test/features/menu/presentation/pages/menu_screen_smoke_test.dart
index 9dc01bfc..2dce3fe9 100644
--- a/test/features/menu/presentation/pages/menu_screen_smoke_test.dart
+++ b/test/features/menu/presentation/pages/menu_screen_smoke_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/features/menu/presentation/pages/menu_screen.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -69,12 +68,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/menu/presentation/pages/notifications_settings_screen_smoke_test.dart b/test/features/menu/presentation/pages/notifications_settings_screen_smoke_test.dart
index 9ee07d14..0a8b70a8 100644
--- a/test/features/menu/presentation/pages/notifications_settings_screen_smoke_test.dart
+++ b/test/features/menu/presentation/pages/notifications_settings_screen_smoke_test.dart
@@ -8,10 +8,9 @@ import 'package:eatvio_app/features/menu/presentation/bloc/notification_settings
import 'package:eatvio_app/features/menu/presentation/pages/notifications_settings_screen.dart';
import 'package:eatvio_app/features/menu/repositories/notification_settings_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:cupertino_ui/cupertino_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -45,12 +44,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/menu/presentation/widgets/blocked_user_widget_test.dart b/test/features/menu/presentation/widgets/blocked_user_widget_test.dart
index a77fd0dd..c81d3235 100644
--- a/test/features/menu/presentation/widgets/blocked_user_widget_test.dart
+++ b/test/features/menu/presentation/widgets/blocked_user_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked
import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
import 'package:eatvio_app/features/menu/presentation/widgets/blocked_user_widget.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/my_diets/presentation/my_diets_screen_smoke_test.dart b/test/features/my_diets/presentation/my_diets_screen_smoke_test.dart
index 1a852e9e..ef005094 100644
--- a/test/features/my_diets/presentation/my_diets_screen_smoke_test.dart
+++ b/test/features/my_diets/presentation/my_diets_screen_smoke_test.dart
@@ -9,9 +9,8 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.d
import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -39,12 +38,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/my_diets/presentation/widgets/basic_widget_test.dart b/test/features/my_diets/presentation/widgets/basic_widget_test.dart
index 9afb6818..2afb1c1a 100644
--- a/test/features/my_diets/presentation/widgets/basic_widget_test.dart
+++ b/test/features/my_diets/presentation/widgets/basic_widget_test.dart
@@ -12,9 +12,8 @@ import 'package:eatvio_app/features/my_diets/presentation/widgets/my_diet_widget
import 'package:eatvio_app/features/my_diets/presentation/widgets/my_diets_tab.dart';
import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -73,12 +72,7 @@ void main() {
);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: widget,
);
diff --git a/test/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet_test.dart b/test/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet_test.dart
index f2c63d3f..afc461df 100644
--- a/test/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet_test.dart
+++ b/test/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet_test.dart
@@ -4,8 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -23,12 +22,7 @@ void main() {
Widget createTestWidget(String title) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: DietDeletedBottomSheet(title: title),
diff --git a/test/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet_test.dart b/test/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet_test.dart
index f6489239..08dfc780 100644
--- a/test/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet_test.dart
+++ b/test/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet_test.dart
@@ -4,8 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -23,12 +22,7 @@ void main() {
Widget createTestWidget(String title) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: DietDraftedBottomSheet(title: title),
diff --git a/test/features/my_diets/presentation/widgets/my_diet_widget_test.dart b/test/features/my_diets/presentation/widgets/my_diet_widget_test.dart
index f6204cb5..47ccd46b 100644
--- a/test/features/my_diets/presentation/widgets/my_diet_widget_test.dart
+++ b/test/features/my_diets/presentation/widgets/my_diet_widget_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.d
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.dart';
import 'package:eatvio_app/features/my_diets/presentation/widgets/my_diet_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:go_router/go_router.dart';
@@ -63,12 +62,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/my_diets/presentation/widgets/my_diets_tab_test.dart b/test/features/my_diets/presentation/widgets/my_diets_tab_test.dart
index 4efadd60..4abe0b2e 100644
--- a/test/features/my_diets/presentation/widgets/my_diets_tab_test.dart
+++ b/test/features/my_diets/presentation/widgets/my_diets_tab_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.d
import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.dart';
import 'package:eatvio_app/features/my_diets/presentation/widgets/my_diets_tab.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -18,12 +17,7 @@ void main() {
Widget wrap(Widget child, MyDietsCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: BlocProvider.value(value: cubit, child: child),
diff --git a/test/features/my_finance/presentation/pages/card_settings_smoke_test.dart b/test/features/my_finance/presentation/pages/card_settings_smoke_test.dart
index f4329b18..f31ae131 100644
--- a/test/features/my_finance/presentation/pages/card_settings_smoke_test.dart
+++ b/test/features/my_finance/presentation/pages/card_settings_smoke_test.dart
@@ -8,10 +8,9 @@ import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cub
import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_state.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -37,12 +36,7 @@ void main() {
Widget wrap(UserCardsCubit cubit, Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(value: cubit, child: child),
);
diff --git a/test/features/my_finance/presentation/pages/user_finance_screen_smoke_test.dart b/test/features/my_finance/presentation/pages/user_finance_screen_smoke_test.dart
index 3cba81f7..3f7c75af 100644
--- a/test/features/my_finance/presentation/pages/user_finance_screen_smoke_test.dart
+++ b/test/features/my_finance/presentation/pages/user_finance_screen_smoke_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/prof
import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_screen.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -50,12 +49,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/my_finance/presentation/widgets/card_widget_test.dart b/test/features/my_finance/presentation/widgets/card_widget_test.dart
index 0b3b8273..791e87bb 100644
--- a/test/features/my_finance/presentation/widgets/card_widget_test.dart
+++ b/test/features/my_finance/presentation/widgets/card_widget_test.dart
@@ -4,9 +4,8 @@ import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cub
import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cubit/user_cards_state.dart';
import 'package:eatvio_app/features/my_finance/presentation/widgets/card_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -30,12 +29,7 @@ void main() {
}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
home: BlocProvider.value(
diff --git a/test/features/my_plans/presentation/my_plans_screen_smoke_test.dart b/test/features/my_plans/presentation/my_plans_screen_smoke_test.dart
index a8d95fcf..dbdcc37a 100644
--- a/test/features/my_plans/presentation/my_plans_screen_smoke_test.dart
+++ b/test/features/my_plans/presentation/my_plans_screen_smoke_test.dart
@@ -8,9 +8,8 @@ import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.d
import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -38,12 +37,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/my_plans/presentation/widgets/basic_widget_test.dart b/test/features/my_plans/presentation/widgets/basic_widget_test.dart
index 270088f2..b3238a0b 100644
--- a/test/features/my_plans/presentation/widgets/basic_widget_test.dart
+++ b/test/features/my_plans/presentation/widgets/basic_widget_test.dart
@@ -10,9 +10,8 @@ import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_state.d
import 'package:eatvio_app/features/my_plans/presentation/widgets/my_plan_widget.dart';
import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -71,12 +70,7 @@ void main() {
);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: widget,
);
diff --git a/test/features/my_plans/presentation/widgets/my_plan_widget_test.dart b/test/features/my_plans/presentation/widgets/my_plan_widget_test.dart
index 87ca2c65..317e2ba5 100644
--- a/test/features/my_plans/presentation/widgets/my_plan_widget_test.dart
+++ b/test/features/my_plans/presentation/widgets/my_plan_widget_test.dart
@@ -8,10 +8,9 @@ import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.d
import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_state.dart';
import 'package:eatvio_app/features/my_plans/presentation/widgets/my_plan_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -39,12 +38,7 @@ void main() {
Widget wrap(Widget child, MyPlansCubit? cubit) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
routes: [
diff --git a/test/features/notifications/presentation/notifications_screen_smoke_test.dart b/test/features/notifications/presentation/notifications_screen_smoke_test.dart
index 0c6e63e4..333e9c61 100644
--- a/test/features/notifications/presentation/notifications_screen_smoke_test.dart
+++ b/test/features/notifications/presentation/notifications_screen_smoke_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/notifications/presentation/notifications_cub
import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_state.dart';
import 'package:eatvio_app/features/notifications/presentation/notifications_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -32,12 +31,7 @@ void main() {
Widget wrap(NotificationsCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(value: cubit, child: const NotificationsScreen()),
);
diff --git a/test/features/notifications/presentation/widgets/notification_widget_test.dart b/test/features/notifications/presentation/widgets/notification_widget_test.dart
index 24d6ec92..a109d9ed 100644
--- a/test/features/notifications/presentation/widgets/notification_widget_test.dart
+++ b/test/features/notifications/presentation/widgets/notification_widget_test.dart
@@ -1,1338 +1,1327 @@
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
-import 'package:eatvio_app/features/notifications/models/notification_model.dart';
-import 'package:eatvio_app/features/notifications/presentation/widgets/notification_widget.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:go_router/go_router.dart';
-
-void main() {
- group('NotificationWidget', () {
- final testDate = DateTime(2024, 1, 15, 10, 30);
-
- Widget createTestWidget(BaseNotificationModel notification) {
- return MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: const [Locale('ru'), Locale('en')],
- locale: const Locale('ru'),
- theme: ThemeHelper().themeData(),
- home: Scaffold(body: NotificationWidget(notification: notification)),
- );
- }
-
- testWidgets('displays PlanSubscriptionStartedToAuthorNotification', (
- tester,
- ) async {
- final notification = PlanSubscriptionStartedToAuthorNotification(
- type: NotificationType.planSubscriptionStartedToAuthor,
- planName: 'Test Plan',
- planId: 1,
- customerName: 'Test Customer',
- userId: 0,
- userPhotoPath: '',
- chatId: 'chat123',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PlanSubscriptionCanceledToAuthorNotification', (
- tester,
- ) async {
- final notification = PlanSubscriptionCanceledToAuthorNotification(
- type: NotificationType.planSubscriptionCanceledToAuthor,
- planName: 'Test Plan',
- planId: 1,
- customerName: 'Test Customer',
- userId: 0,
- userPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanStartedToClientNotification', (
- tester,
- ) async {
- final notification = ChosenPlanStartedToClientNotification(
- type: NotificationType.chosenPlanStartedToClient,
- planName: 'Test Plan',
- planId: 1,
- consultantName: 'Test Consultant',
- peerProfileUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanTomorrowReminderToClientNotification', (
- tester,
- ) async {
- final notification = ChosenPlanTomorrowReminderToClientNotification(
- type: NotificationType.chosenPlanTomorrowReminderToClient,
- planName: 'Test Plan',
- consultantName: '',
- chatId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DiaryReminderNotification', (tester) async {
- final notification = DiaryReminderNotification(
- type: NotificationType.diaryReminderNotification,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantLeftCommentNotification', (tester) async {
- final notification = ConsultantLeftCommentNotification(
- type: NotificationType.consultantLeftComment,
- chosenPlanId: 1,
- diaryId: 0,
- date: testDate,
- planName: '',
- userName: '',
- consultantName: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PersonalizedDietIsDefinedNotification', (
- tester,
- ) async {
- final notification = PersonalizedDietIsDefinedNotification(
- type: NotificationType.personalizedDietIsDefined,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanFinishedToClientNotification', (
- tester,
- ) async {
- final notification = ChosenPlanFinishedToClientNotification(
- type: NotificationType.chosenPlanFinishedToClient,
- planName: 'Test Plan',
- chosenPlanId: 1,
- consultantName: '',
- consultantPhotoPath: '',
- consultantProfileUrl: '',
- consultantId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PlanSubscriptionCanceledToCustomerNotification', (
- tester,
- ) async {
- final notification = PlanSubscriptionCanceledToCustomerNotification(
- type: NotificationType.planSubscriptionCanceledToCustomer,
- planName: 'Test Plan',
- planId: 1,
- authorName: '',
- authorId: 0,
- authorPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanStartedToConsultantNotification', (
- tester,
- ) async {
- final notification = ChosenPlanStartedToConsultantNotification(
- type: NotificationType.chosenPlanStartedToConsultant,
- planName: 'Test Plan',
- customerName: 'Test Customer',
- planId: 1,
- customerId: 1,
- peerProfileUrl: '',
- consultationUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanTomorrowReminderToConsultantNotification', (
- tester,
- ) async {
- final notification = ChosenPlanTomorrowReminderToConsultantNotification(
- type: NotificationType.chosenPlanTomorrowReminderToConsultant,
- planName: 'Test Plan',
- customerName: 'Test Customer',
- chatId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PlanSubscriptionPaidToAuthorNotification', (
- tester,
- ) async {
- final notification = PlanSubscriptionPaidToAuthorNotification(
- type: NotificationType.planSubscriptionPaidToAuthor,
- planName: 'Test Plan',
- planId: 1,
- customerName: 'Test Customer',
- userId: 0,
- userPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets(
- 'displays ChosenPlanFinishedToConsultantNotification with button',
- (tester) async {
- final notification = ChosenPlanFinishedToConsultantNotification(
- type: NotificationType.chosenPlanFinishedToConsultant,
- planName: 'Test Plan',
- customerName: 'Test Customer',
- planId: 1,
- chosenPlanId: 1,
- clientPhotoPath: '',
- clientId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- expect(find.text('Получить выплату'), findsOneWidget);
- },
- );
-
- testWidgets(
- 'collect charge from finished notification uses chosenPlanId, not planId',
- (tester) async {
- int? capturedChosenPlanId;
- final notification = ChosenPlanFinishedToConsultantNotification(
- type: NotificationType.chosenPlanFinishedToConsultant,
- planName: 'Test Plan',
- customerName: 'Test Customer',
- planId: 99,
- chosenPlanId: 42,
- clientPhotoPath: '',
- clientId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- final router = GoRouter(
- routes: [
- GoRoute(
- path: '/',
- builder: (context, state) => Scaffold(
- body: NotificationWidget(notification: notification),
- ),
- ),
- GoRoute(
- path: CardSettingsScreen.path,
- builder: (context, state) {
- capturedChosenPlanId = state.extra as int?;
- return const Scaffold(body: Text('card-settings'));
- },
- ),
- ],
- );
-
- await tester.pumpWidget(
- MaterialApp.router(
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: const [Locale('ru'), Locale('en')],
- locale: const Locale('ru'),
- theme: ThemeHelper().themeData(),
- routerConfig: router,
- ),
- );
- await tester.pumpAndSettle();
-
- await tester.tap(find.text('Получить выплату'));
- await tester.pumpAndSettle();
-
- expect(find.text('card-settings'), findsOneWidget);
- expect(capturedChosenPlanId, 42);
- },
- );
-
- testWidgets('displays ChosenPlanLastDayFinishedForUser', (tester) async {
- final notification = ChosenPlanLastDayFinishedForUser(
- type: NotificationType.chosenPlanLastDayFinishedForUser,
- planName: 'Test Plan',
- chosenPlanId: 1,
- complaintUrl: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanConsultantLastDayStarted', (tester) async {
- final notification = ChosenPlanConsultantLastDayStarted(
- type: NotificationType.chosenPlanConsultantLastDayStarted,
- planName: 'Test Plan',
- planId: 1,
- chatId: 'chat123',
- chatUrl: 'chat_url',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ComplaintToModerationForUser', (tester) async {
- final notification = ComplaintToModerationForUser(
- type: NotificationType.complaintToModerationForUser,
- message: 'Test message',
- entityId: 1,
- entityType: 'test',
- entityName: 'Test Entity',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays CommentReplied', (tester) async {
- final notification = CommentReplied(
- type: NotificationType.commentReplied,
- entityName: 'Test Entity',
- commentedEntityId: 1,
- commentedEntityType: CommentedEntityType.diet,
- author: 'Test Author',
- authorId: 1,
- parentCommentId: 1,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ScoreAdded', (tester) async {
- final notification = ScoreAdded(
- type: NotificationType.scoreAdded,
- scoreKey: 'test_key',
- scorableId: 1,
- scorableType: 'test',
- scorableName: 'Test Name',
- scorableSlug: 'test-slug',
- scoreValue: 10,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays EntityCommented', (tester) async {
- final notification = EntityCommented(
- type: NotificationType.entityCommented,
- entityName: 'Test Entity',
- entityId: 1,
- entityType: CommentedEntityType.diet,
- entityTranslatedType: 'Test Type',
- entityUrl: 'test_url',
- authorName: 'Test Author',
- authorId: 1,
- authorSlug: 'test-author',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PlanSubscriptionExpiredNotification', (tester) async {
- final notification = PlanSubscriptionExpiredNotification(
- type: NotificationType.planSubscriptionExpired,
- planName: 'Test Plan',
- customerName: 'Test Customer',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PlanSubscriptionRenewedNotification', (tester) async {
- final notification = PlanSubscriptionRenewedNotification(
- type: NotificationType.planSubscriptionRenewed,
- planName: 'Test Plan',
- customerName: 'Test Customer',
- renewalDate: '2024-02-01',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantAssignedNotification', (tester) async {
- final notification = ConsultantAssignedNotification(
- type: NotificationType.consultantAssigned,
- consultantName: 'Test Consultant',
- planName: 'Test Plan',
- planId: 1,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantUnassignedNotification', (tester) async {
- final notification = ConsultantUnassignedNotification(
- type: NotificationType.consultantUnassigned,
- consultantName: 'Test Consultant',
- planName: 'Test Plan',
- planId: 1,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PaymentFailedNotification', (tester) async {
- final notification = PaymentFailedNotification(
- type: NotificationType.paymentFailed,
- planName: 'Test Plan',
- errorMessage: 'Test error',
- paymentMethod: 'card',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PaymentSuccessfulNotification', (tester) async {
- final notification = PaymentSuccessfulNotification(
- type: NotificationType.paymentSuccessful,
- planName: 'Test Plan',
- amount: 100.0,
- currency: 'USD',
- transactionId: 'trans123',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays GoalAchievedNotification', (tester) async {
- final notification = GoalAchievedNotification(
- type: NotificationType.goalAchieved,
- goalName: 'Test Goal',
- goalType: 'weight',
- achievedValue: 50.0,
- targetValue: 100.0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays WorkoutReminderNotification', (tester) async {
- final notification = WorkoutReminderNotification(
- type: NotificationType.workoutReminder,
- workoutName: 'Test Workout',
- workoutType: 'cardio',
- duration: 30,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays MealReminderNotification', (tester) async {
- final notification = MealReminderNotification(
- type: NotificationType.mealReminder,
- mealName: 'Test Meal',
- mealType: 'breakfast',
- calories: 500,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DietCancelledNotification', (tester) async {
- final notification = DietCancelledNotification(
- type: NotificationType.dietCancelled,
- dietName: 'Test Diet',
- dietId: 1,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DietStartedNotification', (tester) async {
- final notification = DietStartedNotification(
- type: NotificationType.dietStarted,
- dietName: 'Test Diet',
- dietId: 1,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DietExpiredNotification', (tester) async {
- final notification = DietExpiredNotification(
- type: NotificationType.dietExpired,
- dietName: 'Test Diet',
- dietId: 1,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DietWillStartedInNotification', (tester) async {
- final notification = DietWillStartedInNotification(
- type: NotificationType.dietWillStartedIn,
- dietName: 'Test Diet',
- dietId: 1,
- startDate: '2024-02-01',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DietCanNotBeStartedNotification', (tester) async {
- final notification = DietCanNotBeStartedNotification(
- type: NotificationType.dietCanNotBeStarted,
- dietName: 'Test Diet',
- dietId: 1,
- reason: 'Test reason',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PersonalDietCreationNeededNotification', (
- tester,
- ) async {
- final notification = PersonalDietCreationNeededNotification(
- type: NotificationType.personalDietCreationNeeded,
- userName: 'Test Client',
- consultantName: '',
- myDietsUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanClientLastDayFinishedNotification', (
- tester,
- ) async {
- final notification = ChosenPlanClientLastDayFinishedNotification(
- type: NotificationType.chosenPlanClientLastDayFinished,
- planName: 'Test Plan',
- chosenPlanId: 1,
- complaintUrl: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ChosenPlanClientLastDayStartedNotification', (
- tester,
- ) async {
- final notification = ChosenPlanClientLastDayStartedNotification(
- type: NotificationType.chosenPlanClientLastDayStarted,
- planName: 'Test Plan',
- chosenPlanId: 1,
- lastDayDiaryUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays StayOnTrackToAuthorNotification', (tester) async {
- final notification = StayOnTrackToAuthorNotification(
- type: NotificationType.stayOnTrackToAuthor,
- planName: 'Test Plan',
- userName: 'Test Client',
- dayNum: 1,
- diaryDayId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets(
- 'displays ClientStartPlanSubscriptionToSubscriberNotification',
- (tester) async {
- final notification =
- ClientStartPlanSubscriptionToSubscriberNotification(
- type: NotificationType.clientStartPlanSubscriptionToSubscriber,
- planName: 'Test Plan',
- planId: 1,
- authorName: '',
- authorId: 0,
- authorPhotoPath: '',
- chatUrl: '',
- chatId: '',
- startDate: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- },
- );
-
- testWidgets(
- 'displays ConsultantConfirmPlanSubscriptionToSubscriberNotification',
- (tester) async {
- final notification =
- ConsultantConfirmPlanSubscriptionToSubscriberNotification(
- type: NotificationType
- .consultantConfirmPlanSubscriptionToSubscriber,
- planName: 'Test Plan',
- planId: 1,
- consultantName: 'Test Consultant',
- authorId: 0,
- authorPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- },
- );
-
- testWidgets('displays ClientPaidPlanSubscriptionToAuthorNotification', (
- tester,
- ) async {
- final notification = ClientPaidPlanSubscriptionToAuthorNotification(
- type: NotificationType.clientPaidPlanSubscriptionToAuthor,
- planName: 'Test Plan',
- planId: 1,
- clientName: 'Test Client',
- userId: 0,
- userPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantLeftDiaryCommentNotification', (
- tester,
- ) async {
- final notification = ConsultantLeftDiaryCommentNotification(
- type: NotificationType.consultantLeftDiaryComment,
- chosenPlanId: 1,
- diaryId: 0,
- planName: 'Test Plan',
- userName: '',
- consultantName: 'Test Consultant',
- diaryDate: testDate,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets(
- 'displays ConsultantConfirmPlanSubscriptionToAuthorNotification',
- (tester) async {
- final notification =
- ConsultantConfirmPlanSubscriptionToAuthorNotification(
- type: NotificationType.consultantConfirmPlanSubscriptionToAuthor,
- planName: 'Test Plan',
- planId: 1,
- clientName: 'Test Consultant',
- userId: 0,
- userPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- },
- );
-
- testWidgets('displays ClientPaidPlanSubscriptionToSubscriberNotification', (
- tester,
- ) async {
- final notification = ClientPaidPlanSubscriptionToSubscriberNotification(
- type: NotificationType.clientPaidPlanSubscriptionToSubscriber,
- planName: 'Test Plan',
- planId: 1,
- authorName: '',
- authorId: 0,
- authorPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ClientStartPlanSubscriptionToAuthorNotification', (
- tester,
- ) async {
- final notification = ClientStartPlanSubscriptionToAuthorNotification(
- type: NotificationType.clientStartPlanSubscriptionToAuthor,
- planName: 'Test Plan',
- planId: 1,
- clientName: 'Test Client',
- userId: 0,
- userPhotoPath: '',
- chatId: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ClientCancelPlanSubscriptionToAuthorNotification', (
- tester,
- ) async {
- final notification = ClientCancelPlanSubscriptionToAuthorNotification(
- type: NotificationType.clientCancelPlanSubscriptionToAuthor,
- planName: 'Test Plan',
- planId: 1,
- clientName: 'Test Client',
- userId: 0,
- userPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets(
- 'displays ClientCancelPlanSubscriptionToSubscriberNotification',
- (tester) async {
- final notification =
- ClientCancelPlanSubscriptionToSubscriberNotification(
- type: NotificationType.clientCancelPlanSubscriptionToSubscriber,
- planName: 'Test Plan',
- planId: 1,
- authorName: '',
- authorId: 0,
- authorPhotoPath: '',
- chatUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- },
- );
-
- testWidgets('displays UserDailyReportCompletedNotification', (
- tester,
- ) async {
- final notification = UserDailyReportCompletedNotification(
- type: NotificationType.userDailyReportCompleted,
- chosenPlanId: 1,
- diaryId: 0,
- planName: 'Test Plan',
- clientName: 'Test Client',
- consultantName: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays StayOnTrackToCustomerNotification', (tester) async {
- final notification = StayOnTrackToCustomerNotification(
- type: NotificationType.stayOnTrackToCustomer,
- planName: 'Test Plan',
- dayNum: 1,
- diaryDayId: 0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PhoneChangedNotification', (tester) async {
- final notification = PhoneChangedNotification(
- type: NotificationType.phoneChanged,
- oldPhone: '+1234567890',
- newPhone: '+0987654321',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays SubscriptionNotification', (tester) async {
- final notification = SubscriptionNotification(
- type: NotificationType.subscription,
- userName: '',
- userPhotoPath: '',
- userProfileUrl: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays BadgeAwardedNotification', (tester) async {
- final notification = BadgeAwardedNotification(
- type: NotificationType.badgeAwarded,
- badgeTitle: 'Test Badge',
- badgeType: '',
- badgeImage: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays BadgeRevokedNotification', (tester) async {
- final notification = BadgeRevokedNotification(
- type: NotificationType.badgeRevoked,
- badgeTitle: 'Test Badge',
- badgeType: '',
- badgeImage: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantRequestStartedNotification', (
- tester,
- ) async {
- final notification = ConsultantRequestStartedNotification(
- type: NotificationType.consultantRequestStarted,
- consultantName: 'Test Consultant',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ClientCloseComplaintSuccessNotification', (
- tester,
- ) async {
- final notification = ClientCloseComplaintSuccessNotification(
- type: NotificationType.clientCloseComplaintSuccess,
- planName: 'Test Plan',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ClientRefundSuccessNotification', (tester) async {
- final notification = ClientRefundSuccessNotification(
- type: NotificationType.clientRefundSuccess,
- planName: 'Test Plan',
- amount: 100.0,
- reason: 'Test reason',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantRefundSuccessNotification', (tester) async {
- final notification = ConsultantRefundSuccessNotification(
- type: NotificationType.consultantRefundSuccess,
- planName: 'Test Plan',
- clientName: 'Test Client',
- amount: 100.0,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ClientRejectSuccessNotification', (tester) async {
- final notification = ClientRejectSuccessNotification(
- type: NotificationType.clientRejectSuccess,
- planName: 'Test Plan',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ConsultantRejectSuccessNotification', (tester) async {
- final notification = ConsultantRejectSuccessNotification(
- type: NotificationType.consultantRejectSuccess,
- planName: 'Test Plan',
- clientName: 'Test Client',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ScoreSubstractedNotification', (tester) async {
- final notification = ScoreSubstractedNotification(
- type: NotificationType.scoreSubstracted,
- scoreKey: 'test_key',
- scorableId: 1,
- scorableType: 'test',
- scorableName: 'Test Name',
- scorableSlug: 'test-slug',
- scoreValue: 10,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays ProductStatusUpdatedForAuthorNotification', (
- tester,
- ) async {
- final notification = ProductStatusUpdatedForAuthorNotification(
- type: NotificationType.productStatusUpdatedForAuthor,
- productName: 'Test Product',
- productId: 1,
- author: '',
- authorId: 0,
- status: 'approved',
- subject: '',
- messageLine: '',
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays DiaryReminderForUsersNotification', (tester) async {
- final notification = DiaryReminderForUsersNotification(
- type: NotificationType.diaryReminderForUsers,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PersonalDietIsDefinedToCustomerNotification', (
- tester,
- ) async {
- final notification = PersonalDietIsDefinedToCustomerNotification(
- type: NotificationType.personalDietIsDefinedToCustomer,
- isRead: false,
- createdAt: testDate,
- chosenPlanId: 1,
- dietId: 1,
- planName: '',
- userName: '',
- consultantName: '',
- dietName: 'Test Diet',
- role: '',
- peerSlug: '',
- peerImagePath: '',
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('displays PersonalDietIsDefinedToAuthorNotification', (
- tester,
- ) async {
- final notification = PersonalDietIsDefinedToAuthorNotification(
- type: NotificationType.personalDietIsDefinedToAuthor,
- isRead: false,
- createdAt: testDate,
- chosenPlanId: 1,
- dietId: 1,
- planName: 'Plan',
- userName: 'Client',
- consultantName: 'Consultant',
- dietName: 'Test Diet',
- role: 'consultant',
- peerSlug: 'client-slug',
- peerImagePath: '',
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(
- find.text('Вы предложили персональную диету пользователю Client, выбранная диета: «Test Diet»'),
- findsOneWidget,
- );
- });
-
- testWidgets(
- 'displays PersonalDietIsDefinedToAuthorNotification with fallback user name',
- (tester) async {
- final notification = PersonalDietIsDefinedToAuthorNotification(
- type: NotificationType.personalDietIsDefinedToAuthor,
- isRead: false,
- createdAt: testDate,
- chosenPlanId: 1,
- dietId: 1,
- planName: 'Plan',
- userName: '',
- consultantName: 'Consultant',
- dietName: 'Test Diet',
- role: 'consultant',
- peerSlug: 'client-slug',
- peerImagePath: '',
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(
- find.text('Вы предложили персональную диету пользователю Пользователь, выбранная диета: «Test Diet»'),
- findsOneWidget,
- );
- },
- );
-
- testWidgets(
- 'displays PersonalDietIsDefinedToAuthorNotification without diet name',
- (tester) async {
- final notification = PersonalDietIsDefinedToAuthorNotification(
- type: NotificationType.personalDietIsDefinedToAuthor,
- isRead: false,
- createdAt: testDate,
- chosenPlanId: 1,
- dietId: 1,
- planName: 'Plan',
- userName: 'Client',
- consultantName: 'Consultant',
- dietName: '',
- role: 'consultant',
- peerSlug: 'client-slug',
- peerImagePath: '',
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(
- find.text('Вы предложили персональную диету пользователю Client'),
- findsOneWidget,
- );
- },
- );
-
- testWidgets('displays UnknownNotification', (tester) async {
- final notification = UnknownNotification(
- type: NotificationType.unknown,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
-
- testWidgets('shows unread indicator when isRead is false', (tester) async {
- final notification = DiaryReminderNotification(
- type: NotificationType.diaryReminderNotification,
- isRead: false,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- // Check for unread indicator (blue circle)
- expect(find.byType(Container), findsWidgets);
- });
-
- testWidgets('hides unread indicator when isRead is true', (tester) async {
- final notification = DiaryReminderNotification(
- type: NotificationType.diaryReminderNotification,
- isRead: true,
- createdAt: testDate,
- );
-
- await tester.pumpWidget(createTestWidget(notification));
- await tester.pumpAndSettle();
-
- expect(find.byType(NotificationWidget), findsOneWidget);
- });
- });
-}
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
+import 'package:eatvio_app/features/notifications/models/notification_model.dart';
+import 'package:eatvio_app/features/notifications/presentation/widgets/notification_widget.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:go_router/go_router.dart';
+
+void main() {
+ group('NotificationWidget', () {
+ final testDate = DateTime(2024, 1, 15, 10, 30);
+
+ Widget createTestWidget(BaseNotificationModel notification) {
+ return MaterialApp(
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: const [Locale('ru'), Locale('en')],
+ locale: const Locale('ru'),
+ theme: ThemeHelper().themeData(),
+ home: Scaffold(body: NotificationWidget(notification: notification)),
+ );
+ }
+
+ testWidgets('displays PlanSubscriptionStartedToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = PlanSubscriptionStartedToAuthorNotification(
+ type: NotificationType.planSubscriptionStartedToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ customerName: 'Test Customer',
+ userId: 0,
+ userPhotoPath: '',
+ chatId: 'chat123',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PlanSubscriptionCanceledToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = PlanSubscriptionCanceledToAuthorNotification(
+ type: NotificationType.planSubscriptionCanceledToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ customerName: 'Test Customer',
+ userId: 0,
+ userPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanStartedToClientNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanStartedToClientNotification(
+ type: NotificationType.chosenPlanStartedToClient,
+ planName: 'Test Plan',
+ planId: 1,
+ consultantName: 'Test Consultant',
+ peerProfileUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanTomorrowReminderToClientNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanTomorrowReminderToClientNotification(
+ type: NotificationType.chosenPlanTomorrowReminderToClient,
+ planName: 'Test Plan',
+ consultantName: '',
+ chatId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DiaryReminderNotification', (tester) async {
+ final notification = DiaryReminderNotification(
+ type: NotificationType.diaryReminderNotification,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantLeftCommentNotification', (tester) async {
+ final notification = ConsultantLeftCommentNotification(
+ type: NotificationType.consultantLeftComment,
+ chosenPlanId: 1,
+ diaryId: 0,
+ date: testDate,
+ planName: '',
+ userName: '',
+ consultantName: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PersonalizedDietIsDefinedNotification', (
+ tester,
+ ) async {
+ final notification = PersonalizedDietIsDefinedNotification(
+ type: NotificationType.personalizedDietIsDefined,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanFinishedToClientNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanFinishedToClientNotification(
+ type: NotificationType.chosenPlanFinishedToClient,
+ planName: 'Test Plan',
+ chosenPlanId: 1,
+ consultantName: '',
+ consultantPhotoPath: '',
+ consultantProfileUrl: '',
+ consultantId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PlanSubscriptionCanceledToCustomerNotification', (
+ tester,
+ ) async {
+ final notification = PlanSubscriptionCanceledToCustomerNotification(
+ type: NotificationType.planSubscriptionCanceledToCustomer,
+ planName: 'Test Plan',
+ planId: 1,
+ authorName: '',
+ authorId: 0,
+ authorPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanStartedToConsultantNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanStartedToConsultantNotification(
+ type: NotificationType.chosenPlanStartedToConsultant,
+ planName: 'Test Plan',
+ customerName: 'Test Customer',
+ planId: 1,
+ customerId: 1,
+ peerProfileUrl: '',
+ consultationUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanTomorrowReminderToConsultantNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanTomorrowReminderToConsultantNotification(
+ type: NotificationType.chosenPlanTomorrowReminderToConsultant,
+ planName: 'Test Plan',
+ customerName: 'Test Customer',
+ chatId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PlanSubscriptionPaidToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = PlanSubscriptionPaidToAuthorNotification(
+ type: NotificationType.planSubscriptionPaidToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ customerName: 'Test Customer',
+ userId: 0,
+ userPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets(
+ 'displays ChosenPlanFinishedToConsultantNotification with button',
+ (tester) async {
+ final notification = ChosenPlanFinishedToConsultantNotification(
+ type: NotificationType.chosenPlanFinishedToConsultant,
+ planName: 'Test Plan',
+ customerName: 'Test Customer',
+ planId: 1,
+ chosenPlanId: 1,
+ clientPhotoPath: '',
+ clientId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ expect(find.text('Получить выплату'), findsOneWidget);
+ },
+ );
+
+ testWidgets(
+ 'collect charge from finished notification uses chosenPlanId, not planId',
+ (tester) async {
+ int? capturedChosenPlanId;
+ final notification = ChosenPlanFinishedToConsultantNotification(
+ type: NotificationType.chosenPlanFinishedToConsultant,
+ planName: 'Test Plan',
+ customerName: 'Test Customer',
+ planId: 99,
+ chosenPlanId: 42,
+ clientPhotoPath: '',
+ clientId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ final router = GoRouter(
+ routes: [
+ GoRoute(
+ path: '/',
+ builder: (context, state) => Scaffold(
+ body: NotificationWidget(notification: notification),
+ ),
+ ),
+ GoRoute(
+ path: CardSettingsScreen.path,
+ builder: (context, state) {
+ capturedChosenPlanId = state.extra as int?;
+ return const Scaffold(body: Text('card-settings'));
+ },
+ ),
+ ],
+ );
+
+ await tester.pumpWidget(
+ MaterialApp.router(
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: const [Locale('ru'), Locale('en')],
+ locale: const Locale('ru'),
+ theme: ThemeHelper().themeData(),
+ routerConfig: router,
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ await tester.tap(find.text('Получить выплату'));
+ await tester.pumpAndSettle();
+
+ expect(find.text('card-settings'), findsOneWidget);
+ expect(capturedChosenPlanId, 42);
+ },
+ );
+
+ testWidgets('displays ChosenPlanLastDayFinishedForUser', (tester) async {
+ final notification = ChosenPlanLastDayFinishedForUser(
+ type: NotificationType.chosenPlanLastDayFinishedForUser,
+ planName: 'Test Plan',
+ chosenPlanId: 1,
+ complaintUrl: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanConsultantLastDayStarted', (tester) async {
+ final notification = ChosenPlanConsultantLastDayStarted(
+ type: NotificationType.chosenPlanConsultantLastDayStarted,
+ planName: 'Test Plan',
+ planId: 1,
+ chatId: 'chat123',
+ chatUrl: 'chat_url',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ComplaintToModerationForUser', (tester) async {
+ final notification = ComplaintToModerationForUser(
+ type: NotificationType.complaintToModerationForUser,
+ message: 'Test message',
+ entityId: 1,
+ entityType: 'test',
+ entityName: 'Test Entity',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays CommentReplied', (tester) async {
+ final notification = CommentReplied(
+ type: NotificationType.commentReplied,
+ entityName: 'Test Entity',
+ commentedEntityId: 1,
+ commentedEntityType: CommentedEntityType.diet,
+ author: 'Test Author',
+ authorId: 1,
+ parentCommentId: 1,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ScoreAdded', (tester) async {
+ final notification = ScoreAdded(
+ type: NotificationType.scoreAdded,
+ scoreKey: 'test_key',
+ scorableId: 1,
+ scorableType: 'test',
+ scorableName: 'Test Name',
+ scorableSlug: 'test-slug',
+ scoreValue: 10,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays EntityCommented', (tester) async {
+ final notification = EntityCommented(
+ type: NotificationType.entityCommented,
+ entityName: 'Test Entity',
+ entityId: 1,
+ entityType: CommentedEntityType.diet,
+ entityTranslatedType: 'Test Type',
+ entityUrl: 'test_url',
+ authorName: 'Test Author',
+ authorId: 1,
+ authorSlug: 'test-author',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PlanSubscriptionExpiredNotification', (tester) async {
+ final notification = PlanSubscriptionExpiredNotification(
+ type: NotificationType.planSubscriptionExpired,
+ planName: 'Test Plan',
+ customerName: 'Test Customer',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PlanSubscriptionRenewedNotification', (tester) async {
+ final notification = PlanSubscriptionRenewedNotification(
+ type: NotificationType.planSubscriptionRenewed,
+ planName: 'Test Plan',
+ customerName: 'Test Customer',
+ renewalDate: '2024-02-01',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantAssignedNotification', (tester) async {
+ final notification = ConsultantAssignedNotification(
+ type: NotificationType.consultantAssigned,
+ consultantName: 'Test Consultant',
+ planName: 'Test Plan',
+ planId: 1,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantUnassignedNotification', (tester) async {
+ final notification = ConsultantUnassignedNotification(
+ type: NotificationType.consultantUnassigned,
+ consultantName: 'Test Consultant',
+ planName: 'Test Plan',
+ planId: 1,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PaymentFailedNotification', (tester) async {
+ final notification = PaymentFailedNotification(
+ type: NotificationType.paymentFailed,
+ planName: 'Test Plan',
+ errorMessage: 'Test error',
+ paymentMethod: 'card',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PaymentSuccessfulNotification', (tester) async {
+ final notification = PaymentSuccessfulNotification(
+ type: NotificationType.paymentSuccessful,
+ planName: 'Test Plan',
+ amount: 100.0,
+ currency: 'USD',
+ transactionId: 'trans123',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays GoalAchievedNotification', (tester) async {
+ final notification = GoalAchievedNotification(
+ type: NotificationType.goalAchieved,
+ goalName: 'Test Goal',
+ goalType: 'weight',
+ achievedValue: 50.0,
+ targetValue: 100.0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays WorkoutReminderNotification', (tester) async {
+ final notification = WorkoutReminderNotification(
+ type: NotificationType.workoutReminder,
+ workoutName: 'Test Workout',
+ workoutType: 'cardio',
+ duration: 30,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays MealReminderNotification', (tester) async {
+ final notification = MealReminderNotification(
+ type: NotificationType.mealReminder,
+ mealName: 'Test Meal',
+ mealType: 'breakfast',
+ calories: 500,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DietCancelledNotification', (tester) async {
+ final notification = DietCancelledNotification(
+ type: NotificationType.dietCancelled,
+ dietName: 'Test Diet',
+ dietId: 1,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DietStartedNotification', (tester) async {
+ final notification = DietStartedNotification(
+ type: NotificationType.dietStarted,
+ dietName: 'Test Diet',
+ dietId: 1,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DietExpiredNotification', (tester) async {
+ final notification = DietExpiredNotification(
+ type: NotificationType.dietExpired,
+ dietName: 'Test Diet',
+ dietId: 1,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DietWillStartedInNotification', (tester) async {
+ final notification = DietWillStartedInNotification(
+ type: NotificationType.dietWillStartedIn,
+ dietName: 'Test Diet',
+ dietId: 1,
+ startDate: '2024-02-01',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DietCanNotBeStartedNotification', (tester) async {
+ final notification = DietCanNotBeStartedNotification(
+ type: NotificationType.dietCanNotBeStarted,
+ dietName: 'Test Diet',
+ dietId: 1,
+ reason: 'Test reason',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PersonalDietCreationNeededNotification', (
+ tester,
+ ) async {
+ final notification = PersonalDietCreationNeededNotification(
+ type: NotificationType.personalDietCreationNeeded,
+ userName: 'Test Client',
+ consultantName: '',
+ myDietsUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanClientLastDayFinishedNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanClientLastDayFinishedNotification(
+ type: NotificationType.chosenPlanClientLastDayFinished,
+ planName: 'Test Plan',
+ chosenPlanId: 1,
+ complaintUrl: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ChosenPlanClientLastDayStartedNotification', (
+ tester,
+ ) async {
+ final notification = ChosenPlanClientLastDayStartedNotification(
+ type: NotificationType.chosenPlanClientLastDayStarted,
+ planName: 'Test Plan',
+ chosenPlanId: 1,
+ lastDayDiaryUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays StayOnTrackToAuthorNotification', (tester) async {
+ final notification = StayOnTrackToAuthorNotification(
+ type: NotificationType.stayOnTrackToAuthor,
+ planName: 'Test Plan',
+ userName: 'Test Client',
+ dayNum: 1,
+ diaryDayId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets(
+ 'displays ClientStartPlanSubscriptionToSubscriberNotification',
+ (tester) async {
+ final notification =
+ ClientStartPlanSubscriptionToSubscriberNotification(
+ type: NotificationType.clientStartPlanSubscriptionToSubscriber,
+ planName: 'Test Plan',
+ planId: 1,
+ authorName: '',
+ authorId: 0,
+ authorPhotoPath: '',
+ chatUrl: '',
+ chatId: '',
+ startDate: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ },
+ );
+
+ testWidgets(
+ 'displays ConsultantConfirmPlanSubscriptionToSubscriberNotification',
+ (tester) async {
+ final notification =
+ ConsultantConfirmPlanSubscriptionToSubscriberNotification(
+ type: NotificationType
+ .consultantConfirmPlanSubscriptionToSubscriber,
+ planName: 'Test Plan',
+ planId: 1,
+ consultantName: 'Test Consultant',
+ authorId: 0,
+ authorPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ },
+ );
+
+ testWidgets('displays ClientPaidPlanSubscriptionToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = ClientPaidPlanSubscriptionToAuthorNotification(
+ type: NotificationType.clientPaidPlanSubscriptionToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ clientName: 'Test Client',
+ userId: 0,
+ userPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantLeftDiaryCommentNotification', (
+ tester,
+ ) async {
+ final notification = ConsultantLeftDiaryCommentNotification(
+ type: NotificationType.consultantLeftDiaryComment,
+ chosenPlanId: 1,
+ diaryId: 0,
+ planName: 'Test Plan',
+ userName: '',
+ consultantName: 'Test Consultant',
+ diaryDate: testDate,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets(
+ 'displays ConsultantConfirmPlanSubscriptionToAuthorNotification',
+ (tester) async {
+ final notification =
+ ConsultantConfirmPlanSubscriptionToAuthorNotification(
+ type: NotificationType.consultantConfirmPlanSubscriptionToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ clientName: 'Test Consultant',
+ userId: 0,
+ userPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ },
+ );
+
+ testWidgets('displays ClientPaidPlanSubscriptionToSubscriberNotification', (
+ tester,
+ ) async {
+ final notification = ClientPaidPlanSubscriptionToSubscriberNotification(
+ type: NotificationType.clientPaidPlanSubscriptionToSubscriber,
+ planName: 'Test Plan',
+ planId: 1,
+ authorName: '',
+ authorId: 0,
+ authorPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ClientStartPlanSubscriptionToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = ClientStartPlanSubscriptionToAuthorNotification(
+ type: NotificationType.clientStartPlanSubscriptionToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ clientName: 'Test Client',
+ userId: 0,
+ userPhotoPath: '',
+ chatId: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ClientCancelPlanSubscriptionToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = ClientCancelPlanSubscriptionToAuthorNotification(
+ type: NotificationType.clientCancelPlanSubscriptionToAuthor,
+ planName: 'Test Plan',
+ planId: 1,
+ clientName: 'Test Client',
+ userId: 0,
+ userPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets(
+ 'displays ClientCancelPlanSubscriptionToSubscriberNotification',
+ (tester) async {
+ final notification =
+ ClientCancelPlanSubscriptionToSubscriberNotification(
+ type: NotificationType.clientCancelPlanSubscriptionToSubscriber,
+ planName: 'Test Plan',
+ planId: 1,
+ authorName: '',
+ authorId: 0,
+ authorPhotoPath: '',
+ chatUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ },
+ );
+
+ testWidgets('displays UserDailyReportCompletedNotification', (
+ tester,
+ ) async {
+ final notification = UserDailyReportCompletedNotification(
+ type: NotificationType.userDailyReportCompleted,
+ chosenPlanId: 1,
+ diaryId: 0,
+ planName: 'Test Plan',
+ clientName: 'Test Client',
+ consultantName: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays StayOnTrackToCustomerNotification', (tester) async {
+ final notification = StayOnTrackToCustomerNotification(
+ type: NotificationType.stayOnTrackToCustomer,
+ planName: 'Test Plan',
+ dayNum: 1,
+ diaryDayId: 0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PhoneChangedNotification', (tester) async {
+ final notification = PhoneChangedNotification(
+ type: NotificationType.phoneChanged,
+ oldPhone: '+1234567890',
+ newPhone: '+0987654321',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays SubscriptionNotification', (tester) async {
+ final notification = SubscriptionNotification(
+ type: NotificationType.subscription,
+ userName: '',
+ userPhotoPath: '',
+ userProfileUrl: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays BadgeAwardedNotification', (tester) async {
+ final notification = BadgeAwardedNotification(
+ type: NotificationType.badgeAwarded,
+ badgeTitle: 'Test Badge',
+ badgeType: '',
+ badgeImage: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays BadgeRevokedNotification', (tester) async {
+ final notification = BadgeRevokedNotification(
+ type: NotificationType.badgeRevoked,
+ badgeTitle: 'Test Badge',
+ badgeType: '',
+ badgeImage: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantRequestStartedNotification', (
+ tester,
+ ) async {
+ final notification = ConsultantRequestStartedNotification(
+ type: NotificationType.consultantRequestStarted,
+ consultantName: 'Test Consultant',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ClientCloseComplaintSuccessNotification', (
+ tester,
+ ) async {
+ final notification = ClientCloseComplaintSuccessNotification(
+ type: NotificationType.clientCloseComplaintSuccess,
+ planName: 'Test Plan',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ClientRefundSuccessNotification', (tester) async {
+ final notification = ClientRefundSuccessNotification(
+ type: NotificationType.clientRefundSuccess,
+ planName: 'Test Plan',
+ amount: 100.0,
+ reason: 'Test reason',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantRefundSuccessNotification', (tester) async {
+ final notification = ConsultantRefundSuccessNotification(
+ type: NotificationType.consultantRefundSuccess,
+ planName: 'Test Plan',
+ clientName: 'Test Client',
+ amount: 100.0,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ClientRejectSuccessNotification', (tester) async {
+ final notification = ClientRejectSuccessNotification(
+ type: NotificationType.clientRejectSuccess,
+ planName: 'Test Plan',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ConsultantRejectSuccessNotification', (tester) async {
+ final notification = ConsultantRejectSuccessNotification(
+ type: NotificationType.consultantRejectSuccess,
+ planName: 'Test Plan',
+ clientName: 'Test Client',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ScoreSubstractedNotification', (tester) async {
+ final notification = ScoreSubstractedNotification(
+ type: NotificationType.scoreSubstracted,
+ scoreKey: 'test_key',
+ scorableId: 1,
+ scorableType: 'test',
+ scorableName: 'Test Name',
+ scorableSlug: 'test-slug',
+ scoreValue: 10,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays ProductStatusUpdatedForAuthorNotification', (
+ tester,
+ ) async {
+ final notification = ProductStatusUpdatedForAuthorNotification(
+ type: NotificationType.productStatusUpdatedForAuthor,
+ productName: 'Test Product',
+ productId: 1,
+ author: '',
+ authorId: 0,
+ status: 'approved',
+ subject: '',
+ messageLine: '',
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays DiaryReminderForUsersNotification', (tester) async {
+ final notification = DiaryReminderForUsersNotification(
+ type: NotificationType.diaryReminderForUsers,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PersonalDietIsDefinedToCustomerNotification', (
+ tester,
+ ) async {
+ final notification = PersonalDietIsDefinedToCustomerNotification(
+ type: NotificationType.personalDietIsDefinedToCustomer,
+ isRead: false,
+ createdAt: testDate,
+ chosenPlanId: 1,
+ dietId: 1,
+ planName: '',
+ userName: '',
+ consultantName: '',
+ dietName: 'Test Diet',
+ role: '',
+ peerSlug: '',
+ peerImagePath: '',
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('displays PersonalDietIsDefinedToAuthorNotification', (
+ tester,
+ ) async {
+ final notification = PersonalDietIsDefinedToAuthorNotification(
+ type: NotificationType.personalDietIsDefinedToAuthor,
+ isRead: false,
+ createdAt: testDate,
+ chosenPlanId: 1,
+ dietId: 1,
+ planName: 'Plan',
+ userName: 'Client',
+ consultantName: 'Consultant',
+ dietName: 'Test Diet',
+ role: 'consultant',
+ peerSlug: 'client-slug',
+ peerImagePath: '',
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(
+ find.text('Вы предложили персональную диету пользователю Client, выбранная диета: «Test Diet»'),
+ findsOneWidget,
+ );
+ });
+
+ testWidgets(
+ 'displays PersonalDietIsDefinedToAuthorNotification with fallback user name',
+ (tester) async {
+ final notification = PersonalDietIsDefinedToAuthorNotification(
+ type: NotificationType.personalDietIsDefinedToAuthor,
+ isRead: false,
+ createdAt: testDate,
+ chosenPlanId: 1,
+ dietId: 1,
+ planName: 'Plan',
+ userName: '',
+ consultantName: 'Consultant',
+ dietName: 'Test Diet',
+ role: 'consultant',
+ peerSlug: 'client-slug',
+ peerImagePath: '',
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(
+ find.text('Вы предложили персональную диету пользователю Пользователь, выбранная диета: «Test Diet»'),
+ findsOneWidget,
+ );
+ },
+ );
+
+ testWidgets(
+ 'displays PersonalDietIsDefinedToAuthorNotification without diet name',
+ (tester) async {
+ final notification = PersonalDietIsDefinedToAuthorNotification(
+ type: NotificationType.personalDietIsDefinedToAuthor,
+ isRead: false,
+ createdAt: testDate,
+ chosenPlanId: 1,
+ dietId: 1,
+ planName: 'Plan',
+ userName: 'Client',
+ consultantName: 'Consultant',
+ dietName: '',
+ role: 'consultant',
+ peerSlug: 'client-slug',
+ peerImagePath: '',
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(
+ find.text('Вы предложили персональную диету пользователю Client'),
+ findsOneWidget,
+ );
+ },
+ );
+
+ testWidgets('displays UnknownNotification', (tester) async {
+ final notification = UnknownNotification(
+ type: NotificationType.unknown,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+
+ testWidgets('shows unread indicator when isRead is false', (tester) async {
+ final notification = DiaryReminderNotification(
+ type: NotificationType.diaryReminderNotification,
+ isRead: false,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ // Check for unread indicator (blue circle)
+ expect(find.byType(Container), findsWidgets);
+ });
+
+ testWidgets('hides unread indicator when isRead is true', (tester) async {
+ final notification = DiaryReminderNotification(
+ type: NotificationType.diaryReminderNotification,
+ isRead: true,
+ createdAt: testDate,
+ );
+
+ await tester.pumpWidget(createTestWidget(notification));
+ await tester.pumpAndSettle();
+
+ expect(find.byType(NotificationWidget), findsOneWidget);
+ });
+ });
+}
diff --git a/test/features/order_info/presentation/info_by_order_screen_smoke_test.dart b/test/features/order_info/presentation/info_by_order_screen_smoke_test.dart
index 1a8b5be4..522735d1 100644
--- a/test/features/order_info/presentation/info_by_order_screen_smoke_test.dart
+++ b/test/features/order_info/presentation/info_by_order_screen_smoke_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
import 'package:eatvio_app/features/order_info/cubit/order_info_state.dart';
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -48,12 +47,7 @@ void main() {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
diff --git a/test/features/order_info/presentation/info_by_order_screen_test.dart b/test/features/order_info/presentation/info_by_order_screen_test.dart
index 2a34f6da..cb8f062d 100644
--- a/test/features/order_info/presentation/info_by_order_screen_test.dart
+++ b/test/features/order_info/presentation/info_by_order_screen_test.dart
@@ -13,9 +13,8 @@ import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -63,12 +62,7 @@ void main() {
}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: InfoByOrderScreen(
planId: planId,
diff --git a/test/features/order_info/presentation/widgets/collect_charge_banner_test.dart b/test/features/order_info/presentation/widgets/collect_charge_banner_test.dart
index 28610415..4d9186b4 100644
--- a/test/features/order_info/presentation/widgets/collect_charge_banner_test.dart
+++ b/test/features/order_info/presentation/widgets/collect_charge_banner_test.dart
@@ -11,8 +11,7 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart'
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart'
show Author;
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -35,12 +34,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
routes: [
diff --git a/test/features/order_info/presentation/widgets/payment_banner_test.dart b/test/features/order_info/presentation/widgets/payment_banner_test.dart
index 0b032179..aa1ddf6a 100644
--- a/test/features/order_info/presentation/widgets/payment_banner_test.dart
+++ b/test/features/order_info/presentation/widgets/payment_banner_test.dart
@@ -5,9 +5,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/payment_banner.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -28,12 +27,7 @@ void main() {
Widget createTestWidget(Widget child, OrderInfoCubit cubit) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
routes: [
diff --git a/test/features/order_info/presentation/widgets/plan_info_test.dart b/test/features/order_info/presentation/widgets/plan_info_test.dart
index 89687935..6d6652f1 100644
--- a/test/features/order_info/presentation/widgets/plan_info_test.dart
+++ b/test/features/order_info/presentation/widgets/plan_info_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/plan_info.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
diff --git a/test/features/order_info/presentation/widgets/plan_props_test.dart b/test/features/order_info/presentation/widgets/plan_props_test.dart
index 8d85e220..1370671e 100644
--- a/test/features/order_info/presentation/widgets/plan_props_test.dart
+++ b/test/features/order_info/presentation/widgets/plan_props_test.dart
@@ -5,8 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/plan_props.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/plan_status_box.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -22,12 +21,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/order_info/presentation/widgets/plan_state_test.dart b/test/features/order_info/presentation/widgets/plan_state_test.dart
index 68862e25..c3115ced 100644
--- a/test/features/order_info/presentation/widgets/plan_state_test.dart
+++ b/test/features/order_info/presentation/widgets/plan_state_test.dart
@@ -5,8 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/plan_state.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -22,12 +21,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/order_info/presentation/widgets/plan_status_box_test.dart b/test/features/order_info/presentation/widgets/plan_status_box_test.dart
index ec53a9cf..90104eb7 100644
--- a/test/features/order_info/presentation/widgets/plan_status_box_test.dart
+++ b/test/features/order_info/presentation/widgets/plan_status_box_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/order_info/presentation/widgets/plan_status_box.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -10,12 +9,7 @@ void main() {
Widget createTestWidget(PlanStatusValues status) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: PlanStatusBox(status: status),
diff --git a/test/features/payment/consultation_payment_flow_test.dart b/test/features/payment/consultation_payment_flow_test.dart
index fee46123..b2ab503f 100644
--- a/test/features/payment/consultation_payment_flow_test.dart
+++ b/test/features/payment/consultation_payment_flow_test.dart
@@ -4,8 +4,7 @@ import 'package:eatvio_app/features/payment/models/promo_validate_response.dart'
import 'package:eatvio_app/features/payment/presentation/payment_flow.dart';
import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -13,12 +12,7 @@ void main() {
Widget createTestApp() {
return const MaterialApp(
- localizationsDelegates: [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: [Locale('ru')],
home: Scaffold(body: SizedBox()),
);
diff --git a/test/features/payment/presentation/widgets/promo_code_gate_bottom_sheet_test.dart b/test/features/payment/presentation/widgets/promo_code_gate_bottom_sheet_test.dart
index 48cf3859..4709faaa 100644
--- a/test/features/payment/presentation/widgets/promo_code_gate_bottom_sheet_test.dart
+++ b/test/features/payment/presentation/widgets/promo_code_gate_bottom_sheet_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -13,12 +12,7 @@ void main() {
Widget createTestWidget({required ValueChanged onResult}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: PromoCodeGateBottomSheet(onResult: onResult),
diff --git a/test/features/payment/presentation/widgets/promo_code_modal_test.dart b/test/features/payment/presentation/widgets/promo_code_modal_test.dart
index 56d10633..38199b8b 100644
--- a/test/features/payment/presentation/widgets/promo_code_modal_test.dart
+++ b/test/features/payment/presentation/widgets/promo_code_modal_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -17,12 +16,7 @@ void main() {
}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Builder(
builder: (context) => ElevatedButton(
diff --git a/test/features/payment/presentation/widgets/sbp_banks_bottom_sheet_test.dart b/test/features/payment/presentation/widgets/sbp_banks_bottom_sheet_test.dart
index 36ee7c24..627105ac 100644
--- a/test/features/payment/presentation/widgets/sbp_banks_bottom_sheet_test.dart
+++ b/test/features/payment/presentation/widgets/sbp_banks_bottom_sheet_test.dart
@@ -13,8 +13,7 @@ import 'package:eatvio_app/features/payment/presentation/widgets/sbp_qr_bottom_s
import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:get_it/get_it.dart';
@@ -78,12 +77,7 @@ void main() {
Widget createTestWidget({required int planId}) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: SbpBanksBottomSheet(
diff --git a/test/features/payment/presentation/widgets/sbp_qr_bottom_sheet_test.dart b/test/features/payment/presentation/widgets/sbp_qr_bottom_sheet_test.dart
index 6ed83cf8..1d09ec3f 100644
--- a/test/features/payment/presentation/widgets/sbp_qr_bottom_sheet_test.dart
+++ b/test/features/payment/presentation/widgets/sbp_qr_bottom_sheet_test.dart
@@ -11,8 +11,7 @@ import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:get_it/get_it.dart';
@@ -84,12 +83,7 @@ void main() {
return tester.pumpWidget(
MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: Builder(
diff --git a/test/features/personal_diet_suggestion/presentation/consultation_widget_test.dart b/test/features/personal_diet_suggestion/presentation/consultation_widget_test.dart
index 11b8d568..9b5c8d47 100644
--- a/test/features/personal_diet_suggestion/presentation/consultation_widget_test.dart
+++ b/test/features/personal_diet_suggestion/presentation/consultation_widget_test.dart
@@ -9,10 +9,9 @@ import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet
import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart';
import 'package:eatvio_app/features/personal_diet_suggestion/presentation/consultation_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -55,12 +54,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen_smoke_test.dart b/test/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen_smoke_test.dart
index 624d85ac..deb93c8f 100644
--- a/test/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen_smoke_test.dart
+++ b/test/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen_smoke_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet
import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart';
import 'package:eatvio_app/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -32,12 +31,7 @@ void main() {
Widget wrap(Widget child, PersonalDietSuggestionCubit cubit) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: BlocProvider.value(
diff --git a/test/features/plans/presentation/pages/about_plan_screen_smoke_test.dart b/test/features/plans/presentation/pages/about_plan_screen_smoke_test.dart
index b47e1d2b..f39ed773 100644
--- a/test/features/plans/presentation/pages/about_plan_screen_smoke_test.dart
+++ b/test/features/plans/presentation/pages/about_plan_screen_smoke_test.dart
@@ -14,10 +14,9 @@ import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.d
import 'package:eatvio_app/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet.dart';
import 'package:eatvio_app/features/profile/models/chosen_diets_pagination_model.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
@@ -95,12 +94,7 @@ void main() {
return Portal(
child: MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
),
diff --git a/test/features/plans/presentation/widgets/basic_widget_test.dart b/test/features/plans/presentation/widgets/basic_widget_test.dart
index da6eecde..49098275 100644
--- a/test/features/plans/presentation/widgets/basic_widget_test.dart
+++ b/test/features/plans/presentation/widgets/basic_widget_test.dart
@@ -11,9 +11,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/plan_widget.dart';
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -78,12 +77,7 @@ void main() {
);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: widget,
);
@@ -92,12 +86,7 @@ void main() {
Widget createPlansTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(
diff --git a/test/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet_test.dart b/test/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet_test.dart
index 44e358c1..fceb15a2 100644
--- a/test/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet_test.dart
+++ b/test/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet_test.dart
@@ -2,8 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
import 'package:eatvio_app/features/plans/presentation/widgets/confirm_start_plan_bottom_sheet.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -11,12 +10,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/plans/presentation/widgets/options_tab_test.dart b/test/features/plans/presentation/widgets/options_tab_test.dart
index c820442b..f2851ebd 100644
--- a/test/features/plans/presentation/widgets/options_tab_test.dart
+++ b/test/features/plans/presentation/widgets/options_tab_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_state.dart';
import 'package:eatvio_app/features/plans/presentation/widgets/options_tab.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/plans/presentation/widgets/widgets_test.dart b/test/features/plans/presentation/widgets/widgets_test.dart
index aaecf30a..d2ed824e 100644
--- a/test/features/plans/presentation/widgets/widgets_test.dart
+++ b/test/features/plans/presentation/widgets/widgets_test.dart
@@ -10,9 +10,8 @@ import 'package:eatvio_app/features/plans/presentation/widgets/options_tab.dart'
import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -52,12 +51,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/profile/presentation/basic_widget_test.dart b/test/features/profile/presentation/basic_widget_test.dart
index e92f2906..0d06f807 100644
--- a/test/features/profile/presentation/basic_widget_test.dart
+++ b/test/features/profile/presentation/basic_widget_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/profile/presentation/pages/profile_screen_smoke_test.dart b/test/features/profile/presentation/pages/profile_screen_smoke_test.dart
index 4ecef522..addbe1fb 100644
--- a/test/features/profile/presentation/pages/profile_screen_smoke_test.dart
+++ b/test/features/profile/presentation/pages/profile_screen_smoke_test.dart
@@ -13,8 +13,7 @@ import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.da
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/features/plans/repositories/plans_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
@@ -56,12 +55,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/profile/presentation/pages/subs_screen_smoke_test.dart b/test/features/profile/presentation/pages/subs_screen_smoke_test.dart
index 70797652..7ef370bb 100644
--- a/test/features/profile/presentation/pages/subs_screen_smoke_test.dart
+++ b/test/features/profile/presentation/pages/subs_screen_smoke_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/profile/models/sub_model.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/profile/presentation/pages/subs_screen_test.dart b/test/features/profile/presentation/pages/subs_screen_test.dart
index f1cd34a5..1ab78869 100644
--- a/test/features/profile/presentation/pages/subs_screen_test.dart
+++ b/test/features/profile/presentation/pages/subs_screen_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/profile/presentation/widgets/circumference_chart_widget_test.dart b/test/features/profile/presentation/widgets/circumference_chart_widget_test.dart
index 1c68a19f..16e8f978 100644
--- a/test/features/profile/presentation/widgets/circumference_chart_widget_test.dart
+++ b/test/features/profile/presentation/widgets/circumference_chart_widget_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/models/circumference_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/circumference_chart_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:intl/date_symbol_data_local.dart';
diff --git a/test/features/profile/presentation/widgets/expandable_page_view_test.dart b/test/features/profile/presentation/widgets/expandable_page_view_test.dart
index 057e1de4..b213fbc3 100644
--- a/test/features/profile/presentation/widgets/expandable_page_view_test.dart
+++ b/test/features/profile/presentation/widgets/expandable_page_view_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/profile/presentation/widgets/expandable_page_view.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/profile/presentation/widgets/imt_chart_widget_test.dart b/test/features/profile/presentation/widgets/imt_chart_widget_test.dart
index 59eb1da3..cf4f1087 100644
--- a/test/features/profile/presentation/widgets/imt_chart_widget_test.dart
+++ b/test/features/profile/presentation/widgets/imt_chart_widget_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/models/weight_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/imt_chart_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
diff --git a/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart b/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart
index e1a5411f..cda2960f 100644
--- a/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart
+++ b/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart
@@ -11,9 +11,8 @@ import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/prof
import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/profile_blog_post_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -218,12 +217,7 @@ void main() {
await tester.pumpWidget(
MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: MediaQuery(
@@ -341,12 +335,7 @@ void main() {
await tester.pumpWidget(
MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: MediaQuery(
diff --git a/test/features/profile/presentation/widgets/profile_charts_smoke_test.dart b/test/features/profile/presentation/widgets/profile_charts_smoke_test.dart
index df88a7b5..62b5f3df 100644
--- a/test/features/profile/presentation/widgets/profile_charts_smoke_test.dart
+++ b/test/features/profile/presentation/widgets/profile_charts_smoke_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/features/profile/models/circumference_model.dart';
import 'package:eatvio_app/features/profile/models/weight_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/circumference_chart_widget.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:intl/intl.dart';
diff --git a/test/features/profile/presentation/widgets/sub_action_button_widget_test.dart b/test/features/profile/presentation/widgets/sub_action_button_widget_test.dart
index 9d61437e..7b4c3571 100644
--- a/test/features/profile/presentation/widgets/sub_action_button_widget_test.dart
+++ b/test/features/profile/presentation/widgets/sub_action_button_widget_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/prof
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_state.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/sub_action_button_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/profile/presentation/widgets/sub_widget_test.dart b/test/features/profile/presentation/widgets/sub_widget_test.dart
index 40967be0..d38e09d4 100644
--- a/test/features/profile/presentation/widgets/sub_widget_test.dart
+++ b/test/features/profile/presentation/widgets/sub_widget_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/models/sub_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/sub_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:go_router/go_router.dart';
diff --git a/test/features/profile/presentation/widgets/weight_chart_widget_test.dart b/test/features/profile/presentation/widgets/weight_chart_widget_test.dart
index f16d5322..ede96ed2 100644
--- a/test/features/profile/presentation/widgets/weight_chart_widget_test.dart
+++ b/test/features/profile/presentation/widgets/weight_chart_widget_test.dart
@@ -1,7 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/profile/models/weight_model.dart';
import 'package:eatvio_app/features/profile/presentation/widgets/weight_chart_widget.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:intl/date_symbol_data_local.dart';
diff --git a/test/features/recipe/presentation/pages/about_recipe_screen_smoke_test.dart b/test/features/recipe/presentation/pages/about_recipe_screen_smoke_test.dart
index 5b1eb97a..b9426289 100644
--- a/test/features/recipe/presentation/pages/about_recipe_screen_smoke_test.dart
+++ b/test/features/recipe/presentation/pages/about_recipe_screen_smoke_test.dart
@@ -11,10 +11,9 @@ import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit
import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_state.dart';
import 'package:eatvio_app/features/recipe/presentation/pages/about_recipe_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -102,12 +101,7 @@ void main() {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: router,
);
diff --git a/test/features/recipe/presentation/pages/my_recipes_screen_smoke_test.dart b/test/features/recipe/presentation/pages/my_recipes_screen_smoke_test.dart
index ebd26e01..430e017c 100644
--- a/test/features/recipe/presentation/pages/my_recipes_screen_smoke_test.dart
+++ b/test/features/recipe/presentation/pages/my_recipes_screen_smoke_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/m
import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recipes_state.dart';
import 'package:eatvio_app/features/recipe/presentation/pages/my_recipes_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -30,12 +29,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: child,
);
diff --git a/test/features/recipe/presentation/widgets/ingredients_widget_test.dart b/test/features/recipe/presentation/widgets/ingredients_widget_test.dart
index ccc46e3c..9bb9136a 100644
--- a/test/features/recipe/presentation/widgets/ingredients_widget_test.dart
+++ b/test/features/recipe/presentation/widgets/ingredients_widget_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/features/feed/models/recipes_model.dart';
import 'package:eatvio_app/features/recipe/presentation/widgets/ingredients_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -63,12 +62,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/recipe/presentation/widgets/my_recipe_widget_test.dart b/test/features/recipe/presentation/widgets/my_recipe_widget_test.dart
index caa91380..2e37fb48 100644
--- a/test/features/recipe/presentation/widgets/my_recipe_widget_test.dart
+++ b/test/features/recipe/presentation/widgets/my_recipe_widget_test.dart
@@ -9,10 +9,9 @@ import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/m
import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recipes_state.dart';
import 'package:eatvio_app/features/recipe/presentation/widgets/my_recipe_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -52,12 +51,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/recipe/presentation/widgets/my_recipes_tab_test.dart b/test/features/recipe/presentation/widgets/my_recipes_tab_test.dart
index 58d21ef1..4a688bf1 100644
--- a/test/features/recipe/presentation/widgets/my_recipes_tab_test.dart
+++ b/test/features/recipe/presentation/widgets/my_recipes_tab_test.dart
@@ -1,8 +1,7 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/recipe/presentation/widgets/my_recipes_tab.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -10,12 +9,7 @@ void main() {
Widget wrap() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Material(
child: MyRecipesTab(
diff --git a/test/features/recipes/presentation/widgets/basic_widget_test.dart b/test/features/recipes/presentation/widgets/basic_widget_test.dart
index d71601c9..621b9c00 100644
--- a/test/features/recipes/presentation/widgets/basic_widget_test.dart
+++ b/test/features/recipes/presentation/widgets/basic_widget_test.dart
@@ -12,9 +12,8 @@ import 'package:eatvio_app/features/feed/presentation/widgets/recipes_widget.dar
import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -87,12 +86,7 @@ void main() {
);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: widget,
);
@@ -101,12 +95,7 @@ void main() {
Widget createRecipesTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(
diff --git a/test/features/recipes/presentation/widgets/widgets_test.dart b/test/features/recipes/presentation/widgets/widgets_test.dart
index 0bb74dd4..d9f7f1e7 100644
--- a/test/features/recipes/presentation/widgets/widgets_test.dart
+++ b/test/features/recipes/presentation/widgets/widgets_test.dart
@@ -7,8 +7,7 @@ import 'package:eatvio_app/features/feed/models/recipes_model.dart' as recipes;
import 'package:eatvio_app/features/recipe/presentation/widgets/ingredients_widget.dart';
import 'package:eatvio_app/features/recipe/presentation/widgets/steps_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
@@ -25,12 +24,7 @@ void main() {
Widget createTestWidget(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Portal(
child: Scaffold(body: SingleChildScrollView(child: child)),
diff --git a/test/features/registration/basic_widget_test.dart b/test/features/registration/basic_widget_test.dart
index 2b0a6e29..cc2fde41 100644
--- a/test/features/registration/basic_widget_test.dart
+++ b/test/features/registration/basic_widget_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/prefs.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/registration/integration_widget_test.dart b/test/features/registration/integration_widget_test.dart
index 0e35d009..c03692f6 100644
--- a/test/features/registration/integration_widget_test.dart
+++ b/test/features/registration/integration_widget_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/prefs.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/registration/presentation/pages/additional_information_screen_test.dart b/test/features/registration/presentation/pages/additional_information_screen_test.dart
index d1f1e0d5..d696e050 100644
--- a/test/features/registration/presentation/pages/additional_information_screen_test.dart
+++ b/test/features/registration/presentation/pages/additional_information_screen_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/additional_information_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/registration/presentation/pages/allergies_screen_test.dart b/test/features/registration/presentation/pages/allergies_screen_test.dart
index aed4d2b2..c42b81f1 100644
--- a/test/features/registration/presentation/pages/allergies_screen_test.dart
+++ b/test/features/registration/presentation/pages/allergies_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/allergies_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/blood_pressure_screen_test.dart b/test/features/registration/presentation/pages/blood_pressure_screen_test.dart
index bec7200f..3c1ffc8f 100644
--- a/test/features/registration/presentation/pages/blood_pressure_screen_test.dart
+++ b/test/features/registration/presentation/pages/blood_pressure_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/blood_pressure_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/body_circumferences_screen_test.dart b/test/features/registration/presentation/pages/body_circumferences_screen_test.dart
index 6295ffb8..6efaf48a 100644
--- a/test/features/registration/presentation/pages/body_circumferences_screen_test.dart
+++ b/test/features/registration/presentation/pages/body_circumferences_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/body_circumferences_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/city_of_living_screen_test.dart b/test/features/registration/presentation/pages/city_of_living_screen_test.dart
index 3d63647f..eee380ac 100644
--- a/test/features/registration/presentation/pages/city_of_living_screen_test.dart
+++ b/test/features/registration/presentation/pages/city_of_living_screen_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/city_of_living_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/registration/presentation/pages/credentials_screen_test.dart b/test/features/registration/presentation/pages/credentials_screen_test.dart
index 8547f2c3..490dc60c 100644
--- a/test/features/registration/presentation/pages/credentials_screen_test.dart
+++ b/test/features/registration/presentation/pages/credentials_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/credentials_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/date_of_birth_screen_test.dart b/test/features/registration/presentation/pages/date_of_birth_screen_test.dart
index 9256e053..bd68a0f1 100644
--- a/test/features/registration/presentation/pages/date_of_birth_screen_test.dart
+++ b/test/features/registration/presentation/pages/date_of_birth_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/date_of_birth_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/favorite_foods_screen_test.dart b/test/features/registration/presentation/pages/favorite_foods_screen_test.dart
index e51fbbd5..6e60f4f7 100644
--- a/test/features/registration/presentation/pages/favorite_foods_screen_test.dart
+++ b/test/features/registration/presentation/pages/favorite_foods_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/favorite_foods_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/favorite_sports_screen_test.dart b/test/features/registration/presentation/pages/favorite_sports_screen_test.dart
index 5caa1e3b..e83020aa 100644
--- a/test/features/registration/presentation/pages/favorite_sports_screen_test.dart
+++ b/test/features/registration/presentation/pages/favorite_sports_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/favorite_sports_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/gender_screen_test.dart b/test/features/registration/presentation/pages/gender_screen_test.dart
index f202bbb4..f625352f 100644
--- a/test/features/registration/presentation/pages/gender_screen_test.dart
+++ b/test/features/registration/presentation/pages/gender_screen_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/gender_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/registration/presentation/pages/height_screen_test.dart b/test/features/registration/presentation/pages/height_screen_test.dart
index 4972969e..45953341 100644
--- a/test/features/registration/presentation/pages/height_screen_test.dart
+++ b/test/features/registration/presentation/pages/height_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/height_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/language_select_screen_test.dart b/test/features/registration/presentation/pages/language_select_screen_test.dart
index 769fed02..fd6c9558 100644
--- a/test/features/registration/presentation/pages/language_select_screen_test.dart
+++ b/test/features/registration/presentation/pages/language_select_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/language_select_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/medicine_intake_screen_test.dart b/test/features/registration/presentation/pages/medicine_intake_screen_test.dart
index ab89404a..59ec8e80 100644
--- a/test/features/registration/presentation/pages/medicine_intake_screen_test.dart
+++ b/test/features/registration/presentation/pages/medicine_intake_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/medicine_intake_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/name_screen_test.dart b/test/features/registration/presentation/pages/name_screen_test.dart
index a6481ade..0db39790 100644
--- a/test/features/registration/presentation/pages/name_screen_test.dart
+++ b/test/features/registration/presentation/pages/name_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/name_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/pages/phone_screen_test.dart b/test/features/registration/presentation/pages/phone_screen_test.dart
index 4bbf9fd8..dc42e9b8 100644
--- a/test/features/registration/presentation/pages/phone_screen_test.dart
+++ b/test/features/registration/presentation/pages/phone_screen_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/features/registration/models/user_registration_model.
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/phone_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/registration/presentation/pages/registration_screen_smoke_test.dart b/test/features/registration/presentation/pages/registration_screen_smoke_test.dart
index 4fc28966..88cc7cfd 100644
--- a/test/features/registration/presentation/pages/registration_screen_smoke_test.dart
+++ b/test/features/registration/presentation/pages/registration_screen_smoke_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/registration/presentation/pages/verify_email_screen_test.dart b/test/features/registration/presentation/pages/verify_email_screen_test.dart
index e65f4b5f..01b8ad29 100644
--- a/test/features/registration/presentation/pages/verify_email_screen_test.dart
+++ b/test/features/registration/presentation/pages/verify_email_screen_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/verify_email_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -35,12 +34,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/registration/presentation/pages/verify_screen_test.dart b/test/features/registration/presentation/pages/verify_screen_test.dart
index 4ec33bb1..3ce5bb3a 100644
--- a/test/features/registration/presentation/pages/verify_screen_test.dart
+++ b/test/features/registration/presentation/pages/verify_screen_test.dart
@@ -2,7 +2,7 @@ import 'package:eatvio_app/core/app_config.dart';
import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/features/registration/presentation/pages/verify_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
diff --git a/test/features/registration/presentation/pages/weight_screen_test.dart b/test/features/registration/presentation/pages/weight_screen_test.dart
index 1f670ea7..1423f9e8 100644
--- a/test/features/registration/presentation/pages/weight_screen_test.dart
+++ b/test/features/registration/presentation/pages/weight_screen_test.dart
@@ -7,10 +7,9 @@ import 'package:eatvio_app/features/registration/presentation/bloc/registration_
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
import 'package:eatvio_app/features/registration/presentation/pages/weight_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -61,12 +60,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: Scaffold(body: child),
);
diff --git a/test/features/registration/presentation/widgets/change_email_dialog_test.dart b/test/features/registration/presentation/widgets/change_email_dialog_test.dart
index 8ab87af3..337c0460 100644
--- a/test/features/registration/presentation/widgets/change_email_dialog_test.dart
+++ b/test/features/registration/presentation/widgets/change_email_dialog_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
import 'package:eatvio_app/features/registration/presentation/widgets/change_email_dialog.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/registration/presentation/widgets/code_not_received_dialog_test.dart b/test/features/registration/presentation/widgets/code_not_received_dialog_test.dart
index d770afa5..6b682fef 100644
--- a/test/features/registration/presentation/widgets/code_not_received_dialog_test.dart
+++ b/test/features/registration/presentation/widgets/code_not_received_dialog_test.dart
@@ -4,7 +4,7 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/widgets/code_not_received_dialog.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/registration_v2/presentation/pages/registration_v2_page_smoke_test.dart b/test/features/registration_v2/presentation/pages/registration_v2_page_smoke_test.dart
index d3a0905b..0802e84b 100644
--- a/test/features/registration_v2/presentation/pages/registration_v2_page_smoke_test.dart
+++ b/test/features/registration_v2/presentation/pages/registration_v2_page_smoke_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/pages/registration_v2_page.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -32,12 +31,7 @@ void main() {
sl.registerLazySingleton(() => cubit);
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(
body: BlocProvider.value(
diff --git a/test/features/registration_v2/presentation/widgets/first_step_content_test.dart b/test/features/registration_v2/presentation/widgets/first_step_content_test.dart
index cfb23b2d..6ec7db51 100644
--- a/test/features/registration_v2/presentation/widgets/first_step_content_test.dart
+++ b/test/features/registration_v2/presentation/widgets/first_step_content_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/first_step_content.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration_v2/presentation/widgets/password_field_test.dart b/test/features/registration_v2/presentation/widgets/password_field_test.dart
index 575a6a2b..edae714f 100644
--- a/test/features/registration_v2/presentation/widgets/password_field_test.dart
+++ b/test/features/registration_v2/presentation/widgets/password_field_test.dart
@@ -1,83 +1,77 @@
-import 'package:eatvio_app/core/app_config.dart';
-import 'package:eatvio_app/core/app_initializer.dart';
-import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
-import 'package:eatvio_app/features/registration_v2/presentation/widgets/password_field.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_portal/flutter_portal.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-
-import 'password_field_test.mocks.dart';
-
-@GenerateNiceMocks([MockSpec()])
-void main() {
- group('PasswordField', () {
- setUp(() async {
- await sl.reset();
- dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
- sl.registerLazySingleton(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
- });
-
- Widget createTestWidget(Widget child, RegistrationCubitV2 cubit) {
- return MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: const [Locale('ru')],
- home: Portal(
- child: BlocProvider(
- create: (_) => cubit,
- child: Scaffold(body: child),
- ),
- ),
- );
- }
-
- testWidgets('should display password field with password from state', (WidgetTester tester) async {
- // Arrange
- final mockCubit = MockRegistrationCubitV2();
- const testPassword = 'testPassword123';
- when(mockCubit.state).thenReturn(
- const RegistrationStateV2(password: testPassword),
- );
- final widget = PasswordField(cubit: mockCubit);
-
- // Act
- await tester.pumpWidget(createTestWidget(widget, mockCubit));
- await tester.pump();
-
- // Assert
- expect(find.byType(PasswordField), findsOneWidget);
- expect(find.text(testPassword), findsOneWidget);
- });
-
- testWidgets('should show copy icon initially', (WidgetTester tester) async {
- // Arrange
- final mockCubit = MockRegistrationCubitV2();
- when(mockCubit.state).thenReturn(
- const RegistrationStateV2(password: 'test'),
- );
- final widget = PasswordField(cubit: mockCubit);
-
- // Act
- await tester.pumpWidget(createTestWidget(widget, mockCubit));
- await tester.pump();
-
- // Assert
- expect(find.byType(PasswordField), findsOneWidget);
- });
- });
-}
-
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
+import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
+import 'package:eatvio_app/features/registration_v2/presentation/widgets/password_field.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_portal/flutter_portal.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+
+import 'password_field_test.mocks.dart';
+
+@GenerateNiceMocks([MockSpec()])
+void main() {
+ group('PasswordField', () {
+ setUp(() async {
+ await sl.reset();
+ dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+ sl.registerLazySingleton(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+ });
+
+ Widget createTestWidget(Widget child, RegistrationCubitV2 cubit) {
+ return MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: const [Locale('ru')],
+ home: Portal(
+ child: BlocProvider(
+ create: (_) => cubit,
+ child: Scaffold(body: child),
+ ),
+ ),
+ );
+ }
+
+ testWidgets('should display password field with password from state', (WidgetTester tester) async {
+ // Arrange
+ final mockCubit = MockRegistrationCubitV2();
+ const testPassword = 'testPassword123';
+ when(mockCubit.state).thenReturn(
+ const RegistrationStateV2(password: testPassword),
+ );
+ final widget = PasswordField(cubit: mockCubit);
+
+ // Act
+ await tester.pumpWidget(createTestWidget(widget, mockCubit));
+ await tester.pump();
+
+ // Assert
+ expect(find.byType(PasswordField), findsOneWidget);
+ expect(find.text(testPassword), findsOneWidget);
+ });
+
+ testWidgets('should show copy icon initially', (WidgetTester tester) async {
+ // Arrange
+ final mockCubit = MockRegistrationCubitV2();
+ when(mockCubit.state).thenReturn(
+ const RegistrationStateV2(password: 'test'),
+ );
+ final widget = PasswordField(cubit: mockCubit);
+
+ // Act
+ await tester.pumpWidget(createTestWidget(widget, mockCubit));
+ await tester.pump();
+
+ // Assert
+ expect(find.byType(PasswordField), findsOneWidget);
+ });
+ });
+}
+
diff --git a/test/features/registration_v2/presentation/widgets/phisical_activity_test.dart b/test/features/registration_v2/presentation/widgets/phisical_activity_test.dart
index cedace03..fa37c175 100644
--- a/test/features/registration_v2/presentation/widgets/phisical_activity_test.dart
+++ b/test/features/registration_v2/presentation/widgets/phisical_activity_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/phisical_activity.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/mockito.dart';
@@ -22,12 +21,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
home: BlocProvider.value(
diff --git a/test/features/registration_v2/presentation/widgets/second_step_content_test.dart b/test/features/registration_v2/presentation/widgets/second_step_content_test.dart
index 9ea40583..6a22ea43 100644
--- a/test/features/registration_v2/presentation/widgets/second_step_content_test.dart
+++ b/test/features/registration_v2/presentation/widgets/second_step_content_test.dart
@@ -6,10 +6,9 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/second_step_content.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -31,12 +30,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/registration_v2/presentation/widgets/sex_widget_test.dart b/test/features/registration_v2/presentation/widgets/sex_widget_test.dart
index 0c85cc60..c6ce0e13 100644
--- a/test/features/registration_v2/presentation/widgets/sex_widget_test.dart
+++ b/test/features/registration_v2/presentation/widgets/sex_widget_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/sex_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -24,12 +23,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: BlocProvider.value(
value: mockCubit,
diff --git a/test/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet_test.dart b/test/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet_test.dart
index e55692f5..e9c29630 100644
--- a/test/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet_test.dart
+++ b/test/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet_test.dart
@@ -1,120 +1,109 @@
-import 'package:eatvio_app/core/app_config.dart';
-import 'package:eatvio_app/core/app_initializer.dart';
-import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
-import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
-import 'package:eatvio_app/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart';
-import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:flutter_portal/flutter_portal.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
-
-import 'show_successful_registration_bottom_sheet_test.mocks.dart';
-
-@GenerateNiceMocks([MockSpec()])
-void main() {
- group('ShowSuccessfulRegistrationBottomSheet', () {
- setUp(() async {
- await sl.reset();
- dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
- sl.registerLazySingleton(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
- });
-
- Widget createTestWidget(Widget child, RegistrationCubitV2 cubit) {
- return MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: const [Locale('ru')],
- home: Portal(
- child: BlocProvider(
- create: (_) => cubit,
- child: Scaffold(
- body: Builder(
- builder: (context) => ElevatedButton(
- onPressed: () {
- showRegistrationBottomSheet(context, cubit, true);
- },
- child: const Text('Show Bottom Sheet'),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- testWidgets('should display success bottom sheet when isSuccess is true', (WidgetTester tester) async {
- // Arrange
- final mockCubit = MockRegistrationCubitV2();
- when(mockCubit.state).thenReturn(
- const RegistrationStateV2(password: 'testPassword'),
- );
-
- // Act
- await tester.pumpWidget(createTestWidget(const SizedBox(), mockCubit));
- await tester.pump();
- await tester.tap(find.text('Show Bottom Sheet'));
- await tester.pumpAndSettle();
-
- // Assert
- expect(find.byType(RegistrationBottomSheet), findsOneWidget);
- });
-
- testWidgets('should display error bottom sheet when isSuccess is false', (WidgetTester tester) async {
- // Arrange
- final mockCubit = MockRegistrationCubitV2();
- when(mockCubit.state).thenReturn(
- const RegistrationStateV2(),
- );
-
- Widget createTestWidgetError(Widget child, RegistrationCubitV2 cubit) {
- return MaterialApp(
- theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
- supportedLocales: const [Locale('ru')],
- home: Portal(
- child: BlocProvider(
- create: (_) => cubit,
- child: Scaffold(
- body: Builder(
- builder: (context) => ElevatedButton(
- onPressed: () {
- showRegistrationBottomSheet(context, cubit, false);
- },
- child: const Text('Show Bottom Sheet'),
- ),
- ),
- ),
- ),
- ),
- );
- }
-
- // Act
- await tester.pumpWidget(createTestWidgetError(const SizedBox(), mockCubit));
- await tester.pump();
- await tester.tap(find.text('Show Bottom Sheet'));
- await tester.pumpAndSettle();
-
- // Assert
- expect(find.byType(RegistrationBottomSheet), findsOneWidget);
- });
- });
-}
-
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
+import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
+import 'package:eatvio_app/features/registration_v2/presentation/widgets/show_successful_registration_bottom_sheet.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:material_ui/material_ui.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_portal/flutter_portal.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+
+import 'show_successful_registration_bottom_sheet_test.mocks.dart';
+
+@GenerateNiceMocks([MockSpec()])
+void main() {
+ group('ShowSuccessfulRegistrationBottomSheet', () {
+ setUp(() async {
+ await sl.reset();
+ dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+ sl.registerLazySingleton(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+ });
+
+ Widget createTestWidget(Widget child, RegistrationCubitV2 cubit) {
+ return MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: const [Locale('ru')],
+ home: Portal(
+ child: BlocProvider(
+ create: (_) => cubit,
+ child: Scaffold(
+ body: Builder(
+ builder: (context) => ElevatedButton(
+ onPressed: () {
+ showRegistrationBottomSheet(context, cubit, true);
+ },
+ child: const Text('Show Bottom Sheet'),
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+
+ testWidgets('should display success bottom sheet when isSuccess is true', (WidgetTester tester) async {
+ // Arrange
+ final mockCubit = MockRegistrationCubitV2();
+ when(mockCubit.state).thenReturn(
+ const RegistrationStateV2(password: 'testPassword'),
+ );
+
+ // Act
+ await tester.pumpWidget(createTestWidget(const SizedBox(), mockCubit));
+ await tester.pump();
+ await tester.tap(find.text('Show Bottom Sheet'));
+ await tester.pumpAndSettle();
+
+ // Assert
+ expect(find.byType(RegistrationBottomSheet), findsOneWidget);
+ });
+
+ testWidgets('should display error bottom sheet when isSuccess is false', (WidgetTester tester) async {
+ // Arrange
+ final mockCubit = MockRegistrationCubitV2();
+ when(mockCubit.state).thenReturn(
+ const RegistrationStateV2(),
+ );
+
+ Widget createTestWidgetError(Widget child, RegistrationCubitV2 cubit) {
+ return MaterialApp(
+ theme: ThemeHelper().themeData(),
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
+ supportedLocales: const [Locale('ru')],
+ home: Portal(
+ child: BlocProvider(
+ create: (_) => cubit,
+ child: Scaffold(
+ body: Builder(
+ builder: (context) => ElevatedButton(
+ onPressed: () {
+ showRegistrationBottomSheet(context, cubit, false);
+ },
+ child: const Text('Show Bottom Sheet'),
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+
+ // Act
+ await tester.pumpWidget(createTestWidgetError(const SizedBox(), mockCubit));
+ await tester.pump();
+ await tester.tap(find.text('Show Bottom Sheet'));
+ await tester.pumpAndSettle();
+
+ // Assert
+ expect(find.byType(RegistrationBottomSheet), findsOneWidget);
+ });
+ });
+}
+
diff --git a/test/features/registration_v2/presentation/widgets/step_progress_test.dart b/test/features/registration_v2/presentation/widgets/step_progress_test.dart
index 4fbfdc38..89aa2edc 100644
--- a/test/features/registration_v2/presentation/widgets/step_progress_test.dart
+++ b/test/features/registration_v2/presentation/widgets/step_progress_test.dart
@@ -5,7 +5,7 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/step_progress.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/registration_v2/presentation/widgets/step_widget_test.dart b/test/features/registration_v2/presentation/widgets/step_widget_test.dart
index 9d923ff0..a7b2689f 100644
--- a/test/features/registration_v2/presentation/widgets/step_widget_test.dart
+++ b/test/features/registration_v2/presentation/widgets/step_widget_test.dart
@@ -3,9 +3,8 @@ import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dar
import 'package:eatvio_app/features/registration_v2/cubit/registration_state.dart';
import 'package:eatvio_app/features/registration_v2/presentation/widgets/step_widget.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -24,12 +23,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru'), Locale('en')],
locale: const Locale('ru'),
home: BlocProvider.value(
diff --git a/test/features/settings/presentation/pages/change_email_screen_test.dart b/test/features/settings/presentation/pages/change_email_screen_test.dart
index addc8e4e..cecbbba1 100644
--- a/test/features/settings/presentation/pages/change_email_screen_test.dart
+++ b/test/features/settings/presentation/pages/change_email_screen_test.dart
@@ -7,7 +7,7 @@ import 'package:eatvio_app/features/settings/models/profile_settings_model.dart'
import 'package:eatvio_app/features/profile/models/profile_model.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:mockito/annotations.dart';
diff --git a/test/features/settings/presentation/pages/change_password_screen_test.dart b/test/features/settings/presentation/pages/change_password_screen_test.dart
index c46d2c56..0069ff77 100644
--- a/test/features/settings/presentation/pages/change_password_screen_test.dart
+++ b/test/features/settings/presentation/pages/change_password_screen_test.dart
@@ -3,8 +3,7 @@ import 'package:eatvio_app/features/settings/presentation/pages/change_password_
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/generated/l10n.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import '../../../../fixtures/doubles/session_doubles.dart';
import '../../../../fixtures/settings_fixtures.dart';
@@ -46,12 +45,7 @@ void main() {
await tester.pumpWidget(
MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: ChangePasswordScreen(settingsEntity: settingsEntity),
),
@@ -73,12 +67,7 @@ void main() {
await tester.pumpWidget(
MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: ChangePasswordScreen(settingsEntity: settingsEntity),
),
diff --git a/test/features/settings/presentation/pages/general_info_screen_test.dart b/test/features/settings/presentation/pages/general_info_screen_test.dart
index 2f0fa437..1d302215 100644
--- a/test/features/settings/presentation/pages/general_info_screen_test.dart
+++ b/test/features/settings/presentation/pages/general_info_screen_test.dart
@@ -12,10 +12,9 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/features/settings/presentation/pages/general_info_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -92,12 +91,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/settings/presentation/pages/other_info_screen_test.dart b/test/features/settings/presentation/pages/other_info_screen_test.dart
index ce6a1406..ee437678 100644
--- a/test/features/settings/presentation/pages/other_info_screen_test.dart
+++ b/test/features/settings/presentation/pages/other_info_screen_test.dart
@@ -9,10 +9,9 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/features/settings/presentation/pages/other_info_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -89,12 +88,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/settings/presentation/pages/physical_activity_screen_test.dart b/test/features/settings/presentation/pages/physical_activity_screen_test.dart
index 36b06b96..10d4a46b 100644
--- a/test/features/settings/presentation/pages/physical_activity_screen_test.dart
+++ b/test/features/settings/presentation/pages/physical_activity_screen_test.dart
@@ -8,7 +8,7 @@ import 'package:eatvio_app/features/settings/models/profile_settings_model.dart'
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/features/settings/presentation/pages/physical_activity_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/settings/presentation/pages/physical_form_screen_test.dart b/test/features/settings/presentation/pages/physical_form_screen_test.dart
index d0fb6cfd..bc86fdda 100644
--- a/test/features/settings/presentation/pages/physical_form_screen_test.dart
+++ b/test/features/settings/presentation/pages/physical_form_screen_test.dart
@@ -9,10 +9,9 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/features/settings/presentation/pages/physical_form_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -89,12 +88,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/settings/presentation/pages/pressure_screen_test.dart b/test/features/settings/presentation/pages/pressure_screen_test.dart
index d83ded4a..309597f9 100644
--- a/test/features/settings/presentation/pages/pressure_screen_test.dart
+++ b/test/features/settings/presentation/pages/pressure_screen_test.dart
@@ -9,10 +9,9 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/features/settings/presentation/pages/pressure_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -89,12 +88,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/settings/presentation/pages/settings_additional_info_screens_smoke_test.dart b/test/features/settings/presentation/pages/settings_additional_info_screens_smoke_test.dart
index 24b6c8dd..58f7cc4f 100644
--- a/test/features/settings/presentation/pages/settings_additional_info_screens_smoke_test.dart
+++ b/test/features/settings/presentation/pages/settings_additional_info_screens_smoke_test.dart
@@ -13,9 +13,8 @@ import 'package:eatvio_app/features/settings/presentation/pages/physical_activit
import 'package:eatvio_app/features/settings/presentation/pages/physical_form_screen.dart';
import 'package:eatvio_app/features/settings/presentation/pages/pressure_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -140,12 +139,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
diff --git a/test/features/settings/presentation/pages/settings_screen_smoke_test.dart b/test/features/settings/presentation/pages/settings_screen_smoke_test.dart
index 4f39560f..63a94707 100644
--- a/test/features/settings/presentation/pages/settings_screen_smoke_test.dart
+++ b/test/features/settings/presentation/pages/settings_screen_smoke_test.dart
@@ -11,9 +11,8 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/presentation/pages/settings_screen.dart';
import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
@@ -66,12 +65,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
);
diff --git a/test/features/settings/presentation/pages/settings_screen_test.dart b/test/features/settings/presentation/pages/settings_screen_test.dart
index 256e9f7c..d530be0d 100644
--- a/test/features/settings/presentation/pages/settings_screen_test.dart
+++ b/test/features/settings/presentation/pages/settings_screen_test.dart
@@ -6,9 +6,8 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
import 'package:eatvio_app/features/settings/presentation/pages/settings_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
import 'package:mockito/annotations.dart';
@@ -36,12 +35,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp.router(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
routerConfig: GoRouter(
initialLocation: '/',
diff --git a/test/features/support/presentation/pages/support_screen_test.dart b/test/features/support/presentation/pages/support_screen_test.dart
index ba6a44d3..50ea4eb6 100644
--- a/test/features/support/presentation/pages/support_screen_test.dart
+++ b/test/features/support/presentation/pages/support_screen_test.dart
@@ -4,9 +4,8 @@ import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/support/presentation/pages/support_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -20,12 +19,7 @@ void main() {
Widget createTestWidget() {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: const SupportScreen(),
);
diff --git a/test/features/update_screen/presentation/update_screen_smoke_test.dart b/test/features/update_screen/presentation/update_screen_smoke_test.dart
index 4ba0bbb0..17fd8aa2 100644
--- a/test/features/update_screen/presentation/update_screen_smoke_test.dart
+++ b/test/features/update_screen/presentation/update_screen_smoke_test.dart
@@ -3,7 +3,7 @@ import 'package:eatvio_app/core/app_initializer.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/update_screen/presentation/update_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/user_details/presentation/user_details_screen_smoke_test.dart b/test/features/user_details/presentation/user_details_screen_smoke_test.dart
index 6b8a2996..0b158ee1 100644
--- a/test/features/user_details/presentation/user_details_screen_smoke_test.dart
+++ b/test/features/user_details/presentation/user_details_screen_smoke_test.dart
@@ -9,9 +9,8 @@ import 'package:eatvio_app/features/profile/repositories/profile_repository.dart
import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_portal/flutter_portal.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
@@ -80,12 +79,7 @@ void main() {
return Portal(
child: MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: child,
),
diff --git a/test/features/user_details/presentation/widgets/expandable_bouble_test.dart b/test/features/user_details/presentation/widgets/expandable_bouble_test.dart
index 5c3cd24c..257795c9 100644
--- a/test/features/user_details/presentation/widgets/expandable_bouble_test.dart
+++ b/test/features/user_details/presentation/widgets/expandable_bouble_test.dart
@@ -1,6 +1,6 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:eatvio_app/features/user_details/presentation/widgets/expandable_bouble.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit_test.dart b/test/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit_test.dart
index aa570806..62337ff2 100644
--- a/test/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit_test.dart
+++ b/test/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit_test.dart
@@ -1,14 +1,22 @@
+import 'dart:async';
+
import 'package:eatvio_app/core/models/pagination_model.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/recording_period.dart';
+import 'package:eatvio_app/features/video_calls/recordings/models/recording_status.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
import 'package:eatvio_app/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart';
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/video_call_recording_file_service.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
class _MockRecordingsRepository extends Mock implements VideoCallRecordingsRepository {}
void main() {
+ setUpAll(() {
+ registerFallbackValue((int _, int _) {});
+ });
+
late _MockRecordingsRepository repository;
late VideoCallRecordingsCubit cubit;
@@ -40,7 +48,7 @@ void main() {
VideoCallRecordingModel recording(int id) {
return VideoCallRecordingModel(
id: id,
- status: 'ready',
+ status: RecordingStatus.ready,
createdAt: DateTime.utc(2026, 9, 21, 10),
previewUrl: 'https://example.com/preview.jpg',
fileUrl: 'https://example.com/api/video-call/recordings/$id/file',
@@ -109,4 +117,99 @@ void main() {
expect(cubit.state.recordings.map((e) => e.id), [1, 2]);
expect(cubit.state.currentPage, 2);
});
+
+ test('ignores a stale page after the period changes', () async {
+ final first = Completer();
+ when(
+ () => repository.getRecordings(page: 1, period: null),
+ ).thenAnswer((_) => first.future);
+ when(
+ () => repository.getRecordings(page: 1, period: RecordingPeriod.week),
+ ).thenAnswer(
+ (_) async => page(currentPage: 1, lastPage: 1, data: [recording(2)]),
+ );
+
+ final pending = cubit.load();
+ await cubit.setPeriod(RecordingPeriod.week);
+ first.complete(page(currentPage: 1, lastPage: 1, data: [recording(1)]));
+ await pending;
+
+ expect(cubit.state.period, RecordingPeriod.week);
+ expect(cubit.state.recordings.single.id, 2);
+ expect(cubit.state.error, isNull);
+ });
+
+ test('downloadRecording exposes progress then clears it', () async {
+ when(
+ () => repository.downloadRecordingFile(
+ fileUrl: any(named: 'fileUrl'),
+ recordingId: any(named: 'recordingId'),
+ onProgress: any(named: 'onProgress'),
+ ),
+ ).thenAnswer((invocation) async {
+ final onProgress =
+ invocation.namedArguments[#onProgress] as RecordingDownloadProgress?;
+ onProgress?.call(25, 100);
+ await Future.delayed(Duration.zero);
+ onProgress?.call(100, 100);
+ await Future.delayed(Duration.zero);
+ return '/storage/emulated/0/Download/recording_7.mp4';
+ });
+
+ final progressValues = [];
+ final sub = cubit.stream.listen((state) {
+ if (state.downloadingRecordingId != null || state.downloadProgress != null) {
+ progressValues.add(state.downloadProgress);
+ }
+ });
+
+ final saved = await cubit.downloadRecording(
+ recordingId: 7,
+ fileUrl: 'https://example.com/file',
+ );
+ await Future.delayed(Duration.zero);
+ await sub.cancel();
+
+ expect(saved, isA());
+ expect(
+ (saved as RecordingDownloadSaved).path,
+ '/storage/emulated/0/Download/recording_7.mp4',
+ );
+ expect(progressValues, containsAll([0.0, 0.25, 1.0]));
+ expect(cubit.state.downloadingRecordingId, isNull);
+ expect(cubit.state.downloadProgress, isNull);
+ });
+
+ test('second download while one is running is not a failure', () async {
+ final gate = Completer();
+ when(
+ () => repository.downloadRecordingFile(
+ fileUrl: any(named: 'fileUrl'),
+ recordingId: any(named: 'recordingId'),
+ onProgress: any(named: 'onProgress'),
+ ),
+ ).thenAnswer((_) => gate.future);
+
+ final first = cubit.downloadRecording(
+ recordingId: 7,
+ fileUrl: 'https://example.com/file',
+ );
+ final second = await cubit.downloadRecording(
+ recordingId: 8,
+ fileUrl: 'https://example.com/other',
+ );
+
+ expect(second, isA());
+ expect(cubit.state.downloadError, isNull);
+
+ gate.complete('/storage/emulated/0/Download/recording_7.mp4');
+ expect(await first, isA());
+ verify(
+ () => repository.downloadRecordingFile(
+ fileUrl: any(named: 'fileUrl'),
+ recordingId: any(named: 'recordingId'),
+ onProgress: any(named: 'onProgress'),
+ ),
+ ).called(1);
+ });
}
diff --git a/test/features/video_calls/recordings/presentation/widgets/recording_card_test.dart b/test/features/video_calls/recordings/presentation/widgets/recording_card_test.dart
index 8e94581d..b672d460 100644
--- a/test/features/video_calls/recordings/presentation/widgets/recording_card_test.dart
+++ b/test/features/video_calls/recordings/presentation/widgets/recording_card_test.dart
@@ -1,9 +1,9 @@
import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/video_calls/recordings/models/recording_status.dart';
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
import 'package:eatvio_app/features/video_calls/recordings/presentation/widgets/recording_card.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:network_image_mock/network_image_mock.dart';
@@ -11,12 +11,7 @@ void main() {
Widget wrap(Widget child) {
return MaterialApp(
theme: ThemeHelper().themeData(),
- localizationsDelegates: const [
- S.delegate,
- GlobalMaterialLocalizations.delegate,
- GlobalWidgetsLocalizations.delegate,
- GlobalCupertinoLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: const [Locale('ru')],
home: Scaffold(body: child),
);
@@ -26,30 +21,18 @@ void main() {
await mockNetworkImagesFor(() async {
final recording = VideoCallRecordingModel(
id: 1,
- status: 'ready',
+ status: RecordingStatus.ready,
durationSeconds: 125,
createdAt: DateTime.utc(2026, 5, 12, 14),
previewUrl: 'https://example.com/preview.jpg',
fileUrl: 'https://example.com/file',
- counterpart: const VideoCallRecordingCounterpartModel(
- name: 'Сидни',
- slug: 'sydney',
- profilePhotoUrl: 'https://example.com/a.jpg',
- ),
+ counterpart: const VideoCallRecordingCounterpartModel(name: 'Сидни', slug: 'sydney', profilePhotoUrl: 'https://example.com/a.jpg'),
);
var played = false;
var downloaded = false;
- await tester.pumpWidget(
- wrap(
- RecordingCard(
- recording: recording,
- onPlay: () => played = true,
- onDownload: () => downloaded = true,
- ),
- ),
- );
+ await tester.pumpWidget(wrap(RecordingCard(recording: recording, onPlay: () => played = true, onDownload: () => downloaded = true)));
await tester.pumpAndSettle();
expect(find.text('Скачать'), findsOneWidget);
@@ -63,24 +46,36 @@ void main() {
});
});
+ testWidgets('ready card shows download percent progress', (tester) async {
+ await mockNetworkImagesFor(() async {
+ final recording = VideoCallRecordingModel(
+ id: 1,
+ status: RecordingStatus.ready,
+ durationSeconds: 125,
+ createdAt: DateTime.utc(2026, 5, 12, 14),
+ previewUrl: 'https://example.com/preview.jpg',
+ fileUrl: 'https://example.com/file',
+ );
+
+ await tester.pumpWidget(wrap(RecordingCard(recording: recording, isDownloading: true, downloadProgress: 0.42, onPlay: () {}, onDownload: () {})));
+ await tester.pump();
+
+ expect(find.text('Скачать'), findsNothing);
+ expect(find.textContaining('42%'), findsOneWidget);
+ expect(find.byType(LinearProgressIndicator), findsOneWidget);
+ });
+ });
+
testWidgets('in_progress card hides download and play', (tester) async {
await mockNetworkImagesFor(() async {
final recording = VideoCallRecordingModel(
id: 2,
- status: 'in_progress',
+ status: RecordingStatus.inProgress,
createdAt: DateTime.utc(2026, 5, 12, 14),
previewUrl: 'https://example.com/placeholder.png',
);
- await tester.pumpWidget(
- wrap(
- RecordingCard(
- recording: recording,
- onPlay: () {},
- onDownload: () {},
- ),
- ),
- );
+ await tester.pumpWidget(wrap(RecordingCard(recording: recording, onPlay: () {}, onDownload: () {})));
await tester.pump();
expect(find.textContaining('обрабатывается'), findsOneWidget);
diff --git a/test/features/video_calls/recordings/repositories/video_call_recordings_repository_test.dart b/test/features/video_calls/recordings/repositories/video_call_recordings_repository_test.dart
index 1c2bbdfa..b06c68d4 100644
--- a/test/features/video_calls/recordings/repositories/video_call_recordings_repository_test.dart
+++ b/test/features/video_calls/recordings/repositories/video_call_recordings_repository_test.dart
@@ -1,74 +1,54 @@
-import 'package:dio/dio.dart';
-import 'package:eatvio_app/features/video_calls/recordings/models/recording_not_ready_exception.dart';
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/video_call_recording_file_service.dart';
import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
-import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mocktail/mocktail.dart';
class _MockVideoCallService extends Mock implements VideoCallService {}
-class _MockDio extends Mock implements Dio {}
+class _MockFileService extends Mock implements VideoCallRecordingFileService {}
void main() {
- TestWidgetsFlutterBinding.ensureInitialized();
-
- setUpAll(() {
- registerFallbackValue('');
- registerFallbackValue(Options());
-
- const MethodChannel pathProviderChannel =
- MethodChannel('plugins.flutter.io/path_provider');
- TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
- .setMockMethodCallHandler(pathProviderChannel, (call) async {
- if (call.method == 'getTemporaryDirectory') {
- return '/tmp';
- }
- return null;
- });
- });
-
- late _MockVideoCallService service;
- late _MockDio dio;
+ late _MockVideoCallService videoCallService;
+ late _MockFileService fileService;
late VideoCallRecordingsRepository repository;
+ setUpAll(() {
+ registerFallbackValue((int _, int _) {});
+ });
+
setUp(() {
- service = _MockVideoCallService();
- dio = _MockDio();
+ videoCallService = _MockVideoCallService();
+ fileService = _MockFileService();
repository = VideoCallRecordingsRepository(
- videoCallService: service,
- dio: dio,
+ videoCallService: videoCallService,
+ fileService: fileService,
);
});
- test('downloadRecordingFile maps 409 to RecordingNotReadyException', () async {
+ test('downloadRecordingFile delegates to file service with progress', () async {
+ RecordingDownloadProgress? captured;
+
when(
- () => dio.download(
- any(),
- any(),
- options: any(named: 'options'),
- ),
- ).thenThrow(
- DioException(
- requestOptions: RequestOptions(path: '/file'),
- response: Response(
- requestOptions: RequestOptions(path: '/file'),
- statusCode: 409,
- data: {
- 'message': 'Not ready',
- 'code': RecordingNotReadyException.code,
- },
- ),
- type: DioExceptionType.badResponse,
+ () => fileService.downloadRecordingFile(
+ fileUrl: any(named: 'fileUrl'),
+ recordingId: any(named: 'recordingId'),
+ onProgress: any(named: 'onProgress'),
),
+ ).thenAnswer((invocation) async {
+ captured = invocation.namedArguments[#onProgress] as RecordingDownloadProgress?;
+ captured?.call(10, 20);
+ return '/storage/emulated/0/Download/recording_1.mp4';
+ });
+
+ final progress = <(int, int)>[];
+ final result = await repository.downloadRecordingFile(
+ fileUrl: 'https://example.com/file',
+ recordingId: 1,
+ onProgress: (received, total) => progress.add((received, total)),
);
- await expectLater(
- repository.downloadRecordingFile(
- fileUrl: 'https://example.com/api/video-call/recordings/1/file',
- recordingId: 1,
- ),
- throwsA(isA()),
- );
+ expect(result, '/storage/emulated/0/Download/recording_1.mp4');
+ expect(progress, [(10, 20)]);
});
}
diff --git a/test/features/video_calls/recordings/services/video_call_recording_file_service_test.dart b/test/features/video_calls/recordings/services/video_call_recording_file_service_test.dart
new file mode 100644
index 00000000..760f1cee
--- /dev/null
+++ b/test/features/video_calls/recordings/services/video_call_recording_file_service_test.dart
@@ -0,0 +1,163 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/video_calls/recordings/models/recording_not_ready_exception.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/public_downloads_saver.dart';
+import 'package:eatvio_app/features/video_calls/recordings/services/video_call_recording_file_service.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+class _MockDio extends Mock implements Dio {}
+
+class _FakeDownloadsSaver extends Fake implements PublicDownloadsSaver {
+ String? lastSourcePath;
+ String? lastFileName;
+
+ @override
+ Future saveToDownloads({
+ required String sourcePath,
+ required String fileName,
+ String mimeType = 'video/mp4',
+ String subfolder = PublicDownloadsSaver.appFolderName,
+ }) async {
+ lastSourcePath = sourcePath;
+ lastFileName = fileName;
+ return 'content://downloads/Itvio/$fileName';
+ }
+}
+
+void main() {
+ TestWidgetsFlutterBinding.ensureInitialized();
+
+ setUpAll(() {
+ registerFallbackValue('');
+ registerFallbackValue(Options());
+
+ const MethodChannel pathProviderChannel =
+ MethodChannel('plugins.flutter.io/path_provider');
+ TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+ .setMockMethodCallHandler(pathProviderChannel, (call) async {
+ switch (call.method) {
+ case 'getTemporaryDirectory':
+ case 'getApplicationDocumentsDirectory':
+ return '/tmp';
+ default:
+ return null;
+ }
+ });
+ });
+
+ late _MockDio dio;
+ late _FakeDownloadsSaver downloadsSaver;
+ late VideoCallRecordingFileService service;
+
+ setUp(() {
+ dio = _MockDio();
+ downloadsSaver = _FakeDownloadsSaver();
+ service = VideoCallRecordingFileService(
+ dio: dio,
+ downloadsSaver: downloadsSaver,
+ );
+ });
+
+ test('maps 409 to RecordingNotReadyException before save', () async {
+ when(
+ () => dio.download(
+ any(),
+ any(),
+ cancelToken: any(named: 'cancelToken'),
+ onReceiveProgress: any(named: 'onReceiveProgress'),
+ options: any(named: 'options'),
+ ),
+ ).thenThrow(
+ DioException(
+ requestOptions: RequestOptions(path: '/file'),
+ response: Response(
+ requestOptions: RequestOptions(path: '/file'),
+ statusCode: 409,
+ data: {
+ 'message': 'Not ready',
+ 'code': RecordingNotReadyException.code,
+ },
+ ),
+ type: DioExceptionType.badResponse,
+ ),
+ );
+
+ await expectLater(
+ service.downloadRecordingFile(
+ fileUrl: 'https://example.com/api/video-call/recordings/1/file',
+ recordingId: 1,
+ ),
+ throwsA(isA()),
+ );
+ });
+
+ test('maps a 409 byte body to RecordingNotReadyException', () async {
+ when(
+ () => dio.download(
+ any(),
+ any(),
+ cancelToken: any(named: 'cancelToken'),
+ onReceiveProgress: any(named: 'onReceiveProgress'),
+ options: any(named: 'options'),
+ ),
+ ).thenThrow(
+ DioException(
+ requestOptions: RequestOptions(path: '/file'),
+ response: Response(
+ requestOptions: RequestOptions(path: '/file'),
+ statusCode: 409,
+ data: utf8.encode(
+ '{"message":"Not ready","code":"${RecordingNotReadyException.code}"}',
+ ),
+ ),
+ type: DioExceptionType.badResponse,
+ ),
+ );
+
+ await expectLater(
+ service.downloadRecordingFile(
+ fileUrl: 'https://example.com/api/video-call/recordings/1/file',
+ recordingId: 1,
+ ),
+ throwsA(
+ isA().having(
+ (error) => error.message,
+ 'message',
+ 'Not ready',
+ ),
+ ),
+ );
+ });
+
+ test('saves downloaded file via downloads saver', () async {
+ when(
+ () => dio.download(
+ any(),
+ any(),
+ cancelToken: any(named: 'cancelToken'),
+ onReceiveProgress: any(named: 'onReceiveProgress'),
+ options: any(named: 'options'),
+ ),
+ ).thenAnswer((invocation) async {
+ final path = invocation.positionalArguments[1] as String;
+ await File(path).writeAsBytes([1, 2, 3]);
+ return Response(
+ requestOptions: RequestOptions(path: '/file'),
+ statusCode: 200,
+ );
+ });
+
+ final saved = await service.downloadRecordingFile(
+ fileUrl: 'https://example.com/api/video-call/recordings/1/file',
+ recordingId: 1,
+ );
+
+ expect(downloadsSaver.lastFileName, 'recording_1.mp4');
+ expect(saved, contains('Itvio'));
+ expect(File(downloadsSaver.lastSourcePath!).existsSync(), isFalse);
+ });
+}
diff --git a/test/features/video_calls/widgets/video_call_controls_test.dart b/test/features/video_calls/widgets/video_call_controls_test.dart
index b3317b3c..07850395 100644
--- a/test/features/video_calls/widgets/video_call_controls_test.dart
+++ b/test/features/video_calls/widgets/video_call_controls_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_controls.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/video_calls/widgets/video_call_name_label_test.dart b/test/features/video_calls/widgets/video_call_name_label_test.dart
index 6332785e..8562ea52 100644
--- a/test/features/video_calls/widgets/video_call_name_label_test.dart
+++ b/test/features/video_calls/widgets/video_call_name_label_test.dart
@@ -1,7 +1,6 @@
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_name_chips.dart';
import 'package:eatvio_app/generated/l10n.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
@@ -9,11 +8,7 @@ void main() {
await tester.pumpWidget(
const MaterialApp(
home: Scaffold(
- body: Stack(
- children: [
- VideoCallParticipantNameLabel(name: 'Alex'),
- ],
- ),
+ body: Stack(children: [VideoCallParticipantNameLabel(name: 'Alex')]),
),
),
);
@@ -24,21 +19,10 @@ void main() {
testWidgets('VideoCallParticipantNameLabel renders consultant role above name', (tester) async {
await tester.pumpWidget(
MaterialApp(
- localizationsDelegates: const [
- S.delegate,
- ...GlobalMaterialLocalizations.delegates,
- GlobalWidgetsLocalizations.delegate,
- ],
+ localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
supportedLocales: S.delegate.supportedLocales,
home: const Scaffold(
- body: Stack(
- children: [
- VideoCallParticipantNameLabel(
- name: 'Alex',
- isConsultant: true,
- ),
- ],
- ),
+ body: Stack(children: [VideoCallParticipantNameLabel(name: 'Alex', isConsultant: true)]),
),
),
);
diff --git a/test/features/video_calls/widgets/video_call_no_video_background_test.dart b/test/features/video_calls/widgets/video_call_no_video_background_test.dart
index bdb5a3d6..a387b2f6 100644
--- a/test/features/video_calls/widgets/video_call_no_video_background_test.dart
+++ b/test/features/video_calls/widgets/video_call_no_video_background_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
void main() {
diff --git a/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart b/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart
index c34840f9..e2617226 100644
--- a/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart
+++ b/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart
@@ -1,7 +1,7 @@
import 'dart:collection';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
import 'package:mockito/annotations.dart';
diff --git a/test/features/video_calls/widgets/video_call_stage_layout_test.dart b/test/features/video_calls/widgets/video_call_stage_layout_test.dart
index ba3afd89..aa543e73 100644
--- a/test/features/video_calls/widgets/video_call_stage_layout_test.dart
+++ b/test/features/video_calls/widgets/video_call_stage_layout_test.dart
@@ -1,7 +1,7 @@
import 'dart:collection';
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_stage_layout.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:livekit_client/livekit_client.dart' as lk;
import 'package:mockito/annotations.dart';
diff --git a/test/features/video_calls/widgets/video_call_top_overlay_test.dart b/test/features/video_calls/widgets/video_call_top_overlay_test.dart
index f6dc791a..80de255c 100644
--- a/test/features/video_calls/widgets/video_call_top_overlay_test.dart
+++ b/test/features/video_calls/widgets/video_call_top_overlay_test.dart
@@ -1,5 +1,5 @@
import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_top_overlay.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_svg/flutter_svg.dart';
diff --git a/test/features/welcome/presentation/pages/welcome_screen_test.dart b/test/features/welcome/presentation/pages/welcome_screen_test.dart
index 406d7c2b..6bc7670c 100644
--- a/test/features/welcome/presentation/pages/welcome_screen_test.dart
+++ b/test/features/welcome/presentation/pages/welcome_screen_test.dart
@@ -6,7 +6,7 @@ import 'package:eatvio_app/core/prefs.dart';
import 'package:eatvio_app/core/theme/theme_helper.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:eatvio_app/features/welcome/presentation/pages/welcome_screen.dart';
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart';
diff --git a/test/helpers/webview_test_helper.dart b/test/helpers/webview_test_helper.dart
index ef55f6c2..f466b10d 100644
--- a/test/helpers/webview_test_helper.dart
+++ b/test/helpers/webview_test_helper.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:material_ui/material_ui.dart';
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
/// Helper class to set up WebViewPlatform for testing