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

auto login improvement.

Browse Source
design_3.0_TM_Module
Sikander Saleem 2 months ago
parent 6c3f36944a
commit 642d1a908c
7 changed files with 731 additions and 725 deletions
Show Stats Download Patch File Download Diff File

18
lib/controllers/providers/api/user_provider.dart
Unescape Escape View File

@ -121,37 +121,23 @@ class UserProvider extends ChangeNotifier {
} }
} }
Future<bool> getUserInfo({String? fireBaseToken}) async { Future<bool> getUserInfo({String? fireBaseToken}) async {
// if (_loading == true) return false;
// _loading = true;
notifyListeners();
Response response; Response response;
try { try {
response = await ApiManager.instance.post(URLs.getUserInfo,body: { response = await ApiManager.instance.post(URLs.getUserInfo, body: {'fireBaseToken': fireBaseToken});
'fireBaseToken':fireBaseToken,
});
// _loading = false;
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
_refreshedUser = await User.fromJson(jsonDecode(response.body)); _refreshedUser = await User.fromJson(jsonDecode(response.body));
_refreshedUser!.profilePhotoName = URLs.getFileUrl(_user!.profilePhotoName); _refreshedUser!.profilePhotoName = URLs.getFileUrl(_refreshedUser!.profilePhotoName);
notifyListeners();
if (response.statusCode == 200) { if (response.statusCode == 200) {
return true; return true;
} }
} }
notifyListeners();
return false; return false;
} catch (error) { } catch (error) {
print('SSL or Network Error: $error');
// _loading = false;
notifyListeners();
return false; return false;
} }
} }
Future<bool> logout(BuildContext context) async { Future<bool> logout(BuildContext context) async {
Response response; Response response;
try { try {

1
lib/controllers/providers/settings/setting_provider.dart
Unescape Escape View File

@ -183,6 +183,7 @@ class SettingProvider extends ChangeNotifier {
try { try {
final response = await ApiManager.instance.post( final response = await ApiManager.instance.post(
URLs.enableFaceId, URLs.enableFaceId,
showToast: false,
body: <String, dynamic>{ body: <String, dynamic>{
'isEnabled':status, 'isEnabled':status,
}, },

2
lib/main.dart
Unescape Escape View File

@ -312,7 +312,7 @@ class MyApp extends StatelessWidget {
//ReportIssuesPage.id: (_) => ReportIssuesPage(), //ReportIssuesPage.id: (_) => ReportIssuesPage(),
RequestGasRefill.id: (_) => const RequestGasRefill(), RequestGasRefill.id: (_) => const RequestGasRefill(),
UpdateGasRefillRequest.id: (_) => const UpdateGasRefillRequest(), UpdateGasRefillRequest.id: (_) => const UpdateGasRefillRequest(),
CreateServiceRequestPage.id: (_) => const CreateServiceRequestPage(), // CreateServiceRequestPage.id: (_) => const CreateServiceRequestPage(),
CreateNewRequest.id: (_) => const CreateNewRequest(), CreateNewRequest.id: (_) => const CreateNewRequest(),
// SingleHospitalPicker.id: (_) => SingleHospitalPicker(), // SingleHospitalPicker.id: (_) => SingleHospitalPicker(),
MyAssetsPage.id: (_) => const MyAssetsPage(), MyAssetsPage.id: (_) => const MyAssetsPage(),

2
lib/new_views/pages/login_page.dart
Unescape Escape View File

@ -242,8 +242,6 @@ class _LoginPageState extends State<LoginPage> {
} else { } else {
(await SharedPreferences.getInstance()).remove(ASettings.localAuth); (await SharedPreferences.getInstance()).remove(ASettings.localAuth);
} }
Navigator.pushReplacementNamed(context, LandPage.routeName); Navigator.pushReplacementNamed(context, LandPage.routeName);
} else { } else {
Fluttertoast.showToast(msg: _userProvider.user?.message ?? context.translation.failedToCompleteRequest); Fluttertoast.showToast(msg: _userProvider.user?.message ?? context.translation.failedToCompleteRequest);

43
lib/new_views/pages/splash_page.dart
Unescape Escape View File

@ -9,11 +9,13 @@ import 'package:flutter/material.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:safe_device/safe_device.dart'; import 'package:safe_device/safe_device.dart';
import 'package:test_sa/controllers/api_routes/api_manager.dart';
import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/controllers/api_routes/urls.dart';
import 'package:test_sa/controllers/notification/firebase_notification_manger.dart'; import 'package:test_sa/controllers/notification/firebase_notification_manger.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
import 'package:test_sa/new_views/pages/land_page/land_page.dart'; import 'package:test_sa/new_views/pages/land_page/land_page.dart';
import 'package:test_sa/new_views/pages/login_page.dart'; import 'package:test_sa/new_views/pages/login_page.dart';
import 'package:test_sa/new_views/pages/unsafe_device_view.dart'; import 'package:test_sa/new_views/pages/unsafe_device_view.dart';
@ -88,6 +90,7 @@ class _SplashPageState extends State<SplashPage> {
setState(() { setState(() {
loading = false; loading = false;
}); });
if (isValid == false) { if (isValid == false) {
showDialog( showDialog(
context: context, context: context,
@ -101,11 +104,28 @@ class _SplashPageState extends State<SplashPage> {
}), }),
); );
} else { } else {
if (isValid && _settingProvider.isLocalAuthEnable) { ApiManager.instance.user = _settingProvider.user!;
if (FirebaseNotificationManger.token == null) await FirebaseNotificationManger.getToken();
setState(() {
loading = true;
});
await _userProvider.getUserInfo(fireBaseToken: FirebaseNotificationManger.token).then((status) async {
setState(() {
loading = false;
});
if (status && _userProvider.refreshedUser != null) {
_userProvider.refreshedUser!.token = _settingProvider.user?.token;
await _settingProvider.setUser(_userProvider.refreshedUser!);
_userProvider.setUser(_userProvider.refreshedUser!);
await _settingProvider.setAuth(_settingProvider.user?.isEnabledFaceId ?? false);
}
if (_settingProvider.isLocalAuthEnable) {
handleLocalAuth(); handleLocalAuth();
return; return;
} }
Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true); Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true);
});
} }
} }
} }
@ -119,16 +139,17 @@ class _SplashPageState extends State<SplashPage> {
} }
if (isSuccess) { if (isSuccess) {
_userProvider.setUser(_settingProvider.user!); // _userProvider.setUser(_settingProvider.user!);
if (FirebaseNotificationManger.token == null) await FirebaseNotificationManger.getToken(); // if (FirebaseNotificationManger.token == null) await FirebaseNotificationManger.getToken();
await _userProvider.getUserInfo(fireBaseToken:FirebaseNotificationManger.token).then((status) async{ // await _userProvider.getUserInfo(fireBaseToken: FirebaseNotificationManger.token).then((status) async {
if(status&&_userProvider.refreshedUser!=null){ // if (status && _userProvider.refreshedUser != null) {
_userProvider.refreshedUser!.token = _settingProvider.user?.token; // _userProvider.refreshedUser!.token = _settingProvider.user?.token;
await _settingProvider.setUser(_userProvider.refreshedUser!); // await _settingProvider.setUser(_userProvider.refreshedUser!);
_userProvider.setUser(_settingProvider.user!); // _userProvider.setUser(_settingProvider.user!);
await _settingProvider.setAuth(_settingProvider.user?.isEnabledFaceId??false); // await _settingProvider.setAuth(_settingProvider.user?.isEnabledFaceId ?? false);
} // }
}); // });
if (_userProvider.user!.onlySwipe!) { if (_userProvider.user!.onlySwipe!) {
Navigator.of(context).pushNamedAndRemoveUntil(SwipeView.routeName, (routes) => true); Navigator.of(context).pushNamedAndRemoveUntil(SwipeView.routeName, (routes) => true);
} else { } else {

774
lib/views/pages/user/requests/create_service_request_page.dart
Unescape Escape View File

@ -1,407 +1,407 @@
import 'dart:convert'; // import 'dart:convert';
import 'dart:io'; // import 'dart:io';
//
import 'package:flutter/cupertino.dart'; // import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; // import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; // import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; // import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; // import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; // import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; // import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; // import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; // import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/generic_attachment_model.dart'; // import 'package:test_sa/models/generic_attachment_model.dart';
import 'package:test_sa/models/service_request/pending_service_request_model.dart'; // import 'package:test_sa/models/service_request/pending_service_request_model.dart';
import 'package:test_sa/models/service_request/service_request.dart'; // import 'package:test_sa/models/service_request/service_request.dart';
import 'package:test_sa/modules/cm_module/utilities/service_request_utils.dart'; // import 'package:test_sa/modules/cm_module/utilities/service_request_utils.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; // import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/providers/service_request_providers/equipment_status_provider.dart'; // import 'package:test_sa/providers/service_request_providers/equipment_status_provider.dart';
import 'package:test_sa/providers/service_request_providers/requested_through_provider.dart'; // import 'package:test_sa/providers/service_request_providers/requested_through_provider.dart';
import 'package:test_sa/views/pages/user/requests/pending_requests_screen.dart'; // import 'package:test_sa/views/pages/user/requests/pending_requests_screen.dart';
import 'package:test_sa/views/widgets/bottom_sheets/pending_request_bottom_sheet.dart'; // import 'package:test_sa/views/widgets/bottom_sheets/pending_request_bottom_sheet.dart';
import 'package:test_sa/views/widgets/equipment/asset_picker.dart'; // import 'package:test_sa/views/widgets/equipment/asset_picker.dart';
import 'package:test_sa/views/widgets/images/multi_image_picker.dart'; // import 'package:test_sa/views/widgets/images/multi_image_picker.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; // import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import 'package:test_sa/views/widgets/sound/TextSpeechRecordWidget.dart'; // import 'package:test_sa/views/widgets/sound/TextSpeechRecordWidget.dart';
//
import '../../../../new_views/app_style/app_color.dart'; // import '../../../../new_views/app_style/app_color.dart';
import '../../../../new_views/common_widgets/default_app_bar.dart'; // import '../../../../new_views/common_widgets/default_app_bar.dart';
import '../../../../providers/service_request_providers/priority_provider.dart'; // import '../../../../providers/service_request_providers/priority_provider.dart';
import '../../../../providers/service_request_providers/type_of_request_provider.dart'; // import '../../../../providers/service_request_providers/type_of_request_provider.dart';
//
class CreateServiceRequestPage extends StatefulWidget { // class CreateServiceRequestPage extends StatefulWidget {
static const String id = "/create-request"; // static const String id = "/create-request";
final ServiceRequest? serviceRequest; // final ServiceRequest? serviceRequest;
//
const CreateServiceRequestPage({this.serviceRequest, Key? key}) : super(key: key); // const CreateServiceRequestPage({this.serviceRequest, Key? key}) : super(key: key);
//
@override // @override
CreateServiceRequestPageState createState() => CreateServiceRequestPageState(); // CreateServiceRequestPageState createState() => CreateServiceRequestPageState();
} // }
//
class CreateServiceRequestPageState extends State<CreateServiceRequestPage> { // class CreateServiceRequestPageState extends State<CreateServiceRequestPage> {
late TextEditingController _commentController; // late TextEditingController _commentController;
//
late double _height; // late double _height;
late UserProvider _userProvider; // late UserProvider _userProvider;
late SettingProvider _settingProvider; // late SettingProvider _settingProvider;
late ServiceRequestsProvider _serviceRequestsProvider; // late ServiceRequestsProvider _serviceRequestsProvider;
late ServiceRequest _serviceRequest; // late ServiceRequest _serviceRequest;
final List<GenericAttachmentModel> attachments = []; // final List<GenericAttachmentModel> attachments = [];
final bool _isLoading = false; // final bool _isLoading = false;
bool _showDatePicker = false; // bool _showDatePicker = false;
final GlobalKey<FormState> _formKey = GlobalKey<FormState>(); // final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); // final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
DateTime? _dateTime; // DateTime? _dateTime;
//
bool isFirstActionSubmitted = false; // bool isFirstActionSubmitted = false;
//
@override // @override
void initState() { // void initState() {
_commentController = TextEditingController(); // _commentController = TextEditingController();
if (widget.serviceRequest != null) { // if (widget.serviceRequest != null) {
_serviceRequest = widget.serviceRequest!; // _serviceRequest = widget.serviceRequest!;
attachments.addAll(_serviceRequest.devicePhotos!.map((e) => GenericAttachmentModel(name: e)).toList()); // attachments.addAll(_serviceRequest.devicePhotos!.map((e) => GenericAttachmentModel(name: e)).toList());
_showDatePicker = _serviceRequest.firstAction != null && _serviceRequest.firstAction?.name == "Need a visit"; // _showDatePicker = _serviceRequest.firstAction != null && _serviceRequest.firstAction?.name == "Need a visit";
if (_showDatePicker && _serviceRequest.visitDate != null) {
_dateTime = DateTime.tryParse(_serviceRequest.visitDate!);
}
} else {
_serviceRequest = ServiceRequest();
}
isFirstActionSubmitted = _serviceRequest.firstAction != null;
super.initState();
}
//
// getServiceRequestById(String id) async {
// try {
// ServiceRequest request = await _serviceRequestsProvider.getServiceRequestObjectById(requestId: id) ?? "";
// _serviceRequest = request;
// _device = _serviceRequest.device;
// attachments.addAll(_serviceRequest.devicePhotos.map((e) {
// return File(e);
// }).toList());
// _showDatePicker = _serviceRequest.firstAction != null && _serviceRequest.firstAction.name == "Need a visit";
// if (_showDatePicker && _serviceRequest.visitDate != null) { // if (_showDatePicker && _serviceRequest.visitDate != null) {
// _dateTime = DateTime.tryParse(_serviceRequest.visitDate); // _dateTime = DateTime.tryParse(_serviceRequest.visitDate!);
// } // }
// _isLoading = false; // } else {
// } catch (ex) { // _serviceRequest = ServiceRequest();
// _isLoading = false;
// } // }
// setState(() {}); // isFirstActionSubmitted = _serviceRequest.firstAction != null;
// super.initState();
// }
//
// //
// // getServiceRequestById(String id) async {
// // try {
// // ServiceRequest request = await _serviceRequestsProvider.getServiceRequestObjectById(requestId: id) ?? "";
// // _serviceRequest = request;
// // _device = _serviceRequest.device;
// // attachments.addAll(_serviceRequest.devicePhotos.map((e) {
// // return File(e);
// // }).toList());
// // _showDatePicker = _serviceRequest.firstAction != null && _serviceRequest.firstAction.name == "Need a visit";
// // if (_showDatePicker && _serviceRequest.visitDate != null) {
// // _dateTime = DateTime.tryParse(_serviceRequest.visitDate);
// // }
// // _isLoading = false;
// // } catch (ex) {
// // _isLoading = false;
// // }
// // setState(() {});
// // }
//
// @override
// void dispose() {
// _commentController.dispose();
// super.dispose();
// }
//
// bool _isLocalUrl(String url) {
// if (url.isEmpty != false) return false;
// return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\');
// }
//
// // bool priority;
//
// void getData() {
// Provider.of<RequestedThroughProvider>(context).getDate();
// Provider.of<TypeOfRequestProvider>(context).getDate();
// Provider.of<PriorityProvider>(context).getDate();
// Provider.of<EquipmentStatusProvider>(context).getDate();
// }
//
// PendingAssetServiceRequest? pendingAssetServiceRequest;
//
// @override
// Widget build(BuildContext context) {
// _height = MediaQuery.of(context).size.height;
// _userProvider = Provider.of<UserProvider>(context);
//
// _serviceRequestsProvider = Provider.of<ServiceRequestsProvider>(context);
//
// return Scaffold(
// key: _scaffoldKey,
// appBar: DefaultAppBar(title: context.translation.newServiceRequest),
// body: SafeArea(
// child: LoadingManager(
// isLoading: _isLoading,
// isFailedLoading: false,
// stateCode: 200,
// onRefresh: () async {},
// child: Form(
// key: _formKey,
// child: Column(
// children: [
// SingleChildScrollView(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
// children: [
// AssetPicker(
// device: _serviceRequest.device,
// showLoading: checkPendingRequest,
// onPick: (asset) async {
// pendingAssetServiceRequest = null;
// _serviceRequest.device = asset;
// await checkAssetForPendingServiceRequest(asset.id!.toInt());
//
// if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) {
// showPendingRequestBottomSheet();
// } // }
@override
void dispose() {
_commentController.dispose();
super.dispose();
}
bool _isLocalUrl(String url) {
if (url.isEmpty != false) return false;
return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\');
}
// bool priority;
void getData() {
Provider.of<RequestedThroughProvider>(context).getDate();
Provider.of<TypeOfRequestProvider>(context).getDate();
Provider.of<PriorityProvider>(context).getDate();
Provider.of<EquipmentStatusProvider>(context).getDate();
}
PendingAssetServiceRequest? pendingAssetServiceRequest;
@override
Widget build(BuildContext context) {
_height = MediaQuery.of(context).size.height;
_userProvider = Provider.of<UserProvider>(context);
_serviceRequestsProvider = Provider.of<ServiceRequestsProvider>(context);
return Scaffold(
key: _scaffoldKey,
appBar: DefaultAppBar(title: context.translation.newServiceRequest),
body: SafeArea(
child: LoadingManager(
isLoading: _isLoading,
isFailedLoading: false,
stateCode: 200,
onRefresh: () async {},
child: Form(
key: _formKey,
child: Column(
children: [
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
AssetPicker(
device: _serviceRequest.device,
showLoading: checkPendingRequest,
onPick: (asset) async {
pendingAssetServiceRequest = null;
_serviceRequest.device = asset;
await checkAssetForPendingServiceRequest(asset.id!.toInt());
if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) {
showPendingRequestBottomSheet();
}
},
),
if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
8.height,
Row(
children: [
const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
8.width,
Text(
"This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
).expanded,
],
).onPress(() {
showPendingRequests();
}),
],
16.height,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(context.translation.priority, style: Theme.of(context).textTheme.bodyLarge),
Consumer<PriorityProvider>(builder: (cxt, snapshot, _) {
_serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
return Transform.scale(
scale: 0.8,
child: CupertinoSwitch(
thumbColor: _serviceRequest.priority?.value != 0 ? const Color(0xffF63939) : Colors.blueGrey.withOpacity(.5),
activeColor: AppColor.blueStatus(context).withOpacity(.25),
value: _serviceRequest.priority?.value != 0,
onChanged: (state) {
if (state) {
_serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 1, orElse: null);
} else {
_serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
}
setState(() {});
}).toShimmer(isShow: snapshot.loading,context: context),
);
}),
],
),
16.height,
Consumer<EquipmentStatusProvider>(builder: (cxt, snapshot, _) {
try {
_serviceRequest.defectType ??= snapshot.items.first;
} catch (ex) {
print("snapshot.items:${snapshot.items.length}");
}
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(context.translation.equipmentStatus, style: Theme.of(context).textTheme.bodyLarge),
8.height,
Wrap(
runSpacing: 8,
spacing: 8,
children: [
for (var element in snapshot.items)
Row(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: 24,
height: 24,
child: Radio(
value: element,
activeColor: Colors.red,
fillColor: WidgetStateColor.resolveWith((states) {
if (states.contains(WidgetState.selected)) return const Color(0xff3DA5E5);
return const Color(0xffE0E0E0);
}),
groupValue: _serviceRequest.defectType,
onChanged: (state) {
setState(() {
_serviceRequest.defectType = element;
});
}),
),
8.width,
Text(element.name!, style: Theme.of(context).textTheme.bodySmall),
],
)
],
).toShimmer(isShow: snapshot.loading,context: context),
],
);
}),
16.height,
AttachmentPicker(label: context.translation.attachImage, attachment: attachments, showAsGrid: true),
],
).toShadowContainer(context),
// SingleItemDropDownMenu<Lookup, PriorityProvider>(
// context: context,
// title: context.translation.priority,
// initialValue: _serviceRequest?.priority,
// onSelect: (value) {
// _serviceRequest.priority = value;
// }, // },
// ), // ),
// if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
// 8.height, // 8.height,
// SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>( // Row(
// context: context, // children: [
// title: context.translation.equipmentStatus, // const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
// initialValue: _serviceRequest?.defectType, // 8.width,
// onSelect: (value) { // Text(
// _serviceRequest.defectType = value; // "This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
// }, // style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
// ), // ).expanded,
// ],
// Consumer<RequestedThroughProvider>(builder: (context, snapshot, _) { // ).onPress(() {
// return SingleItemDropDownMenu<Lookup, RequestedThroughProvider>( // showPendingRequests();
// context: context,
// enabled: false,
// title: context.translation.source,
// initialValue: snapshot.items?.firstWhere((element) => element.value == 3, orElse: null),
// );
// }), // }),
// 8.height, // ],
// Consumer<TypeOfRequestProvider>(builder: (context, snapshot, _) { // 16.height,
// return SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>( // Row(
// context: context, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
// title: context.translation.requestType, // children: [
// enabled: false, // Text(context.translation.priority, style: Theme.of(context).textTheme.bodyLarge),
// initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: null), // Consumer<PriorityProvider>(builder: (cxt, snapshot, _) {
// // onSelect: (value) { // _serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
// // _serviceRequest.type = value; //
// // }, // return Transform.scale(
// scale: 0.8,
// child: CupertinoSwitch(
// thumbColor: _serviceRequest.priority?.value != 0 ? const Color(0xffF63939) : Colors.blueGrey.withOpacity(.5),
// activeColor: AppColor.blueStatus(context).withOpacity(.25),
// value: _serviceRequest.priority?.value != 0,
// onChanged: (state) {
// if (state) {
// _serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 1, orElse: null);
// } else {
// _serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
// }
// setState(() {});
// }).toShimmer(isShow: snapshot.loading,context: context),
// ); // );
// }), // }),
// ],
// Align(
// alignment: AlignmentDirectional.centerStart,
// child: context.translation.callComments.heading5(context),
// ),
8.height,
// SpeechToTextButton(
// controller: _commentController,
// ), // ),
// 16.height,
// Consumer<EquipmentStatusProvider>(builder: (cxt, snapshot, _) {
// try {
// _serviceRequest.defectType ??= snapshot.items.first;
// } catch (ex) {
// print("snapshot.items:${snapshot.items.length}");
// }
//
// return Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
// children: [
// Text(context.translation.equipmentStatus, style: Theme.of(context).textTheme.bodyLarge),
// 8.height, // 8.height,
// AppTextFormField( // Wrap(
// controller: _commentController, // runSpacing: 8,
// labelText: context.translation.problemDesc, // spacing: 8,
// suffixIcon: "warning".toSvgAsset(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, width: 24).paddingOnly(end: 16), // children: [
// initialValue: _serviceRequest.callComments, // for (var element in snapshot.items)
// onSaved: (text) { // Row(
// _serviceRequest.callComments = text; // mainAxisSize: MainAxisSize.min,
// }, // children: [
// SizedBox(
// width: 24,
// height: 24,
// child: Radio(
// value: element,
// activeColor: Colors.red,
// fillColor: WidgetStateColor.resolveWith((states) {
// if (states.contains(WidgetState.selected)) return const Color(0xff3DA5E5);
// return const Color(0xffE0E0E0);
// }),
// groupValue: _serviceRequest.defectType,
// onChanged: (state) {
// setState(() {
// _serviceRequest.defectType = element;
// });
// }),
// ), // ),
// 8.width,
// Text(element.name!, style: Theme.of(context).textTheme.bodySmall),
// ],
// )
// ],
// ).toShimmer(isShow: snapshot.loading,context: context),
// ],
// );
// }),
// 16.height,
// AttachmentPicker(label: context.translation.attachImage, attachment: attachments, showAsGrid: true),
// ],
// ).toShadowContainer(context),
//
// // SingleItemDropDownMenu<Lookup, PriorityProvider>(
// // context: context,
// // title: context.translation.priority,
// // initialValue: _serviceRequest?.priority,
// // onSelect: (value) {
// // _serviceRequest.priority = value;
// // },
// // ),
// // 8.height,
// // SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
// // context: context,
// // title: context.translation.equipmentStatus,
// // initialValue: _serviceRequest?.defectType,
// // onSelect: (value) {
// // _serviceRequest.defectType = value;
// // },
// // ),
//
// // Consumer<RequestedThroughProvider>(builder: (context, snapshot, _) {
// // return SingleItemDropDownMenu<Lookup, RequestedThroughProvider>(
// // context: context,
// // enabled: false,
// // title: context.translation.source,
// // initialValue: snapshot.items?.firstWhere((element) => element.value == 3, orElse: null),
// // );
// // }),
// // 8.height,
// // Consumer<TypeOfRequestProvider>(builder: (context, snapshot, _) {
// // return SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>(
// // context: context,
// // title: context.translation.requestType,
// // enabled: false,
// // initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: null),
// // // onSelect: (value) {
// // // _serviceRequest.type = value;
// // // },
// // );
// // }),
//
// // Align(
// // alignment: AlignmentDirectional.centerStart,
// // child: context.translation.callComments.heading5(context),
// // ),
// 8.height,
// // SpeechToTextButton(
// // controller: _commentController,
// // ),
// // 8.height,
// // AppTextFormField(
// // controller: _commentController,
// // labelText: context.translation.problemDesc,
// // suffixIcon: "warning".toSvgAsset(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, width: 24).paddingOnly(end: 16),
// // initialValue: _serviceRequest.callComments,
// // onSaved: (text) {
// // _serviceRequest.callComments = text;
// // },
// // ),
// // 8.height,
// // RecordSound(
// // onRecord: (audio) {
// // _serviceRequest.audio = audio;
// // },
// // enabled: widget.serviceRequest == null ? true : false,
// // ),
// 8.height, // 8.height,
// RecordSound( // TextSpeechRecordWidget(
// initialMessage: _serviceRequest.callComments!,
// onMessageChange: (message) {
// _serviceRequest.callComments = message;
// },
// onRecord: (audio) { // onRecord: (audio) {
// _serviceRequest.audio = audio; // _serviceRequest.audio = audio;
// }, // },
// enabled: widget.serviceRequest == null ? true : false, // enabled: widget.serviceRequest == null ? true : false,
// ), // ),
8.height, // 16.height,
TextSpeechRecordWidget( // ],
initialMessage: _serviceRequest.callComments!, // ),
onMessageChange: (message) { // ).expanded,
_serviceRequest.callComments = message; // AppFilledButton(
}, // onPressed: checkPendingRequest ? null : _submit,
onRecord: (audio) { // loading: checkPendingRequest,
_serviceRequest.audio = audio; // label: (pendingAssetServiceRequest != null && (pendingAssetServiceRequest!.details?.isNotEmpty ?? false)) ? "Submit Duplicate Request" : "Submit New Request",
}, // ),
enabled: widget.serviceRequest == null ? true : false, // ],
), // ),
16.height, // ).paddingOnly(start: 16, end: 16, bottom: 24, top: 16),
], // ),
), // ),
).expanded, // );
AppFilledButton( // }
onPressed: checkPendingRequest ? null : _submit, //
loading: checkPendingRequest, // bool checkPendingRequest = false;
label: (pendingAssetServiceRequest != null && (pendingAssetServiceRequest!.details?.isNotEmpty ?? false)) ? "Submit Duplicate Request" : "Submit New Request", //
), // void showPendingRequests() {
], // Navigator.of(context).push(MaterialPageRoute(builder: (_) => PendingServiceRequestScreen(pendingAssetServiceRequest!)));
), // }
).paddingOnly(start: 16, end: 16, bottom: 24, top: 16), //
), // void showPendingRequestBottomSheet() async {
), // bool view = (await showModalBottomSheet(
); // context: context,
} // isDismissible: false,
// shape: const RoundedRectangleBorder(
bool checkPendingRequest = false; // borderRadius: BorderRadius.vertical(
// top: Radius.circular(20),
void showPendingRequests() { // ),
Navigator.of(context).push(MaterialPageRoute(builder: (_) => PendingServiceRequestScreen(pendingAssetServiceRequest!))); // ),
} // clipBehavior: Clip.antiAliasWithSaveLayer,
// builder: (BuildContext context) => PendingRequestBottomSheet(pendingAssetServiceRequest!, _serviceRequest.device!),
void showPendingRequestBottomSheet() async { // )) as bool;
bool view = (await showModalBottomSheet( // if (view) {
context: context, // showPendingRequests();
isDismissible: false, // }
shape: const RoundedRectangleBorder( // }
borderRadius: BorderRadius.vertical( //
top: Radius.circular(20), // Future<void> checkAssetForPendingServiceRequest(int assetId) async {
), // checkPendingRequest = true;
), // setState(() {});
clipBehavior: Clip.antiAliasWithSaveLayer, //
builder: (BuildContext context) => PendingRequestBottomSheet(pendingAssetServiceRequest!, _serviceRequest.device!), // pendingAssetServiceRequest = await _serviceRequestsProvider.checkAssetPendingRequest(assetId);
)) as bool; // await Future.delayed(const Duration(milliseconds: 250));
if (view) { //
showPendingRequests(); // checkPendingRequest = false;
} // setState(() {});
} // }
//
Future<void> checkAssetForPendingServiceRequest(int assetId) async { // Future<void> _submit() async {
checkPendingRequest = true; // _serviceRequest.requestedThrough = Provider.of<RequestedThroughProvider>(context, listen: false).items.firstWhere((element) => element.value == 3, orElse: null);
setState(() {}); // _serviceRequest.type = Provider.of<TypeOfRequestProvider>(context, listen: false).items.firstWhere((element) => element.value == 1, orElse: null);
//
pendingAssetServiceRequest = await _serviceRequestsProvider.checkAssetPendingRequest(assetId); // if (_formKey.currentState!.validate() && await _serviceRequest.validateNewRequest(context)) {
await Future.delayed(const Duration(milliseconds: 250)); // _formKey.currentState!.save();
//
checkPendingRequest = false; // // bool canSubmitRequest = await checkAssetForPendingServiceRequest(_serviceRequest.device.id);
setState(() {}); // // if (!canSubmitRequest) {
} // // return;
// // }
Future<void> _submit() async { //
_serviceRequest.requestedThrough = Provider.of<RequestedThroughProvider>(context, listen: false).items.firstWhere((element) => element.value == 3, orElse: null); //
_serviceRequest.type = Provider.of<TypeOfRequestProvider>(context, listen: false).items.firstWhere((element) => element.value == 1, orElse: null); // _serviceRequest.devicePhotos = attachments.map((item) => ServiceRequestUtils.isLocalUrl(item.name??'') ? "${item.name?.split("/").last}|${base64Encode(File(item.name??'').readAsBytesSync())}" : item.name??'').toList();
// if (_serviceRequest.audio != null) {
if (_formKey.currentState!.validate() && await _serviceRequest.validateNewRequest(context)) { // if (_isLocalUrl(_serviceRequest.audio!)) {
_formKey.currentState!.save(); // final File file = File(_serviceRequest.audio!);
// _serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}";
// bool canSubmitRequest = await checkAssetForPendingServiceRequest(_serviceRequest.device.id); // }
// if (!canSubmitRequest) { // }
// return; // await _serviceRequestsProvider.createRequest(
// context: context,
// user: _userProvider.user!,
// host: _settingProvider.host!,
// serviceRequest: _serviceRequest,
// );
// }
// }
// } // }
_serviceRequest.devicePhotos = attachments.map((item) => ServiceRequestUtils.isLocalUrl(item.name??'') ? "${item.name?.split("/").last}|${base64Encode(File(item.name??'').readAsBytesSync())}" : item.name??'').toList();
if (_serviceRequest.audio != null) {
if (_isLocalUrl(_serviceRequest.audio!)) {
final File file = File(_serviceRequest.audio!);
_serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}";
}
}
await _serviceRequestsProvider.createRequest(
context: context,
user: _userProvider.user!,
host: _settingProvider.host!,
serviceRequest: _serviceRequest,
);
}
}
}

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

