Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'doctor-app-design' into 'development'

Browse Source 
app button color fix in multiple screens

See merge request Cloud_Solution/doctor_app_flutter!921
merge-requests/922/merge
Elham Ali 4 years ago
parent fc81370b0a c6a77563cc
commit 4049b0e066
9 changed files with 131 additions and 57 deletions
Show Stats Download Patch File Download Diff File

3
lib/screens/auth/login_screen.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart';
@ -195,7 +196,7 @@ class _LoginScreenState extends State<LoginScreen> {
children: <Widget>[
AppButton(
title: TranslationBase.of(context).login,
color: Color(0xFFD02127),
color: AppGlobal.appRedColor,
fontWeight: FontWeight.w600,
disabled: authenticationViewModel.userInfo.userID == null ||
authenticationViewModel.userInfo.password == null,

4
lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
@ -9,6 +10,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../../../routes.dart';
import 'UCAF-detail-screen.dart';
@ -195,7 +197,7 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen>
vPadding: 8,
hPadding: 8,
borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B),
color: AppGlobal.appRedColor,
fontColor: Colors.white,
fontSize: 2.0,
onPressed: () {

150
lib/screens/patients/profile/referral/my-referral-detail-screen.dart
Unescape Escape View File

@ -19,7 +19,8 @@ import 'package:flutter/material.dart';
class MyReferralDetailScreen extends StatelessWidget {
final MyReferralPatientModel referralPatient;
const MyReferralDetailScreen({Key key, this.referralPatient}) : super(key: key);
const MyReferralDetailScreen({Key key, this.referralPatient})
: super(key: key);
@override
Widget build(BuildContext context) {
@ -54,7 +55,9 @@ class MyReferralDetailScreen extends StatelessWidget {
),
Expanded(
child: AppText(
(Helpers.capitalize(referralPatient.firstName + " " + referralPatient.lastName)),
(Helpers.capitalize(referralPatient.firstName +
" " +
referralPatient.lastName)),
fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
@ -94,23 +97,31 @@ class MyReferralDetailScreen extends StatelessWidget {
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
AppText(
referralPatient.referralStatus != null
? model.getReferralStatusNameByCode(referralPatient.referralStatus, context)
? model.getReferralStatusNameByCode(
referralPatient.referralStatus,
context)
: "",
fontFamily: 'Poppins',
fontSize: 1.9 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w700,
color: referralPatient.referralStatus == 1
? Color(0xffc4aa54)
: referralPatient.referralStatus == 46 || referralPatient.referralStatus == 2
: referralPatient.referralStatus ==
46 ||
referralPatient
.referralStatus ==
2
? AppGlobal.appGreenColor
: Colors.red[700],
),
AppText(
AppDateUtils.getDayMonthYearDateFormatted(referralPatient.referralDate),
AppDateUtils.getDayMonthYearDateFormatted(
referralPatient.referralDate),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 2.0 * SizeConfig.textMultiplier,
@ -119,29 +130,35 @@ class MyReferralDetailScreen extends StatelessWidget {
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).fileNumber,
TranslationBase.of(context)
.fileNumber,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize:
1.7 * SizeConfig.textMultiplier,
color: Color(0XFF575757),
),
AppText(
"${referralPatient.patientID}",
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontSize:
1.8 * SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
],
),
AppText(
AppDateUtils.getTimeHHMMA(referralPatient.referralDate),
AppDateUtils.getTimeHHMMA(
referralPatient.referralDate),
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.8 * SizeConfig.textMultiplier,
@ -150,50 +167,70 @@ class MyReferralDetailScreen extends StatelessWidget {
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expanded(
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).referredFrom,
TranslationBase.of(context)
.referredFrom,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig.textMultiplier,
color: Color(0XFF575757),
),
AppText(
referralPatient.targetProjectId == referralPatient.sourceProjectId
? TranslationBase.of(context).sameBranch
: TranslationBase.of(context).otherBranch,
referralPatient
.targetProjectId ==
referralPatient
.sourceProjectId
? TranslationBase.of(
context)
.sameBranch
: TranslationBase.of(
context)
.otherBranch,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontSize: 1.8 *
SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).remarks + " : ",
TranslationBase.of(context)
.remarks +
" : ",
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig.textMultiplier,
color: Color(0XFF575757),
),
Expanded(
child: AppText(
referralPatient.referringDoctorRemarks ?? '',
referralPatient
.referringDoctorRemarks ??
'',
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.8 * SizeConfig.textMultiplier,
fontSize: 1.8 *
SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
),
@ -205,22 +242,29 @@ class MyReferralDetailScreen extends StatelessWidget {
Row(
children: [
AppText(
referralPatient.nationalityName != null
referralPatient.nationalityName !=
null
? referralPatient.nationalityName
: "",
fontWeight: FontWeight.bold,
color: Color(0xFF2E303A),
fontSize: 1.4 * SizeConfig.textMultiplier,
fontSize:
1.4 * SizeConfig.textMultiplier,
),
referralPatient.nationalityFlagURL != null
referralPatient.nationalityFlagURL !=
null
? ClipRRect(
borderRadius: BorderRadius.circular(20.0),
borderRadius:
BorderRadius.circular(20.0),
child: Image.network(
referralPatient.nationalityFlagURL,
referralPatient
.nationalityFlagURL,
height: 25,
width: 30,
errorBuilder:
(BuildContext context, Object exception, StackTrace stackTrace) {
errorBuilder: (BuildContext
context,
Object exception,
StackTrace stackTrace) {
return Text('No Image');
},
))
@ -233,7 +277,8 @@ class MyReferralDetailScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(left: 10, right: 0),
margin:
EdgeInsets.only(left: 10, right: 0),
child: Image.asset(
'assets/images/patient/ic_ref_arrow_up.png',
height: 50,
@ -241,14 +286,20 @@ class MyReferralDetailScreen extends StatelessWidget {
),
),
Container(
margin: EdgeInsets.only(left: 0, top: 25, right: 0, bottom: 0),
padding: EdgeInsets.only(left: 4.0, right: 4.0),
margin: EdgeInsets.only(
left: 0,
top: 25,
right: 0,
bottom: 0),
padding: EdgeInsets.only(
left: 4.0, right: 4.0),
child: Container(
width: 40,
height: 40,
child: CircleAvatar(
radius: 25.0,
backgroundImage: NetworkImage(referralPatient.doctorImageURL),
backgroundImage: NetworkImage(
referralPatient.doctorImageURL),
backgroundColor: Colors.transparent,
),
),
@ -256,14 +307,19 @@ class MyReferralDetailScreen extends StatelessWidget {
Expanded(
flex: 4,
child: Container(
margin: EdgeInsets.only(left: 10, top: 25, right: 10, bottom: 0),
margin: EdgeInsets.only(
left: 10,
top: 25,
right: 10,
bottom: 0),
child: Column(
children: [
AppText(
referralPatient.doctorName,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize: 1.7 *
SizeConfig.textMultiplier,
color: Color(0XFF2E303A),
),
],
@ -294,7 +350,8 @@ class MyReferralDetailScreen extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: SizedBox(
child: ProfileMedicalInfoWidgetSearch(
patient: model.getPatientFromReferralO(referralPatient),
patient: model
.getPatientFromReferralO(referralPatient),
patientType: "7",
isInpatient: false,
from: null,
@ -326,7 +383,9 @@ class MyReferralDetailScreen extends StatelessWidget {
if (model.state == ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(model.error);
} else {
DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgAccept);
DrAppToastMsg.showSuccesToast(
TranslationBase.of(context)
.referralSuccessMsgAccept);
model.getMyReferralOutPatientService();
Navigator.pop(context);
Navigator.pop(context);
@ -340,18 +399,21 @@ class MyReferralDetailScreen extends StatelessWidget {
Expanded(
child: AppButton(
title: TranslationBase.of(context).reject,
color: Color(0xFFB9382C),
color: AppGlobal.appRedColor,
fontColor: Colors.white,
fontSize: 1.6,
hPadding: 8,
vPadding: 12,
disabled: model.state == ViewState.Busy,
onPressed: () async {
await model.responseReferral(referralPatient, false);
await model.responseReferral(
referralPatient, false);
if (model.state == ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(model.error);
} else {
DrAppToastMsg.showSuccesToast(TranslationBase.of(context).referralSuccessMsgReject);
DrAppToastMsg.showSuccesToast(
TranslationBase.of(context)
.referralSuccessMsgReject);
model.getMyReferralOutPatientService();
Navigator.pop(context);
Navigator.pop(context);

9
lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
Unescape Escape View File

@ -29,6 +29,7 @@ import 'package:doctor_app_flutter/widgets/shared/speech-text-popup.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:hijri/hijri_calendar.dart';
import 'package:intl/intl.dart';
import 'package:permission_handler/permission_handler.dart';
@ -134,7 +135,8 @@ class _RegisterConfirmationPatientPageState
CustomEditableText(
controller: firstNameAr,
isSubmitted: isSubmitted,
hint: TranslationBase.of(context).firstNameInAr),
hint:
TranslationBase.of(context).firstNameInAr),
SizedBox(
height: 4,
),
@ -142,7 +144,8 @@ class _RegisterConfirmationPatientPageState
controller: middleNameAr,
isEditable: middleNameN.text.isEmpty,
isSubmitted: isSubmitted,
hint: TranslationBase.of(context).middleNameInAr),
hint:
TranslationBase.of(context).middleNameInAr),
SizedBox(
height: 4,
),
@ -381,7 +384,7 @@ class _RegisterConfirmationPatientPageState
vPadding: 12,
hPadding: 8,
borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B),
color: HexColor("#D02127"),
fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async {

4
lib/screens/patients/register_patient/RegisterPatientPage.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart';
@ -8,6 +9,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'RegisterSearchPatientPage.dart';
@ -202,7 +204,7 @@ class _RegisterPatientPageState extends State<RegisterPatientPage>
vPadding: 12,
hPadding: 8,
borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B),
color: AppGlobal.appRedColor,
fontColor: Colors.white,
fontSize: 2.0,
onPressed: () {

10
lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
Unescape Escape View File

@ -20,6 +20,7 @@ import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils
import 'package:doctor_app_flutter/widgets/shared/text_fields/app-textfield-custom.dart';
import 'package:doctor_app_flutter/widgets/shared/text_fields/country_textfield_custom.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:hijri/hijri_calendar.dart';
import 'package:hijri_picker/hijri_picker.dart';
import 'package:doctor_app_flutter/core/enum/CalenderType.dart';
@ -44,7 +45,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
List<dynamic> countryList;
dynamic country ;
dynamic country;
bool isSubmitted = false;
@ -226,7 +227,8 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
children: [
Expanded(
child: RadioListTile<CalenderType>(
title: AppText(TranslationBase.of(context).gregorian),
title:
AppText(TranslationBase.of(context).gregorian),
value: CalenderType.Gregorian,
groupValue: calenderType,
onChanged: (CalenderType value) {
@ -255,7 +257,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
),
AppTextFieldCustom(
height: screenSize.height * 0.075,
hintText:TranslationBase.of(context).birthdate,
hintText: TranslationBase.of(context).birthdate,
dropDownText: getBirthdate(),
enabled: false,
isTextFieldHasSuffix: true,
@ -342,7 +344,7 @@ class _RegisterSearchPatientPageState extends State<RegisterSearchPatientPage> {
vPadding: 12,
hPadding: 8,
borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B),
color: AppGlobal.appRedColor,
fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async {

2
lib/screens/patients/register_patient/VerifyMethodPage.dart
Unescape Escape View File

@ -458,7 +458,7 @@ class _ActivationPageState extends State<ActivationPage> {
vPadding: 12,
hPadding: 8,
borderColor: Color(0xFFB8382B),
color: Color(0xFFB8382B),
color: HexColor("#D02127"),
fontColor: Colors.white,
fontSize: 2.0,
onPressed: () async {

3
lib/screens/procedures/update-procedure.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/enum/viewstate.dart';
import 'package:doctor_app_flutter/core/model/procedure/ControlsModel.dart';
@ -324,7 +325,7 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
),
AppButton(
title: TranslationBase.of(context).cancel,
color: Color(0xFFB9382C),
color: AppGlobal.appRedColor,
onPressed: () {
Navigator.pop(context);
},

3
lib/widgets/patients/profile/prescription_in_patinets_widget.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/patient/prescription/prescription_report_for_in_patient.dart';
import 'package:doctor_app_flutter/routes.dart';
@ -29,7 +30,7 @@ class PrescriptionInPatientWidget extends StatelessWidget {
padding: EdgeInsets.all(40),
decoration: BoxDecoration(
border:
Border.all(color: HexColor('#D02127'), width: 4),
Border.all(color: AppGlobal.appRedColor, width: 4),
borderRadius: BorderRadius.all(Radius.circular(100))),
child: IconButton(
icon: Icon(

Write Preview
Loading…
Cancel
Save