diff --git a/assets/fonts/DoctorApp.ttf b/assets/fonts/DoctorApp.ttf
new file mode 100644
index 0000000..4ef2028
Binary files /dev/null and b/assets/fonts/DoctorApp.ttf differ
diff --git a/assets/fonts/Poppins/Poppins-Bold.ttf b/assets/fonts/Poppins/Poppins-Bold.ttf
new file mode 100644
index 0000000..b94d47f
Binary files /dev/null and b/assets/fonts/Poppins/Poppins-Bold.ttf differ
diff --git a/assets/fonts/Poppins/Poppins-Medium.ttf b/assets/fonts/Poppins/Poppins-Medium.ttf
new file mode 100644
index 0000000..e90e87e
Binary files /dev/null and b/assets/fonts/Poppins/Poppins-Medium.ttf differ
diff --git a/assets/fonts/Poppins/Poppins-Regular.ttf b/assets/fonts/Poppins/Poppins-Regular.ttf
new file mode 100644
index 0000000..be06e7f
Binary files /dev/null and b/assets/fonts/Poppins/Poppins-Regular.ttf differ
diff --git a/assets/fonts/Poppins/Poppins-SemiBold.ttf b/assets/fonts/Poppins/Poppins-SemiBold.ttf
new file mode 100644
index 0000000..8987d80
Binary files /dev/null and b/assets/fonts/Poppins/Poppins-SemiBold.ttf differ
diff --git a/assets/fonts/Work_Sans/OFL.txt b/assets/fonts/Work_Sans/OFL.txt
new file mode 100644
index 0000000..5c0354e
--- /dev/null
+++ b/assets/fonts/Work_Sans/OFL.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2014-2015 Wei Huang (wweeiihhuuaanngg@gmail.com)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/fonts/Work_Sans/WorkSans-Black.ttf b/assets/fonts/Work_Sans/WorkSans-Black.ttf
new file mode 100644
index 0000000..fb74420
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-Black.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Bold.ttf b/assets/fonts/Work_Sans/WorkSans-Bold.ttf
new file mode 100644
index 0000000..7caa359
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-Bold.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-ExtraBold.ttf b/assets/fonts/Work_Sans/WorkSans-ExtraBold.ttf
new file mode 100644
index 0000000..fd4b912
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-ExtraBold.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-ExtraLight.ttf b/assets/fonts/Work_Sans/WorkSans-ExtraLight.ttf
new file mode 100644
index 0000000..b97cf8c
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-ExtraLight.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Light.ttf b/assets/fonts/Work_Sans/WorkSans-Light.ttf
new file mode 100644
index 0000000..3e981fb
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-Light.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Medium.ttf b/assets/fonts/Work_Sans/WorkSans-Medium.ttf
new file mode 100644
index 0000000..7a2645b
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-Medium.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Regular.ttf b/assets/fonts/Work_Sans/WorkSans-Regular.ttf
new file mode 100644
index 0000000..0ac4520
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-Regular.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-SemiBold.ttf b/assets/fonts/Work_Sans/WorkSans-SemiBold.ttf
new file mode 100644
index 0000000..589a5f5
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-SemiBold.ttf differ
diff --git a/assets/fonts/Work_Sans/WorkSans-Thin.ttf b/assets/fonts/Work_Sans/WorkSans-Thin.ttf
new file mode 100644
index 0000000..011fcd3
Binary files /dev/null and b/assets/fonts/Work_Sans/WorkSans-Thin.ttf differ
diff --git a/assets/images/login/more_icon.png b/assets/images/login/more_icon.png
new file mode 100644
index 0000000..b696d34
Binary files /dev/null and b/assets/images/login/more_icon.png differ
diff --git a/assets/images/login/verify_face.svg b/assets/images/login/verify_face.svg
new file mode 100644
index 0000000..e50d1a6
--- /dev/null
+++ b/assets/images/login/verify_face.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/login/verify_sms.svg b/assets/images/login/verify_sms.svg
new file mode 100644
index 0000000..ae5fa9f
--- /dev/null
+++ b/assets/images/login/verify_sms.svg
@@ -0,0 +1,11 @@
+
diff --git a/assets/images/login/verify_thumb.svg b/assets/images/login/verify_thumb.svg
new file mode 100644
index 0000000..e626baf
--- /dev/null
+++ b/assets/images/login/verify_thumb.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/login/verify_whatsapp.svg b/assets/images/login/verify_whatsapp.svg
new file mode 100644
index 0000000..09ac85c
--- /dev/null
+++ b/assets/images/login/verify_whatsapp.svg
@@ -0,0 +1,12 @@
+
diff --git a/assets/images/patient/admission_req.png b/assets/images/patient/admission_req.png
new file mode 100644
index 0000000..b233508
Binary files /dev/null and b/assets/images/patient/admission_req.png differ
diff --git a/assets/images/patient/ic_ref_arrow_left.png b/assets/images/patient/ic_ref_arrow_left.png
new file mode 100644
index 0000000..09e05ab
Binary files /dev/null and b/assets/images/patient/ic_ref_arrow_left.png differ
diff --git a/assets/images/patient/ic_ref_arrow_up.png b/assets/images/patient/ic_ref_arrow_up.png
new file mode 100644
index 0000000..8294cfe
Binary files /dev/null and b/assets/images/patient/ic_ref_arrow_up.png differ
diff --git a/assets/images/patient/refer_patient.png b/assets/images/patient/refer_patient.png
new file mode 100644
index 0000000..ac3aea6
Binary files /dev/null and b/assets/images/patient/refer_patient.png differ
diff --git a/assets/images/patient/ucaf.png b/assets/images/patient/ucaf.png
new file mode 100644
index 0000000..f729359
Binary files /dev/null and b/assets/images/patient/ucaf.png differ
diff --git a/assets/images/patient/vital_signs/Obese_BMI-r.png b/assets/images/patient/vital_signs/Obese_BMI-r.png
new file mode 100644
index 0000000..50b3282
Binary files /dev/null and b/assets/images/patient/vital_signs/Obese_BMI-r.png differ
diff --git a/assets/images/patient/vital_signs/Obese_BMI.png b/assets/images/patient/vital_signs/Obese_BMI.png
new file mode 100644
index 0000000..540d4bc
Binary files /dev/null and b/assets/images/patient/vital_signs/Obese_BMI.png differ
diff --git a/assets/images/patient/vital_signs/blood_pressure.png b/assets/images/patient/vital_signs/blood_pressure.png
new file mode 100644
index 0000000..9670187
Binary files /dev/null and b/assets/images/patient/vital_signs/blood_pressure.png differ
diff --git a/assets/images/patient/vital_signs/health_BMI-r.png b/assets/images/patient/vital_signs/health_BMI-r.png
new file mode 100644
index 0000000..96189d3
Binary files /dev/null and b/assets/images/patient/vital_signs/health_BMI-r.png differ
diff --git a/assets/images/patient/vital_signs/health_BMI.png b/assets/images/patient/vital_signs/health_BMI.png
new file mode 100644
index 0000000..c87a042
Binary files /dev/null and b/assets/images/patient/vital_signs/health_BMI.png differ
diff --git a/assets/images/patient/vital_signs/heart_rate.png b/assets/images/patient/vital_signs/heart_rate.png
new file mode 100644
index 0000000..7601719
Binary files /dev/null and b/assets/images/patient/vital_signs/heart_rate.png differ
diff --git a/assets/images/patient/vital_signs/height.png b/assets/images/patient/vital_signs/height.png
new file mode 100644
index 0000000..e176c45
Binary files /dev/null and b/assets/images/patient/vital_signs/height.png differ
diff --git a/assets/images/patient/vital_signs/ovrweight_BMI-r.png b/assets/images/patient/vital_signs/ovrweight_BMI-r.png
new file mode 100644
index 0000000..ff24fc6
Binary files /dev/null and b/assets/images/patient/vital_signs/ovrweight_BMI-r.png differ
diff --git a/assets/images/patient/vital_signs/ovrweight_BMI.png b/assets/images/patient/vital_signs/ovrweight_BMI.png
new file mode 100644
index 0000000..da8e67b
Binary files /dev/null and b/assets/images/patient/vital_signs/ovrweight_BMI.png differ
diff --git a/assets/images/patient/vital_signs/oxg.png b/assets/images/patient/vital_signs/oxg.png
new file mode 100644
index 0000000..344344e
Binary files /dev/null and b/assets/images/patient/vital_signs/oxg.png differ
diff --git a/assets/images/patient/vital_signs/painScale.png b/assets/images/patient/vital_signs/painScale.png
new file mode 100644
index 0000000..36b6b9f
Binary files /dev/null and b/assets/images/patient/vital_signs/painScale.png differ
diff --git a/assets/images/patient/vital_signs/respiration_rate.png b/assets/images/patient/vital_signs/respiration_rate.png
new file mode 100644
index 0000000..ff695de
Binary files /dev/null and b/assets/images/patient/vital_signs/respiration_rate.png differ
diff --git a/assets/images/patient/vital_signs/temperature.png b/assets/images/patient/vital_signs/temperature.png
new file mode 100644
index 0000000..9953a13
Binary files /dev/null and b/assets/images/patient/vital_signs/temperature.png differ
diff --git a/assets/images/patient/vital_signs/underweight_BMI-r.png b/assets/images/patient/vital_signs/underweight_BMI-r.png
new file mode 100644
index 0000000..2f633b4
Binary files /dev/null and b/assets/images/patient/vital_signs/underweight_BMI-r.png differ
diff --git a/assets/images/patient/vital_signs/underweight_BMI.png b/assets/images/patient/vital_signs/underweight_BMI.png
new file mode 100644
index 0000000..83b0260
Binary files /dev/null and b/assets/images/patient/vital_signs/underweight_BMI.png differ
diff --git a/assets/images/patient/vital_signs/weight.png b/assets/images/patient/vital_signs/weight.png
new file mode 100644
index 0000000..4a3bd2c
Binary files /dev/null and b/assets/images/patient/vital_signs/weight.png differ
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index cb952f2..1b04c62 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -2,6 +2,30 @@
"mohemm": "Mohemm",
"english": "English",
"arabic": "عربي",
- "login": "تسجيل الدخول"
-
+ "login": "تسجيل الدخول",
+ "drSulaiman": "سليمان الحبيب",
+ "welcomeTo": "مرحبا بك في",
+ "userID" : "معرف المستخدم",
+ "password" : "كلمة المرور",
+ "branch" : "فرع",
+ "pleaseEnterLoginDetails": "الرجاء إدخال التفاصيل أدناه لتسجيل الدخول",
+ "username": "اسم المستخدم",
+ "welcomeBack": "مرحبا بعودتك",
+ "wouldYouLikeToLoginWithCurrentUsername": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟",
+ "lastLoginDetails": "تفاصيل تسجيل الدخول الأخير:",
+ "verificationType": "نوع التحقق:",
+ "pleaseVerify": "ارجوك تحقق",
+ "pleaseVerifyForBio": "الرجاء التحقق من تسجيل الدخول باستخدام أحد هذه الخيارات",
+ "verifyThroughFace": "تحقق من خلال الوجه",
+ "verifyThroughFingerprint": "تحقق من خلال بصمة الإصبع",
+ "verifyThroughSMS": "تحقق من خلال الرسائل القصيرة",
+ "verifyThroughWhatsapp": "تحقق من خلال Whatsapp",
+ "useAnotherAccount": "استخدم حسابا آخر",
+ "pleaseEnterTheVerificationCodeSentTo": "الرجاء إدخال رمز التحقق المرسل إلى ",
+ "theVerificationCodeWillExpireIn": "ستنتهي صلاحية رمز التحقق في ",
+ "goodMorning": "صباح الخير",
+ "markAttendance": "علامة الحضور",
+ "timeLeftToday": "الوقت المتبقي اليوم",
+ "checkIn": "تحقق في",
+ "workList": "قائمة العمل"
}
\ No newline at end of file
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index afb883f..ba73640 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -2,6 +2,30 @@
"mohemm": "Mohemm",
"english": "English",
"arabic": "عربي",
- "login": "Login"
-
+ "login": "Login",
+ "drSulaiman" : "Dr Sulaiman Al Habib",
+ "welcomeTo": "Welcome to",
+ "userID" : "User ID",
+ "password" : "Password",
+ "branch" : "Branch",
+ "pleaseEnterLoginDetails": "Please enter the detail below to login",
+ "username": "Username",
+ "welcomeBack": "Welcome back",
+ "wouldYouLikeToLoginWithCurrentUsername": "Would you like to login with current Username?",
+ "lastLoginDetails": "Last Login Details:",
+ "verificationType": "Verification Type:",
+ "pleaseVerify": "Please Verify",
+ "pleaseVerifyForBio": "Please verify login with one of the following options",
+ "verifyThroughFace": "Verify Through Face",
+ "verifyThroughFingerprint": "Verify Through Fingerprint",
+ "verifyThroughSMS": "Verify Through SMS",
+ "verifyThroughWhatsapp": "Verify Through Whatsapp",
+ "useAnotherAccount": "Use Another Account",
+ "pleaseEnterTheVerificationCodeSentTo": "Please enter the verification code sent to ",
+ "theVerificationCodeWillExpireIn": "The verification code will expire in ",
+ "goodMorning": "Good Morning",
+ "markAttendance": "Mark Attendance",
+ "timeLeftToday": "Time Left Today",
+ "checkIn": "Check In",
+ "workList": "Work List"
}
\ No newline at end of file
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
index 592ceee..ec97fc6 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 592ceee..c4855bf 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/lib/config/routes.dart b/lib/config/routes.dart
index eca978f..3938565 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -1,25 +1,17 @@
import 'package:flutter/material.dart';
-import 'package:hmg_nurses/ui/login/splash_page.dart';
-
-
+import 'package:hmg_nurses/ui/login/login_method_page.dart';
+import 'package:hmg_nurses/ui/login/login_page.dart';
class AppRoutes {
-
//Login
static const String splash = "/splash";
static const String registerSelection = "/registerSelection";
- static const String loginVerifyAccount = "/loginVerifyAccount";
+ static const String loginMethodsPage = "/loginMethodsPage";
static const String login = "/login";
-
-
static final Map routes = {
-
//Login
- splash: (BuildContext context) => SplashPage(),
- // login: (BuildContext context) => LoginScreen(),
-
-
-
+ login: (BuildContext context) => const LoginPage(),
+ loginMethodsPage: (BuildContext context) => const LoginMethodsPage(),
};
}
diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart
index 113e677..92c9461 100644
--- a/lib/generated/codegen_loader.g.dart
+++ b/lib/generated/codegen_loader.g.dart
@@ -6,15 +6,75 @@ import 'dart:ui';
import 'package:easy_localization/easy_localization.dart' show AssetLoader;
-class CodegenLoader extends AssetLoader {
+class CodegenLoader extends AssetLoader{
const CodegenLoader();
@override
- Future