Merge branch 'development' into Haroon
# Conflicts: # lib/config/localized_values.dartmerge-update-with-lab-changes
commit
b6c617888b
@ -1,461 +1,25 @@
|
||||
PODS:
|
||||
- android_intent (0.0.1):
|
||||
- Flutter
|
||||
- barcode_scan_fix (0.0.1):
|
||||
- Flutter
|
||||
- MTBBarcodeScanner
|
||||
- connectivity (0.0.1):
|
||||
- Flutter
|
||||
- Reachability
|
||||
- connectivity_for_web (0.1.0):
|
||||
- Flutter
|
||||
- connectivity_macos (0.0.1):
|
||||
- Flutter
|
||||
- device_calendar (0.0.1):
|
||||
- Flutter
|
||||
- device_info (0.0.1):
|
||||
- Flutter
|
||||
- Firebase/CoreOnly (6.33.0):
|
||||
- FirebaseCore (= 6.10.3)
|
||||
- Firebase/Messaging (6.33.0):
|
||||
- Firebase/CoreOnly
|
||||
- FirebaseMessaging (~> 4.7.0)
|
||||
- firebase_core (0.5.3):
|
||||
- Firebase/CoreOnly (~> 6.33.0)
|
||||
- Flutter
|
||||
- firebase_core_web (0.1.0):
|
||||
- Flutter
|
||||
- firebase_messaging (7.0.3):
|
||||
- Firebase/CoreOnly (~> 6.33.0)
|
||||
- Firebase/Messaging (~> 6.33.0)
|
||||
- firebase_core
|
||||
- Flutter
|
||||
- FirebaseCore (6.10.3):
|
||||
- FirebaseCoreDiagnostics (~> 1.6)
|
||||
- GoogleUtilities/Environment (~> 6.7)
|
||||
- GoogleUtilities/Logger (~> 6.7)
|
||||
- FirebaseCoreDiagnostics (1.7.0):
|
||||
- GoogleDataTransport (~> 7.4)
|
||||
- GoogleUtilities/Environment (~> 6.7)
|
||||
- GoogleUtilities/Logger (~> 6.7)
|
||||
- nanopb (~> 1.30906.0)
|
||||
- FirebaseInstallations (1.7.0):
|
||||
- FirebaseCore (~> 6.10)
|
||||
- GoogleUtilities/Environment (~> 6.7)
|
||||
- GoogleUtilities/UserDefaults (~> 6.7)
|
||||
- PromisesObjC (~> 1.2)
|
||||
- FirebaseInstanceID (4.8.0):
|
||||
- FirebaseCore (~> 6.10)
|
||||
- FirebaseInstallations (~> 1.6)
|
||||
- GoogleUtilities/Environment (~> 6.7)
|
||||
- GoogleUtilities/UserDefaults (~> 6.7)
|
||||
- FirebaseMessaging (4.7.1):
|
||||
- FirebaseCore (~> 6.10)
|
||||
- FirebaseInstanceID (~> 4.7)
|
||||
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
|
||||
- GoogleUtilities/Environment (~> 6.7)
|
||||
- GoogleUtilities/Reachability (~> 6.7)
|
||||
- GoogleUtilities/UserDefaults (~> 6.7)
|
||||
- Protobuf (>= 3.9.2, ~> 3.9)
|
||||
- Flutter (1.0.0)
|
||||
- flutter_email_sender (0.0.1):
|
||||
- Flutter
|
||||
- flutter_flexible_toast (0.0.1):
|
||||
- Flutter
|
||||
- flutter_inappwebview (0.0.1):
|
||||
- Flutter
|
||||
- flutter_local_notifications (0.0.1):
|
||||
- Flutter
|
||||
- flutter_plugin_android_lifecycle (0.0.1):
|
||||
- Flutter
|
||||
- flutter_tts (0.0.1):
|
||||
- Flutter
|
||||
- geolocator (6.1.9):
|
||||
- Flutter
|
||||
- google_maps_flutter (0.0.1):
|
||||
- Flutter
|
||||
- GoogleMaps (< 3.10)
|
||||
- GoogleDataTransport (7.5.1):
|
||||
- nanopb (~> 1.30906.0)
|
||||
- GoogleMaps (3.9.0):
|
||||
- GoogleMaps/Maps (= 3.9.0)
|
||||
- GoogleMaps/Base (3.9.0)
|
||||
- GoogleMaps/Maps (3.9.0):
|
||||
- GoogleMaps/Base
|
||||
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
|
||||
- GoogleUtilities/Environment
|
||||
- GoogleUtilities/Logger
|
||||
- GoogleUtilities/Network
|
||||
- GoogleUtilities/Environment (6.7.2):
|
||||
- PromisesObjC (~> 1.2)
|
||||
- GoogleUtilities/Logger (6.7.2):
|
||||
- GoogleUtilities/Environment
|
||||
- GoogleUtilities/Network (6.7.2):
|
||||
- GoogleUtilities/Logger
|
||||
- "GoogleUtilities/NSData+zlib"
|
||||
- GoogleUtilities/Reachability
|
||||
- "GoogleUtilities/NSData+zlib (6.7.2)"
|
||||
- GoogleUtilities/Reachability (6.7.2):
|
||||
- GoogleUtilities/Logger
|
||||
- GoogleUtilities/UserDefaults (6.7.2):
|
||||
- GoogleUtilities/Logger
|
||||
- hexcolor (0.0.1):
|
||||
- Flutter
|
||||
- image_cropper (0.0.3):
|
||||
- Flutter
|
||||
- TOCropViewController (~> 2.5.4)
|
||||
- image_picker (0.0.1):
|
||||
- Flutter
|
||||
- just_audio (0.0.1):
|
||||
- Flutter
|
||||
- local_auth (0.0.1):
|
||||
- Flutter
|
||||
- location (0.0.1):
|
||||
- Flutter
|
||||
- manage_calendar_events (0.0.1):
|
||||
- Flutter
|
||||
- map_launcher (0.0.1):
|
||||
- Flutter
|
||||
- maps_launcher (0.0.1):
|
||||
- Flutter
|
||||
- MTBBarcodeScanner (5.0.11)
|
||||
- nanopb (1.30906.0):
|
||||
- nanopb/decode (= 1.30906.0)
|
||||
- nanopb/encode (= 1.30906.0)
|
||||
- nanopb/decode (1.30906.0)
|
||||
- nanopb/encode (1.30906.0)
|
||||
- native_device_orientation (0.0.1):
|
||||
- Flutter
|
||||
- native_progress_hud (0.0.1):
|
||||
- Flutter
|
||||
- NVActivityIndicatorView (5.1.1):
|
||||
- NVActivityIndicatorView/Base (= 5.1.1)
|
||||
- NVActivityIndicatorView/Base (5.1.1)
|
||||
- path_provider (0.0.1):
|
||||
- Flutter
|
||||
- path_provider_linux (0.0.1):
|
||||
- Flutter
|
||||
- path_provider_macos (0.0.1):
|
||||
- Flutter
|
||||
- path_provider_windows (0.0.1):
|
||||
- Flutter
|
||||
- "permission_handler (5.0.1+1)":
|
||||
- Flutter
|
||||
- PromisesObjC (1.2.11)
|
||||
- Protobuf (3.13.0)
|
||||
- Reachability (3.2)
|
||||
- screen (0.0.1):
|
||||
- Flutter
|
||||
- shared_preferences (0.0.1):
|
||||
- Flutter
|
||||
- shared_preferences_linux (0.0.1):
|
||||
- Flutter
|
||||
- shared_preferences_macos (0.0.1):
|
||||
- Flutter
|
||||
- shared_preferences_web (0.0.1):
|
||||
- Flutter
|
||||
- shared_preferences_windows (0.0.1):
|
||||
- Flutter
|
||||
- speech_to_text (0.0.1):
|
||||
- Flutter
|
||||
- Try
|
||||
- TOCropViewController (2.5.5)
|
||||
- Try (2.1.1)
|
||||
- "twilio_programmable_video (0.5.0+4)":
|
||||
- Flutter
|
||||
- TwilioVideo (~> 3.4)
|
||||
- TwilioVideo (3.8.0)
|
||||
- url_launcher (0.0.1):
|
||||
- Flutter
|
||||
- url_launcher_linux (0.0.1):
|
||||
- Flutter
|
||||
- url_launcher_macos (0.0.1):
|
||||
- Flutter
|
||||
- url_launcher_web (0.0.1):
|
||||
- Flutter
|
||||
- url_launcher_windows (0.0.1):
|
||||
- Flutter
|
||||
- vibration (1.7.3):
|
||||
- Flutter
|
||||
- vibration_web (1.6.2):
|
||||
- Flutter
|
||||
- video_player (0.0.1):
|
||||
- Flutter
|
||||
- video_player_web (0.0.1):
|
||||
- Flutter
|
||||
- wakelock (0.0.1):
|
||||
- Flutter
|
||||
- webview_flutter (0.0.1):
|
||||
- Flutter
|
||||
- wifi (0.0.1):
|
||||
- Flutter
|
||||
|
||||
DEPENDENCIES:
|
||||
- android_intent (from `.symlinks/plugins/android_intent/ios`)
|
||||
- barcode_scan_fix (from `.symlinks/plugins/barcode_scan_fix/ios`)
|
||||
- connectivity (from `.symlinks/plugins/connectivity/ios`)
|
||||
- connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
|
||||
- connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
|
||||
- device_calendar (from `.symlinks/plugins/device_calendar/ios`)
|
||||
- device_info (from `.symlinks/plugins/device_info/ios`)
|
||||
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
|
||||
- firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
|
||||
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
|
||||
- Flutter (from `Flutter`)
|
||||
- flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`)
|
||||
- flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`)
|
||||
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
|
||||
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
||||
- flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
|
||||
- flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
|
||||
- geolocator (from `.symlinks/plugins/geolocator/ios`)
|
||||
- google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`)
|
||||
- hexcolor (from `.symlinks/plugins/hexcolor/ios`)
|
||||
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
|
||||
- image_picker (from `.symlinks/plugins/image_picker/ios`)
|
||||
- just_audio (from `.symlinks/plugins/just_audio/ios`)
|
||||
- local_auth (from `.symlinks/plugins/local_auth/ios`)
|
||||
- location (from `.symlinks/plugins/location/ios`)
|
||||
- manage_calendar_events (from `.symlinks/plugins/manage_calendar_events/ios`)
|
||||
- map_launcher (from `.symlinks/plugins/map_launcher/ios`)
|
||||
- maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
|
||||
- native_device_orientation (from `.symlinks/plugins/native_device_orientation/ios`)
|
||||
- native_progress_hud (from `.symlinks/plugins/native_progress_hud/ios`)
|
||||
- NVActivityIndicatorView
|
||||
- path_provider (from `.symlinks/plugins/path_provider/ios`)
|
||||
- path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
|
||||
- path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
|
||||
- path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
|
||||
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
|
||||
- screen (from `.symlinks/plugins/screen/ios`)
|
||||
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
|
||||
- shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
|
||||
- shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
|
||||
- shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
|
||||
- shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
|
||||
- speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
|
||||
- twilio_programmable_video (from `.symlinks/plugins/twilio_programmable_video/ios`)
|
||||
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
|
||||
- url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
|
||||
- url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
|
||||
- url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
|
||||
- url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
|
||||
- vibration (from `.symlinks/plugins/vibration/ios`)
|
||||
- vibration_web (from `.symlinks/plugins/vibration_web/ios`)
|
||||
- video_player (from `.symlinks/plugins/video_player/ios`)
|
||||
- video_player_web (from `.symlinks/plugins/video_player_web/ios`)
|
||||
- wakelock (from `.symlinks/plugins/wakelock/ios`)
|
||||
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
|
||||
- wifi (from `.symlinks/plugins/wifi/ios`)
|
||||
|
||||
SPEC REPOS:
|
||||
trunk:
|
||||
- Firebase
|
||||
- FirebaseCore
|
||||
- FirebaseCoreDiagnostics
|
||||
- FirebaseInstallations
|
||||
- FirebaseInstanceID
|
||||
- FirebaseMessaging
|
||||
- GoogleDataTransport
|
||||
- GoogleMaps
|
||||
- GoogleUtilities
|
||||
- MTBBarcodeScanner
|
||||
- nanopb
|
||||
- NVActivityIndicatorView
|
||||
- PromisesObjC
|
||||
- Protobuf
|
||||
- Reachability
|
||||
- TOCropViewController
|
||||
- Try
|
||||
- TwilioVideo
|
||||
|
||||
EXTERNAL SOURCES:
|
||||
android_intent:
|
||||
:path: ".symlinks/plugins/android_intent/ios"
|
||||
barcode_scan_fix:
|
||||
:path: ".symlinks/plugins/barcode_scan_fix/ios"
|
||||
connectivity:
|
||||
:path: ".symlinks/plugins/connectivity/ios"
|
||||
connectivity_for_web:
|
||||
:path: ".symlinks/plugins/connectivity_for_web/ios"
|
||||
connectivity_macos:
|
||||
:path: ".symlinks/plugins/connectivity_macos/ios"
|
||||
device_calendar:
|
||||
:path: ".symlinks/plugins/device_calendar/ios"
|
||||
device_info:
|
||||
:path: ".symlinks/plugins/device_info/ios"
|
||||
firebase_core:
|
||||
:path: ".symlinks/plugins/firebase_core/ios"
|
||||
firebase_core_web:
|
||||
:path: ".symlinks/plugins/firebase_core_web/ios"
|
||||
firebase_messaging:
|
||||
:path: ".symlinks/plugins/firebase_messaging/ios"
|
||||
Flutter:
|
||||
:path: Flutter
|
||||
flutter_email_sender:
|
||||
:path: ".symlinks/plugins/flutter_email_sender/ios"
|
||||
flutter_flexible_toast:
|
||||
:path: ".symlinks/plugins/flutter_flexible_toast/ios"
|
||||
flutter_inappwebview:
|
||||
:path: ".symlinks/plugins/flutter_inappwebview/ios"
|
||||
flutter_local_notifications:
|
||||
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
||||
flutter_plugin_android_lifecycle:
|
||||
:path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
|
||||
flutter_tts:
|
||||
:path: ".symlinks/plugins/flutter_tts/ios"
|
||||
geolocator:
|
||||
:path: ".symlinks/plugins/geolocator/ios"
|
||||
google_maps_flutter:
|
||||
:path: ".symlinks/plugins/google_maps_flutter/ios"
|
||||
hexcolor:
|
||||
:path: ".symlinks/plugins/hexcolor/ios"
|
||||
image_cropper:
|
||||
:path: ".symlinks/plugins/image_cropper/ios"
|
||||
image_picker:
|
||||
:path: ".symlinks/plugins/image_picker/ios"
|
||||
just_audio:
|
||||
:path: ".symlinks/plugins/just_audio/ios"
|
||||
local_auth:
|
||||
:path: ".symlinks/plugins/local_auth/ios"
|
||||
location:
|
||||
:path: ".symlinks/plugins/location/ios"
|
||||
manage_calendar_events:
|
||||
:path: ".symlinks/plugins/manage_calendar_events/ios"
|
||||
map_launcher:
|
||||
:path: ".symlinks/plugins/map_launcher/ios"
|
||||
maps_launcher:
|
||||
:path: ".symlinks/plugins/maps_launcher/ios"
|
||||
native_device_orientation:
|
||||
:path: ".symlinks/plugins/native_device_orientation/ios"
|
||||
native_progress_hud:
|
||||
:path: ".symlinks/plugins/native_progress_hud/ios"
|
||||
path_provider:
|
||||
:path: ".symlinks/plugins/path_provider/ios"
|
||||
path_provider_linux:
|
||||
:path: ".symlinks/plugins/path_provider_linux/ios"
|
||||
path_provider_macos:
|
||||
:path: ".symlinks/plugins/path_provider_macos/ios"
|
||||
path_provider_windows:
|
||||
:path: ".symlinks/plugins/path_provider_windows/ios"
|
||||
permission_handler:
|
||||
:path: ".symlinks/plugins/permission_handler/ios"
|
||||
screen:
|
||||
:path: ".symlinks/plugins/screen/ios"
|
||||
shared_preferences:
|
||||
:path: ".symlinks/plugins/shared_preferences/ios"
|
||||
shared_preferences_linux:
|
||||
:path: ".symlinks/plugins/shared_preferences_linux/ios"
|
||||
shared_preferences_macos:
|
||||
:path: ".symlinks/plugins/shared_preferences_macos/ios"
|
||||
shared_preferences_web:
|
||||
:path: ".symlinks/plugins/shared_preferences_web/ios"
|
||||
shared_preferences_windows:
|
||||
:path: ".symlinks/plugins/shared_preferences_windows/ios"
|
||||
speech_to_text:
|
||||
:path: ".symlinks/plugins/speech_to_text/ios"
|
||||
twilio_programmable_video:
|
||||
:path: ".symlinks/plugins/twilio_programmable_video/ios"
|
||||
url_launcher:
|
||||
:path: ".symlinks/plugins/url_launcher/ios"
|
||||
url_launcher_linux:
|
||||
:path: ".symlinks/plugins/url_launcher_linux/ios"
|
||||
url_launcher_macos:
|
||||
:path: ".symlinks/plugins/url_launcher_macos/ios"
|
||||
url_launcher_web:
|
||||
:path: ".symlinks/plugins/url_launcher_web/ios"
|
||||
url_launcher_windows:
|
||||
:path: ".symlinks/plugins/url_launcher_windows/ios"
|
||||
vibration:
|
||||
:path: ".symlinks/plugins/vibration/ios"
|
||||
vibration_web:
|
||||
:path: ".symlinks/plugins/vibration_web/ios"
|
||||
video_player:
|
||||
:path: ".symlinks/plugins/video_player/ios"
|
||||
video_player_web:
|
||||
:path: ".symlinks/plugins/video_player_web/ios"
|
||||
wakelock:
|
||||
:path: ".symlinks/plugins/wakelock/ios"
|
||||
webview_flutter:
|
||||
:path: ".symlinks/plugins/webview_flutter/ios"
|
||||
wifi:
|
||||
:path: ".symlinks/plugins/wifi/ios"
|
||||
|
||||
SPEC CHECKSUMS:
|
||||
android_intent: 367df2f1277a74e4a90e14a8ab3df3112d087052
|
||||
barcode_scan_fix: 80dd65de55f27eec6591dd077c8b85f2b79e31f1
|
||||
connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
|
||||
connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
|
||||
connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
|
||||
device_calendar: 23b28a5f1ab3bf77e34542fb1167e1b8b29a98f5
|
||||
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
|
||||
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
|
||||
firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
|
||||
firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
|
||||
firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
|
||||
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
|
||||
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
|
||||
FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
|
||||
FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
|
||||
FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
|
||||
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
|
||||
flutter_email_sender: f787522d0e82f50e5766c1213dbffff22fdcf009
|
||||
flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
|
||||
flutter_inappwebview: 69dfbac46157b336ffbec19ca6dfd4638c7bf189
|
||||
flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
|
||||
flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
|
||||
flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d
|
||||
geolocator: 057a0c63a43e9c5296d8ad845a3ac8e6df23d899
|
||||
google_maps_flutter: c7f9c73576de1fbe152a227bfd6e6c4ae8088619
|
||||
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
|
||||
GoogleMaps: 4b5346bddfe6911bb89155d43c903020170523ac
|
||||
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
|
||||
hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
|
||||
image_cropper: c8f9b4157933c7bb965a66d1c5e6c8fd408c6eb4
|
||||
image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
|
||||
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
|
||||
local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
|
||||
location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740
|
||||
manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34
|
||||
map_launcher: e325db1261d029ff33e08e03baccffe09593ffea
|
||||
maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
|
||||
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
|
||||
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
|
||||
native_device_orientation: e24d00be281de72996640885d80e706142707660
|
||||
native_progress_hud: f95f5529742b36a3c7fdecfa88dc018319e39bf9
|
||||
NVActivityIndicatorView: 1f6c5687f1171810aa27a3296814dc2d7dec3667
|
||||
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
|
||||
path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
|
||||
path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
|
||||
path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
|
||||
permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
|
||||
PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
|
||||
Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
|
||||
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
|
||||
screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
|
||||
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
|
||||
shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
|
||||
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
|
||||
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
|
||||
shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
|
||||
speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
|
||||
TOCropViewController: da59f531f8ac8a94ef6d6c0fc34009350f9e8bfe
|
||||
Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
|
||||
twilio_programmable_video: 6a41593640f3d86af60b22541fd457b22deaae7f
|
||||
TwilioVideo: c13a51ceca375e91620eb7578d2573c90cf53b46
|
||||
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
|
||||
url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
|
||||
url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
|
||||
url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
|
||||
url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
|
||||
vibration: b5a33e764c3f609a975b9dca73dce20fdde627dc
|
||||
vibration_web: 0ba303d92469ba34d71c612a228b315908d7fcd9
|
||||
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
|
||||
video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
|
||||
wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
|
||||
webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
|
||||
wifi: d7d77c94109e36c4175d845f0a5964eadba71060
|
||||
|
||||
PODFILE CHECKSUM: 5a17be3f8af73a757fa4439c77cf6ab2db29a6e7
|
||||
PODFILE CHECKSUM: d94bd40f28772938199c67fcced06ffe96096c14
|
||||
|
||||
COCOAPODS: 1.10.0
|
||||
COCOAPODS: 1.10.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,104 @@
|
||||
class UserDetailModel {
|
||||
int userID;
|
||||
int patientID;
|
||||
int patientType;
|
||||
bool patientOutSA;
|
||||
String firstName;
|
||||
String middleName;
|
||||
String lastName;
|
||||
String firstNameN;
|
||||
String middleNameN;
|
||||
String lastNameN;
|
||||
String identificationNo;
|
||||
String mobile;
|
||||
String emailID;
|
||||
String zipCode;
|
||||
String dOB;
|
||||
String gender;
|
||||
int activityID;
|
||||
String createdDate;
|
||||
double height;
|
||||
double weight;
|
||||
bool isHeightInCM;
|
||||
bool isWeightInKG;
|
||||
bool isNotificationON;
|
||||
|
||||
UserDetailModel(
|
||||
{this.userID,
|
||||
this.patientID,
|
||||
this.patientType,
|
||||
this.patientOutSA,
|
||||
this.firstName,
|
||||
this.middleName,
|
||||
this.lastName,
|
||||
this.firstNameN,
|
||||
this.middleNameN,
|
||||
this.lastNameN,
|
||||
this.identificationNo,
|
||||
this.mobile,
|
||||
this.emailID,
|
||||
this.zipCode,
|
||||
this.dOB,
|
||||
this.gender,
|
||||
this.activityID,
|
||||
this.createdDate,
|
||||
this.height,
|
||||
this.weight,
|
||||
this.isHeightInCM,
|
||||
this.isWeightInKG,
|
||||
this.isNotificationON});
|
||||
|
||||
UserDetailModel.fromJson(Map<String, dynamic> json) {
|
||||
userID = json['UserID'];
|
||||
patientID = json['PatientID'];
|
||||
patientType = json['PatientType'];
|
||||
patientOutSA = json['PatientOutSA'];
|
||||
firstName = json['FirstName'];
|
||||
middleName = json['MiddleName'];
|
||||
lastName = json['LastName'];
|
||||
firstNameN = json['FirstNameN'];
|
||||
middleNameN = json['MiddleNameN'];
|
||||
lastNameN = json['LastNameN'];
|
||||
identificationNo = json['IdentificationNo'];
|
||||
mobile = json['Mobile'];
|
||||
emailID = json['EmailID'];
|
||||
zipCode = json['ZipCode'];
|
||||
dOB = json['DOB'];
|
||||
gender = json['Gender'];
|
||||
activityID = json['ActivityID'];
|
||||
createdDate = json['CreatedDate'];
|
||||
height = json['Height'];
|
||||
weight = json['Weight'];
|
||||
isHeightInCM = json['IsHeightInCM'];
|
||||
isWeightInKG = json['IsWeightInKG'];
|
||||
isNotificationON = json['IsNotificationON'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['UserID'] = this.userID;
|
||||
data['PatientID'] = this.patientID;
|
||||
data['PatientType'] = this.patientType;
|
||||
data['PatientOutSA'] = this.patientOutSA;
|
||||
data['FirstName'] = this.firstName;
|
||||
data['MiddleName'] = this.middleName;
|
||||
data['LastName'] = this.lastName;
|
||||
data['FirstNameN'] = this.firstNameN;
|
||||
data['MiddleNameN'] = this.middleNameN;
|
||||
data['LastNameN'] = this.lastNameN;
|
||||
data['IdentificationNo'] = this.identificationNo;
|
||||
data['Mobile'] = this.mobile;
|
||||
data['EmailID'] = this.emailID;
|
||||
data['ZipCode'] = this.zipCode;
|
||||
data['DOB'] = this.dOB;
|
||||
data['Gender'] = this.gender;
|
||||
data['ActivityID'] = this.activityID;
|
||||
data['CreatedDate'] = this.createdDate;
|
||||
data['Height'] = this.height;
|
||||
data['Weight'] = this.weight;
|
||||
data['IsHeightInCM'] = this.isHeightInCM;
|
||||
data['IsWeightInKG'] = this.isWeightInKG;
|
||||
data['IsNotificationON'] = this.isNotificationON;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,124 @@
|
||||
class UserDetailRequestModel {
|
||||
String activityID;
|
||||
int channel;
|
||||
int deviceTypeID;
|
||||
String dOB;
|
||||
String email;
|
||||
String firstName;
|
||||
String gender;
|
||||
String generalid;
|
||||
double height;
|
||||
String identificationNo;
|
||||
String iPAdress;
|
||||
bool isDentalAllowedBackend;
|
||||
bool isHeightInCM;
|
||||
bool isNotificationOn;
|
||||
bool isWeightInKG;
|
||||
int languageID;
|
||||
String lastName;
|
||||
String middleName;
|
||||
String mobileNumber;
|
||||
int patientID;
|
||||
int patientOutSA;
|
||||
int patientType;
|
||||
int patientTypeID;
|
||||
String sessionID;
|
||||
String tokenID;
|
||||
double versionID;
|
||||
double weight;
|
||||
String zipCode;
|
||||
|
||||
UserDetailRequestModel(
|
||||
{this.activityID,
|
||||
this.channel,
|
||||
this.deviceTypeID,
|
||||
this.dOB,
|
||||
this.email,
|
||||
this.firstName,
|
||||
this.gender,
|
||||
this.generalid,
|
||||
this.height,
|
||||
this.identificationNo,
|
||||
this.iPAdress,
|
||||
this.isDentalAllowedBackend,
|
||||
this.isHeightInCM,
|
||||
this.isNotificationOn,
|
||||
this.isWeightInKG,
|
||||
this.languageID,
|
||||
this.lastName,
|
||||
this.middleName,
|
||||
this.mobileNumber,
|
||||
this.patientID,
|
||||
this.patientOutSA,
|
||||
this.patientType,
|
||||
this.patientTypeID,
|
||||
this.sessionID,
|
||||
this.tokenID,
|
||||
this.versionID,
|
||||
this.weight,
|
||||
this.zipCode});
|
||||
|
||||
UserDetailRequestModel.fromJson(Map<String, dynamic> json) {
|
||||
activityID = json['ActivityID'];
|
||||
channel = json['Channel'];
|
||||
deviceTypeID = json['DeviceTypeID'];
|
||||
dOB = json['DOB'];
|
||||
email = json['Email'];
|
||||
firstName = json['FirstName'];
|
||||
gender = json['Gender'];
|
||||
generalid = json['generalid'];
|
||||
height = json['Height'];
|
||||
identificationNo = json['IdentificationNo'];
|
||||
iPAdress = json['IPAdress'];
|
||||
isDentalAllowedBackend = json['isDentalAllowedBackend'];
|
||||
isHeightInCM = json['IsHeightInCM'];
|
||||
isNotificationOn = json['isNotificationOn'];
|
||||
isWeightInKG = json['IsWeightInKG'];
|
||||
languageID = json['LanguageID'];
|
||||
lastName = json['LastName'];
|
||||
middleName = json['MiddleName'];
|
||||
mobileNumber = json['MobileNumber'];
|
||||
patientID = json['PatientID'];
|
||||
patientOutSA = json['PatientOutSA'];
|
||||
patientType = json['PatientType'];
|
||||
patientTypeID = json['PatientTypeID'];
|
||||
sessionID = json['SessionID'];
|
||||
tokenID = json['TokenID'];
|
||||
versionID = json['VersionID'];
|
||||
weight = json['Weight'];
|
||||
zipCode = json['ZipCode'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['ActivityID'] = this.activityID;
|
||||
data['Channel'] = this.channel;
|
||||
data['DeviceTypeID'] = this.deviceTypeID;
|
||||
data['DOB'] = this.dOB;
|
||||
data['Email'] = this.email;
|
||||
data['FirstName'] = this.firstName;
|
||||
data['Gender'] = this.gender;
|
||||
data['generalid'] = this.generalid;
|
||||
data['Height'] = this.height;
|
||||
data['IdentificationNo'] = this.identificationNo;
|
||||
data['IPAdress'] = this.iPAdress;
|
||||
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
|
||||
data['IsHeightInCM'] = this.isHeightInCM;
|
||||
data['isNotificationOn'] = this.isNotificationOn;
|
||||
data['IsWeightInKG'] = this.isWeightInKG;
|
||||
data['LanguageID'] = this.languageID;
|
||||
data['LastName'] = this.lastName;
|
||||
data['MiddleName'] = this.middleName;
|
||||
data['MobileNumber'] = this.mobileNumber;
|
||||
data['PatientID'] = this.patientID;
|
||||
data['PatientOutSA'] = this.patientOutSA;
|
||||
data['PatientType'] = this.patientType;
|
||||
data['PatientTypeID'] = this.patientTypeID;
|
||||
data['SessionID'] = this.sessionID;
|
||||
data['TokenID'] = this.tokenID;
|
||||
data['VersionID'] = this.versionID;
|
||||
data['Weight'] = this.weight;
|
||||
data['ZipCode'] = this.zipCode;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,101 @@
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class CommonRadioButtonDialog extends StatefulWidget {
|
||||
final List<String> list;
|
||||
final String title;
|
||||
final int selectedIndex;
|
||||
final Function(int) onSelect;
|
||||
CommonRadioButtonDialog({Key key, this.title = "", this.selectedIndex = 0, this.list, this.onSelect}) : super(key: key);
|
||||
|
||||
@override
|
||||
_CommonRadioButtonDialogState createState() {
|
||||
return _CommonRadioButtonDialogState();
|
||||
}
|
||||
}
|
||||
|
||||
class _CommonRadioButtonDialogState extends State<CommonRadioButtonDialog> {
|
||||
int _selectedIndex = 0;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_selectedIndex = widget.selectedIndex;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Dialog(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
elevation: 0,
|
||||
backgroundColor: Colors.white,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Container(
|
||||
height: widget.title == "" ? 24 : 50,
|
||||
alignment: Alignment.center,
|
||||
child: Text(
|
||||
widget.title,
|
||||
style: TextStyle(color: Colors.black87, fontSize: 18, fontWeight: FontWeight.w500),
|
||||
),
|
||||
),
|
||||
Divider(height: 1, color: Colors.black38),
|
||||
ListView.builder(
|
||||
shrinkWrap: true,
|
||||
padding: EdgeInsets.only(top: 4, bottom: 4),
|
||||
physics: NeverScrollableScrollPhysics(),
|
||||
itemBuilder: (context, index) {
|
||||
return RadioListTile(
|
||||
value: index,
|
||||
dense: true,
|
||||
activeColor: Colors.black54,
|
||||
groupValue: _selectedIndex,
|
||||
onChanged: (_index) => setState(() => _selectedIndex = _index),
|
||||
title: Text(
|
||||
widget.list[index],
|
||||
style: TextStyle(fontWeight: FontWeight.w500),
|
||||
),
|
||||
);
|
||||
},
|
||||
itemCount: widget.list?.length ?? 0,
|
||||
),
|
||||
Divider(height: 1, color: Colors.black38),
|
||||
Container(
|
||||
height: 50,
|
||||
alignment: Alignment.center,
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: FlatButton(
|
||||
child: Text(
|
||||
TranslationBase.of(context).cancel,
|
||||
style: TextStyle(color: Colors.redAccent, fontSize: 16, fontWeight: FontWeight.w500),
|
||||
),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: FlatButton(
|
||||
child: Text(
|
||||
TranslationBase.of(context).ok,
|
||||
style: TextStyle(color: Colors.black87, fontSize: 16, fontWeight: FontWeight.w500),
|
||||
),
|
||||
onPressed: () => widget.onSelect(_selectedIndex),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,463 @@
|
||||
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/H2O/user_detail_model.dart';
|
||||
import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/H2O_service.dart';
|
||||
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/H2O_view_model.dart';
|
||||
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
|
||||
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
|
||||
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
|
||||
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/painting.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
||||
import 'Dialog/setting_page_radio_button_list_dialog.dart';
|
||||
|
||||
class H2oSetting extends StatefulWidget {
|
||||
final UserDetailModel userDetailModel;
|
||||
final H2OViewModel viewModel;
|
||||
H2oSetting({Key key, this.userDetailModel, this.viewModel}) : super(key: key);
|
||||
|
||||
@override
|
||||
_H2oSettingState createState() {
|
||||
return _H2oSettingState();
|
||||
}
|
||||
}
|
||||
|
||||
class _H2oSettingState extends State<H2oSetting> {
|
||||
TextEditingController _nameController = TextEditingController();
|
||||
TextEditingController _heightController = TextEditingController();
|
||||
TextEditingController _weightController = TextEditingController();
|
||||
bool _isUnitML = false;
|
||||
bool _isGenderMale = false;
|
||||
bool _isHeightCM = false;
|
||||
bool _isWeightKG = false;
|
||||
double _heightValue = 1;
|
||||
double _weightValue = 1;
|
||||
|
||||
List<String> _activityLevelListEng = [];
|
||||
List<String> _remindedTimeListEng = [];
|
||||
int _selectedActiveLevel = 1;
|
||||
int _selectedRemindedTime = 0;
|
||||
DateTime _dobDate = DateTime.now();
|
||||
DateTime _tempDate = DateTime.now();
|
||||
|
||||
UserDetailModel _userDetailModel;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_userDetailModel = widget.userDetailModel;
|
||||
_heightValue = _userDetailModel.height;
|
||||
_weightValue = _userDetailModel.weight;
|
||||
_heightController.text = _heightValue.toStringAsFixed(0);
|
||||
_weightController.text = _weightValue.toStringAsFixed(0);
|
||||
_nameController.text = _userDetailModel.firstName;
|
||||
_isWeightKG = _userDetailModel.isWeightInKG;
|
||||
_isHeightCM = _userDetailModel.isHeightInCM;
|
||||
_isGenderMale = _userDetailModel.gender == "M" ? true : false;
|
||||
_dobDate = DateUtil.convertStringToDate(_userDetailModel.dOB);
|
||||
_selectedActiveLevel = _userDetailModel.activityID ?? 1;
|
||||
}
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
// TODO: implement didChangeDependencies
|
||||
super.didChangeDependencies();
|
||||
|
||||
_activityLevelListEng = [
|
||||
TranslationBase.of(context).notActive,
|
||||
TranslationBase.of(context).lightActive,
|
||||
TranslationBase.of(context).modActive,
|
||||
TranslationBase.of(context).active
|
||||
];
|
||||
|
||||
_remindedTimeListEng = [
|
||||
"1 ${TranslationBase.of(context).time}",
|
||||
"2 ${TranslationBase.of(context).times}",
|
||||
"3 ${TranslationBase.of(context).times}",
|
||||
"4 ${TranslationBase.of(context).times}"
|
||||
];
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return AppScaffold(
|
||||
isShowAppBar: true,
|
||||
appBarTitle: TranslationBase.of(context).h2o,
|
||||
showHomeAppBarIcon: false,
|
||||
body: SingleChildScrollView(
|
||||
padding: EdgeInsets.fromLTRB(8, 8, 8, 80),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
TextField(
|
||||
controller: _nameController,
|
||||
decoration: InputDecoration(
|
||||
labelText: TranslationBase.of(context).enterNameHere,
|
||||
labelStyle: TextStyle(color: Colors.black87),
|
||||
fillColor: Colors.white,
|
||||
filled: true,
|
||||
border: UnderlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
width: 0,
|
||||
style: BorderStyle.none,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(6.0),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
Text(TranslationBase.of(context).preferredunit),
|
||||
SizedBox(height: 8),
|
||||
_commonButtonsRow(TranslationBase.of(context).ml, TranslationBase.of(context).l, _isUnitML, (value) {
|
||||
if (_isUnitML != value) {
|
||||
setState(() {
|
||||
_isUnitML = value;
|
||||
});
|
||||
}
|
||||
}),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
|
||||
child: Divider(height: 1.5, color: Colors.black54),
|
||||
),
|
||||
Text(TranslationBase.of(context).gender),
|
||||
SizedBox(height: 8),
|
||||
_commonButtonsRow(TranslationBase.of(context).male, TranslationBase.of(context).female, _isGenderMale, (value) {
|
||||
if (_isGenderMale != value) {
|
||||
setState(() {
|
||||
_isGenderMale = value;
|
||||
});
|
||||
}
|
||||
}),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
|
||||
child: Divider(height: 1.5, color: Colors.black54),
|
||||
),
|
||||
Text(TranslationBase.of(context).height),
|
||||
_commonSlidersRow(_heightController, 1, 270, _heightValue, (text) {
|
||||
_heightController.text = text;
|
||||
}, (value) {
|
||||
setState(() {
|
||||
_heightValue = value;
|
||||
});
|
||||
}),
|
||||
SizedBox(height: 8),
|
||||
Text(TranslationBase.of(context).heightUnit),
|
||||
SizedBox(height: 8),
|
||||
_commonButtonsRow(TranslationBase.of(context).cm, TranslationBase.of(context).ft, _isHeightCM, (value) {
|
||||
if (_isHeightCM != value) {
|
||||
setState(() {
|
||||
_isHeightCM = value;
|
||||
});
|
||||
}
|
||||
}),
|
||||
SizedBox(height: 8),
|
||||
_commonSlidersRow(_weightController, 1, 250, _weightValue, (text) {
|
||||
_weightController.text = text;
|
||||
}, (value) {
|
||||
setState(() {
|
||||
_weightValue = value;
|
||||
});
|
||||
}),
|
||||
SizedBox(height: 8),
|
||||
Text(TranslationBase.of(context).weightUnit),
|
||||
SizedBox(height: 8),
|
||||
_commonButtonsRow(TranslationBase.of(context).kg, TranslationBase.of(context).lb, _isWeightKG, (value) {
|
||||
if (_isWeightKG != value) {
|
||||
setState(() {
|
||||
_isWeightKG = value;
|
||||
});
|
||||
}
|
||||
}),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(top: 8.0, bottom: 8.0),
|
||||
child: Divider(height: 1.5, color: Colors.black54),
|
||||
),
|
||||
Container(
|
||||
padding: EdgeInsets.all(8),
|
||||
width: MediaQuery.of(context).size.width,
|
||||
decoration: BoxDecoration(borderRadius: BorderRadius.circular(8), color: Colors.white),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text("${TranslationBase.of(context).birth_date}:"),
|
||||
SizedBox(height: 8),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
showModalBottomSheet(
|
||||
context: context,
|
||||
builder: (context) {
|
||||
return Container(
|
||||
height: 250,
|
||||
padding: EdgeInsets.all(8),
|
||||
child: Column(children: [
|
||||
Container(
|
||||
height: 40,
|
||||
alignment: Alignment.centerRight,
|
||||
child: Row(mainAxisSize: MainAxisSize.min, children: [
|
||||
InkWell(
|
||||
onTap: () => Navigator.pop(context),
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
|
||||
child: Text(TranslationBase.of(context).cancel),
|
||||
),
|
||||
),
|
||||
SizedBox(width: 8),
|
||||
InkWell(
|
||||
onTap: () {
|
||||
Navigator.pop(context);
|
||||
setState(() {
|
||||
_dobDate = _tempDate;
|
||||
});
|
||||
},
|
||||
child: Container(
|
||||
alignment: Alignment.center,
|
||||
padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
|
||||
child: Text(TranslationBase.of(context).ok),
|
||||
),
|
||||
)
|
||||
]),
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
width: MediaQuery.of(context).size.width,
|
||||
child: CupertinoDatePicker(
|
||||
initialDateTime: _dobDate,
|
||||
mode: CupertinoDatePickerMode.date,
|
||||
onDateTimeChanged: (_date) {
|
||||
_tempDate = _date;
|
||||
},
|
||||
),
|
||||
),
|
||||
)
|
||||
]),
|
||||
);
|
||||
});
|
||||
}, // implement cupertino dialog to select date
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [Text(DateUtil.getFormattedDate(_dobDate, "yyyy-MM-dd")), Icon(Icons.arrow_drop_down_outlined)]),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
SizedBox(height: 8),
|
||||
_commonDialogSelectorRow(TranslationBase.of(context).activityLevel, _activityLevelListEng[_selectedActiveLevel - 1], () {
|
||||
showDialog(
|
||||
context: context,
|
||||
child: CommonRadioButtonDialog(
|
||||
list: _activityLevelListEng,
|
||||
title: TranslationBase.of(context).activityLevel,
|
||||
onSelect: (index) {
|
||||
Navigator.pop(context);
|
||||
setState(() {
|
||||
_selectedActiveLevel = index + 1;
|
||||
});
|
||||
},
|
||||
selectedIndex: _selectedActiveLevel - 1,
|
||||
),
|
||||
);
|
||||
}),
|
||||
SizedBox(height: 8),
|
||||
_commonDialogSelectorRow(TranslationBase.of(context).reminderLabel, _remindedTimeListEng[_selectedRemindedTime], () {
|
||||
showDialog(
|
||||
context: context,
|
||||
child: CommonRadioButtonDialog(
|
||||
list: _remindedTimeListEng,
|
||||
onSelect: (index) {
|
||||
Navigator.pop(context);
|
||||
setState(() {
|
||||
_selectedRemindedTime = index;
|
||||
});
|
||||
},
|
||||
selectedIndex: _selectedRemindedTime,
|
||||
),
|
||||
);
|
||||
}),
|
||||
SizedBox(height: 16),
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: MediaQuery.of(context).size.width,
|
||||
child: FlatButton(
|
||||
color: Theme.of(context).appBarTheme.color,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8.0),
|
||||
),
|
||||
onPressed: _updateUserDetails,
|
||||
child: Text(
|
||||
TranslationBase.of(context).save,
|
||||
style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _commonButtonsRow(String rightText, String leftText, bool checkParam, Function(bool) callBack) {
|
||||
return Row(children: [
|
||||
Expanded(
|
||||
child: SizedBox(
|
||||
height: 40,
|
||||
child: RaisedButton(
|
||||
color: checkParam ? Theme.of(context).appBarTheme.color : Colors.white,
|
||||
child: Text(
|
||||
rightText,
|
||||
style: TextStyle(color: checkParam ? Colors.white : Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w600),
|
||||
),
|
||||
onPressed: () => callBack(true),
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: SizedBox(
|
||||
height: 40,
|
||||
child: RaisedButton(
|
||||
color: !checkParam ? Theme.of(context).appBarTheme.color : Colors.white,
|
||||
child: Text(
|
||||
leftText,
|
||||
style: TextStyle(color: !checkParam ? Colors.white : Theme.of(context).appBarTheme.color, fontWeight: FontWeight.w600),
|
||||
),
|
||||
onPressed: () => callBack(false),
|
||||
),
|
||||
),
|
||||
),
|
||||
]);
|
||||
}
|
||||
|
||||
Widget _commonSlidersRow(
|
||||
_controller, double _minValue, double _maxValue, double _valueOrg, Function(String) onTextValueChange, Function(double) onValueChange) {
|
||||
return Container(
|
||||
margin: EdgeInsets.only(top: 6),
|
||||
padding: EdgeInsets.all(6),
|
||||
color: Colors.white,
|
||||
height: 50,
|
||||
child: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 75,
|
||||
child: TextField(
|
||||
controller: _controller,
|
||||
textAlign: TextAlign.center,
|
||||
keyboardType: TextInputType.number,
|
||||
onChanged: (value) {
|
||||
double _value = double.parse(value);
|
||||
if (_value > _maxValue) {
|
||||
onTextValueChange(_maxValue.toStringAsFixed(0));
|
||||
onValueChange(_maxValue);
|
||||
return;
|
||||
} else if (_value < _minValue) {
|
||||
onTextValueChange(_minValue.toStringAsFixed(0));
|
||||
onValueChange(_minValue);
|
||||
return;
|
||||
} else if (_value >= _minValue && _value <= _maxValue) {
|
||||
onValueChange(_value);
|
||||
return;
|
||||
}
|
||||
},
|
||||
inputFormatters: [
|
||||
FilteringTextInputFormatter.allow(RegExp(r'[0-9]')),
|
||||
],
|
||||
decoration: InputDecoration(
|
||||
contentPadding: EdgeInsets.only(left: 4, right: 4),
|
||||
fillColor: Colors.white,
|
||||
filled: true,
|
||||
focusedBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
width: 1,
|
||||
color: Colors.grey,
|
||||
style: BorderStyle.solid,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(6.0),
|
||||
),
|
||||
enabledBorder: OutlineInputBorder(
|
||||
borderSide: BorderSide(
|
||||
width: 1,
|
||||
color: Colors.grey,
|
||||
style: BorderStyle.solid,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(6.0),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
flex: 6,
|
||||
child: Slider(
|
||||
min: _minValue,
|
||||
max: _maxValue,
|
||||
activeColor: Colors.redAccent,
|
||||
inactiveColor: Colors.redAccent.withOpacity(.3),
|
||||
value: _valueOrg,
|
||||
onChanged: (value) {
|
||||
onTextValueChange(value.toStringAsFixed(0));
|
||||
onValueChange(value);
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _commonDialogSelectorRow(String title, String selectedText, VoidCallback onPressed) {
|
||||
return Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [
|
||||
Text(title),
|
||||
SizedBox(height: 8),
|
||||
InkWell(
|
||||
onTap: onPressed,
|
||||
child: Container(
|
||||
height: 50,
|
||||
padding: EdgeInsets.all(8),
|
||||
width: MediaQuery.of(context).size.width,
|
||||
decoration: BoxDecoration(borderRadius: BorderRadius.circular(8), color: Colors.white),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [Text(selectedText), Icon(Icons.arrow_drop_down_outlined)],
|
||||
),
|
||||
),
|
||||
)
|
||||
]);
|
||||
}
|
||||
|
||||
void _updateUserDetails() async {
|
||||
_userDetailModel.height = _heightValue;
|
||||
_userDetailModel.weight = _weightValue;
|
||||
_userDetailModel.firstName = _nameController.text;
|
||||
_userDetailModel.isWeightInKG = _isWeightKG;
|
||||
_userDetailModel.isHeightInCM = _isHeightCM;
|
||||
_userDetailModel.gender = _isGenderMale ? "M" : "F";
|
||||
|
||||
var tempDate = DateUtil.convertDateToString(_dobDate);
|
||||
if (!tempDate.endsWith("/")) {
|
||||
tempDate = tempDate + "/";
|
||||
}
|
||||
|
||||
_userDetailModel.dOB = tempDate;
|
||||
_userDetailModel.activityID = _selectedActiveLevel;
|
||||
GifLoaderDialogUtils.showMyDialog(context);
|
||||
await widget.viewModel.updateUserDetail(_userDetailModel, (tag) {
|
||||
if (tag) {
|
||||
AppToast.showSuccessToast(message: TranslationBase.of(context).success);
|
||||
}
|
||||
GifLoaderDialogUtils.hideDialog(context);
|
||||
});
|
||||
|
||||
Navigator.pop(context);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue