From 2e2a29145ceb42e4d661881aac57a9444149c0ed Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Mon, 7 Dec 2020 10:27:06 +0200 Subject: [PATCH] fix merge issues --- lib/config/localized_values.dart | 2 +- lib/pages/landing/home_page.dart | 3 +-- lib/routes.dart | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 2891da6c..df63929a 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1307,7 +1307,7 @@ const Map localizedValues = { "referralNumber": { "en": "Referral Number", "ar": "رقم الإحالة" - } + }, "requestID": { "en": "Request ID", "ar": " رقم الطلب" diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index f6742789..9c82ff09 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -479,7 +479,7 @@ class _HomePageState extends State { opacity: 0.5, ), DashboardItem( - onTap: () => Navigator.push(context, FadePage(page: PharmacyPage())), + //onTap: () => Navigator.push(context, FadePage(page: PharmacyPage())), child: Center( child: Padding( @@ -677,7 +677,6 @@ class _HomePageState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ DashboardItem( - opacity:1.0, child: Container( width: double.infinity, padding: EdgeInsets.all(10), diff --git a/lib/routes.dart b/lib/routes.dart index 84438456..78b79c0f 100644 --- a/lib/routes.dart +++ b/lib/routes.dart @@ -57,7 +57,7 @@ var routes = { SYMPTOM_CHECKER_INFO: (_) => SymptomInfo(), SELECT_GENDER: (_) => SelectGender(), SETTINGS: (_) => Settings(), - APP_UPDATE: (_) => AppUpdatePage() + APP_UPDATE: (_) => AppUpdatePage(), SETTINGS: (_) => Settings(), HEALTH_WEATHER: (_)=> HealthWeatherIndicator() };