bottomsheet fixes

main_production_upgrade
WaseemAbbasi22 1 week ago
parent b94d5d1fbd
commit 765115390f

@ -67,7 +67,7 @@ class _InspectionPersonBottomSheetState extends State<InspectionPersonBottomShee
top: 16, top: 16,
left: 16, left: 16,
right: 16, right: 16,
bottom: MediaQuery.of(context).viewInsets.bottom, bottom: MediaQuery.of(context).viewInsets.bottom+MediaQuery.of(context).padding.bottom,
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

@ -46,7 +46,12 @@ class _DemoExtensionBottomSheetState extends State<DemoExtensionBottomSheet> {
topLeft: Radius.circular(30), topLeft: Radius.circular(30),
), ),
), ),
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight), padding: EdgeInsets.only(
left: 16.toScreenWidth,
right: 16.toScreenWidth,
top: 8.toScreenHeight,
bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom,
),
child: SafeArea( child: SafeArea(
child: Form( child: Form(
key: _formKey, key: _formKey,
@ -93,7 +98,7 @@ class _DemoExtensionBottomSheetState extends State<DemoExtensionBottomSheet> {
textColor: AppColor.black10, textColor: AppColor.black10,
loading: false, loading: false,
onPressed: () async { onPressed: () async {
Navigator.pop(context,false); Navigator.pop(context, false);
}, },
).expanded, ).expanded,
16.width, 16.width,

@ -423,6 +423,7 @@ class SwipeGeneralUtils {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
useSafeArea: true,
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
top: Radius.circular(20), top: Radius.circular(20),
@ -430,7 +431,12 @@ class SwipeGeneralUtils {
), ),
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: Theme.of(context).scaffoldBackgroundColor,
clipBehavior: Clip.antiAliasWithSaveLayer, clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => Column( builder: (BuildContext context) =>Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom +
MediaQuery.of(context).padding.bottom,
),
child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -446,6 +452,7 @@ class SwipeGeneralUtils {
children: availableAttendanceMethodList(context: context, userProvider: _userProvider, isNfcSupported: isNfcSupported)), children: availableAttendanceMethodList(context: context, userProvider: _userProvider, isNfcSupported: isNfcSupported)),
], ],
).paddingAll(16), ).paddingAll(16),
),
); );
} }

@ -53,7 +53,12 @@ class _AddSupplierEngineerBottomSheetState extends State<AddSupplierEngineerBott
color: Theme.of(context).scaffoldBackgroundColor, color: Theme.of(context).scaffoldBackgroundColor,
borderRadius: const BorderRadius.only(topRight: Radius.circular(20), topLeft: Radius.circular(20)), borderRadius: const BorderRadius.only(topRight: Radius.circular(20), topLeft: Radius.circular(20)),
), ),
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight), padding: EdgeInsets.only(
left: 16.toScreenWidth,
right: 16.toScreenHeight,
top: 8.toScreenHeight,
bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom,
),
child: Form( child: Form(
key: _formKey, key: _formKey,
child: SingleChildScrollView( child: SingleChildScrollView(

@ -44,7 +44,11 @@ class _UpdateUserContactInfoBottomSheetState extends State<UpdateUserContactInfo
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -98,7 +102,7 @@ class _UpdateUserContactInfoBottomSheetState extends State<UpdateUserContactInfo
12.height, 12.height,
AppFilledButton( AppFilledButton(
label: "Update", label: "Update",
buttonColor: context.isDark? AppColor.primary10:AppColor.neutral50, buttonColor: context.isDark ? AppColor.primary10 : AppColor.neutral50,
onPressed: () async { onPressed: () async {
FocusManager.instance.primaryFocus!.unfocus(); FocusManager.instance.primaryFocus!.unfocus();
if (email.isEmpty || !Validator.isEmail(email)) { if (email.isEmpty || !Validator.isEmail(email)) {
@ -123,6 +127,7 @@ class _UpdateUserContactInfoBottomSheetState extends State<UpdateUserContactInfo
}, },
), ),
], ],
),
); );
} }
} }

@ -14,7 +14,12 @@ class AssetDetailBottomSheet extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( return Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom +
MediaQuery.of(context).padding.bottom,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -78,6 +83,7 @@ class AssetDetailBottomSheet extends StatelessWidget {
], ],
) )
], ],
).paddingAll(16); ).paddingAll(16),
);
} }
} }

@ -17,7 +17,12 @@ class PendingRequestBottomSheet extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: const EdgeInsets.all(21), padding: EdgeInsets.only(
left: 21,
right: 21,
top: 12,
bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom,
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

@ -41,6 +41,10 @@ class _RejectionReasonBottomSheetState extends State<RejectionReasonBottomSheet>
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Form( return Form(
key: _formKey, key: _formKey,
child: Padding(
padding: EdgeInsetsGeometry.only(
bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom,
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -96,6 +100,7 @@ class _RejectionReasonBottomSheetState extends State<RejectionReasonBottomSheet>
16.height, 16.height,
], ],
), ),
),
); );
} }
} }

@ -91,7 +91,7 @@ class _RequestApprovalBottomState extends State<RequestApprovalBottomSheet> {
color: AppColor.background(context), color: AppColor.background(context),
borderRadius: const BorderRadius.only(topRight: Radius.circular(20), topLeft: Radius.circular(20)), borderRadius: const BorderRadius.only(topRight: Radius.circular(20), topLeft: Radius.circular(20)),
), ),
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 24.toScreenHeight), padding: EdgeInsets.only(right: 16.toScreenWidth, left: 16.toScreenWidth, top: 24.toScreenHeight, bottom: MediaQuery.of(context).viewInsets.bottom + MediaQuery.of(context).padding.bottom),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

Loading…
Cancel
Save