@ -14,254 +14,226 @@ import 'package:test_sa/new_views/app_style/app_color.dart';
import '../../../new_views/common_widgets/app_dashed_button.dart'; import '../../../new_views/common_widgets/app_dashed_button.dart';
import 'multi_image_picker_item.dart'; import 'multi_image_picker_item.dart';
class MultiFilesPicker extends StatefulWidget { // class MultiFilesPicker extends StatefulWidget {
final String label; // final String label;
final bool error; // final bool error;
final List<File> files; // final List<File> files;
final List<GenericAttachmentModel> attachment; // final List<GenericAttachmentModel> attachment;
//
final bool enabled, onlyImages; // final bool enabled, onlyImages;
double? buttonHeight; // double? buttonHeight;
Widget? buttonIcon; // Widget? buttonIcon;
Color? buttonColor; // Color? buttonColor;
final Function(List<File>)? onChange; // final Function(List<File>)? onChange;
final bool showAsGrid; // final bool showAsGrid;
//
MultiFilesPicker( // MultiFilesPicker(
{Key? key, // {Key? key,
this.files = const <File>[], // this.files = const <File>[],
this.attachment = const <GenericAttachmentModel>[], // this.attachment = const <GenericAttachmentModel>[],
required this.label, // required this.label,
this.error = false, // this.error = false,
this.buttonHeight, // this.buttonHeight,
this.buttonIcon, // this.buttonIcon,
this.enabled = true, // this.enabled = true,
this.onlyImages = false, // this.onlyImages = false,
this.onChange, // this.onChange,
this.showAsGrid = false, // this.showAsGrid = false,
this.buttonColor}) // this.buttonColor})
: super(key: key); // : super(key: key);
//
@override // @override
State<MultiFilesPicker> createState() => _MultiFilesPickerState(); // State<MultiFilesPicker> createState() => _MultiFilesPickerState();
} // }
//
class _MultiFilesPickerState extends State<MultiFilesPicker> { // class _MultiFilesPickerState extends State<MultiFilesPicker> {
@override // @override
Widget build(BuildContext context) { // Widget build(BuildContext context) {
return Column( // return Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
if (widget.enabled) ...[ // if (widget.enabled) ...[
AppDashedButton( // AppDashedButton(
title: widget.label, // title: widget.label,
height: widget.buttonHeight, // height: widget.buttonHeight,
buttonColor: widget.buttonColor, // buttonColor: widget.buttonColor,
icon: widget.buttonIcon, // icon: widget.buttonIcon,
onPressed: (widget.enabled == false) // onPressed: (widget.enabled == false)
? () {} // ? () {}
: widget.showAsGrid // : widget.showAsGrid
? showFileSourceSheet // ? showFileSourceSheet
: onFilePicker), // : onFilePicker),
16.height, // 16.height,
], // ],
if (widget.files.isNotEmpty) // if (widget.files.isNotEmpty)
Wrap( // Wrap(
spacing: 8.toScreenWidth, // spacing: 8.toScreenWidth,
children: List.generate( // children: List.generate(
widget.files!.length, // widget.files!.length,
(index) { // (index) {
File image = widget.files![index]; // File image = widget.files![index];
return MultiFilesPickerItem( // return MultiFilesPickerItem(
file: image, // file: image,
enabled: widget.enabled, // enabled: widget.enabled,
onRemoveTap: (image) { // onRemoveTap: (image) {
if (!widget.enabled) { // if (!widget.enabled) {
return; // return;
} // }
widget.files.remove(image); // widget.files.remove(image);
if (widget.onChange != null) { // if (widget.onChange != null) {
widget.onChange!(widget.files); // widget.onChange!(widget.files);
} // }
setState(() {}); // setState(() {});
}, // },
); // );
}, // },
), // ),
), // ),
], // ],
); // );
} // }
//
fromFilePicker() async { // fromFilePicker() async {
FilePickerResult? result = await FilePicker.platform.pickFiles( // FilePickerResult? result = await FilePicker.platform.pickFiles(
type: FileType.custom, // type: FileType.custom,
allowMultiple: true, // allowMultiple: true,
allowedExtensions: widget.onlyImages ? ['jpg', 'jpeg', 'png'] : ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xlsx', 'pptx'], // allowedExtensions: widget.onlyImages ? ['jpg', 'jpeg', 'png'] : ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xlsx', 'pptx'],
); // );
if (result != null) { // if (result != null) {
for (var path in result.paths) { // for (var path in result.paths) {
widget.files.add(File(path!)); // widget.files.add(File(path!));
if (widget.onChange != null) { // if (widget.onChange != null) {
widget.onChange!(widget.files); // widget.onChange!(widget.files);
} // }
} // }
setState(() {}); // setState(() {});
} // }
} // }
//
void showFileSourceSheet() async { // void showFileSourceSheet() async {
if (widget.files.length >= 5) { // if (widget.files.length >= 5) {
Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5); // Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5);
return; // return;
} // }
//
ImageSource? source = (await showModalBottomSheet( // ImageSource? source = (await showModalBottomSheet(
context: context,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
"Attach File".heading4(context),
12.height,
GridView(
padding: const EdgeInsets.all(0),
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12),
children: <Widget>[
gridItem(Icons.camera_enhance_rounded, context.translation.pickFromCamera).onPress(() => Navigator.of(context).pop(ImageSource.camera)),
gridItem(Icons.image_rounded, context.translation.pickFromGallery).onPress(() => Navigator.of(context).pop(ImageSource.gallery)),
gridItem(Icons.file_present_rounded, context.translation.pickFromFiles).onPress(() async {
await fromFilePicker();
Navigator.pop(context);
}),
],
),
12.height,
],
).paddingAll(21),
)) as ImageSource?;
if (source == null) return;
final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
if (pickedFile != null) {
File fileImage = File(pickedFile.path);
widget.files.add(fileImage);
if (widget.onChange != null) {
widget.onChange!(widget.files);
}
setState(() {});
}
}
Widget gridItem(IconData iconData, String title) {
return Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12),
border: Border.all(color: const Color(0xffF1F1F1), width: 1),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Icon(iconData, color: const Color(0xff7D859A), size: 36),
Text(
title,
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500),
),
],
),
);
}
onFilePicker() async {
if (widget.files.length >= 5) {
Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5);
return;
}
ImageSource? source = await showModalBottomSheet<ImageSource>(
context: context,
builder: (BuildContext context) {
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)),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
icon.toSvgAsset(),
24.height,
label.bodyText2(context).custom(color: AppColor.black20),
],
),
),
);
}
return Container(
padding: const EdgeInsets.all(16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
listCard(
icon: 'camera_icon',
label: '${context.translation.open}\n${context.translation.camera}',
onTap: () {
Navigator.of(context).pop(ImageSource.camera);
},
),
listCard(
icon: 'gallery_icon',
label: '${context.translation.open}\n${context.translation.gallery}',
onTap: () {
Navigator.of(context).pop(ImageSource.gallery);
},
),
listCard(
icon: 'file_icon',
label: '${context.translation.open}\n${context.translation.files}',
onTap: () async {
await fromFilePicker();
Navigator.pop(context);
},
),
],
),
);
},
);
// ImageSource source = await showDialog(
// context: context, // context: context,
// builder: (dialogContext) => CupertinoAlertDialog( // shape: const RoundedRectangleBorder(
// actions: <Widget>[ // borderRadius: BorderRadius.vertical(
// TextButton( // top: Radius.circular(20),
// child: Text(context.translation.pickFromCamera), // ),
// onPressed: () { // ),
// Navigator.of(dialogContext).pop(ImageSource.camera); // clipBehavior: Clip.antiAliasWithSaveLayer,
// builder: (BuildContext context) => Column(
// mainAxisSize: MainAxisSize.min,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// "Attach File".heading4(context),
// 12.height,
// GridView(
// padding: const EdgeInsets.all(0),
// shrinkWrap: true,
// physics: const NeverScrollableScrollPhysics(),
// gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12),
// children: <Widget>[
// gridItem(Icons.camera_enhance_rounded, context.translation.pickFromCamera).onPress(() => Navigator.of(context).pop(ImageSource.camera)),
// gridItem(Icons.image_rounded, context.translation.pickFromGallery).onPress(() => Navigator.of(context).pop(ImageSource.gallery)),
// gridItem(Icons.file_present_rounded, context.translation.pickFromFiles).onPress(() async {
// await fromFilePicker();
// Navigator.pop(context);
// }),
// ],
// ),
// 12.height,
// ],
// ).paddingAll(21),
// )) as ImageSource?;
// if (source == null) return;
// final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
//
// if (pickedFile != null) {
// File fileImage = File(pickedFile.path);
// widget.files.add(fileImage);
// if (widget.onChange != null) {
// widget.onChange!(widget.files);
// }
// setState(() {});
// }
// }
//
// Widget gridItem(IconData iconData, String title) {
// return Container(
// padding: const EdgeInsets.all(12),
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.circular(12),
// border: Border.all(color: const Color(0xffF1F1F1), width: 1),
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Icon(iconData, color: const Color(0xff7D859A), size: 36),
// Text(
// title,
// style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500),
// ),
// ],
// ),
// );
// }
//
// onFilePicker() async {
// if (widget.files.length >= 5) {
// Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5);
// return;
// }
// ImageSource? source = await showModalBottomSheet<ImageSource>(
// context: context,
// builder: (BuildContext context) {
// 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)),
// child: Column(
// mainAxisSize: MainAxisSize.min,
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// icon.toSvgAsset(),
// 24.height,
// label.bodyText2(context).custom(color: AppColor.black20),
// ],
// ),
// ),
// );
// }
//
// return Container(
// padding: const EdgeInsets.all(16.0),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: <Widget>[
// listCard(
// icon: 'camera_icon',
// label: '${context.translation.open}\n${context.translation.camera}',
// onTap: () {
// Navigator.of(context).pop(ImageSource.camera);
// }, // },
// ), // ),
// TextButton( // listCard(
// child: Text(context.translation.pickFromGallery), // icon: 'gallery_icon',
// onPressed: () { // label: '${context.translation.open}\n${context.translation.gallery}',
// Navigator.of(dialogContext).pop(ImageSource.gallery); // onTap: () {
// Navigator.of(context).pop(ImageSource.gallery);
// }, // },
// ), // ),
// TextButton( // listCard(
// child: Text(context.translation.pickFromFiles), // icon: 'file_icon',
// onPressed: () async { // label: '${context.translation.open}\n${context.translation.files}',
// onTap: () async {
// await fromFilePicker(); // await fromFilePicker();
// Navigator.pop(context); // Navigator.pop(context);
// }, // },
@ -269,24 +241,52 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
// ], // ],
// ), // ),
// ); // );
if (source == null) return; // },
// );
final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800); // // ImageSource source = await showDialog(
// // context: context,
if (pickedFile != null) { // // builder: (dialogContext) => CupertinoAlertDialog(
File fileImage = File(pickedFile.path); // // actions: <Widget>[
if (fileImage != null) { // // TextButton(
widget.files.add(fileImage); // // child: Text(context.translation.pickFromCamera),
if (widget.onChange != null) { // // onPressed: () {
widget.onChange!(widget.files); // // Navigator.of(dialogContext).pop(ImageSource.camera);
} // // },
setState(() {}); // // ),
} // // TextButton(
} // // child: Text(context.translation.pickFromGallery),
// // onPressed: () {
setState(() {}); // // Navigator.of(dialogContext).pop(ImageSource.gallery);
} // // },
} // // ),
// // TextButton(
// // child: Text(context.translation.pickFromFiles),
// // onPressed: () async {
// // await fromFilePicker();
// // Navigator.pop(context);
// // },
// // ),
// // ],
// // ),
// // );
// if (source == null) return;
//
// final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
//
// if (pickedFile != null) {
// File fileImage = File(pickedFile.path);
// if (fileImage != null) {
// widget.files.add(fileImage);
// if (widget.onChange != null) {
// widget.onChange!(widget.files);
// }
// setState(() {});
// }
// }
//
// setState(() {});
// }
// }
class AttachmentModel { class AttachmentModel {
int id = 0; int id = 0;
@ -402,10 +402,10 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
} }
void showFileSourceSheet() async { void showFileSourceSheet() async {
if (widget.attachment.length >= 5) { // if (widget.attachment.length >= 5) {
Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5); // Fluttertoast.showToast(msg: context.translation.maxImagesNumberIs5);
return; // return;
} // }
ImageSource source = (await showModalBottomSheet( ImageSource source = (await showModalBottomSheet(
context: context, context: context,

Write Preview
Loading…
Cancel
Save