From 4239124f1ac52c2a89123b51334bbde0aac2d173 Mon Sep 17 00:00:00 2001 From: Salman Afzal Date: Thu, 4 Jun 2020 11:05:57 +0300 Subject: [PATCH] dashboard icon updated --- .../dashboard_icon/discharge_patient.svg | 37 +++++ assets/images/dashboard_icon/home_icon.svg | 3 + .../dashboard_icon/home_icon_active.svg | 3 + .../dashboard_icon/in_patient_white.svg | 6 + assets/images/dashboard_icon/lab_results.svg | 20 +++ assets/images/dashboard_icon/menu_icon.svg | 22 +++ .../dashboard_icon/menu_icon_active.svg | 22 +++ assets/images/dashboard_icon/message_icon.svg | 7 + .../dashboard_icon/message_icon_active.svg | 7 + assets/images/dashboard_icon/operations.svg | 15 +++ assets/images/dashboard_icon/out_patient.svg | 5 + assets/images/dashboard_icon/patient.svg | 8 ++ assets/images/dashboard_icon/radiology.svg | 27 ++++ assets/images/dashboard_icon/referral.svg | 6 + .../dashboard_icon/scdedule_icon_active.svg | 7 + .../images/dashboard_icon/schedule_icon.svg | 5 + .../images/dashboard_icon/search_patient.svg | 32 +++++ ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Podfile | 90 +++++++++++++ ios/Podfile.lock | 127 ++++++++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 95 ++++++++++--- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../xcshareddata/xcschemes/Runner.xcscheme | 8 +- .../contents.xcworkspacedata | 3 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ ios/Runner/Info.plist | 10 +- lib/presentation/doctor_app_icons.dart | 55 +++++--- lib/screens/dashboard_screen.dart | 32 ++--- .../dashboard/dashboard_item_icons_texts.dart | 15 ++- lib/widgets/home/home_item.dart | 30 ++--- pubspec.yaml | 27 ++-- ssh_key | 8 ++ ssh_key.pub | 1 + 34 files changed, 649 insertions(+), 102 deletions(-) create mode 100644 assets/images/dashboard_icon/discharge_patient.svg create mode 100644 assets/images/dashboard_icon/home_icon.svg create mode 100644 assets/images/dashboard_icon/home_icon_active.svg create mode 100644 assets/images/dashboard_icon/in_patient_white.svg create mode 100644 assets/images/dashboard_icon/lab_results.svg create mode 100644 assets/images/dashboard_icon/menu_icon.svg create mode 100644 assets/images/dashboard_icon/menu_icon_active.svg create mode 100644 assets/images/dashboard_icon/message_icon.svg create mode 100644 assets/images/dashboard_icon/message_icon_active.svg create mode 100644 assets/images/dashboard_icon/operations.svg create mode 100644 assets/images/dashboard_icon/out_patient.svg create mode 100644 assets/images/dashboard_icon/patient.svg create mode 100644 assets/images/dashboard_icon/radiology.svg create mode 100644 assets/images/dashboard_icon/referral.svg create mode 100644 assets/images/dashboard_icon/scdedule_icon_active.svg create mode 100644 assets/images/dashboard_icon/schedule_icon.svg create mode 100644 assets/images/dashboard_icon/search_patient.svg create mode 100644 ios/Podfile create mode 100644 ios/Podfile.lock create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ssh_key create mode 100644 ssh_key.pub diff --git a/assets/images/dashboard_icon/discharge_patient.svg b/assets/images/dashboard_icon/discharge_patient.svg new file mode 100644 index 00000000..68186c51 --- /dev/null +++ b/assets/images/dashboard_icon/discharge_patient.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/dashboard_icon/home_icon.svg b/assets/images/dashboard_icon/home_icon.svg new file mode 100644 index 00000000..32597a47 --- /dev/null +++ b/assets/images/dashboard_icon/home_icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/dashboard_icon/home_icon_active.svg b/assets/images/dashboard_icon/home_icon_active.svg new file mode 100644 index 00000000..31b47d99 --- /dev/null +++ b/assets/images/dashboard_icon/home_icon_active.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/dashboard_icon/in_patient_white.svg b/assets/images/dashboard_icon/in_patient_white.svg new file mode 100644 index 00000000..d648f62c --- /dev/null +++ b/assets/images/dashboard_icon/in_patient_white.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/dashboard_icon/lab_results.svg b/assets/images/dashboard_icon/lab_results.svg new file mode 100644 index 00000000..353c6a19 --- /dev/null +++ b/assets/images/dashboard_icon/lab_results.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/dashboard_icon/menu_icon.svg b/assets/images/dashboard_icon/menu_icon.svg new file mode 100644 index 00000000..0a62759b --- /dev/null +++ b/assets/images/dashboard_icon/menu_icon.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/dashboard_icon/menu_icon_active.svg b/assets/images/dashboard_icon/menu_icon_active.svg new file mode 100644 index 00000000..b565b40a --- /dev/null +++ b/assets/images/dashboard_icon/menu_icon_active.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/dashboard_icon/message_icon.svg b/assets/images/dashboard_icon/message_icon.svg new file mode 100644 index 00000000..d200320b --- /dev/null +++ b/assets/images/dashboard_icon/message_icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/dashboard_icon/message_icon_active.svg b/assets/images/dashboard_icon/message_icon_active.svg new file mode 100644 index 00000000..87759ec7 --- /dev/null +++ b/assets/images/dashboard_icon/message_icon_active.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/dashboard_icon/operations.svg b/assets/images/dashboard_icon/operations.svg new file mode 100644 index 00000000..1dc283cc --- /dev/null +++ b/assets/images/dashboard_icon/operations.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/assets/images/dashboard_icon/out_patient.svg b/assets/images/dashboard_icon/out_patient.svg new file mode 100644 index 00000000..bc0a7a9b --- /dev/null +++ b/assets/images/dashboard_icon/out_patient.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/dashboard_icon/patient.svg b/assets/images/dashboard_icon/patient.svg new file mode 100644 index 00000000..40082dcc --- /dev/null +++ b/assets/images/dashboard_icon/patient.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/assets/images/dashboard_icon/radiology.svg b/assets/images/dashboard_icon/radiology.svg new file mode 100644 index 00000000..e8e45723 --- /dev/null +++ b/assets/images/dashboard_icon/radiology.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/dashboard_icon/referral.svg b/assets/images/dashboard_icon/referral.svg new file mode 100644 index 00000000..bdf4d096 --- /dev/null +++ b/assets/images/dashboard_icon/referral.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/dashboard_icon/scdedule_icon_active.svg b/assets/images/dashboard_icon/scdedule_icon_active.svg new file mode 100644 index 00000000..5c3fc7ae --- /dev/null +++ b/assets/images/dashboard_icon/scdedule_icon_active.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/dashboard_icon/schedule_icon.svg b/assets/images/dashboard_icon/schedule_icon.svg new file mode 100644 index 00000000..10b78b14 --- /dev/null +++ b/assets/images/dashboard_icon/schedule_icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/assets/images/dashboard_icon/search_patient.svg b/assets/images/dashboard_icon/search_patient.svg new file mode 100644 index 00000000..92c1ca4b --- /dev/null +++ b/assets/images/dashboard_icon/search_patient.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee8..e8efba11 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee8..399e9340 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 00000000..b30a428b --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,90 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def parse_KV_file(file, separator='=') + file_abs_path = File.expand_path(file) + if !File.exists? file_abs_path + return []; + end + generated_key_values = {} + skip_line_start_symbols = ["#", "/"] + File.foreach(file_abs_path) do |line| + next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } + plugin = line.split(pattern=separator) + if plugin.length == 2 + podname = plugin[0].strip() + path = plugin[1].strip() + podpath = File.expand_path("#{path}", file_abs_path) + generated_key_values[podname] = podpath + else + puts "Invalid plugin specification: #{line}" + end + end + generated_key_values +end + +target 'Runner' do + use_frameworks! + use_modular_headers! + + # Flutter Pod + + copied_flutter_dir = File.join(__dir__, 'Flutter') + copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework') + copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec') + unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path) + # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet. + # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration. + # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist. + + generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig') + unless File.exist?(generated_xcode_build_settings_path) + raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path) + cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR']; + + unless File.exist?(copied_framework_path) + FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir) + end + unless File.exist?(copied_podspec_path) + FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir) + end + end + + # Keep pod path relative so it can be checked into Podfile.lock. + pod 'Flutter', :path => 'Flutter' + + # Plugin Pods + + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock + # referring to absolute paths on developers' machines. + system('rm -rf .symlinks') + system('mkdir -p .symlinks/plugins') + plugin_pods = parse_KV_file('../.flutter-plugins') + plugin_pods.each do |name, path| + symlink = File.join('.symlinks', 'plugins', name) + File.symlink(path, symlink) + pod name, :path => File.join(symlink, 'ios') + end +end + +# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system. +install! 'cocoapods', :disable_input_output_paths => true + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['ENABLE_BITCODE'] = 'NO' + end + end +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 00000000..392290a0 --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,127 @@ +PODS: + - barcode_scan (0.0.1): + - Flutter + - MTBBarcodeScanner + - SwiftProtobuf + - connectivity (0.0.1): + - Flutter + - Reachability + - connectivity_macos (0.0.1): + - Flutter + - device_info (0.0.1): + - Flutter + - Flutter (1.0.0) + - flutter_flexible_toast (0.0.1): + - Flutter + - flutter_plugin_android_lifecycle (0.0.1): + - Flutter + - hexcolor (0.0.1): + - Flutter + - imei_plugin (0.0.1): + - Flutter + - local_auth (0.0.1): + - Flutter + - MTBBarcodeScanner (5.0.11) + - "permission_handler (5.0.0+hotfix.5)": + - Flutter + - Reachability (3.2) + - shared_preferences (0.0.1): + - Flutter + - shared_preferences_macos (0.0.1): + - Flutter + - shared_preferences_web (0.0.1): + - Flutter + - SwiftProtobuf (1.9.0) + - url_launcher (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_macos (from `.symlinks/plugins/connectivity_macos/ios`) + - device_info (from `.symlinks/plugins/device_info/ios`) + - Flutter (from `Flutter`) + - flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`) + - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`) + - hexcolor (from `.symlinks/plugins/hexcolor/ios`) + - imei_plugin (from `.symlinks/plugins/imei_plugin/ios`) + - local_auth (from `.symlinks/plugins/local_auth/ios`) + - permission_handler (from `.symlinks/plugins/permission_handler/ios`) + - shared_preferences (from `.symlinks/plugins/shared_preferences/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_macos (from `.symlinks/plugins/url_launcher_macos/ios`) + - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) + +SPEC REPOS: + https://cdn.cocoapods.org/: + - MTBBarcodeScanner + - Reachability + - SwiftProtobuf + +EXTERNAL SOURCES: + barcode_scan: + :path: ".symlinks/plugins/barcode_scan/ios" + connectivity: + :path: ".symlinks/plugins/connectivity/ios" + connectivity_macos: + :path: ".symlinks/plugins/connectivity_macos/ios" + device_info: + :path: ".symlinks/plugins/device_info/ios" + Flutter: + :path: Flutter + flutter_flexible_toast: + :path: ".symlinks/plugins/flutter_flexible_toast/ios" + flutter_plugin_android_lifecycle: + :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios" + hexcolor: + :path: ".symlinks/plugins/hexcolor/ios" + imei_plugin: + :path: ".symlinks/plugins/imei_plugin/ios" + local_auth: + :path: ".symlinks/plugins/local_auth/ios" + permission_handler: + :path: ".symlinks/plugins/permission_handler/ios" + shared_preferences: + :path: ".symlinks/plugins/shared_preferences/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_macos: + :path: ".symlinks/plugins/url_launcher_macos/ios" + url_launcher_web: + :path: ".symlinks/plugins/url_launcher_web/ios" + +SPEC CHECKSUMS: + barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479 + connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75 + connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191 + device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 + Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143 + flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35 + hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89 + imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd + local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd + MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb + permission_handler: 6226fcb78b97c7c7458a95c7346a11d5184fec12 + Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 + shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d + shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 + shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 + SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932 + url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef + url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 + url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c + +PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83 + +COCOAPODS: 1.9.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index bfb59352..8548667e 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -9,14 +9,11 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + B650DC3076E9D70CB188286A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93A5F83B23AB032D1E096663 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -26,8 +23,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -38,18 +33,20 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 75DD06875D42C7903A76DF9F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 93A5F83B23AB032D1E096663 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9D4B7DB43C6A6C849D2387CE /* 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 = ""; }; + E698D7B14B12DF768FE47A1A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,20 +54,27 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, + B650DC3076E9D70CB188286A /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 7D66D387293CE5376A07EC5F /* Pods */ = { + isa = PBXGroup; + children = ( + E698D7B14B12DF768FE47A1A /* Pods-Runner.debug.xcconfig */, + 75DD06875D42C7903A76DF9F /* Pods-Runner.release.xcconfig */, + 9D4B7DB43C6A6C849D2387CE /* Pods-Runner.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -84,6 +88,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, + 7D66D387293CE5376A07EC5F /* Pods */, + F984EB986238F1809678CD84 /* Frameworks */, ); sourceTree = ""; }; @@ -118,6 +124,14 @@ name = "Supporting Files"; sourceTree = ""; }; + F984EB986238F1809678CD84 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 93A5F83B23AB032D1E096663 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -125,12 +139,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 986D76F6694E0D6D8C5CDAAB /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 08568E6EE9BA48E55B7C3865 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -152,6 +168,7 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = 3A359E86ZF; LastSwiftMigration = 1100; }; }; @@ -189,6 +206,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 08568E6EE9BA48E55B7C3865 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -201,7 +233,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -217,6 +249,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + 986D76F6694E0D6D8C5CDAAB /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -309,6 +363,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 3A359E86ZF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -320,8 +375,8 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.doctorAppFlutter; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorApp; + PRODUCT_NAME = Runner; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -443,6 +498,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 3A359E86ZF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -454,8 +510,8 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.doctorAppFlutter; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorApp; + PRODUCT_NAME = Runner; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -470,6 +526,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 3A359E86ZF; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -481,8 +538,8 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.doctorAppFlutter; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_BUNDLE_IDENTIFIER = com.hmg.doctorApp; + PRODUCT_NAME = Runner; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; 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/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cf..fb2dffc4 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - - - - + + - - + + 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/Info.plist b/ios/Runner/Info.plist index 31708450..4c18587e 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - doctor_app_flutter + Doctor App CFBundlePackageType APPL CFBundleShortVersionString @@ -22,12 +22,14 @@ $(FLUTTER_BUILD_NUMBER) LSRequiresIPhoneOS + NSCameraUsageDescription + Camera permission is required for barcode scanning. + NSFaceIDUsageDescription + Why is my app authenticating using face id? UILaunchStoryboardName LaunchScreen UIMainStoryboardFile Main - NSFaceIDUsageDescription - Why is my app authenticating using face id? UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -43,7 +45,5 @@ UIViewControllerBasedStatusBarAppearance - NSCameraUsageDescription - Camera permission is required for barcode scanning. diff --git a/lib/presentation/doctor_app_icons.dart b/lib/presentation/doctor_app_icons.dart index 1ee49644..a795a081 100644 --- a/lib/presentation/doctor_app_icons.dart +++ b/lib/presentation/doctor_app_icons.dart @@ -11,7 +11,7 @@ /// fonts: /// - asset: fonts/DoctorApp.ttf /// -/// +/// /// import 'package:flutter/widgets.dart'; @@ -21,21 +21,40 @@ class DoctorApp { static const _kFontFam = 'DoctorApp'; static const _kFontPkg = null; - static const IconData discharge_patient = const IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon = const IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon_active = const IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData in_patient_white = const IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData lab_results = const IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon = const IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon_active = const IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon = const IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon_active = const IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData out_patient = const IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData radiology = const IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referral = const IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData scdedule_icon_active = const IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_patient = const IconData(0xe810, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule_icon = const IconData(0xe811, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData image2vector = const IconData(0xe824, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_bar_icon = const IconData(0xe825, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData discharge_patient = + const IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon = + const IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon_active = + const IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData in_patient_white = + const IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData lab_results = + const IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon = + const IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon_active = + const IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon = + const IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon_active = + const IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData out_patient = + const IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData radiology = + const IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referral = + const IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData scdedule_icon_active = + const IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_patient = + const IconData(0xe810, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule_icon = + const IconData(0xe811, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData image2vector = + const IconData(0xe824, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_bar_icon = + const IconData(0xe825, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static Image labResultSVG = + Image.asset('assets/images/dashboard-icon/lab_result.png'); } diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 79c492a8..2368eff3 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -26,7 +26,7 @@ class DashboardScreen extends StatefulWidget { DashboardScreen({Key key, this.title}) : super(key: key); final String title; - + final String iconURL = 'assets/images/dashboard_icon/'; @override _DashboardScreenState createState() => _DashboardScreenState(); } @@ -146,7 +146,7 @@ class _DashboardScreenState extends State { Expanded( flex: 2, child: new DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'lab_results.svg', "08", "Lab Result", backgroundColor: Colors.black45, @@ -158,7 +158,7 @@ class _DashboardScreenState extends State { Expanded( flex: 2, child: new DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'radiology.svg', "10", "Radiology", backgroundColor: Colors.black45, @@ -169,7 +169,7 @@ class _DashboardScreenState extends State { Expanded( flex: 2, child: new DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'referral.svg', "05", "Referral", backgroundColor: Colors.black45, @@ -188,17 +188,17 @@ class _DashboardScreenState extends State { Expanded( flex: 2, child: new DashboardItemIconText( - DoctorApp.home_icon, - "23", - "In-Patient", - showBorder: true, - backgroundColor: Colors.red[900], - ), + widget.iconURL + 'in_patient_white.svg', + "23", + "In-Patient", + showBorder: true, + backgroundColor: Colors.red[900], + iconColor: Colors.white), ), Expanded( flex: 2, child: new DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'operations.svg', "23", "Operations", showBorder: true, @@ -227,7 +227,7 @@ class _DashboardScreenState extends State { flex: 2, child: InkWell( child: DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'search_patient.svg', "", "Search Patient", showBorder: true, @@ -257,7 +257,7 @@ class _DashboardScreenState extends State { ); }, child: DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'message_icon.svg', "", "Doctor Reply", showBorder: true, @@ -281,7 +281,7 @@ class _DashboardScreenState extends State { flex: 1, child: InkWell( child: DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'search_patient.svg', "", "Search Medicine", showBorder: true, @@ -319,7 +319,7 @@ class _DashboardScreenState extends State { ); }, child: DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'referral.svg', "", "My Referral Patient", showBorder: true, @@ -354,7 +354,7 @@ class _DashboardScreenState extends State { ); }, child: DashboardItemIconText( - DoctorApp.home_icon, + widget.iconURL + 'referral.svg', "", "My Referred Patient", showBorder: true, diff --git a/lib/widgets/dashboard/dashboard_item_icons_texts.dart b/lib/widgets/dashboard/dashboard_item_icons_texts.dart index fc9e27c4..76e84e13 100644 --- a/lib/widgets/dashboard/dashboard_item_icons_texts.dart +++ b/lib/widgets/dashboard/dashboard_item_icons_texts.dart @@ -1,11 +1,13 @@ import 'dart:ffi'; +import 'package:flutter_svg/svg.dart'; + import '../shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; import '../shared/app_texts_widget.dart'; class DashboardItemIconText extends StatefulWidget { - final IconData icon; + final String icon; final String value; final String label; final Color backgroundColor; @@ -43,12 +45,11 @@ class _DashboardItemTextsState extends State { Align( alignment: FractionalOffset.topLeft, child: Container( - margin: EdgeInsets.all(10), - child: Icon( - widget.icon, - color: widget.iconColor, - ), - )), + margin: EdgeInsets.all(10), + child: SvgPicture.asset( + widget.icon, + color: widget.iconColor, + ))), Align( alignment: FractionalOffset.bottomRight, child: Container( diff --git a/lib/widgets/home/home_item.dart b/lib/widgets/home/home_item.dart index 59e606d8..0de07d7b 100644 --- a/lib/widgets/home/home_item.dart +++ b/lib/widgets/home/home_item.dart @@ -6,7 +6,7 @@ class HomeItem extends StatelessWidget { final String image; final String link; - HomeItem(this.id, this.title, this.image,this.link); + HomeItem(this.id, this.title, this.image, this.link); @override Widget build(BuildContext context) { return InkWell( @@ -22,21 +22,21 @@ class HomeItem extends StatelessWidget { child: Column( children: [ Container( - // decoration: BoxDecoration(color:Colors.red), - width: 10000, - height: 60, + // decoration: BoxDecoration(color:Colors.red), + width: 10000, + height: 60, child: CircleAvatar( - backgroundColor: Colors.white, - child: Container( - child: Image.asset( - image, - // width 50, - scale: 0.6, - color: Theme.of(context).primaryColor, - fit: BoxFit.cover, - ), - ), - )), + backgroundColor: Colors.white, + child: Container( + child: Image.asset( + image, + // width 50, + scale: 0.6, + color: Theme.of(context).primaryColor, + fit: BoxFit.cover, + ), + ), + )), Text( title, style: TextStyle(fontSize: 16), diff --git a/pubspec.yaml b/pubspec.yaml index 4336bacd..92593a05 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: flutter_localizations: sdk: flutter flutter_device_type: ^0.2.0 - intl: ^0.16.1 + intl: ^0.16.0 http: ^0.12.0+4 provider: ^4.0.5+1 shared_preferences: ^0.5.6+3 @@ -37,15 +37,13 @@ dependencies: url_launcher: ^5.4.5 charts_flutter: ^0.9.0 eva_icons_flutter: ^2.0.0 - + # Qr code Scanner barcode_scan: ^3.0.1 # permissions permission_handler: ^5.0.0+hotfix.3 device_info: ^0.4.2+4 - - # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 @@ -59,23 +57,20 @@ dev_dependencies: build_runner: any build_web_compilers: any - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. flutter: - # The following line ensures that the Material Icons font is # included with your application, so that you can use the icons in # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: assets: - - assets/images/ - + - assets/images/ + - assets/images/dashboard_icon/ # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see @@ -95,14 +90,14 @@ flutter: - asset: assets/fonts/Work_Sans/WorkSans-Regular.ttf - asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf weight: 700 - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - - family: DoctorApp + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + - family: DoctorApp fonts: - - asset: fonts/DoctorApp.ttf + - asset: fonts/DoctorApp.ttf # # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages diff --git a/ssh_key b/ssh_key new file mode 100644 index 00000000..b2bfd464 --- /dev/null +++ b/ssh_key @@ -0,0 +1,8 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDdAHzw+C +qTVdRkviTeVAj7AAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIGnX/M1OFtZvGTEI +h5/B9u+eQwjzRJpanfljungMbc+VAAAAkPGJXHVNFeKLXK+aQFiTKx8EU48dQGLBQVIq4G +1SOgNvOaK2UfnQwSbZzhMAOmA1RCUbpQH9cGr9B/uSI88sdghcTEkNgVAtVF/NHNeKMahf +3hdVQ7ER6Au4FEIhpvUTzF+0G+8QBTabpNQx3UdLUxFAOulX6nIYG2phQIS08V/DdS70IG +luo6vY2w/qnXDsWQ== +-----END OPENSSH PRIVATE KEY----- diff --git a/ssh_key.pub b/ssh_key.pub new file mode 100644 index 00000000..1d1ef8f5 --- /dev/null +++ b/ssh_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGnX/M1OFtZvGTEIh5/B9u+eQwjzRJpanfljungMbc+V sultan