diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b5cad835..d22522c3 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -351,7 +351,7 @@ const Map localizedValues = { "en": "Remove this member?", "ar": "إزالة ملف العضو؟" }, - "MyMedicalFile": {"en": "My Medical File", 'ar': 'ملف الطبي الالكتروني'}, + "MyMedicalFile": {"en": "My Medical File", 'ar': 'ملف الطبي'}, "myMedicalFileSubTitle": { "en": "All your medical records", 'ar': 'جميع سجلاتك الطبية' diff --git a/lib/core/service/AuthenticatedUserObject.dart b/lib/core/service/AuthenticatedUserObject.dart index 4fe8716f..8dd2583d 100644 --- a/lib/core/service/AuthenticatedUserObject.dart +++ b/lib/core/service/AuthenticatedUserObject.dart @@ -19,7 +19,6 @@ class AuthenticatedUserObject { var userData = await sharedPref.getObject(USER_PROFILE); if (userData != null) user = AuthenticatedUser.fromJson(userData); } - this.isLogin = user != null; } logout() async { diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 4157ee78..dcf51b3d 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -208,7 +208,7 @@ class _HomePageState extends State { children: [ Row( children: [ - if (model.user != null) + if (model.user != null && model.isLogin) Expanded( child: Column( crossAxisAlignment: diff --git a/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart b/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart index ce811406..af2768a5 100644 --- a/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart +++ b/lib/widgets/data_display/medical/LabResult/LineChartCurved.dart @@ -100,7 +100,8 @@ class LineChartCurvedState extends State { color: Colors.black, fontSize: 12, ), - margin: 10, + margin: 22, + rotateAngle:-65, getTitles: (value) { print(value); DateTime date = DateUtil.convertStringToDate(widget.labResult[value.toInt()].verifiedOnDateTime);