Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

improvements

Browse Source
design_3.0_task_module_new
Sikander Saleem 4 months ago
parent 116855878b
commit c92aae9048
19 changed files with 626 additions and 636 deletions
Show Stats Download Patch File Download Diff File

12
lib/extensions/context_extension.dart
Unescape Escape View File

@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart';
import '../controllers/providers/settings/setting_provider.dart';
import '../controllers/providers/settings/setting_provider.dart';
extension BuildContextExtension on BuildContext {
@ -17,6 +17,7 @@ extension BuildContextExtension on BuildContext {
bool get isAr => Provider.of<SettingProvider>(this).language == "ar";
SettingProvider get settingProvider => Provider.of<SettingProvider>(this, listen: false);
UserProvider get userProvider => Provider.of<UserProvider>(this, listen: false);
void showConfirmDialog(String message, {String? title, VoidCallback? onTap}) => showDialog(
@ -26,4 +27,13 @@ extension BuildContextExtension on BuildContext {
onTap: onTap,
),
);
void showBottomSheet(Widget childWidget, {bool? isDismissible, String? title}) => showModalBottomSheet(
context: this,
useSafeArea: true,
isScrollControlled: true,
isDismissible: true,
backgroundColor: Colors.transparent,
builder: (context) => SingleChildScrollView(padding: const EdgeInsets.all(0), child: childWidget.bottomSafeArea).bottomSheetContainerNew(context, title: title),
);
}

39
lib/extensions/widget_extensions.dart
Unescape Escape View File

@ -21,8 +21,10 @@ extension WidgetExtensions on Widget {
Widget paddingAll(double value) => Padding(padding: EdgeInsets.all(value), child: this);
Widget get bottomSafeArea => SafeArea(bottom: true, top: false, right: false, left: false, child: this);
Widget indicatorWidget({double? height, double? width, Color? color}) => Container(
width: height ?? 40.toScreenWidth,
width: height ?? 50.toScreenWidth,
height: width ?? 5.toScreenHeight,
decoration: BoxDecoration(color: color ?? AppColor.white50, borderRadius: BorderRadius.circular(30)),
child: this,
@ -55,8 +57,9 @@ extension WidgetExtensions on Widget {
Widget toExpanded({int flex = 1}) => Expanded(flex: flex, child: this);
Widget handlePopScope({required BuildContext cxt, required VoidCallback onSave, bool? showPopUp =true}) {
return showPopUp! ? PopScope(
Widget handlePopScope({required BuildContext cxt, required VoidCallback onSave, bool? showPopUp = true}) {
return showPopUp!
? PopScope(
canPop: false,
onPopInvokedWithResult: (didPop, result) {
if (didPop) {
@ -72,7 +75,8 @@ extension WidgetExtensions on Widget {
),
);
},
child: this): this;
child: this)
: this;
}
Widget toShimmer({bool isShow = true, double radius = 20}) => isShow
@ -128,6 +132,33 @@ extension WidgetExtensions on Widget {
child: this,
);
Widget bottomSheetContainerNew(BuildContext context, {EdgeInsets? padding, String? title}) => Container(
clipBehavior: Clip.antiAlias,
margin: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
decoration: BoxDecoration(
color: AppColor.background(context),
borderRadius: const BorderRadius.only(topRight: Radius.circular(30), topLeft: Radius.circular(30)),
),
padding: padding ?? EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 50.toScreenWidth,
height: 6.toScreenHeight,
decoration: BoxDecoration(color: AppColor.white50, borderRadius: BorderRadius.circular(30)),
).center,
16.height,
if (title != null) ...[
title.bottomSheetHeadingTextStyle(context),
16.height,
],
this
],
),
);
Widget toShadowCircleContainer(BuildContext context, {bool showShadow = true, double padding = 16}) => showShadow
? Container(
padding: EdgeInsets.all(padding),

8
lib/modules/cm_module/views/components/action_button/footer_action_button.dart
Unescape Escape View File

@ -24,13 +24,11 @@ import 'package:test_sa/providers/service_request_providers/reject_reason_provid
class FooterActionButton {
static Widget footerContainer({required Widget child}) {
return Align(
return Container(
alignment: Alignment.bottomCenter,
child: Container(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight),
padding: const EdgeInsets.only(left: 16, right: 16, top: 12,bottom: 8),
color: AppColor.white10,
child: child,
),
child: SafeArea(child: child),
);
}

20
lib/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart
Unescape Escape View File

@ -41,7 +41,7 @@ class ServiceRequestBottomSheet {
isDismissible: isDismissible ?? true,
backgroundColor: Colors.transparent,
builder: (context) => SingleChildScrollView(
child: childWidget,
child: SafeArea(child: childWidget),
).bottomSheetContainer(context),
);
}
@ -636,13 +636,8 @@ class ServiceRequestBottomSheet {
{'heading': context.translation.requestSparePart, 'subHeading': context.translation.requestSparePartForYourAsset, 'icon': AppAsset.sparePartIcon},
{'heading': context.translation.addNewActivity, 'subHeading': context.translation.addNewActivityToYourWorkOrder, 'icon': AppAsset.maintenanceIcon},
];
Widget customListItem({
required BuildContext context,
required String icon,
required String heading,
required String subHeading,
required VoidCallback onTap,
}) {
Widget customListItem({required BuildContext context, required String icon, required String heading, required String subHeading, required VoidCallback onTap}) {
return GestureDetector(
onTap: onTap, // Handles the tap
child: Card(
@ -654,13 +649,7 @@ class ServiceRequestBottomSheet {
crossAxisAlignment: CrossAxisAlignment.start, // Align items at the top
children: [
// Icon Section
icon
.toSvgAsset(
width: 26,
color: AppColor.neutral120,
height: 29,
)
.paddingOnly(top: 8),
icon.toSvgAsset(width: 26, color: AppColor.neutral120, height: 29).paddingOnly(top: 8),
14.width,
Expanded(
child: Column(
@ -725,6 +714,7 @@ class ServiceRequestBottomSheet {
shrinkWrap: true,
padding: EdgeInsets.zero,
itemCount: items.length,
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (context, index) {
final item = items[index];
return customListItem(

3
lib/modules/cm_module/views/components/service_request_detail_view.dart
Unescape Escape View File

@ -346,8 +346,9 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
files: _userAttachments,
buttonColor: AppColor.primary10,
onlyImages: false,
// showAsGrid: true,
buttonIcon: 'quotation_icon'.toSvgAsset(color: AppColor.primary10),
onChange: (attachment) {
onChange: () {
requestProvider.addWorkOrderAttachment(woId: workOrder.requestId!, attachments: _userAttachments, otherAttachment: _attachments);
},
),

4
lib/modules/cm_module/views/forms/maintenance_request/maintenance_request_main.dart
Unescape Escape View File

@ -58,7 +58,7 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
save(requestDetailProvider);
},
),
body: Stack(
body: Column(
children: [
DefaultTabController(
length: 2,
@ -99,7 +99,7 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
).expanded,
],
),
),
).expanded,
if (!requestDetailProvider.isReadOnlyRequest)
FooterActionButton.footerContainer(
child: AppFilledButton(

30
lib/modules/pm_module/ppm_wo/ppm_details_page.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/widgets/loaders/app_loading.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
@ -60,12 +61,12 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
// ppmProvider!.getPlanPreventiveVisitById(widget.request.id!);
return Scaffold(
appBar: DefaultAppBar(title: context.translation.preventiveMaintenance),
body: SafeArea(
child: Consumer<PpmProvider>(builder: (context, ppmProvider, child) {
body: Consumer<PpmProvider>(builder: (context, ppmProvider, child) {
PlanPreventiveVisit? planPreventiveVisit = ppmProvider.planPreventiveVisit;
return ppmProvider.isLoading
? const ALoading()
:planPreventiveVisit!=null? Column(children: [
: planPreventiveVisit != null
? Column(children: [
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -81,7 +82,7 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
// if (planPreventiveVisit?.visitStatus != null) 8.width,
StatusLabel(
label: planPreventiveVisit?.visitStatus!.name!,
id: planPreventiveVisit?.visitStatus?.id??0,
id: planPreventiveVisit?.visitStatus?.id ?? 0,
textColor: AppColor.getRequestStatusTextColorByName(context, planPreventiveVisit.visitStatus!.name!),
backgroundColor: AppColor.getRequestStatusColorByName(context, planPreventiveVisit.visitStatus!.name!),
),
@ -107,27 +108,30 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
],
).toShadowContainer(context).paddingAll(16),
).expanded,
if (userProvider!.user!.type == UsersTypes.engineer && (!ppmProvider.isReadOnly))...[
AppFilledButton(
if (userProvider!.user!.type == UsersTypes.engineer && (!ppmProvider.isReadOnly)) ...[
FooterActionButton.footerContainer(
child: AppFilledButton(
onPressed: () async {
await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));
getVisitData();
},
label: context.translation.updateWorkOrder,
).paddingAll(16)
]
else ...[
AppFilledButton(
),
)
] else ...[
FooterActionButton.footerContainer(
child: AppFilledButton(
onPressed: () async {
await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdatePpm(ppm: null, planPreventiveVisit: planPreventiveVisit)));
getVisitData();
},
label: context.translation.viewDetails,
).paddingAll(16)
),
)
]
]):const Center(child: NoDataFound());
])
: const Center(child: NoDataFound());
}),
),
);
}
}

12
lib/modules/pm_module/ppm_wo/update_ppm/update_ppm.dart
Unescape Escape View File

@ -12,10 +12,12 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/plan_preventive_visit/plan_preventive_visit_model.dart';
import 'package:test_sa/models/ppm/ppm.dart';
import 'package:test_sa/modules/cm_module/utilities/service_request_utils.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'ppm_calibration_tools_form.dart';
import 'ppm_external_details_form.dart';
import 'ppm_pm_check_list_form.dart';
@ -132,8 +134,7 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
},
),
key: _scaffoldKey,
body: SafeArea(
child: Column(
body: Column(
children: [
DefaultTabController(
length: 2,
@ -199,7 +200,8 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
],
),
).expanded,
Row(
FooterActionButton.footerContainer(
child: Row(
children: [
if (tabIndex == 1) ...[
AppFilledButton(
@ -261,10 +263,10 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
),
]
],
).toShadowContainer(context, showShadow: false, borderRadius: 0),
],
),
),
],
),
).handlePopScope(
cxt: context,
showPopUp: !ppmProvider.isReadOnly,

1
lib/modules/pm_module/recurrent_wo/components/room_tabs_widget.dart
Unescape Escape View File

@ -26,6 +26,7 @@ class _RoomTabsWidgetState extends State<RoomTabsWidget> {
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Container(
padding: EdgeInsets.all(8.toScreenHeight),

7
lib/modules/pm_module/recurrent_wo/recurrent_work_order_view.dart
Unescape Escape View File

@ -58,9 +58,10 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
body: allRequestsProvider!.isLoading
? const ALoading()
: requestProvider.recurrentWoData != null
? Stack(
? Column(
children: [
SingleChildScrollView(
padding: EdgeInsets.all(16),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@ -75,8 +76,8 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
)
: const SizedBox(),
],
).paddingAll(12),
).paddingOnly(bottom: 85),
),
).expanded,
if (requestProvider.recurrentWoData?.status?.value != 1) ...[
FooterActionButton.footerContainer(
child: Row(

11
lib/modules/tm_module/tasks_wo/task_request_detail_view.dart
Unescape Escape View File

@ -8,6 +8,7 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/all_requests_and_count_model.dart';
import 'package:test_sa/models/new_models/task_request/task_request_model.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/providers/task_request_provider/task_request_provider.dart';
import 'package:test_sa/views/widgets/images/files_list.dart';
@ -61,8 +62,7 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
userProvider ??= Provider.of<UserProvider>(context, listen: false);
return Scaffold(
appBar: DefaultAppBar(title: context.translation.taskRequest),
body: SafeArea(
child: Consumer<TaskRequestProvider>(builder: (context, taskProvider, child) {
body: Consumer<TaskRequestProvider>(builder: (context, taskProvider, child) {
TaskData? taskModel = taskProvider.taskRequestModel;
return taskProvider.isLoading
? const ALoading()
@ -144,7 +144,8 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
).toShadowContainer(context).paddingAll(16),
).expanded,
if (userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value != 4 && taskModel?.taskJobStatus?.value != 3))
AppFilledButton(
FooterActionButton.footerContainer(
child: AppFilledButton(
onPressed: () async {
if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) {
taskProvider.getSiteData(siteId: taskProvider.taskRequestModel?.asset?.siteId);
@ -152,10 +153,10 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateTaskRequest(taskId: widget.taskId)));
},
label: context.translation.updateRequest,
).paddingAll(16)
),
)
]);
}),
),
);
}

8
lib/modules/tm_module/tasks_wo/update_task_request_view.dart
Unescape Escape View File

@ -98,10 +98,9 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
body: taskProvider.isLoading
? const ALoading()
: taskProvider.taskRequestModel != null
? SafeArea(
child: Form(
? Form(
key: _formKey,
child: Stack(
child: Column(
children: [
SingleChildScrollView(
padding: EdgeInsets.all(12 * AppStyle.getScaleFactor(context)),
@ -149,7 +148,7 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
const AssistantEmployeeCard().toShadowContainer(context, paddingObject: const EdgeInsets.symmetric(horizontal: 16)),
],
),
).paddingOnly(bottom: 85),
).expanded,
FooterActionButton.footerContainer(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
@ -171,7 +170,6 @@ class _UpdateTaskRequestState extends State<UpdateTaskRequest> {
),
],
),
),
)
: NoDataFound(message: context.translation.noDataFound).center,
).handlePopScope(

4
lib/views/pages/device_transfer/update_device_transfer.dart
Unescape Escape View File

@ -209,8 +209,7 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
},
),
key: _scaffoldKey,
body: SafeArea(
child: LoadingManager(
body: LoadingManager(
isLoading: _isLoading,
isFailedLoading: false,
stateCode: 200,
@ -293,7 +292,6 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
),
),
),
),
).handlePopScope(
cxt: context,
onSave: () {

11
lib/views/pages/user/gas_refill/gas_refill_details.dart
Unescape Escape View File

@ -10,6 +10,7 @@ import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/views/pages/user/gas_refill/update_gas_refill_request.dart';
import 'package:test_sa/views/widgets/images/files_list.dart';
@ -56,8 +57,7 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
return Scaffold(
appBar: DefaultAppBar(title: context.translation.gasRefillDetails),
key: _scaffoldKey,
body: SafeArea(
child: FutureBuilder(
body: FutureBuilder(
future: gasRefillProvider.getGasRefillObjectById(widget.model.id!),
builder: (context, snap) {
if (snap.connectionState == ConnectionState.waiting) {
@ -74,13 +74,15 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
child: informationCard(_model),
).expanded,
if (_userProvider.user!.type == UsersTypes.engineer && (_model.status!.value! != 2)) ...[
AppFilledButton(
FooterActionButton.footerContainer(
child: AppFilledButton(
onPressed: () async {
await Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateGasRefillRequest(gasRefillModel: _model)));
// getVisitData();
},
label: context.translation.updateRequest,
).paddingAll(16)
),
)
]
//TODO need to uncomment this to enable nurse edit gas refill request.
// else if (_model.status!.value! == 0) ...[
@ -102,7 +104,6 @@ class _GasRefillDetailsPageState extends State<GasRefillDetailsPage> {
return NoDataFound(message: context.translation.noDataFound).center;
},
),
),
);
}

2
lib/views/pages/user/gas_refill/update_gas_refill_request.dart
Unescape Escape View File

@ -211,7 +211,6 @@ class _UpdateGasRefillRequestState extends State<UpdateGasRefillRequest> {
key: _scaffoldKey,
body: Form(
key: _formKey,
child: SafeArea(
child: LoadingManager(
isLoading: _isLoading,
isFailedLoading: false,
@ -288,7 +287,6 @@ class _UpdateGasRefillRequestState extends State<UpdateGasRefillRequest> {
],
)),
),
),
).handlePopScope(
cxt: context,
onSave: () {

14
lib/views/pages/user/profile_page.dart
Unescape Escape View File

@ -177,15 +177,8 @@ class _ProfilePageState extends State<ProfilePage> {
label: "Update Information",
buttonColor: AppColor.neutral50,
onPressed: () {
showModalBottomSheet(
context: context,
useSafeArea: true,
isScrollControlled: true,
isDismissible: true,
backgroundColor: Colors.transparent,
builder: (context) => SingleChildScrollView(
padding: const EdgeInsets.all(0),
child: UpdateUserContactInfoBottomSheet(
context.showBottomSheet(
UpdateUserContactInfoBottomSheet(
_userProvider.user!.userID!,
uEmail: _user.email,
uPhoneNo: _user.phoneNumber,
@ -198,8 +191,7 @@ class _ProfilePageState extends State<ProfilePage> {
Provider.of<SettingProvider>(context, listen: false).setUser(_userProvider.user!);
},
),
).bottomSheetContainer(context),
);
title: "Update Information");
},
)
],

6
lib/views/pages/user/update_user_contact_info_bottomsheet.dart
Unescape Escape View File

@ -48,12 +48,6 @@ class _UpdateUserContactInfoBottomSheetState extends State<UpdateUserContactInfo
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
8.height,
Align(
alignment: AlignmentDirectional.centerStart,
child: "Update Information".bottomSheetHeadingTextStyle(context),
),
16.height,
AppTextFormField(
labelText: "Email",
backgroundColor: AppColor.neutral100,

29
lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
Unescape Escape View File

@ -3,6 +3,7 @@ import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
@ -96,28 +97,6 @@ class _SelectionBottomSheetState<T> extends State<SelectionFullScreenDialog<T>>
setState(() {});
},
).paddingOnly(top: 16, start: 16, end: 16, bottom: 8),
// TextField(
// onChanged: (queryString) {
// query = queryString;
// setState(() {});
// },
// style: const TextStyle(fontSize: 14),
// focusNode: searchFocusNode,
// decoration: InputDecoration(
// hintText: 'Search by name',
// labelText: 'Search',
// hintStyle: const TextStyle(fontSize: 14),
// focusedBorder: OutlineInputBorder(
// borderSide: BorderSide(color: AppColor.blueStatus(context), width: 2.0),
// borderRadius: const BorderRadius.all(Radius.circular(12.0)),
// ),
// enabledBorder: OutlineInputBorder(
// borderSide: BorderSide(color: AppColor.blueStatus(context), width: 1.0),
// borderRadius: const BorderRadius.all(Radius.circular(12.0)),
// ),
// contentPadding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
// ),
// ),
8.height,
Expanded(
child: ListView.builder(
@ -145,14 +124,16 @@ class _SelectionBottomSheetState<T> extends State<SelectionFullScreenDialog<T>>
),
8.height,
if (_selectedValue != null)
AppFilledButton(
FooterActionButton.footerContainer(
child: AppFilledButton(
label: context.translation.select,
maxWidth: true,
onPressed: () {
Navigator.pop(context);
widget.onSelect(_selectedValue);
},
).paddingAll(16),
),
),
],
),
);

