diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index e4204f20..cf6348eb 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -45,7 +45,7 @@ android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" tools:replace="android:name" - android:label="HMG Doctor"> + android:label="Qasim hospital cluster"> - + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09bc..c4a603d4 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 11e35ed2..00000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index a032e3d4..00000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 4d0b9bac..00000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png deleted file mode 100644 index 675dfb3a..00000000 Binary files a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 13a8a4aa..00000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 12301f4a..00000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index bf0d6d1d..00000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index caf1fc21..00000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index d3ae924e..00000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index e7d996be..00000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index f0ba70b5..00000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 9133b963..00000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 9605dda8..00000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 0fce1189..00000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 67f0120e..00000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index de8b067e..00000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/assets/images/dr_app_logo.png b/assets/images/dr_app_logo.png index cc9186c2..55f7df04 100644 Binary files a/assets/images/dr_app_logo.png and b/assets/images/dr_app_logo.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index e83c3bf5..8a7bb573 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,128 +1,122 @@ { - "images":[ - { - "idiom":"iphone", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"iphone", - "size":"20x20", - "scale":"3x", - "filename":"Icon-App-20x20@3x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"3x", - "filename":"Icon-App-29x29@3x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"3x", - "filename":"Icon-App-40x40@3x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"2x", - "filename":"Icon-App-60x60@2x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"3x", - "filename":"Icon-App-60x60@3x.png" - }, - { - "idiom":"iphone", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"1x", - "filename":"Icon-App-20x20@1x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"1x", - "filename":"Icon-App-40x40@1x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"1x", - "filename":"Icon-App-76x76@1x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"83.5x83.5", - "scale":"2x", - "filename":"Icon-App-83.5x83.5@2x.png" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "scale" : "1x", - "filename" : "ItunesArtwork@2x.png" - } - ], - "info":{ - "version":1, - "author":"easyappicon" + "images" : [ + { + "filename" : "Icon-40.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-60.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "Icon-29 1.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-58.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-87.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "Icon-80.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-120.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "Icon-120 1.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "Icon-180.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "Icon-20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "Icon-40 1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-58 1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-40 2.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "Icon-80 1.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "Icon-152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "Icon-167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "filename" : "Icon-1024.png", + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } } diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png new file mode 100644 index 00000000..ecff70be Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120 1.png new file mode 100644 index 00000000..a501f8fd Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.png new file mode 100644 index 00000000..a501f8fd Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-120.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.png new file mode 100644 index 00000000..87cf1a7b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-152.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.png new file mode 100644 index 00000000..96da0af7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-167.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.png new file mode 100644 index 00000000..de4cce52 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-180.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png new file mode 100644 index 00000000..f139f21b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29 1.png new file mode 100644 index 00000000..a6ae7792 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png new file mode 100644 index 00000000..a6ae7792 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40 1.png new file mode 100644 index 00000000..7ca74015 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40 2.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40 2.png new file mode 100644 index 00000000..7ca74015 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40 2.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 00000000..7ca74015 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58 1.png new file mode 100644 index 00000000..5090d24d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.png new file mode 100644 index 00000000..5090d24d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-58.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.png new file mode 100644 index 00000000..716a3106 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 00000000..2ba72a06 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80 1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80 1.png new file mode 100644 index 00000000..6ffb0550 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80 1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.png new file mode 100644 index 00000000..6ffb0550 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-80.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.png new file mode 100644 index 00000000..70a12401 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-87.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada47..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index a506606c..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 002322b4..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index c4197e69..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 61d2e737..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index 3c9f4819..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 5b6d4029..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 002322b4..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 049de742..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index f47f5fa2..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index f47f5fa2..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 1f53454b..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 9a3d0236..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index cbec330f..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 832249a6..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png deleted file mode 100644 index b51b90aa..00000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png and /dev/null differ diff --git a/lib/config/config.dart b/lib/config/config.dart index cec77c23..6b291526 100755 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -11,9 +11,9 @@ const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; // const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'http://10.20.200.111:1010/'; -// const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; -const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://webservices.hmg.com/'; // @@ -430,8 +430,8 @@ const TIMER_MIN = 10; class AppGlobal { static var CONTEX; - static Color appRedColor = Color(0xFFD02127); - static Color appGreenColor = Color(0xFF359846); + static Color appRedColor = Color(0xFF1E8CC8); + static Color appGreenColor = Color(0xFF1E8CC8); static Color appTextColor = Color(0xFF2B353E); static Color scheduleTextColor = Color(0xFF2E303A); static Color inProgressColor = Color(0xFFCC9B14); diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 4188c144..8e85dd86 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -166,7 +166,7 @@ const Map> localizedValues = { "ar": "الرجاء ادخال مستشفى" }, "login": {"en": "Login", "ar": "تسجيل دخول"}, - "drSulaimanAlHabib": {"en": "Dr Sulaiman Al Habib", "ar": "د.سليمان الحبيب"}, + "ministryOfHealth": {"en": "Ministry of Health", "ar": "وزارة الصحة"}, "welcomeTo": {"en": "Welcome to", "ar": "مرحبا بك"}, "welcomeBackTo": {"en": "Welcome Back to", "ar": "مرحبًا بعودتك الى "}, "home": {"en": "Home", "ar": "الرئيسية"}, diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 9317e4e0..c3db2f09 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -81,11 +81,11 @@ class _LandingPageState extends State { HomeScreen(), MyScheduleScreen(), QrReaderScreen(), - DoctorReplyScreen( - changeCurrentTab: () { - _changeCurrentTab(0); - }, - ), + // DoctorReplyScreen( + // changeCurrentTab: () { + // _changeCurrentTab(0); + // }, + // ), ], ), bottomNavigationBar: BottomNavBar( diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index 07315d91..0ad11698 100755 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -74,12 +74,12 @@ class _LoginScreenState extends State { style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, fontFamily: 'Poppins'), ), Text( - TranslationBase.of(context).drSulaimanAlHabib, + TranslationBase.of(context).ministryOfHealth, style: TextStyle(color: Color(0xFF2B353E), fontWeight: FontWeight.bold, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth! * 0.029, fontFamily: 'Poppins'), ), Text( "Doctor App", - style: TextStyle(fontSize: SizeConfig.isMobile ? 16 : SizeConfig.realScreenWidth! * 0.030, fontWeight: FontWeight.w600, color: Color(0xFFD02127)), + style: TextStyle(fontSize: SizeConfig.isMobile ? 16 : SizeConfig.realScreenWidth! * 0.030, fontWeight: FontWeight.w600, color: Color(0xFF1E8CC8)), ), ]), ], diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index e562c742..c4f448d5 100755 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -302,20 +302,19 @@ class _VerificationMethodsScreenState extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded( - child: VerificationMethodsList( + VerificationMethodsList( authenticationViewModel: authenticationViewModel, authMethodType: AuthMethodTypes.SMS, authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive), onShowMore: () {}, - )), - Expanded( - child: VerificationMethodsList( - authenticationViewModel: authenticationViewModel, - authMethodType: AuthMethodTypes.WhatsApp, - authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive), - onShowMore: () {}, - )) + ), + // Expanded( + // child: VerificationMethodsList( + // authenticationViewModel: authenticationViewModel, + // authMethodType: AuthMethodTypes.WhatsApp, + // authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive), + // onShowMore: () {}, + // )) ], ), ]), diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 4be54f9e..c0b7e303 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -368,59 +368,59 @@ class _HomeScreenState extends State { List patientCards = []; - if (model.hasVirtualClinic) { - patientCards.add(HomePatientCard( - gradient: backgroundColors[colorIndex], - backgroundIconColor: backgroundIconColors[colorIndex], - cardIcon: DoctorApp.livecare, - textColor: textColors[colorIndex], - iconSize: 21, - text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}", - onTap: () { - // TODO MOSA TEST - // PatiantInformtion patient = PatiantInformtion( - // patientStatusType: 43, - // episodeNo: 0, - // vcId: 42342, - // fullName: "mosa test", - // dateofBirth: "2000-05-01 10:42:35.790004" - // ); - // Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { - // "patient": patient, - // "patientType": "0", - // "isSearch": false, - // "isInpatient": false, - // "arrivalType": "0", - // "isSearchAndOut": false, - // "isFromLiveCare": true, - // }); - Navigator.push( - context, - FadePage( - page: LiveCarePatientScreen(), - ), - ); - }, - )); - changeColorIndex(); - } + // if (model.hasVirtualClinic) { + // patientCards.add(HomePatientCard( + // gradient: backgroundColors[colorIndex], + // backgroundIconColor: backgroundIconColors[colorIndex], + // cardIcon: DoctorApp.livecare, + // textColor: textColors[colorIndex], + // iconSize: 21, + // text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}", + // onTap: () { + // // TODO MOSA TEST + // // PatiantInformtion patient = PatiantInformtion( + // // patientStatusType: 43, + // // episodeNo: 0, + // // vcId: 42342, + // // fullName: "mosa test", + // // dateofBirth: "2000-05-01 10:42:35.790004" + // // ); + // // Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { + // // "patient": patient, + // // "patientType": "0", + // // "isSearch": false, + // // "isInpatient": false, + // // "arrivalType": "0", + // // "isSearchAndOut": false, + // // "isFromLiveCare": true, + // // }); + // Navigator.push( + // context, + // FadePage( + // page: LiveCarePatientScreen(), + // ), + // ); + // }, + // )); + // changeColorIndex(); + // } - patientCards.add(HomePatientCard( - gradient: backgroundColors[colorIndex], - backgroundIconColor: backgroundIconColors[colorIndex], - cardIcon: DoctorApp.qr_reader, - textColor: textColors[colorIndex], - text: "ER sign In", - onTap: () { - Navigator.push( - context, - FadePage( - page: ErSignInScreen(), - ), - ); - }, - )); - changeColorIndex(); + // patientCards.add(HomePatientCard( + // gradient: backgroundColors[colorIndex], + // backgroundIconColor: backgroundIconColors[colorIndex], + // cardIcon: DoctorApp.qr_reader, + // textColor: textColors[colorIndex], + // text: "ER sign In", + // onTap: () { + // Navigator.push( + // context, + // FadePage( + // page: ErSignInScreen(), + // ), + // ); + // }, + // )); + // changeColorIndex(); if (model.doctorProfile != null) { patientCards.add( diff --git a/lib/screens/patients/In_patient/in_patient_list_page.dart b/lib/screens/patients/In_patient/in_patient_list_page.dart index c5004a9e..f95f7581 100644 --- a/lib/screens/patients/In_patient/in_patient_list_page.dart +++ b/lib/screens/patients/In_patient/in_patient_list_page.dart @@ -72,7 +72,7 @@ class _InPatientListPageState extends State { widget.patientSearchViewModel!.resetFilters(); }); }, - activeColor: Colors.red, + activeColor: Color(0xFF1E8CC8), ), AppText( "${TranslationBase.of(context).allClinic}", @@ -103,7 +103,7 @@ class _InPatientListPageState extends State { widget.onChangeValue!(isAllClinic: false, showBottomSheet: true, selectedClinicName: widget.selectedClinicName); } }, - activeColor: Colors.red, + activeColor: Color(0xFF1E8CC8), ), AppText( widget.selectedClinicName ?? TranslationBase.of(context).clinicSelect, @@ -247,7 +247,7 @@ class _InPatientListPageState extends State { widget.patientSearchViewModel!.filterByClinic(clinicName: value!); }); }, - activeColor: Colors.red, + activeColor: Color(0xFF1E8CC8), ), AppText( widget.patientSearchViewModel!.InpatientClinicList[index], diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart index 5cf11c5f..5f06a562 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart @@ -43,14 +43,14 @@ class ProfileGridForInPatient extends StatelessWidget { isVidaPlusProject: isVidaPlusProject ), - PatientProfileCardModel( - TranslationBase.of(context).lab, - TranslationBase.of(context).special, - ALL_SPECIAL_LAB_RESULT, - 'assets/images/svgs/profile_screen/lab results.svg', - isInPatient: isInpatient, - isVidaPlusProject: isVidaPlusProject - ), + // PatientProfileCardModel( + // TranslationBase.of(context).lab, + // TranslationBase.of(context).special, + // ALL_SPECIAL_LAB_RESULT, + // 'assets/images/svgs/profile_screen/lab results.svg', + // isInPatient: isInpatient, + // isVidaPlusProject: isVidaPlusProject + // ), PatientProfileCardModel( TranslationBase.of(context).radiology, TranslationBase.of(context).result, @@ -59,14 +59,14 @@ class ProfileGridForInPatient extends StatelessWidget { isInPatient: isInpatient, isVidaPlusProject: isVidaPlusProject ), - PatientProfileCardModel( - TranslationBase.of(context).patient, - TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', - ORDER_PRESCRIPTION_OLD, - 'assets/images/svgs/profile_screen/order prescription.svg', - isInPatient: isInpatient, - isVidaPlusProject: isVidaPlusProject - ), + // PatientProfileCardModel( + // TranslationBase.of(context).patient, + // TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', + // ORDER_PRESCRIPTION_OLD, + // 'assets/images/svgs/profile_screen/order prescription.svg', + // isInPatient: isInpatient, + // isVidaPlusProject: isVidaPlusProject + // ), PatientProfileCardModel( TranslationBase.of(context).patient, TranslationBase.of(context).prescription, @@ -145,15 +145,15 @@ class ProfileGridForInPatient extends StatelessWidget { isInPatient: isInpatient, isVidaPlusProject: isVidaPlusProject ), - PatientProfileCardModel( - TranslationBase.of(context).patientSick, - TranslationBase.of(context).leave, - ADD_SICKLEAVE, - 'assets/images/svgs/profile_screen/patient sick leave.svg', - isInPatient: isInpatient, - //onTap: () {}, - isVidaPlusProject: isVidaPlusProject - ), + // PatientProfileCardModel( + // TranslationBase.of(context).patientSick, + // TranslationBase.of(context).leave, + // ADD_SICKLEAVE, + // 'assets/images/svgs/profile_screen/patient sick leave.svg', + // isInPatient: isInpatient, + // //onTap: () {}, + // isVidaPlusProject: isVidaPlusProject + // ), PatientProfileCardModel( TranslationBase.of(context).operation, TranslationBase.of(context).report, @@ -194,22 +194,22 @@ class ProfileGridForInPatient extends StatelessWidget { isInPatient: isInpatient, isVidaPlusProject: isVidaPlusProject ), - PatientProfileCardModel( - TranslationBase.of(context).diabetic, - TranslationBase.of(context).chart, - DIABETIC_CHART_VALUES, - 'assets/images/svgs/profile_screen/diabetic chart.svg', - isInPatient: isInpatient, - isVidaPlusProject: isVidaPlusProject - ), - PatientProfileCardModel( - "VTE", - "Assessment", - VTE_ASSESSMENT, - 'assets/images/svgs/profile_screen/diabetic chart.svg', - isInPatient: isInpatient, - isVidaPlusProject: isVidaPlusProject - ), + // PatientProfileCardModel( + // TranslationBase.of(context).diabetic, + // TranslationBase.of(context).chart, + // DIABETIC_CHART_VALUES, + // 'assets/images/svgs/profile_screen/diabetic chart.svg', + // isInPatient: isInpatient, + // isVidaPlusProject: isVidaPlusProject + // ), + // PatientProfileCardModel( + // "VTE", + // "Assessment", + // VTE_ASSESSMENT, + // 'assets/images/svgs/profile_screen/diabetic chart.svg', + // isInPatient: isInpatient, + // isVidaPlusProject: isVidaPlusProject + // ), PatientProfileCardModel( TranslationBase.of(context).pharmacy, TranslationBase.of(context).intervention, diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart index 4010575f..48e80982 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart @@ -27,50 +27,60 @@ class ProfileGridForOther extends StatelessWidget { @override Widget build(BuildContext context) { final List cardsList = [ - PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient), - PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), + PatientProfileCardModel(TranslationBase + .of(context) + .vital, TranslationBase + .of(context) + .signs, VITAL_SIGN_DETAILS, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient,), + PatientProfileCardModel(TranslationBase + .of(context) + .lab, TranslationBase + .of(context) + .result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', - isInPatient: isInpatient), + isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg', - isInPatient: isInpatient), + isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', ORDER_PRESCRIPTION_OLD, 'assets/images/svgs/profile_screen/order prescription.svg', - isInPatient: isInpatient), + isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).prescription, ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg', - isInPatient: isInpatient), + isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, 'assets/images/svgs/profile_screen/health summary.svg', - isInPatient: isInpatient), - PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient), + isInPatient: isInpatient,), + PatientProfileCardModel(TranslationBase + .of(context) + .patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg', - isInPatient: isInpatient), + isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service, PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/insurance approval.svg', - isInPatient: isInpatient), + isInPatient: isInpatient,), PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, 'assets/images/svgs/profile_screen/patient sick leave.svg', - isInPatient: isInpatient), - if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) + isInPatient: isInpatient,), + if ( (patient.appointmentNo != null && patient.appointmentNo != 0)) PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg', - isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null), - if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) + isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null,), + if ( (patient.appointmentNo != null && patient.appointmentNo != 0)) PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient, REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg', - isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null), - if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) + isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null,), + if ((patient.appointmentNo != null && patient.appointmentNo != 0)) PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg', isInPatient: isInpatient, isDisable: - Utils.isVidaPlusProject(projectViewModel, patient.projectId!) || (isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43) || patient.appointmentNo == null), + Utils.isVidaPlusProject(projectViewModel, patient.projectId!) || (isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43) || patient.appointmentNo == null,), ]; return Padding( - padding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15), + padding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15,), child: GridView( shrinkWrap: true, - physics: BouncingScrollPhysics(), + physics: BouncingScrollPhysics(), // if you want IOS bouncing effect, otherwise remove this line gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisSpacing: 10, mainAxisSpacing: 8, crossAxisCount: 3, - ), + ), //change the number as you want children: cardsList.map((item) { return PatientProfileButton( @@ -90,7 +100,7 @@ class ProfileGridForOther extends StatelessWidget { isLoading: item.isLoading, ); }).toList(), - ), + ), ); } } diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart index 2ba0386e..83cb623a 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart @@ -36,14 +36,14 @@ class ProfileGridForSearch extends StatelessWidget { isInPatient: isInpatient, //onTap: () {}, ), - PatientProfileCardModel( - TranslationBase.of(context).lab, - TranslationBase.of(context).special, - ALL_SPECIAL_LAB_RESULT, - 'assets/images/svgs/profile_screen/lab results.svg', - isInPatient: isInpatient, - //onTap: () {}, - ), + // PatientProfileCardModel( + // TranslationBase.of(context).lab, + // TranslationBase.of(context).special, + // ALL_SPECIAL_LAB_RESULT, + // 'assets/images/svgs/profile_screen/lab results.svg', + // isInPatient: isInpatient, + // //onTap: () {}, + // ), PatientProfileCardModel( TranslationBase.of(context).radiology, TranslationBase.of(context).service, @@ -52,14 +52,14 @@ class ProfileGridForSearch extends StatelessWidget { isInPatient: isInpatient, //onTap: () {}, ), - PatientProfileCardModel( - TranslationBase.of(context).orders, - TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', - ORDER_PRESCRIPTION_OLD, - 'assets/images/svgs/profile_screen/order prescription.svg', - isInPatient: isInpatient, - //onTap: () {}, - ), + // PatientProfileCardModel( + // TranslationBase.of(context).orders, + // TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', + // ORDER_PRESCRIPTION_OLD, + // 'assets/images/svgs/profile_screen/order prescription.svg', + // isInPatient: isInpatient, + // //onTap: () {}, + // ), PatientProfileCardModel( TranslationBase.of(context).patient, TranslationBase.of(context).prescription, @@ -100,14 +100,14 @@ class ProfileGridForSearch extends StatelessWidget { isInPatient: isInpatient, //onTap: () {}, ), - PatientProfileCardModel( - TranslationBase.of(context).patientSick, - TranslationBase.of(context).leave, - ADD_SICKLEAVE, - 'assets/images/svgs/profile_screen/patient sick leave.svg', - isInPatient: isInpatient, - //onTap: () {}, - ), + // PatientProfileCardModel( + // TranslationBase.of(context).patientSick, + // TranslationBase.of(context).leave, + // ADD_SICKLEAVE, + // 'assets/images/svgs/profile_screen/patient sick leave.svg', + // isInPatient: isInpatient, + // //onTap: () {}, + // ), if (patient!.appointmentNo != null && patient!.appointmentNo != 0) PatientProfileCardModel( TranslationBase.of(context).patient, diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart index a4af47f0..aeeeb4cc 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart @@ -415,7 +415,7 @@ class _EditDiagnosisState extends State { child: AppButton( title: TranslationBase.of(context).save, fontWeight: FontWeight.w600, - color: Color(0xFF359846), + color: Color(0xFF1E8CC8), onPressed: () async { selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart index 42a649d3..19a3cd3e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/enter_diagnosis.dart @@ -381,7 +381,7 @@ class _EnterDiagnosisState extends State { child: AppButton( title: TranslationBase.of(context).save, fontWeight: FontWeight.w600, - color: Color(0xFF359846), + color: Color(0xFF1E8CC8), onPressed: () async { selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem]; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart index c65d145e..42aac05e 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart @@ -451,7 +451,7 @@ class _FavoriteDiagnosisState extends State { child: AppButton( title: TranslationBase.of(context).save, fontWeight: FontWeight.w600, - color: Color(0xFF359846), + color: Color(0xFF1E8CC8), onPressed: () async { selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem]; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart index 40de420b..b80cb952 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart @@ -112,7 +112,7 @@ class _AddDetailsToExaminationVidaPlusState Expanded( child: AppButton( title: TranslationBase.of(context).saveSmall, - color: Color(0xff359846), + color: Color(0xFF1E8CC8), fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart index ab92d4d8..edf9d68b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/plan/widget/add_progress_note.dart @@ -325,7 +325,7 @@ class _AddProgressNoteState extends State { Expanded( child: AppButton( title: TranslationBase.of(context).save, - color: Color(0xff359846), + color: Color(0xFF1E8CC8), fontColor: Colors.white, fontWeight: FontWeight.w600, onPressed: () async { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart index a3e3d43a..ca3377af 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/reactions_selection.dart @@ -470,7 +470,7 @@ class _ReactionsSelectionAllergiesWidgetState )) // CustomBottomSheetContainer( - // buttonColor: Color(0xff359846), + // buttonColor: Color(0xFF1E8CC8), // fontColor: Colors.white, // label: TranslationBase.of(context).next, // onTap: () { diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart index 755e49a6..4f4f609b 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/allergies/update_allergies_widget.dart @@ -201,7 +201,7 @@ class _UpdateAllergiesWidgetState extends State { label: AppText( TranslationBase.of(context).resolve, fontSize: 12, - color: Color(0xff359846))) + color: Color(0xFF1E8CC8))) ], ) : selectedAllergy.allergyID! != 0 @@ -253,7 +253,7 @@ class _UpdateAllergiesWidgetState extends State { Color getColor(int severity) { Map color = { - 1: Color(0xff359846), + 1: Color(0xFF1E8CC8), 2: Color(0xFFCC9B14), 3: Color(0xffD02127) }; diff --git a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart index 26b2d8f2..aa1d2aeb 100644 --- a/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart +++ b/lib/screens/patients/profile/soap_update_vida_plus/widgets/SoapDetailItem.dart @@ -78,7 +78,7 @@ class SoapDetailItem extends StatelessWidget { ), AppText( type ?? '', - color: Color(0xff359846), + color: Color(0xFF1E8CC8), fontSize: 10, fontWeight: FontWeight.w500, ), @@ -131,7 +131,7 @@ class SoapDetailItem extends StatelessWidget { onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE), child: SoapDetailItemActionsView( icon: 'assets/images/svgs/resolve.svg', - fontColor: Color(0XFF359846), + fontColor: Color(0xFF1E8CC8), text: TranslationBase.of(context).resolve, ), ), @@ -203,7 +203,7 @@ class Status extends StatelessWidget { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(3), ), - // color: Color(0xFF359846), + // color: Color(0xFF1E8CC8), color: (status.toLowerCase() == TranslationBase.of(context).active.toLowerCase() || status.toLowerCase() == @@ -221,7 +221,7 @@ class Status extends StatelessWidget { TranslationBase.of(context).active.toLowerCase() || status.toLowerCase() == TranslationBase.of(context).stable.toLowerCase()) - ? Color(0xFF359846) + ? Color(0xFF1E8CC8) : Colors.white, fontSize: 8, fontWeight: FontWeight.w600, diff --git a/lib/screens/prescription/add_prescription/prescription_form_widget.dart b/lib/screens/prescription/add_prescription/prescription_form_widget.dart index e2eb3ef2..c1b0f22d 100644 --- a/lib/screens/prescription/add_prescription/prescription_form_widget.dart +++ b/lib/screens/prescription/add_prescription/prescription_form_widget.dart @@ -562,7 +562,7 @@ getIcdCodeData() async{ alignment: WrapAlignment.center, children: [ AppButton( - color: Color(0xff359846), + color: Color(0xFF1E8CC8), title: TranslationBase.of(context).addMedication, fontWeight: FontWeight.w600, onPressed: () async { diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart index 6f228007..4c2723ae 100644 --- a/lib/utils/translations_delegate_base_utils.dart +++ b/lib/utils/translations_delegate_base_utils.dart @@ -335,8 +335,8 @@ class TranslationBase { String get login => localizedValues['login']![locale.languageCode]!; - String get drSulaimanAlHabib => - localizedValues['drSulaimanAlHabib']![locale.languageCode]!; + String get ministryOfHealth => + localizedValues['ministryOfHealth']![locale.languageCode]!; String get welcomeTo => localizedValues['welcomeTo']![locale.languageCode]!; diff --git a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart index 52e2a1d7..db8a5dfe 100644 --- a/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart +++ b/lib/widgets/bottom_sheet/custom_bottom_sheet_container.dart @@ -13,7 +13,7 @@ class CustomBottomSheetContainer extends StatelessWidget { final double? widthFactor; double headerHeight = SizeConfig.heightMultiplier! * 12; - CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key); + CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF1E8CC8) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 4b057bff..6cf5708a 100755 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -127,22 +127,22 @@ class _AppDrawerState extends State { }, ), SizedBox(height: 15), - InkWell( - child: DrawerItem( - TranslationBase.of(context).doctorRota, - icon: Icons.punch_clock, - - // subTitle: , - ), - onTap: () { - Navigator.pop(context); - Navigator.push( - context, - MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule') - // MyReferredPatient(), - )); - }, - ), + // InkWell( + // child: DrawerItem( + // TranslationBase.of(context).doctorRota, + // icon: Icons.punch_clock, + // + // // subTitle: , + // ), + // onTap: () { + // Navigator.pop(context); + // Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule') + // // MyReferredPatient(), + // )); + // }, + // ), SizedBox(height: 15), InkWell( child: DrawerItem( diff --git a/lib/widgets/shared/bottom_nav_bar.dart b/lib/widgets/shared/bottom_nav_bar.dart index d0ec2e3f..83dec7cf 100644 --- a/lib/widgets/shared/bottom_nav_bar.dart +++ b/lib/widgets/shared/bottom_nav_bar.dart @@ -80,16 +80,16 @@ class _BottomNavBarState extends State { name: TranslationBase.of(context).qr, dashboardViewModel: widget.dashboardViewModel, ), - BottomNavigationItem( - icon: DoctorApp.dr_reply_1, - activeIcon: DoctorApp.dr_reply_active_1, - svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", - changeIndex: _changeIndex, - index: widget.index, - currentIndex: 3, - name: TranslationBase.of(context).replay2, - dashboardViewModel: widget.dashboardViewModel, - ), + // BottomNavigationItem( + // icon: DoctorApp.dr_reply_1, + // activeIcon: DoctorApp.dr_reply_active_1, + // svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", + // changeIndex: _changeIndex, + // index: widget.index, + // currentIndex: 3, + // name: TranslationBase.of(context).replay2, + // dashboardViewModel: widget.dashboardViewModel, + // ), ], ), ), diff --git a/lib/widgets/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart index 0ab825f8..6d328042 100644 --- a/lib/widgets/shared/buttons/app_buttons_widget.dart +++ b/lib/widgets/shared/buttons/app_buttons_widget.dart @@ -75,7 +75,7 @@ class _AppButtonState extends State { ? Colors.grey : widget.color != null ? widget.color - : HexColor("#D02127"), + : Color(0xFF1E8CC8), splashColor: widget.color, child: Padding( padding: (widget.hPadding > 0 || widget.vPadding > 0) @@ -133,7 +133,7 @@ class _AppButtonState extends State { ? widget.borderColor : widget.disabled ? Colors.grey - : widget.color ?? Color(0xFFB8382C), + : widget.color ?? Color(0xFF1E8CC8), width: 0.8, ), borderRadius: BorderRadius.all(Radius.circular(widget.radius))), diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index fa8b1cd1..b38c2e40 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -111,7 +111,7 @@ class _AppTextFieldCustomState extends State { Color(0Xffffffff), widget.validationError == null ? Color(0xFFEFEFEF) - : Colors.red.shade700, + : Color(0xFF1E8CC8), ) : null, padding: diff --git a/pubspec.lock b/pubspec.lock index cb832c0c..a577ba7d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1073,10 +1073,10 @@ packages: dependency: transitive description: name: meta - sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" + sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.16.0" mime: dependency: transitive description: @@ -1598,10 +1598,10 @@ packages: dependency: transitive description: name: test_api - sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00" url: "https://pub.dev" source: hosted - version: "0.7.7" + version: "0.7.6" timezone: dependency: "direct main" description: