auto login improvement.

design_3.0_TM_Module
Sikander Saleem 2 months ago
parent 6c3f36944a
commit 642d1a908c

@ -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 {

@ -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,
}, },

@ -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(),

@ -110,8 +110,8 @@ class _LoginPageState extends State<LoginPage> {
backgroundColor: AppColor.fieldBgColor(context), backgroundColor: AppColor.fieldBgColor(context),
validator: (value) => Validator.hasValue(value!) ? null : context.translation.requiredField, validator: (value) => Validator.hasValue(value!) ? null : context.translation.requiredField,
labelText: context.translation.username, labelText: context.translation.username,
style: TextStyle(fontWeight: FontWeight.w500, fontSize: 12, color:context .isDark?Colors.white: const Color(0xff3B3D4A)), style: TextStyle(fontWeight: FontWeight.w500, fontSize: 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 11, color:context .isDark?Colors.white:const Color(0xff767676)), labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 11, color: context.isDark ? Colors.white : const Color(0xff767676)),
textInputType: TextInputType.text, textInputType: TextInputType.text,
showWithoutDecoration: true, showWithoutDecoration: true,
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight), contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
@ -125,8 +125,8 @@ class _LoginPageState extends State<LoginPage> {
showWithoutDecoration: true, showWithoutDecoration: true,
labelText: context.translation.password, labelText: context.translation.password,
backgroundColor: AppColor.fieldBgColor(context), backgroundColor: AppColor.fieldBgColor(context),
style: TextStyle(fontWeight: FontWeight.w500, fontSize: 12, color: context .isDark?Colors.white: const Color(0xff3B3D4A)), style: TextStyle(fontWeight: FontWeight.w500, fontSize: 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 11, color: context .isDark?Colors.white: const Color(0xff767676)), labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 11, color: context.isDark ? Colors.white : const Color(0xff767676)),
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight), contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
obscureText: !_passwordVisible, obscureText: !_passwordVisible,
suffixIcon: Icon( suffixIcon: Icon(
@ -237,13 +237,11 @@ class _LoginPageState extends State<LoginPage> {
// (await SharedPreferences.getInstance()).remove(ASettings.localAuth); // (await SharedPreferences.getInstance()).remove(ASettings.localAuth);
await _settingProvider!.setRememberMe(_user.userName!, _user.password!, rememberMe); await _settingProvider!.setRememberMe(_user.userName!, _user.password!, rememberMe);
//TODO need to verify this here... //TODO need to verify this here...
if(_userProvider.user?.isEnabledFaceId==true){ if (_userProvider.user?.isEnabledFaceId == true) {
await _settingProvider!.setAuth(_userProvider.user!.isEnabledFaceId!); await _settingProvider!.setAuth(_userProvider.user!.isEnabledFaceId!);
}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);

@ -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!;
handleLocalAuth();
return; if (FirebaseNotificationManger.token == null) await FirebaseNotificationManger.getToken();
} setState(() {
Navigator.of(context).pushNamedAndRemoveUntil(LoginPage.routeName, (routes) => true); 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();
return;
}
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 {

@ -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) { // if (_showDatePicker && _serviceRequest.visitDate != null) {
_dateTime = DateTime.tryParse(_serviceRequest.visitDate!); // _dateTime = DateTime.tryParse(_serviceRequest.visitDate!);
} // }
} else { // } else {
_serviceRequest = ServiceRequest(); // _serviceRequest = ServiceRequest();
} // }
isFirstActionSubmitted = _serviceRequest.firstAction != null; // isFirstActionSubmitted = _serviceRequest.firstAction != null;
super.initState(); // super.initState();
} // }
//
// // //
// getServiceRequestById(String id) async { // // getServiceRequestById(String id) async {
// try { // // try {
// ServiceRequest request = await _serviceRequestsProvider.getServiceRequestObjectById(requestId: id) ?? ""; // // ServiceRequest request = await _serviceRequestsProvider.getServiceRequestObjectById(requestId: id) ?? "";
// _serviceRequest = request; // // _serviceRequest = request;
// _device = _serviceRequest.device; // // _device = _serviceRequest.device;
// attachments.addAll(_serviceRequest.devicePhotos.map((e) { // // attachments.addAll(_serviceRequest.devicePhotos.map((e) {
// return File(e); // // return File(e);
// }).toList()); // // }).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) { // // if (_showDatePicker && _serviceRequest.visitDate != null) {
// _dateTime = DateTime.tryParse(_serviceRequest.visitDate); // // _dateTime = DateTime.tryParse(_serviceRequest.visitDate);
// } // // }
// _isLoading = false; // // _isLoading = false;
// } catch (ex) { // // } catch (ex) {
// _isLoading = false; // // _isLoading = false;
// } // // }
// setState(() {}); // // setState(() {});
// } // // }
//
@override // @override
void dispose() { // void dispose() {
_commentController.dispose(); // _commentController.dispose();
super.dispose(); // super.dispose();
} // }
//
bool _isLocalUrl(String url) { // bool _isLocalUrl(String url) {
if (url.isEmpty != false) return false; // if (url.isEmpty != false) return false;
return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\'); // return url.startsWith("/") || url.startsWith("file://") || url.substring(1).startsWith(':\\');
} // }
//
// bool priority; // // bool priority;
//
void getData() { // void getData() {
Provider.of<RequestedThroughProvider>(context).getDate(); // Provider.of<RequestedThroughProvider>(context).getDate();
Provider.of<TypeOfRequestProvider>(context).getDate(); // Provider.of<TypeOfRequestProvider>(context).getDate();
Provider.of<PriorityProvider>(context).getDate(); // Provider.of<PriorityProvider>(context).getDate();
Provider.of<EquipmentStatusProvider>(context).getDate(); // Provider.of<EquipmentStatusProvider>(context).getDate();
} // }
//
PendingAssetServiceRequest? pendingAssetServiceRequest; // PendingAssetServiceRequest? pendingAssetServiceRequest;
//
@override // @override
Widget build(BuildContext context) { // Widget build(BuildContext context) {
_height = MediaQuery.of(context).size.height; // _height = MediaQuery.of(context).size.height;
_userProvider = Provider.of<UserProvider>(context); // _userProvider = Provider.of<UserProvider>(context);
//
_serviceRequestsProvider = Provider.of<ServiceRequestsProvider>(context); // _serviceRequestsProvider = Provider.of<ServiceRequestsProvider>(context);
//
return Scaffold( // return Scaffold(
key: _scaffoldKey, // key: _scaffoldKey,
appBar: DefaultAppBar(title: context.translation.newServiceRequest), // appBar: DefaultAppBar(title: context.translation.newServiceRequest),
body: SafeArea( // body: SafeArea(
child: LoadingManager( // child: LoadingManager(
isLoading: _isLoading, // isLoading: _isLoading,
isFailedLoading: false, // isFailedLoading: false,
stateCode: 200, // stateCode: 200,
onRefresh: () async {}, // onRefresh: () async {},
child: Form( // child: Form(
key: _formKey, // key: _formKey,
child: Column( // child: Column(
children: [ // children: [
SingleChildScrollView( // SingleChildScrollView(
child: Column( // child: Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
Column( // Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
AssetPicker( // AssetPicker(
device: _serviceRequest.device, // device: _serviceRequest.device,
showLoading: checkPendingRequest, // showLoading: checkPendingRequest,
onPick: (asset) async { // onPick: (asset) async {
pendingAssetServiceRequest = null; // pendingAssetServiceRequest = null;
_serviceRequest.device = asset; // _serviceRequest.device = asset;
await checkAssetForPendingServiceRequest(asset.id!.toInt()); // await checkAssetForPendingServiceRequest(asset.id!.toInt());
//
if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) { // if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) {
showPendingRequestBottomSheet(); // showPendingRequestBottomSheet();
} // }
}, // },
), // ),
if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[ // if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
8.height, // 8.height,
Row( // Row(
children: [ // children: [
const Icon(Icons.warning, color: Color(0xffEE404C), size: 14), // const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
8.width, // 8.width,
Text( // Text(
"This asset already have ${pendingAssetServiceRequest!.details!.length} request pending", // "This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline), // style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
).expanded, // ).expanded,
], // ],
).onPress(() { // ).onPress(() {
showPendingRequests(); // showPendingRequests();
}), // }),
], // ],
16.height, // 16.height,
Row( // Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ // children: [
Text(context.translation.priority, style: Theme.of(context).textTheme.bodyLarge), // Text(context.translation.priority, style: Theme.of(context).textTheme.bodyLarge),
Consumer<PriorityProvider>(builder: (cxt, snapshot, _) { // Consumer<PriorityProvider>(builder: (cxt, snapshot, _) {
_serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: null); // _serviceRequest.priority ??= snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
//
return Transform.scale( // return Transform.scale(
scale: 0.8, // scale: 0.8,
child: CupertinoSwitch( // child: CupertinoSwitch(
thumbColor: _serviceRequest.priority?.value != 0 ? const Color(0xffF63939) : Colors.blueGrey.withOpacity(.5), // thumbColor: _serviceRequest.priority?.value != 0 ? const Color(0xffF63939) : Colors.blueGrey.withOpacity(.5),
activeColor: AppColor.blueStatus(context).withOpacity(.25), // activeColor: AppColor.blueStatus(context).withOpacity(.25),
value: _serviceRequest.priority?.value != 0, // value: _serviceRequest.priority?.value != 0,
onChanged: (state) { // onChanged: (state) {
if (state) { // if (state) {
_serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 1, orElse: null); // _serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 1, orElse: null);
} else { // } else {
_serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 0, orElse: null); // _serviceRequest.priority = snapshot.items.firstWhere((element) => element.value == 0, orElse: null);
} // }
setState(() {}); // setState(() {});
}).toShimmer(isShow: snapshot.loading,context: context), // }).toShimmer(isShow: snapshot.loading,context: context),
); // );
}), // }),
], // ],
), // ),
16.height, // 16.height,
Consumer<EquipmentStatusProvider>(builder: (cxt, snapshot, _) { // Consumer<EquipmentStatusProvider>(builder: (cxt, snapshot, _) {
try { // try {
_serviceRequest.defectType ??= snapshot.items.first; // _serviceRequest.defectType ??= snapshot.items.first;
} catch (ex) { // } catch (ex) {
print("snapshot.items:${snapshot.items.length}"); // print("snapshot.items:${snapshot.items.length}");
} // }
//
return Column( // return Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
Text(context.translation.equipmentStatus, style: Theme.of(context).textTheme.bodyLarge), // Text(context.translation.equipmentStatus, style: Theme.of(context).textTheme.bodyLarge),
8.height, // 8.height,
Wrap( // Wrap(
runSpacing: 8, // runSpacing: 8,
spacing: 8, // spacing: 8,
children: [ // children: [
for (var element in snapshot.items) // for (var element in snapshot.items)
Row( // Row(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
SizedBox( // SizedBox(
width: 24, // width: 24,
height: 24, // height: 24,
child: Radio( // child: Radio(
value: element, // value: element,
activeColor: Colors.red, // activeColor: Colors.red,
fillColor: WidgetStateColor.resolveWith((states) { // fillColor: WidgetStateColor.resolveWith((states) {
if (states.contains(WidgetState.selected)) return const Color(0xff3DA5E5); // if (states.contains(WidgetState.selected)) return const Color(0xff3DA5E5);
return const Color(0xffE0E0E0); // return const Color(0xffE0E0E0);
}), // }),
groupValue: _serviceRequest.defectType, // groupValue: _serviceRequest.defectType,
onChanged: (state) { // onChanged: (state) {
setState(() { // setState(() {
_serviceRequest.defectType = element; // _serviceRequest.defectType = element;
}); // });
}), // }),
), // ),
8.width, // 8.width,
Text(element.name!, style: Theme.of(context).textTheme.bodySmall), // Text(element.name!, style: Theme.of(context).textTheme.bodySmall),
], // ],
) // )
], // ],
).toShimmer(isShow: snapshot.loading,context: context), // ).toShimmer(isShow: snapshot.loading,context: context),
], // ],
); // );
}), // }),
16.height, // 16.height,
AttachmentPicker(label: context.translation.attachImage, attachment: attachments, showAsGrid: true), // AttachmentPicker(label: context.translation.attachImage, attachment: attachments, showAsGrid: true),
], // ],
).toShadowContainer(context), // ).toShadowContainer(context),
//
// SingleItemDropDownMenu<Lookup, PriorityProvider>( // // SingleItemDropDownMenu<Lookup, PriorityProvider>(
// context: context, // // context: context,
// title: context.translation.priority, // // title: context.translation.priority,
// initialValue: _serviceRequest?.priority, // // initialValue: _serviceRequest?.priority,
// onSelect: (value) { // // onSelect: (value) {
// _serviceRequest.priority = value; // // _serviceRequest.priority = value;
// }, // // },
// ), // // ),
// 8.height, // // 8.height,
// SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>( // // SingleItemDropDownMenu<Lookup, EquipmentStatusProvider>(
// context: context, // // context: context,
// title: context.translation.equipmentStatus, // // title: context.translation.equipmentStatus,
// initialValue: _serviceRequest?.defectType, // // initialValue: _serviceRequest?.defectType,
// onSelect: (value) { // // onSelect: (value) {
// _serviceRequest.defectType = value; // // _serviceRequest.defectType = value;
// }, // // },
// ), // // ),
//
// Consumer<RequestedThroughProvider>(builder: (context, snapshot, _) { // // Consumer<RequestedThroughProvider>(builder: (context, snapshot, _) {
// return SingleItemDropDownMenu<Lookup, RequestedThroughProvider>( // // return SingleItemDropDownMenu<Lookup, RequestedThroughProvider>(
// context: context, // // context: context,
// enabled: false, // // enabled: false,
// title: context.translation.source, // // title: context.translation.source,
// initialValue: snapshot.items?.firstWhere((element) => element.value == 3, orElse: null), // // initialValue: snapshot.items?.firstWhere((element) => element.value == 3, orElse: null),
// ); // // );
// }), // // }),
// 8.height, // // 8.height,
// Consumer<TypeOfRequestProvider>(builder: (context, snapshot, _) { // // Consumer<TypeOfRequestProvider>(builder: (context, snapshot, _) {
// return SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>( // // return SingleItemDropDownMenu<Lookup, TypeOfRequestProvider>(
// context: context, // // context: context,
// title: context.translation.requestType, // // title: context.translation.requestType,
// enabled: false, // // enabled: false,
// initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: null), // // initialValue: snapshot.items?.firstWhere((element) => element.value == 1, orElse: null),
// // onSelect: (value) { // // // onSelect: (value) {
// // _serviceRequest.type = value; // // // _serviceRequest.type = value;
// // }, // // // },
// ); // // );
// }), // // }),
//
// Align( // // Align(
// alignment: AlignmentDirectional.centerStart, // // alignment: AlignmentDirectional.centerStart,
// child: context.translation.callComments.heading5(context), // // child: context.translation.callComments.heading5(context),
// ), // // ),
8.height, // 8.height,
// SpeechToTextButton( // // SpeechToTextButton(
// controller: _commentController, // // controller: _commentController,
// ), // // ),
// 8.height, // // 8.height,
// AppTextFormField( // // AppTextFormField(
// controller: _commentController, // // controller: _commentController,
// labelText: context.translation.problemDesc, // // labelText: context.translation.problemDesc,
// suffixIcon: "warning".toSvgAsset(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, width: 24).paddingOnly(end: 16), // // suffixIcon: "warning".toSvgAsset(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, width: 24).paddingOnly(end: 16),
// initialValue: _serviceRequest.callComments, // // initialValue: _serviceRequest.callComments,
// onSaved: (text) { // // onSaved: (text) {
// _serviceRequest.callComments = text; // // _serviceRequest.callComments = text;
// }, // // },
// ), // // ),
// 8.height, // // 8.height,
// RecordSound( // // RecordSound(
// onRecord: (audio) { // // onRecord: (audio) {
// _serviceRequest.audio = audio; // // _serviceRequest.audio = audio;
// }, // // },
// enabled: widget.serviceRequest == null ? true : false, // // enabled: widget.serviceRequest == null ? true : false,
// ), // // ),
8.height, // 8.height,
TextSpeechRecordWidget( // TextSpeechRecordWidget(
initialMessage: _serviceRequest.callComments!, // initialMessage: _serviceRequest.callComments!,
onMessageChange: (message) { // onMessageChange: (message) {
_serviceRequest.callComments = 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,
), // ),
16.height, // 16.height,
], // ],
), // ),
).expanded, // ).expanded,
AppFilledButton( // AppFilledButton(
onPressed: checkPendingRequest ? null : _submit, // onPressed: checkPendingRequest ? null : _submit,
loading: checkPendingRequest, // loading: checkPendingRequest,
label: (pendingAssetServiceRequest != null && (pendingAssetServiceRequest!.details?.isNotEmpty ?? false)) ? "Submit Duplicate Request" : "Submit New Request", // label: (pendingAssetServiceRequest != null && (pendingAssetServiceRequest!.details?.isNotEmpty ?? false)) ? "Submit Duplicate Request" : "Submit New Request",
), // ),
], // ],
), // ),
).paddingOnly(start: 16, end: 16, bottom: 24, top: 16), // ).paddingOnly(start: 16, end: 16, bottom: 24, top: 16),
), // ),
), // ),
); // );
} // }
//
bool checkPendingRequest = false; // bool checkPendingRequest = false;
//
void showPendingRequests() { // void showPendingRequests() {
Navigator.of(context).push(MaterialPageRoute(builder: (_) => PendingServiceRequestScreen(pendingAssetServiceRequest!))); // Navigator.of(context).push(MaterialPageRoute(builder: (_) => PendingServiceRequestScreen(pendingAssetServiceRequest!)));
} // }
//
void showPendingRequestBottomSheet() async { // void showPendingRequestBottomSheet() async {
bool view = (await showModalBottomSheet( // bool view = (await showModalBottomSheet(
context: context, // context: context,
isDismissible: false, // isDismissible: false,
shape: const RoundedRectangleBorder( // shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical( // borderRadius: BorderRadius.vertical(
top: Radius.circular(20), // top: Radius.circular(20),
), // ),
), // ),
clipBehavior: Clip.antiAliasWithSaveLayer, // clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => PendingRequestBottomSheet(pendingAssetServiceRequest!, _serviceRequest.device!), // builder: (BuildContext context) => PendingRequestBottomSheet(pendingAssetServiceRequest!, _serviceRequest.device!),
)) as bool; // )) as bool;
if (view) { // if (view) {
showPendingRequests(); // showPendingRequests();
} // }
} // }
//
Future<void> checkAssetForPendingServiceRequest(int assetId) async { // Future<void> checkAssetForPendingServiceRequest(int assetId) async {
checkPendingRequest = true; // checkPendingRequest = true;
setState(() {}); // setState(() {});
//
pendingAssetServiceRequest = await _serviceRequestsProvider.checkAssetPendingRequest(assetId); // pendingAssetServiceRequest = await _serviceRequestsProvider.checkAssetPendingRequest(assetId);
await Future.delayed(const Duration(milliseconds: 250)); // await Future.delayed(const Duration(milliseconds: 250));
//
checkPendingRequest = false; // checkPendingRequest = false;
setState(() {}); // setState(() {});
} // }
//
Future<void> _submit() async { // Future<void> _submit() async {
_serviceRequest.requestedThrough = Provider.of<RequestedThroughProvider>(context, listen: false).items.firstWhere((element) => element.value == 3, orElse: null); // _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.type = Provider.of<TypeOfRequestProvider>(context, listen: false).items.firstWhere((element) => element.value == 1, orElse: null);
//
if (_formKey.currentState!.validate() && await _serviceRequest.validateNewRequest(context)) { // if (_formKey.currentState!.validate() && await _serviceRequest.validateNewRequest(context)) {
_formKey.currentState!.save(); // _formKey.currentState!.save();
//
// bool canSubmitRequest = await checkAssetForPendingServiceRequest(_serviceRequest.device.id); // // bool canSubmitRequest = await checkAssetForPendingServiceRequest(_serviceRequest.device.id);
// if (!canSubmitRequest) { // // if (!canSubmitRequest) {
// return; // // return;
// } // // }
//
//
_serviceRequest.devicePhotos = attachments.map((item) => ServiceRequestUtils.isLocalUrl(item.name??'') ? "${item.name?.split("/").last}|${base64Encode(File(item.name??'').readAsBytesSync())}" : item.name??'').toList(); // _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 (_serviceRequest.audio != null) {
if (_isLocalUrl(_serviceRequest.audio!)) { // if (_isLocalUrl(_serviceRequest.audio!)) {
final File file = File(_serviceRequest.audio!); // final File file = File(_serviceRequest.audio!);
_serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}"; // _serviceRequest.audio = "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}";
} // }
} // }
await _serviceRequestsProvider.createRequest( // await _serviceRequestsProvider.createRequest(
context: context, // context: context,
user: _userProvider.user!, // user: _userProvider.user!,
host: _settingProvider.host!, // host: _settingProvider.host!,
serviceRequest: _serviceRequest, // serviceRequest: _serviceRequest,
); // );
} // }
} // }
} // }

