fix bottom sheet

merge-requests/709/head
Elham Rababah 5 years ago
parent 2bff3a594c
commit dc22e3f46e

@ -1,4 +1,3 @@
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/patient_muse/PatientSearchRequestModel.dart';
@ -6,10 +5,7 @@ import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart
import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
import 'package:doctor_app_flutter/models/doctor/clinic_model.dart';
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/patient/patient_model.dart';
import 'package:doctor_app_flutter/screens/base/base_view.dart';
import 'package:doctor_app_flutter/screens/home/dashboard_slider-item-widget.dart';
import 'package:doctor_app_flutter/screens/home/dashboard_swipe_widget.dart';
@ -22,7 +18,6 @@ import 'package:doctor_app_flutter/screens/patients/patient_search/patient_searc
import 'package:doctor_app_flutter/screens/patients/profile/referral/patient_referral_screen.dart';
import 'package:doctor_app_flutter/util/date-utils.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@ -83,16 +78,18 @@ class _HomeScreenState extends State<HomeScreen> {
StickyHeader(
header: Container(
color: Colors.grey[100],
padding: EdgeInsets.only(top: 10),
child: Stack(children: [
IconButton(
icon: Image.asset('assets/images/menu.png',
width:SizeConfig.widthMultiplier* 7,),
iconSize: 18,
icon: Image.asset(
'assets/images/menu.png',
width: SizeConfig.widthMultiplier * 7,
),
iconSize: SizeConfig.heightMultiplier * 2,
color: Colors.black,
onPressed: () => Scaffold.of(context).openDrawer(),
),
Column(children: <Widget>[
Column(
children: <Widget>[
ProfileWelcomeWidget(
Row(
mainAxisAlignment: MainAxisAlignment.start,
@ -204,16 +201,19 @@ class _HomeScreenState extends State<HomeScreen> {
value: item.clinicID,
);
}).toList(),
)),
],
)
: AppText(
TranslationBase.of(context).noClinic),
)),
],
)
: AppText(
TranslationBase
.of(context)
.noClinic),
),
],
),
],
),
isClinic: true,
height: 50,
isClinic: true,
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8),
),
])
])),

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -21,7 +22,8 @@ class BottomNavigationItem extends StatelessWidget {
Widget build(BuildContext context) {
return Expanded(
child: SizedBox(
height: 70.0,
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8),
child: Material(
type: MaterialType.transparency,
child: InkWell(
@ -32,19 +34,24 @@ class BottomNavigationItem extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
SizedBox(height: 15,),
SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8) ) * 10,),
Container(
child: Icon(currentIndex == index ? activeIcon : icon,
color: currentIndex == index
? Color(0xFF333C45)
: Theme.of(context).dividerColor,
size: 22.0),
size: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8) ) * 40,),
),
SizedBox(height: 5,),
SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8) ) * 0.5,),
Expanded(
child: Text(
name,
style: TextStyle(
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
color: currentIndex == index
? Theme.of(context).primaryColor
: Theme.of(context).dividerColor,

Loading…
Cancel
Save