59
lib/views/widgets/images/multi_image_picker.dart
Unescape Escape View File

@ -1,7 +1,6 @@
import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:image_picker/image_picker.dart';
@ -18,12 +17,13 @@ class MultiFilesPicker extends StatefulWidget {
final String label;
final bool error;
final List<File> files;
final List<AttachmentModel> attachment ;
final List<AttachmentModel> attachment;
final bool enabled, onlyImages;
double? buttonHeight;
Widget? buttonIcon;
Color? buttonColor;
final Function(List<File>)? onChange;
final VoidCallback? onChange;
final bool showAsGrid;
MultiFilesPicker(
@ -51,7 +51,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if(widget.enabled)...[
if (widget.enabled) ...[
AppDashedButton(
title: widget.label,
height: widget.buttonHeight,
@ -80,7 +80,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
}
widget.files.remove(image);
if (widget.onChange != null) {
widget.onChange!(widget.files);
widget.onChange!();
}
setState(() {});
},
@ -101,6 +101,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
if (result != null) {
for (var path in result.paths) {
widget.files.add(File(path!));
widget.onChange!();
}
setState(() {});
}
@ -151,7 +152,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
File fileImage = File(pickedFile.path);
widget.files.add(fileImage);
if (widget.onChange != null) {
widget.onChange!(widget.files);
widget.onChange!();
}
setState(() {});
}
@ -187,16 +188,13 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
ImageSource? source = await showModalBottomSheet<ImageSource>(
context: context,
builder: (BuildContext context) {
Widget listCard({required String icon, required String label, required VoidCallback onTap}){
Widget listCard({required String icon, required String label, required VoidCallback onTap}) {
return GestureDetector(
onTap: onTap,
child: Container(
constraints: BoxConstraints(minWidth: 111.toScreenWidth,minHeight: 111.toScreenHeight),
padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth,vertical: 12.toScreenHeight),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
border: Border.all(width: 1,color:AppColor.white70)
),
constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@ -209,6 +207,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
),
);
}
return Container(
padding: const EdgeInsets.all(16.0),
child: Row(
@ -273,27 +272,20 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
if (pickedFile != null) {
File fileImage = File(pickedFile.path);
if (fileImage != null) {
widget.files.add(fileImage);
if (widget.onChange != null) {
widget.onChange!(widget.files);
widget.onChange!();
}
setState(() {});
}
}
setState(() {});
}
}
class AttachmentModel {
int id =0;
File ? file;
AttachmentModel(this.id,this.file);
int id = 0;
File? file;
AttachmentModel(this.id, this.file);
factory AttachmentModel.fromJson(Map<String, dynamic> json) {
return AttachmentModel(
@ -308,14 +300,13 @@ class AttachmentModel {
'file': file?.path,
};
}
}
class AttachmentPicker extends StatefulWidget {
final String label;
final bool error;
final List<AttachmentModel> attachment ;
final List<AttachmentModel> attachment;
final bool enabled, onlyImages;
double? buttonHeight;
Widget? buttonIcon;
@ -481,16 +472,13 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
ImageSource? source = await showModalBottomSheet<ImageSource>(
context: context,
builder: (BuildContext context) {
Widget listCard({required String icon, required String label, required VoidCallback onTap}){
Widget listCard({required String icon, required String label, required VoidCallback onTap}) {
return GestureDetector(
onTap: onTap,
child: Container(
constraints: BoxConstraints(minWidth: 111.toScreenWidth,minHeight: 111.toScreenHeight),
padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth,vertical: 12.toScreenHeight),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
border: Border.all(width: 1,color:AppColor.white70)
),
constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@ -503,6 +491,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
),
);
}
return Container(
padding: const EdgeInsets.all(16.0),
child: Row(

Write Preview
Loading…
Cancel
Save