fix merge issues

merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
parent 459ba828d9
commit 2e2a29145c

@ -1307,7 +1307,7 @@ const Map localizedValues = {
"referralNumber": { "referralNumber": {
"en": "Referral Number", "en": "Referral Number",
"ar": "رقم الإحالة" "ar": "رقم الإحالة"
} },
"requestID": { "requestID": {
"en": "Request ID", "en": "Request ID",
"ar": " رقم الطلب" "ar": " رقم الطلب"

@ -479,7 +479,7 @@ class _HomePageState extends State<HomePage> {
opacity: 0.5, opacity: 0.5,
), ),
DashboardItem( DashboardItem(
onTap: () => Navigator.push(context, FadePage(page: PharmacyPage())), //onTap: () => Navigator.push(context, FadePage(page: PharmacyPage())),
child: Center( child: Center(
child: Padding( child: Padding(
@ -677,7 +677,6 @@ class _HomePageState extends State<HomePage> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
DashboardItem( DashboardItem(
opacity:1.0,
child: Container( child: Container(
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),

@ -57,7 +57,7 @@ var routes = {
SYMPTOM_CHECKER_INFO: (_) => SymptomInfo(), SYMPTOM_CHECKER_INFO: (_) => SymptomInfo(),
SELECT_GENDER: (_) => SelectGender(), SELECT_GENDER: (_) => SelectGender(),
SETTINGS: (_) => Settings(), SETTINGS: (_) => Settings(),
APP_UPDATE: (_) => AppUpdatePage() APP_UPDATE: (_) => AppUpdatePage(),
SETTINGS: (_) => Settings(), SETTINGS: (_) => Settings(),
HEALTH_WEATHER: (_)=> HealthWeatherIndicator() HEALTH_WEATHER: (_)=> HealthWeatherIndicator()
}; };

Loading…
Cancel
Save