Compare commits

..

No commits in common. 'e4b84bb3e0fa998c3d3fe246b23ca6a19d080988' and 'abe29fc7b3e37a05a16f867db682a5d31e6c1f92' have entirely different histories.

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save