diff --git a/ios/Podfile b/ios/Podfile
index 9712eaff..c2702b3e 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+# platform :ios, '11.0'
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -10,6 +10,9 @@ project 'Runner', {
'Release' => :release,
}
+# pod 'FBSDKCoreKit'
+# pod 'FBSDKLoginKit'
+
def parse_KV_file(file, separator='=')
file_abs_path = File.expand_path(file)
if !File.exists? file_abs_path
@@ -85,3 +88,4 @@ post_install do |installer|
end
end
end
+
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
deleted file mode 100644
index 005fe83c..00000000
--- a/ios/Podfile.lock
+++ /dev/null
@@ -1,310 +0,0 @@
-PODS:
- - barcode_scan (0.0.1):
- - Flutter
- - MTBBarcodeScanner
- - SwiftProtobuf
- - connectivity (0.0.1):
- - Flutter
- - Reachability
- - connectivity_for_web (0.1.0):
- - Flutter
- - connectivity_macos (0.0.1):
- - Flutter
- - device_info (0.0.1):
- - Flutter
- - Firebase/Core (6.23.0):
- - Firebase/CoreOnly
- - FirebaseAnalytics (= 6.4.2)
- - Firebase/CoreOnly (6.23.0):
- - FirebaseCore (= 6.6.7)
- - Firebase/Messaging (6.23.0):
- - Firebase/CoreOnly
- - FirebaseMessaging (~> 4.3.1)
- - firebase_messaging (0.0.1):
- - Firebase/Core
- - Firebase/Messaging
- - Flutter
- - FirebaseAnalytics (6.4.2):
- - FirebaseCore (~> 6.6)
- - FirebaseInstallations (~> 1.2)
- - GoogleAppMeasurement (= 6.4.2)
- - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- - GoogleUtilities/MethodSwizzler (~> 6.0)
- - GoogleUtilities/Network (~> 6.0)
- - "GoogleUtilities/NSData+zlib (~> 6.0)"
- - nanopb (= 0.3.9011)
- - FirebaseAnalyticsInterop (1.5.0)
- - FirebaseCore (6.6.7):
- - FirebaseCoreDiagnostics (~> 1.2)
- - FirebaseCoreDiagnosticsInterop (~> 1.2)
- - GoogleUtilities/Environment (~> 6.5)
- - GoogleUtilities/Logger (~> 6.5)
- - FirebaseCoreDiagnostics (1.2.4):
- - FirebaseCoreDiagnosticsInterop (~> 1.2)
- - GoogleDataTransportCCTSupport (~> 3.0)
- - GoogleUtilities/Environment (~> 6.5)
- - GoogleUtilities/Logger (~> 6.5)
- - nanopb (~> 0.3.901)
- - FirebaseCoreDiagnosticsInterop (1.2.0)
- - FirebaseInstallations (1.2.0):
- - FirebaseCore (~> 6.6)
- - GoogleUtilities/Environment (~> 6.6)
- - GoogleUtilities/UserDefaults (~> 6.6)
- - PromisesObjC (~> 1.2)
- - FirebaseInstanceID (4.3.4):
- - FirebaseCore (~> 6.6)
- - FirebaseInstallations (~> 1.0)
- - GoogleUtilities/Environment (~> 6.5)
- - GoogleUtilities/UserDefaults (~> 6.5)
- - FirebaseMessaging (4.3.1):
- - FirebaseAnalyticsInterop (~> 1.5)
- - FirebaseCore (~> 6.6)
- - FirebaseInstanceID (~> 4.3)
- - GoogleUtilities/AppDelegateSwizzler (~> 6.5)
- - GoogleUtilities/Environment (~> 6.5)
- - GoogleUtilities/Reachability (~> 6.5)
- - GoogleUtilities/UserDefaults (~> 6.5)
- - Protobuf (>= 3.9.2, ~> 3.9)
- - Flutter (1.0.0)
- - 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
- - GoogleAppMeasurement (6.4.2):
- - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
- - GoogleUtilities/MethodSwizzler (~> 6.0)
- - GoogleUtilities/Network (~> 6.0)
- - "GoogleUtilities/NSData+zlib (~> 6.0)"
- - nanopb (= 0.3.9011)
- - GoogleDataTransport (6.0.0)
- - GoogleDataTransportCCTSupport (3.0.0):
- - GoogleDataTransport (~> 6.0)
- - nanopb (~> 0.3.901)
- - GoogleUtilities/AppDelegateSwizzler (6.6.0):
- - GoogleUtilities/Environment
- - GoogleUtilities/Logger
- - GoogleUtilities/Network
- - GoogleUtilities/Environment (6.6.0):
- - PromisesObjC (~> 1.2)
- - GoogleUtilities/Logger (6.6.0):
- - GoogleUtilities/Environment
- - GoogleUtilities/MethodSwizzler (6.6.0):
- - GoogleUtilities/Logger
- - GoogleUtilities/Network (6.6.0):
- - GoogleUtilities/Logger
- - "GoogleUtilities/NSData+zlib"
- - GoogleUtilities/Reachability
- - "GoogleUtilities/NSData+zlib (6.6.0)"
- - GoogleUtilities/Reachability (6.6.0):
- - GoogleUtilities/Logger
- - GoogleUtilities/UserDefaults (6.6.0):
- - GoogleUtilities/Logger
- - hexcolor (0.0.1):
- - Flutter
- - image_cropper (0.0.2):
- - Flutter
- - TOCropViewController (~> 2.5.2)
- - image_picker (0.0.1):
- - Flutter
- - local_auth (0.0.1):
- - Flutter
- - manage_calendar_events (0.0.1):
- - Flutter
- - map_launcher (0.0.1):
- - Flutter
- - MTBBarcodeScanner (5.0.11)
- - nanopb (0.3.9011):
- - nanopb/decode (= 0.3.9011)
- - nanopb/encode (= 0.3.9011)
- - nanopb/decode (0.3.9011)
- - nanopb/encode (0.3.9011)
- - path_provider_linux (0.0.1):
- - Flutter
- - "permission_handler (5.0.1+1)":
- - Flutter
- - PromisesObjC (1.2.8)
- - Protobuf (3.11.4)
- - Reachability (3.2)
- - 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
- - SwiftProtobuf (1.10.2)
- - TOCropViewController (2.5.4)
- - 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
-
-DEPENDENCIES:
- - barcode_scan (from `.symlinks/plugins/barcode_scan/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_info (from `.symlinks/plugins/device_info/ios`)
- - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
- - Flutter (from `Flutter`)
- - 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`)
- - hexcolor (from `.symlinks/plugins/hexcolor/ios`)
- - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
- - image_picker (from `.symlinks/plugins/image_picker/ios`)
- - local_auth (from `.symlinks/plugins/local_auth/ios`)
- - manage_calendar_events (from `.symlinks/plugins/manage_calendar_events/ios`)
- - map_launcher (from `.symlinks/plugins/map_launcher/ios`)
- - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
- - permission_handler (from `.symlinks/plugins/permission_handler/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`)
- - 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`)
-
-SPEC REPOS:
- trunk:
- - Firebase
- - FirebaseAnalytics
- - FirebaseAnalyticsInterop
- - FirebaseCore
- - FirebaseCoreDiagnostics
- - FirebaseCoreDiagnosticsInterop
- - FirebaseInstallations
- - FirebaseInstanceID
- - FirebaseMessaging
- - GoogleAppMeasurement
- - GoogleDataTransport
- - GoogleDataTransportCCTSupport
- - GoogleUtilities
- - MTBBarcodeScanner
- - nanopb
- - PromisesObjC
- - Protobuf
- - Reachability
- - SwiftProtobuf
- - TOCropViewController
-
-EXTERNAL SOURCES:
- barcode_scan:
- :path: ".symlinks/plugins/barcode_scan/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_info:
- :path: ".symlinks/plugins/device_info/ios"
- firebase_messaging:
- :path: ".symlinks/plugins/firebase_messaging/ios"
- Flutter:
- :path: Flutter
- 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"
- hexcolor:
- :path: ".symlinks/plugins/hexcolor/ios"
- image_cropper:
- :path: ".symlinks/plugins/image_cropper/ios"
- image_picker:
- :path: ".symlinks/plugins/image_picker/ios"
- local_auth:
- :path: ".symlinks/plugins/local_auth/ios"
- manage_calendar_events:
- :path: ".symlinks/plugins/manage_calendar_events/ios"
- map_launcher:
- :path: ".symlinks/plugins/map_launcher/ios"
- path_provider_linux:
- :path: ".symlinks/plugins/path_provider_linux/ios"
- permission_handler:
- :path: ".symlinks/plugins/permission_handler/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"
- 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"
-
-SPEC CHECKSUMS:
- barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
- connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
- connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
- connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
- device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
- Firebase: 585ae467b3edda6a5444e788fda6888f024d8d6f
- firebase_messaging: 21344b3b3a7d9d325d63a70e3750c0c798fe1e03
- FirebaseAnalytics: 558f7a03d19de451093032c806f39d5f9dff096e
- FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
- FirebaseCore: a2788a0d5f6c1dff17b8f79b4a73654a8d4bfdbd
- FirebaseCoreDiagnostics: b59c024493a409f8aecba02c99928d0d8431d159
- FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
- FirebaseInstallations: 2119fb3e46b0a88bfdbf12562f855ee3252462fa
- FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b
- FirebaseMessaging: 828e66eb357a893e3cebd9ee0f6bc1941447cc94
- Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
- flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
- flutter_inappwebview: 69dfbac46157b336ffbec19ca6dfd4638c7bf189
- flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186
- flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
- GoogleAppMeasurement: 2253e99c1f22638cf234c059144660c338ad76c3
- GoogleDataTransport: 061fe7d9b476710e3cd8ea51e8e07d8b67c2b420
- GoogleDataTransportCCTSupport: 0f39025e8cf51f168711bd3fb773938d7e62ddb5
- GoogleUtilities: 39530bc0ad980530298e9c4af8549e991fd033b1
- hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
- image_cropper: 3c16d7651730ffe85897f5a1c4e2547e6b54989a
- image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09
- local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
- manage_calendar_events: 0338d505ea26cdfd20cd883279bc28afa11eca34
- map_launcher: e325db1261d029ff33e08e03baccffe09593ffea
- MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
- nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
- path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
- permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6
- PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
- Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
- Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
- shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
- shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
- shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
- shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
- SwiftProtobuf: bec1ae7d686ff73dd09d79866154f4970b891410
- TOCropViewController: 2a1ae1242600b1f2d996fd91a5268b2309a33b5c
- url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
- url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
- url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
- url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
-
-PODFILE CHECKSUM: 2609452b760cd11039b14039a86564367a3d8ab9
-
-COCOAPODS: 1.9.1
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000..1d526a16
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
+
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000..f9b0d7c5
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+
+
+
+
+ PreviewsEnabled
+
+
+
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
new file mode 100644
index 00000000..a28140cf
--- /dev/null
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000..18d98100
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
+
diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 00000000..f9b0d7c5
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+
+
+
+
+ PreviewsEnabled
+
+
+
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
new file mode 100644
index 00000000..70693e4a
--- /dev/null
+++ b/ios/Runner/AppDelegate.swift
@@ -0,0 +1,13 @@
+import UIKit
+import Flutter
+
+@UIApplicationMain
+@objc class AppDelegate: FlutterAppDelegate {
+ override func application(
+ _ application: UIApplication,
+ didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+ ) -> Bool {
+ GeneratedPluginRegistrant.register(with: self)
+ return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+ }
+}
diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard
index f3c28516..00abc512 100644
--- a/ios/Runner/Base.lproj/Main.storyboard
+++ b/ios/Runner/Base.lproj/Main.storyboard
@@ -1,8 +1,10 @@
-
-
+
+
+
-
+
+
@@ -14,13 +16,14 @@
-
+
-
+
+
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 792eb95e..b807d9c6 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -22,12 +22,22 @@
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
- NSCalendarsUsageDescription
- We Need to access the calender to add reminder for you
+ io.flutter.embedded_views_preview
+
UILaunchStoryboardName
LaunchScreen
UIMainStoryboardFile
Main
+ NSMicrophoneUsageDescription
+ Need microphone access for uploading videos
+ NSCameraUsageDescription
+ Need camera access for uploading images
+ NSLocationUsageDescription
+ Need location access for updating nearby friends
+ NSLocationWhenInUseUsageDescription
+ This app will use your location to show cool stuffs near you.
+ NSPhotoLibraryUsageDescription
+ Need photo library access for uploading images
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h
new file mode 100644
index 00000000..308a2a56
--- /dev/null
+++ b/ios/Runner/Runner-Bridging-Header.h
@@ -0,0 +1 @@
+#import "GeneratedPluginRegistrant.h"
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 973f430f..0e2cb367 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -324,13 +324,10 @@ const CREATE_E_REFERRAL = "Services/Patients.svc/REST/CreateEReferral";
const GET_E_REFERRALS = "Services/Patients.svc/REST/GetEReferrals";
-<<<<<<< HEAD
//Pharmacy wishlist
const GET_WISHLIST = "http://swd-pharapp-01:7200/api/shopping_cart_items/";
-=======
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
const TIMER_MIN = 10;
class AppGlobal {
@@ -357,4 +354,4 @@ class AppGlobal {
return request;
}
-}
+}
\ No newline at end of file
diff --git a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
index 88116cd9..74cba568 100644
--- a/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
+++ b/lib/pages/BookAppointment/components/DocAvailableAppointments.dart
@@ -235,7 +235,7 @@ class _DocAvailableAppointmentsState extends State
return children;
},
),
- onDaySelected: (date, events) {
+ onDaySelected: (date, events,holidays) {
_onDaySelected(date, events);
_animationController.forward(from: 0.0);
},
diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
index 060a8132..264f828a 100644
--- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
+++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
@@ -348,7 +348,7 @@ class _CovidTimeSlotsState extends State
return children;
},
),
- onDaySelected: (date, events) {
+ onDaySelected: (date, events,holidays) {
_onDaySelected(date, events);
_animationController.forward(from: 0.0);
},
diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart
index fe4e55a3..292006d0 100644
--- a/lib/pages/landing/home_page.dart
+++ b/lib/pages/landing/home_page.dart
@@ -97,10 +97,10 @@ class _HomePageState extends State {
Container(
margin: EdgeInsets.only(
top: 15.0, left: 3.5, right: 3.5),
- child: SvgPicture.asset(
- 'assets/images/new-design/covid-19-car.svg',
- width: 45.0,
- height: 45.0),
+ // child: SvgPicture.asset(
+ // 'assets/images/new-design/covid-19-car.svg',
+ // width: 45.0,
+ // height: 45.0),
),
Container(
margin: EdgeInsets.only(
@@ -174,11 +174,11 @@ class _HomePageState extends State {
.withOpacity(0.3),
borderRadius: BorderRadius.all(
Radius.circular(5))),
- child: SvgPicture.asset(
- projectViewModel.isArabic
- ? 'assets/images/new-design/livecare_arabic_logo.svg'
- : 'assets/images/new-design/liveCare_white_logo.svg',
- ),
+ // child: SvgPicture.asset(
+ // projectViewModel.isArabic
+ // ? 'assets/images/new-design/livecare_arabic_logo.svg'
+ // : 'assets/images/new-design/liveCare_white_logo.svg',
+ // ),
),
),
),
@@ -690,7 +690,7 @@ class _HomePageState extends State {
),
),
height: 100,
- imageName: 'hmg_services_bg.png',
+ imageName: 'contact_us_bg.png',
opacity: 0.5,
color: Colors.grey[700],
width: MediaQuery.of(context).size.width * 0.45,
diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart
index dcfa3ba8..ff21d73e 100644
--- a/lib/pages/landing/landing_page.dart
+++ b/lib/pages/landing/landing_page.dart
@@ -346,14 +346,14 @@ class _LandingPageState extends State with WidgetsBindingObserver {
},
),
actions: [
- IconButton(
- iconSize: 70,
- icon: SvgPicture.asset('assets/images/svg/robort_svg.svg',
- height: 100, width: 100, fit: BoxFit.cover),
- onPressed: () {
- triggerRobot();
- } //do something,
- )
+ // IconButton(
+ // iconSize: 70,
+ // icon: SvgPicture.asset('assets/images/svg/robort_svg.svg',
+ // height: 100, width: 100, fit: BoxFit.cover),
+ // onPressed: () {
+ // triggerRobot();
+ // } //do something,
+ // )
],
centerTitle: true,
),
diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart
index 30ca8a4c..3ebd84d8 100644
--- a/lib/widgets/others/app_scaffold_widget.dart
+++ b/lib/widgets/others/app_scaffold_widget.dart
@@ -32,16 +32,13 @@ class AppScaffold extends StatelessWidget {
final BaseViewModel baseViewModel;
final bool isBottomBar;
final Widget floatingActionButton;
-<<<<<<< HEAD
final bool isPharmacy;
-=======
final String title;
final String description;
final bool isShowDecPage;
AuthenticatedUserObject authenticatedUserObject =
locator();
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
AppScaffold(
{@required this.body,
@@ -52,13 +49,10 @@ class AppScaffold extends StatelessWidget {
this.bottomSheet,
this.baseViewModel,
this.floatingActionButton,
-<<<<<<< HEAD
- this.isPharmacy = false});
-=======
+ this.isPharmacy = false,
this.title,
this.description,
this.isShowDecPage = true, this.isBottomBar});
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
@override
Widget build(BuildContext context) {
@@ -69,32 +63,22 @@ class AppScaffold extends StatelessWidget {
appBar: isShowAppBar
? AppBar(
elevation: 0,
-<<<<<<< HEAD
backgroundColor: isPharmacy
? Colors.green
: Theme.of(context).appBarTheme.color,
-=======
- backgroundColor: Theme.of(context).appBarTheme.color,
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
textTheme: TextTheme(
headline6:
TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
),
-<<<<<<< HEAD
- title: Text(appBarTitle.toUpperCase()),
- leading: Builder(
-=======
title: Text(authenticatedUserObject.isLogin
? appBarTitle.toUpperCase()
: TranslationBase.of(context).serviceInformationTitle),leading: Builder(
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
builder: (BuildContext context) {
return ArrowBack();
},
),
centerTitle: true,
actions: [
-<<<<<<< HEAD
isPharmacy
? IconButton(
icon: Icon(Icons.shopping_cart),
@@ -116,39 +100,16 @@ class AppScaffold extends StatelessWidget {
)
: null,
body: baseViewModel != null
-=======
- IconButton(
- icon: Icon(FontAwesomeIcons.home),
- color: Colors.white,
- onPressed: () {
- Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (context) => LandingPage()), (Route r) => false);
- },
- ),
- ],
- )
- : null,
- body: (!authenticatedUserObject.isLogin && isShowDecPage)
- ? NotAutPage(
- title: appBarTitle,
- description: description,
- )
- :baseViewModel != null
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
? NetworkBaseView(
child: buildBodyWidget(),
baseViewModel: baseViewModel,
)
: buildBodyWidget(),
bottomSheet: bottomSheet,
-<<<<<<< HEAD
- // bottomNavigationBar: BottomBarSearch()
- floatingActionButton: floatingActionButton ?? floatingActionButton,
-=======
floatingActionButton: floatingActionButton ?? floatingActionButton,
// bottomNavigationBar:
// this.isBottomBar == true ? BottomBarSearch() : SizedBox()
// floatingActionButton: FloatingSearchButton(),
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
);
}
@@ -157,11 +118,7 @@ class AppScaffold extends StatelessWidget {
}
buildBodyWidget() {
-<<<<<<< HEAD
- return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]);
-=======
// return body; //Stack(children: [body, buildAppLoaderWidget(isLoading)]);
return Stack(children: [body, FloatingSearchButton()]);
->>>>>>> 62efc13047052d287d62a39e3adbab7305cfe596
}
}