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

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

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

Loading…
Cancel
Save