Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!364
merge-requests/365/merge
Mohammad Aljammal 5 years ago
commit 9e346df910

@ -50,17 +50,15 @@ class _SearchMedicinePatientScreen extends State<SearchMedicinePatientScreen>
child: Center(
child: Container(
height: 60.0,
color: Colors.white,
margin: EdgeInsets.only(top: 10.0),
width: MediaQuery.of(context).size.width, // 0.9,
// decoration: BoxDecoration(
// border: Border(
// bottom: BorderSide(
// color: Theme.of(context).dividerColor,
// width: 0.9), //width: 0.7
// ),
// color: Colors.white),
width: MediaQuery.of(context).size.width * 0.92, // 0.9,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 0.9), //width: 0.7
),
color: Colors.white),
child: TabBar(
isScrollable: true,
onTap: (index) {
@ -69,42 +67,31 @@ class _SearchMedicinePatientScreen extends State<SearchMedicinePatientScreen>
});
},
controller: _tabController,
indicatorWeight: 0.01,
indicatorSize: TabBarIndicatorSize.label,
indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.tab,
indicatorColor: Colors.red[800],
labelColor: Theme.of(context).primaryColor,
indicatorColor: Colors.grey[800],
// labelPadding:
// EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0),
labelPadding:
EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0),
unselectedLabelColor: Colors.grey[800],
tabs: [
Container(
width: MediaQuery.of(context).size.width * 0.40,
decoration: BoxDecoration(
color: activeIndex == 0
? Colors.red[700]
: Colors.grey[200],
borderRadius: BorderRadius.circular(5)),
width: MediaQuery.of(context).size.width * 0.30,
child: Center(
child: AppText(
TranslationBase.of(context).searchPatient,
color: activeIndex == 0 ? Colors.white : Colors.black,
color: Colors.black,
fontWeight: FontWeight.bold,
),
),
),
Container(
width: MediaQuery.of(context).size.width * 0.40,
decoration: BoxDecoration(
color: activeIndex == 1
? Colors.red[700]
: Colors.grey[200],
borderRadius: BorderRadius.circular(5)),
width: MediaQuery.of(context).size.width * 0.30,
child: Center(
child: AppText(
TranslationBase.of(context).searchMedicine,
fontWeight: FontWeight.bold,
color: activeIndex == 1 ? Colors.white : Colors.black,
),
TranslationBase.of(context).searchMedicine,
fontWeight: FontWeight.bold,
color: Colors.black),
),
),
],

@ -55,6 +55,7 @@ class _PatientReferralScreen extends State<PatientReferralScreen>
child: TabBar(
isScrollable: true,
controller: _tabController,
indicatorColor: Colors.red[800],
indicatorWeight: 5.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor,

@ -240,22 +240,25 @@ class PatientCard extends StatelessWidget {
" : ",
fontSize: 14,
),
Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(25),
color: HexColor("#20A169"),
),
child: AppText(
patientInfo.startTime,
color: Colors.white,
fontSize:
1.5 * SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
),
patientInfo.startTime != null
? Container(
height: 15,
width: 60,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(25),
color: HexColor("#20A169"),
),
child: AppText(
patientInfo.startTime,
color: Colors.white,
fontSize: 1.5 *
SizeConfig.textMultiplier,
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
),
)
: SizedBox(),
SizedBox(
width: 3.5,
),

Loading…
Cancel
Save