Medical Profile Complete 1.1

merge-update-with-lab-changes
Mirza.Shafique 5 years ago
parent bbaeec5b85
commit e9e3b079b3

@ -128,7 +128,6 @@ class _HomePageFragmentState extends State<HomePageFragment> {
), ),
], ],
), ),
mHeight(140), mHeight(140),
], ],
), ),

@ -105,7 +105,7 @@ class _HomePageFragmentState extends State<LoggedHomePageFragment> {
mHeight(16), mHeight(16),
Container( Container(
width: double.infinity, width: double.infinity,
height: MediaQuery.of(context).size.height * 0.143, height: MediaQuery.of(context).size.width * 0.26,
child: ListView.separated( child: ListView.separated(
itemCount: 4, itemCount: 4,
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
@ -115,10 +115,12 @@ class _HomePageFragmentState extends State<LoggedHomePageFragment> {
return widget.projectViewModel.isArabic return widget.projectViewModel.isArabic
? Container( ? Container(
child: myMedicalList[index], child: myMedicalList[index],
width: MediaQuery.of(context).size.width * 0.26,
margin: EdgeInsets.only(left: index == 3 ? 20 : 0, right: index == 0 ? 20 : 0), margin: EdgeInsets.only(left: index == 3 ? 20 : 0, right: index == 0 ? 20 : 0),
) )
: Container( : Container(
child: myMedicalList[index], child: myMedicalList[index],
width: MediaQuery.of(context).size.width * 0.26,
margin: EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == 3 ? 20 : 0), margin: EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == 3 ? 20 : 0),
); );
}, },
@ -215,7 +217,7 @@ class _HomePageFragmentState extends State<LoggedHomePageFragment> {
mHeight(4), mHeight(4),
Container( Container(
width: double.infinity, width: double.infinity,
height: MediaQuery.of(context).size.height * 0.143, height: MediaQuery.of(context).size.width * 0.26,
child: ListView.separated( child: ListView.separated(
itemCount: hmgServices.length, itemCount: hmgServices.length,
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
@ -223,7 +225,7 @@ class _HomePageFragmentState extends State<LoggedHomePageFragment> {
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Container( return Container(
width: MediaQuery.of(context).size.height * 0.143, width: MediaQuery.of(context).size.width * 0.26,
margin: widget.projectViewModel.isArabic margin: widget.projectViewModel.isArabic
? EdgeInsets.only(left: index == hmgServices.length - 1 ? 20 : 0, right: index == 0 ? 20 : 0) ? EdgeInsets.only(left: index == hmgServices.length - 1 ? 20 : 0, right: index == 0 ? 20 : 0)
: EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == hmgServices.length - 1 ? 20 : 0), : EdgeInsets.only(left: index == 0 ? 20 : 0, right: index == hmgServices.length - 1 ? 20 : 0),

@ -12,9 +12,11 @@ import 'package:provider/provider.dart';
final bluePrimary = Color(0xFF3F51B5); final bluePrimary = Color(0xFF3F51B5);
final blueAccent = Color(0xFFFF9800); final blueAccent = Color(0xFFFF9800);
final blueBackground = Color(0xFFFFFFFF); final blueBackground = Color(0xFFFFFFFF);
defaultTheme({fontName}) { defaultTheme({fontName}) {
return ThemeData( return ThemeData(
fontFamily: fontName, //projectProvider.isArabic ? 'Cairo' : 'WorkSans', fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
@ -28,7 +30,8 @@ defaultTheme({fontName}) {
hintColor: Colors.grey[400], hintColor: Colors.grey[400],
disabledColor: Colors.grey[300], disabledColor: Colors.grey[300],
errorColor: Color.fromRGBO(235, 80, 60, 1.0), errorColor: Color.fromRGBO(235, 80, 60, 1.0),
scaffoldBackgroundColor: Color(0xffE9E9E9), // Colors.grey[100], scaffoldBackgroundColor: Color(0xffE9E9E9),
// Colors.grey[100],
textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5), textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5),
textSelectionHandleColor: Colors.grey, textSelectionHandleColor: Colors.grey,
canvasColor: Colors.white, canvasColor: Colors.white,
@ -39,15 +42,15 @@ defaultTheme({fontName}) {
buttonColor: Colors.black, buttonColor: Colors.black,
toggleableActiveColor: secondaryColor, toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor, indicatorColor: secondaryColor,
bottomSheetTheme: bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
cursorColor: Colors.grey, cursorColor: Colors.grey,
primaryTextTheme: TextTheme(bodyText2: TextStyle(color: Colors.white)), primaryTextTheme: TextTheme(bodyText2: TextStyle(color: Colors.white)),
iconTheme: IconThemeData(), iconTheme: IconThemeData(),
textTheme: TextTheme( textTheme: TextTheme(
bodyText1: TextStyle(color: Colors.black), bodyText1: TextStyle(color: Colors.black, letterSpacing: 0.6),
headline1: TextStyle(color: Colors.white), headline1: TextStyle(color: Colors.white, letterSpacing: 0.6),
headline2: TextStyle(color: Colors.white)), headline2: TextStyle(color: Colors.white, letterSpacing: 0.6),
),
floatingActionButtonTheme: FloatingActionButtonThemeData(highlightElevation: 2, disabledElevation: 0, elevation: 2), floatingActionButtonTheme: FloatingActionButtonThemeData(highlightElevation: 2, disabledElevation: 0, elevation: 2),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
@ -63,7 +66,8 @@ defaultTheme({fontName}) {
invertThemes({fontName}) { invertThemes({fontName}) {
return ThemeData( return ThemeData(
fontFamily: fontName, //projectProvider.isArabic ? 'Cairo' : 'WorkSans', fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
@ -75,13 +79,11 @@ invertThemes({fontName}) {
}, },
), ),
hintColor: Colors.grey[400], hintColor: Colors.grey[400],
textTheme: TextTheme( textTheme: TextTheme(bodyText1: TextStyle(color: Colors.white), headline1: TextStyle(color: Colors.white), headline2: TextStyle(color: Colors.white)),
bodyText1: TextStyle(color: Colors.white),
headline1: TextStyle(color: Colors.white),
headline2: TextStyle(color: Colors.white)),
disabledColor: Colors.grey[800], disabledColor: Colors.grey[800],
errorColor: Color.fromRGBO(235, 80, 60, 1.0), errorColor: Color.fromRGBO(235, 80, 60, 1.0),
scaffoldBackgroundColor: Color(0xff000000), // Colors.grey[100], scaffoldBackgroundColor: Color(0xff000000),
// Colors.grey[100],
textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5), textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5),
textSelectionHandleColor: Colors.grey, textSelectionHandleColor: Colors.grey,
canvasColor: Colors.black, canvasColor: Colors.black,
@ -92,8 +94,7 @@ invertThemes({fontName}) {
buttonColor: Colors.black, buttonColor: Colors.black,
toggleableActiveColor: secondaryColor, toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor, indicatorColor: secondaryColor,
bottomSheetTheme: bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
cursorColor: Colors.black, cursorColor: Colors.black,
iconTheme: IconThemeData(), iconTheme: IconThemeData(),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
@ -109,7 +110,8 @@ invertThemes({fontName}) {
bwThemes({fontName}) { bwThemes({fontName}) {
return ThemeData( return ThemeData(
fontFamily: fontName, //projectProvider.isArabic ? 'Cairo' : 'WorkSans', fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
@ -136,7 +138,8 @@ bwThemes({fontName}) {
disabledColor: Colors.grey[800], disabledColor: Colors.grey[800],
errorColor: Color.fromRGBO(235, 80, 60, 1.0), errorColor: Color.fromRGBO(235, 80, 60, 1.0),
scaffoldBackgroundColor: Color(0xffffffe4), // Colors.grey[100], scaffoldBackgroundColor: Color(0xffffffe4),
// Colors.grey[100],
textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5), textSelectionColor: Color.fromRGBO(80, 100, 253, 0.5),
textSelectionHandleColor: Colors.grey, textSelectionHandleColor: Colors.grey,
canvasColor: Colors.black, canvasColor: Colors.black,
@ -146,8 +149,7 @@ bwThemes({fontName}) {
primaryColor: Color(0xfffffff4), primaryColor: Color(0xfffffff4),
toggleableActiveColor: secondaryColor, toggleableActiveColor: secondaryColor,
indicatorColor: secondaryColor, indicatorColor: secondaryColor,
bottomSheetTheme: bottomSheetTheme: BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
BottomSheetThemeData(backgroundColor: HexColor('#E0E0E0')),
cursorColor: Colors.black, cursorColor: Colors.black,
iconTheme: IconThemeData(), iconTheme: IconThemeData(),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
@ -163,7 +165,8 @@ bwThemes({fontName}) {
dimTheme({fontName}) { dimTheme({fontName}) {
return ThemeData( return ThemeData(
fontFamily: fontName, //projectProvider.isArabic ? 'Cairo' : 'WorkSans', fontFamily: fontName,
//projectProvider.isArabic ? 'Cairo' : 'WorkSans',
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity, visualDensity: VisualDensity.adaptivePlatformDensity,
brightness: Brightness.dark, brightness: Brightness.dark,

@ -30,8 +30,8 @@ class MedicalProfileItem extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
//ProjectViewModel projectViewModel = Provider.of(context); //ProjectViewModel projectViewModel = Provider.of(context);
return Container( return Container(
height: MediaQuery.of(context).size.height * 0.143, height: double.infinity,
width: MediaQuery.of(context).size.height * 0.143, width: double.infinity,
margin: EdgeInsets.all(0), margin: EdgeInsets.all(0),
decoration: containerColorRadiusBorderWidth(Colors.white, 20, CustomColors.pharmacyGreyColor, 1), decoration: containerColorRadiusBorderWidth(Colors.white, 20, CustomColors.pharmacyGreyColor, 1),
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,

Loading…
Cancel
Save