diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 390ee63..922eb2f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,9 @@
android:authorities = "${applicationId}.fileprovider"
android:exported = "false"
android:grantUriPermissions = "true"
-android:name = "androidx.core.content.FileProvider">
+android:name = "androidx.core.content.FileProvider"
+android:usesCleartextTraffic="true">
+
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index cb24abd..ee64223 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+android.enableDexingArtifactTransform=false
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/assets/fail.mp3 b/assets/fail.mp3
new file mode 100644
index 0000000..6ad9241
Binary files /dev/null and b/assets/fail.mp3 differ
diff --git a/assets/invalid.mp3 b/assets/invalid.mp3
new file mode 100644
index 0000000..b7c5d31
Binary files /dev/null and b/assets/invalid.mp3 differ
diff --git a/assets/sounds/ScanFailed.mp3 b/assets/sounds/ScanFailed.mp3
new file mode 100644
index 0000000..7309226
Binary files /dev/null and b/assets/sounds/ScanFailed.mp3 differ
diff --git a/assets/sounds/Successful.mp3 b/assets/sounds/Successful.mp3
new file mode 100644
index 0000000..5fe691d
Binary files /dev/null and b/assets/sounds/Successful.mp3 differ
diff --git a/assets/success.mp3 b/assets/success.mp3
new file mode 100644
index 0000000..7b8174a
Binary files /dev/null and b/assets/success.mp3 differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0f8d01a..cdf552e 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,4 +1,10 @@
PODS:
+ - assets_audio_player (0.0.1):
+ - Flutter
+ - assets_audio_player_web (0.0.1):
+ - Flutter
+ - audioplayers_darwin (0.0.1):
+ - Flutter
- barcode_scan2 (0.0.1):
- Flutter
- MTBBarcodeScanner
@@ -24,20 +30,25 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- - permission_handler_apple (9.0.4):
+ - permission_handler_apple (9.1.0):
- Flutter
- platform_device_id (0.0.1):
- Flutter
+ - rive_common (0.0.1):
+ - Flutter
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- - sqflite (0.0.2):
+ - sqflite (0.0.3):
- Flutter
- FMDB (>= 2.7.5)
- SwiftProtobuf (1.20.3)
- Toast (4.0.0)
DEPENDENCIES:
+ - assets_audio_player (from `.symlinks/plugins/assets_audio_player/ios`)
+ - assets_audio_player_web (from `.symlinks/plugins/assets_audio_player_web/ios`)
+ - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
- barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
- device_info (from `.symlinks/plugins/device_info/ios`)
- easy_app_installer (from `.symlinks/plugins/easy_app_installer/ios`)
@@ -49,6 +60,7 @@ DEPENDENCIES:
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- platform_device_id (from `.symlinks/plugins/platform_device_id/ios`)
+ - rive_common (from `.symlinks/plugins/rive_common/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
@@ -60,6 +72,12 @@ SPEC REPOS:
- Toast
EXTERNAL SOURCES:
+ assets_audio_player:
+ :path: ".symlinks/plugins/assets_audio_player/ios"
+ assets_audio_player_web:
+ :path: ".symlinks/plugins/assets_audio_player_web/ios"
+ audioplayers_darwin:
+ :path: ".symlinks/plugins/audioplayers_darwin/ios"
barcode_scan2:
:path: ".symlinks/plugins/barcode_scan2/ios"
device_info:
@@ -82,27 +100,33 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/permission_handler_apple/ios"
platform_device_id:
:path: ".symlinks/plugins/platform_device_id/ios"
+ rive_common:
+ :path: ".symlinks/plugins/rive_common/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/ios"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
SPEC CHECKSUMS:
+ assets_audio_player: edee322b9cb625571b830b35872ead1a295fd917
+ assets_audio_player_web: 19826380c44375761aa0b9053665c1e3fbc3b86b
+ audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
easy_app_installer: 29abe397da7d86721fee853281202f414373f45c
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
- fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
+ fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
modal_progress_hud_nsn: f6fb744cd060653d66ed8f325360ef3650eb2fde
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
- path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
- permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+ path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
+ permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
platform_device_id: 81b3e2993881f87d0c82ef151dc274df4869aef5
- shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
- sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+ rive_common: 60ae7896ab40f9513974f36f015de33f70d2c5c5
+ shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
+ sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
SwiftProtobuf: b02b5075dcf60c9f5f403000b3b0c202a11b6ae1
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index db5f9c0..1372ea9 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -323,6 +323,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -341,7 +342,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -362,7 +363,7 @@
DEVELOPMENT_TEAM = 2WLSMMLG6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -404,6 +405,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -428,7 +430,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -459,6 +461,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -477,7 +480,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@@ -500,7 +503,7 @@
DEVELOPMENT_TEAM = 2WLSMMLG6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@@ -532,7 +535,7 @@
DEVELOPMENT_TEAM = 2WLSMMLG6W;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 06ce33a..67bed1a 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,6 +2,8 @@
+NSCameraUsageDescription
+ Camera permission is required for barcode scanning.
CADisableMinimumFrameDurationOnPhone
CFBundleDevelopmentRegion
diff --git a/lib/bloc/profile/family/family_bloc.dart b/lib/bloc/profile/family/family_bloc.dart
index f948ab6..96b13f8 100644
--- a/lib/bloc/profile/family/family_bloc.dart
+++ b/lib/bloc/profile/family/family_bloc.dart
@@ -120,5 +120,8 @@ class FamilyBloc extends Bloc {
emit(FamilyErrorState(message: e.toString()));
}
});
+ on((event,emit){
+ emit(FamilyErrorState(message: state.toString()));
+ });
}
}
diff --git a/lib/bloc/profile/family/family_event.dart b/lib/bloc/profile/family/family_event.dart
index ba6ff31..a9fb8c5 100644
--- a/lib/bloc/profile/family/family_event.dart
+++ b/lib/bloc/profile/family/family_event.dart
@@ -64,3 +64,8 @@ class AddEmergencyEvent extends FamilyEvent{
@override
List