@ -14,279 +14,279 @@ 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, // context: context,
shape: const RoundedRectangleBorder( // shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical( // borderRadius: BorderRadius.vertical(
top: Radius.circular(20), // top: Radius.circular(20),
), // ),
), // ),
clipBehavior: Clip.antiAliasWithSaveLayer, // clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => Column( // builder: (BuildContext context) => Column(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
"Attach File".heading4(context), // "Attach File".heading4(context),
12.height, // 12.height,
GridView( // GridView(
padding: const EdgeInsets.all(0), // padding: const EdgeInsets.all(0),
shrinkWrap: true, // shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), // physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12), // gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12),
children: <Widget>[ // children: <Widget>[
gridItem(Icons.camera_enhance_rounded, context.translation.pickFromCamera).onPress(() => Navigator.of(context).pop(ImageSource.camera)), // 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.image_rounded, context.translation.pickFromGallery).onPress(() => Navigator.of(context).pop(ImageSource.gallery)),
gridItem(Icons.file_present_rounded, context.translation.pickFromFiles).onPress(() async { // gridItem(Icons.file_present_rounded, context.translation.pickFromFiles).onPress(() async {
await fromFilePicker(); // await fromFilePicker();
Navigator.pop(context); // Navigator.pop(context);
}), // }),
], // ],
), // ),
12.height, // 12.height,
], // ],
).paddingAll(21), // ).paddingAll(21),
)) as ImageSource?; // )) as ImageSource?;
if (source == null) return; // if (source == null) return;
final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800); // final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
//
if (pickedFile != null) { // if (pickedFile != null) {
File fileImage = File(pickedFile.path); // File fileImage = File(pickedFile.path);
widget.files.add(fileImage); // widget.files.add(fileImage);
if (widget.onChange != null) { // if (widget.onChange != null) {
widget.onChange!(widget.files); // widget.onChange!(widget.files);
} // }
setState(() {}); // setState(() {});
} // }
} // }
//
Widget gridItem(IconData iconData, String title) { // Widget gridItem(IconData iconData, String title) {
return Container( // return Container(
padding: const EdgeInsets.all(12), // padding: const EdgeInsets.all(12),
decoration: BoxDecoration( // decoration: BoxDecoration(
color: Colors.white, // color: Colors.white,
borderRadius: BorderRadius.circular(12), // borderRadius: BorderRadius.circular(12),
border: Border.all(color: const Color(0xffF1F1F1), width: 1), // border: Border.all(color: const Color(0xffF1F1F1), width: 1),
), // ),
child: Column( // child: Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ // children: [
Icon(iconData, color: const Color(0xff7D859A), size: 36), // Icon(iconData, color: const Color(0xff7D859A), size: 36),
Text( // Text(
title, // title,
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), // style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500),
), // ),
], // ],
), // ),
); // );
} // }
//
onFilePicker() async { // onFilePicker() 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>( // ImageSource? source = await showModalBottomSheet<ImageSource>(
context: context, // context: context,
builder: (BuildContext 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( // return GestureDetector(
onTap: onTap, // onTap: onTap,
child: Container( // child: Container(
constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight), // constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight), // padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)), // decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
child: Column( // child: Column(
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
icon.toSvgAsset(), // icon.toSvgAsset(),
24.height, // 24.height,
label.bodyText2(context).custom(color: AppColor.black20), // label.bodyText2(context).custom(color: AppColor.black20),
], // ],
), // ),
), // ),
); // );
} // }
//
return Container( // return Container(
padding: const EdgeInsets.all(16.0), // padding: const EdgeInsets.all(16.0),
child: Row( // child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ // children: <Widget>[
listCard( // listCard(
icon: 'camera_icon', // icon: 'camera_icon',
label: '${context.translation.open}\n${context.translation.camera}', // label: '${context.translation.open}\n${context.translation.camera}',
onTap: () { // onTap: () {
Navigator.of(context).pop(ImageSource.camera); // Navigator.of(context).pop(ImageSource.camera);
}, // },
), // ),
listCard( // listCard(
icon: 'gallery_icon', // icon: 'gallery_icon',
label: '${context.translation.open}\n${context.translation.gallery}', // label: '${context.translation.open}\n${context.translation.gallery}',
onTap: () { // onTap: () {
Navigator.of(context).pop(ImageSource.gallery); // Navigator.of(context).pop(ImageSource.gallery);
}, // },
), // ),
listCard( // listCard(
icon: 'file_icon', // icon: 'file_icon',
label: '${context.translation.open}\n${context.translation.files}', // label: '${context.translation.open}\n${context.translation.files}',
onTap: () async { // onTap: () async {
await fromFilePicker(); // await fromFilePicker();
Navigator.pop(context); // Navigator.pop(context);
}, // },
), // ),
], // ],
), // ),
); // );
}, // },
); // );
// ImageSource source = await showDialog( // // ImageSource source = await showDialog(
// context: context, // // context: context,
// builder: (dialogContext) => CupertinoAlertDialog( // // builder: (dialogContext) => CupertinoAlertDialog(
// actions: <Widget>[ // // actions: <Widget>[
// TextButton( // // TextButton(
// child: Text(context.translation.pickFromCamera), // // child: Text(context.translation.pickFromCamera),
// onPressed: () { // // onPressed: () {
// Navigator.of(dialogContext).pop(ImageSource.camera); // // Navigator.of(dialogContext).pop(ImageSource.camera);
// }, // // },
// ), // // ),
// TextButton( // // TextButton(
// child: Text(context.translation.pickFromGallery), // // child: Text(context.translation.pickFromGallery),
// onPressed: () { // // onPressed: () {
// Navigator.of(dialogContext).pop(ImageSource.gallery); // // Navigator.of(dialogContext).pop(ImageSource.gallery);
// }, // // },
// ), // // ),
// TextButton( // // TextButton(
// child: Text(context.translation.pickFromFiles), // // child: Text(context.translation.pickFromFiles),
// onPressed: () async { // // onPressed: () async {
// await fromFilePicker(); // // await fromFilePicker();
// Navigator.pop(context); // // Navigator.pop(context);
// }, // // },
// ), // // ),
// ], // // ],
// ), // // ),
// ); // // );
if (source == null) return; // if (source == null) return;
//
final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800); // final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
//
if (pickedFile != null) { // if (pickedFile != null) {
File fileImage = File(pickedFile.path); // File fileImage = File(pickedFile.path);
if (fileImage != null) { // if (fileImage != null) {
widget.files.add(fileImage); // widget.files.add(fileImage);
if (widget.onChange != null) { // if (widget.onChange != null) {
widget.onChange!(widget.files); // widget.onChange!(widget.files);
} // }
setState(() {}); // setState(() {});
} // }
} // }
//
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,

Loading…
Cancel
Save