From 5bb780c4ac83316abcaeccb8b7b8b84291cf3520 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 26 Nov 2020 09:43:51 +0300 Subject: [PATCH 1/2] push --- lib/pages/landing/landing_page.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 3f64afa3..826c8b76 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -145,9 +145,9 @@ class _LandingPageState extends State with WidgetsBindingObserver { _firebaseMessaging.requestNotificationPermissions(); } - _firebaseMessaging.getToken().then((String token) { + _firebaseMessaging.getToken().then((String token) async { sharedPref.setString(PUSH_TOKEN, token); - if (token != null) { + if (token != null && await sharedPref.getObject(USER_PROFILE) ==null) { DEVICE_TOKEN = token; checkUserStatus(token); } From b6d2878cf101c78d687f950357019bb00d47ae66 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 26 Nov 2020 09:28:53 +0200 Subject: [PATCH 2/2] add Radiology translations and colors --- lib/config/config.dart | 4 ++-- lib/config/localized_values.dart | 15 ++++++++++++++- lib/pages/feedback/feedback_home_page.dart | 2 +- lib/pages/feedback/send_feedback_page.dart | 12 ++++++------ .../medical/radiology/radiology_details_page.dart | 9 +++++---- .../medical/radiology/radiology_home_page.dart | 4 ++-- lib/uitl/translations_delegate_base.dart | 3 +++ 7 files changed, 33 insertions(+), 16 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 58ade1bc..67f4fbbc 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -7,8 +7,8 @@ import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart'; const MAX_SMALL_SCREEN = 660; -const BASE_URL = 'https://uat.hmgwebservices.com/'; - //const BASE_URL = 'https://hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; + const BASE_URL = 'https://hmgwebservices.com/'; const GET_PROJECT = 'Services/Lists.svc/REST/GetProject'; ///Doctor diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b1ed5307..0ced0591 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -1022,5 +1022,18 @@ const Map localizedValues = { "in-patient": { "en": "In Patient", "ar": "تنويم" - } + }, + "report": { + "en": "Radiology Report", + "ar": "تقرير الاشعة" + }, + "open-rad": { + "en": "Open Image", + "ar": "فتح صور الاشعة" + }, + "send-copy": { + "en": "Email the Report", + "ar": "أرسل التقرير" + }, + }; diff --git a/lib/pages/feedback/feedback_home_page.dart b/lib/pages/feedback/feedback_home_page.dart index 309b5713..3d761bd3 100644 --- a/lib/pages/feedback/feedback_home_page.dart +++ b/lib/pages/feedback/feedback_home_page.dart @@ -74,7 +74,7 @@ class _FeedbackHomePageState extends State controller: _tabController, indicatorWeight: 5.0, indicatorSize: TabBarIndicatorSize.label, - indicatorColor: Colors.red[800], + indicatorColor: Theme.of(context).primaryColor, labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only(top: 4.0, left: 18.0, right: 18.0), diff --git a/lib/pages/feedback/send_feedback_page.dart b/lib/pages/feedback/send_feedback_page.dart index 27d2f353..14463825 100644 --- a/lib/pages/feedback/send_feedback_page.dart +++ b/lib/pages/feedback/send_feedback_page.dart @@ -514,7 +514,7 @@ class FeedbackTypeDialogState extends State { leading: Radio( value: MessageType.ComplaintOnAnAppointment, groupValue: model.messageTypeDialog, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (MessageType value) => model.setMessageDialogType(value), ), @@ -538,7 +538,7 @@ class FeedbackTypeDialogState extends State { leading: Radio( value: MessageType.ComplaintWithoutAppointment, groupValue: model.messageTypeDialog, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (MessageType value) => model.setMessageDialogType(value), ), @@ -562,7 +562,7 @@ class FeedbackTypeDialogState extends State { leading: Radio( value: MessageType.Question, groupValue: model.messageTypeDialog, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (MessageType value) => model.setMessageDialogType(value), ), @@ -586,7 +586,7 @@ class FeedbackTypeDialogState extends State { leading: Radio( value: MessageType.Compliment, groupValue: model.messageTypeDialog, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (MessageType value) => model.setMessageDialogType(value), ), @@ -610,7 +610,7 @@ class FeedbackTypeDialogState extends State { leading: Radio( value: MessageType.Suggestion, groupValue: model.messageTypeDialog, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (MessageType value) => model.setMessageDialogType(value), ), @@ -644,7 +644,7 @@ class FeedbackTypeDialogState extends State { child: Center( child: Texts( TranslationBase.of(context).cancel, - color: Colors.red, + color: Theme.of(context).primaryColor, ), ), ), diff --git a/lib/pages/medical/radiology/radiology_details_page.dart b/lib/pages/medical/radiology/radiology_details_page.dart index cb98fb81..9f8a0640 100644 --- a/lib/pages/medical/radiology/radiology_details_page.dart +++ b/lib/pages/medical/radiology/radiology_details_page.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/radiology/final_radiology.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/radiology_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; @@ -21,7 +22,7 @@ class RadiologyDetailsPage extends StatelessWidget { lineItem: finalRadiology.invoiceLineItemNo, invoiceNo: finalRadiology.invoiceNo), builder: (_, model, widget) => AppScaffold( - appBarTitle: 'Radiology Report', + appBarTitle: TranslationBase.of(context).report, isShowAppBar: true, baseViewModel: model, body: SingleChildScrollView( @@ -45,7 +46,7 @@ class RadiologyDetailsPage extends StatelessWidget { onTap: () { launch(model.radImageURL); }, - label: 'Open Radio Image', + label: TranslationBase.of(context).openRad, backgroundColor: Colors.grey[800], ), ), @@ -54,9 +55,9 @@ class RadiologyDetailsPage extends StatelessWidget { child: Button( onTap: () => model.sendRadReportEmail( finalRadiology: finalRadiology), - label: 'Send Copy', + label: TranslationBase.of(context).sendCopyRad, loading: model.state == ViewState.BusyLocal, - backgroundColor: Colors.red[800], + backgroundColor: Theme.of(context).primaryColor, ), ) ], diff --git a/lib/pages/medical/radiology/radiology_home_page.dart b/lib/pages/medical/radiology/radiology_home_page.dart index a7c4fcc5..1233a89a 100644 --- a/lib/pages/medical/radiology/radiology_home_page.dart +++ b/lib/pages/medical/radiology/radiology_home_page.dart @@ -38,7 +38,7 @@ class RadiologyHomePage extends StatelessWidget { leading: Radio( value: FilterType.Clinic, groupValue: model.filterType, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { model.setFilterType(value); }, @@ -56,7 +56,7 @@ class RadiologyHomePage extends StatelessWidget { leading: Radio( value: FilterType.Hospital, groupValue: model.filterType, - activeColor: Colors.red[800], + activeColor: Theme.of(context).primaryColor, onChanged: (FilterType value) { model.setFilterType(value); }, diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 12c7ff6e..6e991e01 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -863,6 +863,9 @@ String get fileno => localizedValues['fileno'][locale.languageCode]; String get range => localizedValues['range'][locale.languageCode]; String get outpatient => localizedValues['out-patient'][locale.languageCode]; String get inPatient => localizedValues['in-patient'][locale.languageCode]; + String get report => localizedValues['report'][locale.languageCode]; + String get openRad => localizedValues['open-rad'][locale.languageCode]; + String get sendCopyRad => localizedValues['send-copy'][locale.languageCode]; }