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

profile contact detail update added.

Browse Source
design_3.0_task_module_new
Sikander Saleem 4 months ago
parent 50eb16ce32
commit 40c37f5373
4 changed files with 260 additions and 139 deletions
Show Stats Download Patch File Download Diff File

8
lib/controllers/api_routes/urls.dart
Unescape Escape View File

@ -4,11 +4,11 @@ class URLs {
static const String appReleaseBuildNumber = "16"; static const String appReleaseBuildNumber = "16";
// static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "https://atomsm.hmg.com"; // production url
static const host1 = "https://atomsmdev.hmg.com"; // local DEV url // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
// static const host1 = "https://atomsmuat.hmg.com"; // local UAT url static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
// static String _baseUrl = "$_host/mobile"; static String _baseUrl = "$_host/mobile";
static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
// static final String _baseUrl = "$_host/mobile"; // host local UAT // static final String _baseUrl = "$_host/mobile"; // host local UAT
// static final String _baseUrl = "$_host/v3/mobile"; // v3 for new CM,PM,TM // static final String _baseUrl = "$_host/v3/mobile"; // v3 for new CM,PM,TM

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

@ -37,7 +37,7 @@ class UserProvider extends ChangeNotifier {
VerifyOtpModel _verifyOtpModel = VerifyOtpModel(); VerifyOtpModel _verifyOtpModel = VerifyOtpModel();
SwipeTransaction _swipeTransactionModel = SwipeTransaction(); SwipeTransaction _swipeTransactionModel = SwipeTransaction();
List<SwipeHistory> _swipeHistory = []; List<SwipeHistory> _swipeHistory = [];
UserContactInfoModel userInfoModel =UserContactInfoModel(); UserContactInfoModel userInfoModel = UserContactInfoModel();
SwipeTransaction get swipeTransactionModel => _swipeTransactionModel; SwipeTransaction get swipeTransactionModel => _swipeTransactionModel;
@ -232,6 +232,7 @@ class UserProvider extends ChangeNotifier {
Navigator.pop(context); Navigator.pop(context);
return generalResponseModel; return generalResponseModel;
} catch (error) { } catch (error) {
// debugPrint(error);
// debugPrint(error); // debugPrint(error);
Navigator.pop(context); Navigator.pop(context);
_loading = false; _loading = false;
@ -266,41 +267,20 @@ class UserProvider extends ChangeNotifier {
return -1; return -1;
} }
} }
// Future<int> updateContactInfo({required UserContactInfoModel model}) async {
// Response response;
// try {
// isLoading = true;
// notifyListeners();
// response = await ApiManager.instance.put('${URLs.updateUserContactInformation}/userId?userId=${model.userId}', body: model.toJson());
// isLoading = false;
// notifyListeners();
// return response.statusCode;
// } catch (e) {
// log("engineer mark as fixed [error] : $e");
// isLoading = false;
// notifyListeners();
// return -1;
// }
// }
Future<void> updateContactInfo({ Future<bool> updateContactInfo(String userId, String email, String phoneNo, String extensionNo) async {
required BuildContext context, Response response;
}) async {
late Response response;
try { try {
showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); response = await ApiManager.instance.put('${URLs.updateUserContactInformation}/userId?userId=$userId', body: {"mobileNumber": phoneNo, "email": email, "extensionNo": extensionNo});
response = await ApiManager.instance.put('${URLs.updateUserContactInformation}/userId?userId=${userInfoModel.userId}', body: userInfoModel.toJson());
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
Navigator.pop(context); Fluttertoast.showToast(msg: "Updated Successfully");
return true;
} else { } else {
print('i am here..'); Fluttertoast.showToast(msg: "${json.decode(response.body)['message']}");
Fluttertoast.showToast(msg: "${context.translation.failedToCompleteRequest} :${json.decode(response.body)['message']}");
} }
Navigator.pop(context); return false;
} catch (error) { } catch (e) {
notifyListeners(); return false;
Navigator.pop(context);
print(error);
} }
} }
@ -335,7 +315,7 @@ class UserProvider extends ChangeNotifier {
"userId": userId, "userId": userId,
}; };
try { try {
response = await ApiManager.instance.post(URLs.getSwipeLastTransactionUrl, body: body,showToast: false); response = await ApiManager.instance.post(URLs.getSwipeLastTransactionUrl, body: body, showToast: false);
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
swipeTransactionModel = SwipeTransaction.fromJson(json.decode(response.body)['data']); swipeTransactionModel = SwipeTransaction.fromJson(json.decode(response.body)['data']);

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

@ -177,36 +177,31 @@ class _ProfilePageState extends State<ProfilePage> {
label: "Update Information", label: "Update Information",
buttonColor: AppColor.neutral50, buttonColor: AppColor.neutral50,
onPressed: () { onPressed: () {
_userProvider.userInfoModel = UserContactInfoModel( // _userProvider.userInfoModel = UserContactInfoModel(userId: _user.userID, email: _user.email, phoneNo: _user.phoneNumber, extensionNo: _user.extensionNo);
userId: _user.userID,
email: _user.email,
phoneNo: _user.phoneNumber,
extensionNo: _user.extensionNo
);
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
useSafeArea: true,
isScrollControlled: true, isScrollControlled: true,
shape: const RoundedRectangleBorder( isDismissible: true,
borderRadius: BorderRadius.vertical(top: Radius.circular(20)), backgroundColor: Colors.transparent,
), builder: (context) => SingleChildScrollView(
clipBehavior: Clip.antiAliasWithSaveLayer, padding: const EdgeInsets.all(0),
builder: (BuildContext context) { child: UpdateUserContactInfoBottomSheet(
return Padding( _userProvider.user!.userID!,
padding: EdgeInsets.only( uEmail: _user.email,
bottom: MediaQuery.of(context).viewInsets.bottom, uPhoneNo: _user.phoneNumber,
), uExtensionNo: _user.extensionNo,
child: ConstrainedBox( onUpdate: (email, phoneNo, extensionNo) {
constraints: BoxConstraints( _userProvider.user!.email = email;
maxHeight: MediaQuery.of(context).size.height * 0.4, _userProvider.user!.phoneNumber = phoneNo;
), _userProvider.user!.extensionNo = extensionNo;
child: const UpdateUserContactInfoBottomsheet( _firstTime = true;
Provider.of<SettingProvider>(context, listen: false).setUser(_userProvider.user!);
), },
), ),
); ).bottomSheetContainer(context),
},
); );
}, },
) )
], ],

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

@ -1,91 +1,237 @@
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:test_sa/controllers/validator/validator.dart';
import 'package:test_sa/controllers/providers/api/user_provider.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/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart';
class UpdateUserContactInfoBottomsheet extends StatelessWidget { class UpdateUserContactInfoBottomSheet extends StatefulWidget {
const UpdateUserContactInfoBottomsheet({super.key}); final String userID;
final String? uEmail;
final String? uPhoneNo;
final String? uExtensionNo;
final Function(String, String, String) onUpdate;
UpdateUserContactInfoBottomSheet(this.userID, {Key? key, this.uEmail = "", this.uPhoneNo = "", this.uExtensionNo = "", required this.onUpdate}) : super(key: key);
@override
_UpdateUserContactInfoBottomSheetState createState() {
return _UpdateUserContactInfoBottomSheetState();
}
}
class _UpdateUserContactInfoBottomSheetState extends State<UpdateUserContactInfoBottomSheet> {
String email = "";
String phoneNo = "";
String extensionNo = "";
@override
void initState() {
super.initState();
email = widget.uEmail ?? "";
phoneNo = widget.uPhoneNo?? "";
extensionNo = widget.uExtensionNo?? "";
}
@override
void dispose() {
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<UserProvider>( return Column(
builder: (context, userProvider,child) { crossAxisAlignment: CrossAxisAlignment.start,
return Column( mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, children: [
mainAxisAlignment: MainAxisAlignment.spaceBetween, 8.height,
children: [ Align(
SingleChildScrollView( alignment: AlignmentDirectional.centerStart,
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight), child: "Update Information".bottomSheetHeadingTextStyle(context),
child: Column( ),
crossAxisAlignment: CrossAxisAlignment.start, 16.height,
mainAxisSize: MainAxisSize.min, AppTextFormField(
children: [ labelText: "Email",
AppTextFormField( backgroundColor: AppColor.neutral100,
labelText: "Email", initialValue: widget.uEmail,
backgroundColor: AppColor.neutral100, textAlign: TextAlign.center,
initialValue: userProvider.userInfoModel.email, labelStyle: AppTextStyles.textFieldLabelStyle,
textAlign: TextAlign.center, textInputType: TextInputType.emailAddress,
labelStyle: AppTextStyles.textFieldLabelStyle, showShadow: false,
showShadow: false, onChange: (value) {
onChange: (value) { email = value;
userProvider.userInfoModel.email = value; },
}, style: Theme.of(context).textTheme.titleMedium,
style: Theme.of(context).textTheme.titleMedium, ),
), 12.height,
8.height, AppTextFormField(
AppTextFormField( labelText: "Phone Number",
labelText: "Phone Number", backgroundColor: AppColor.neutral100,
backgroundColor: AppColor.neutral100, initialValue: widget.uPhoneNo,
initialValue: userProvider.userInfoModel.phoneNo, textAlign: TextAlign.center,
textAlign: TextAlign.center, labelStyle: AppTextStyles.textFieldLabelStyle,
labelStyle: AppTextStyles.textFieldLabelStyle, textInputType: TextInputType.phone,
textInputType: TextInputType.number, showShadow: false,
showShadow: false, onChange: (value) {
onChange: (value) { phoneNo = value;
userProvider.userInfoModel.phoneNo = value; },
}, style: Theme.of(context).textTheme.titleMedium,
style: Theme.of(context).textTheme.titleMedium, ),
), 12.height,
8.height, AppTextFormField(
AppTextFormField( labelText: "Extension No",
labelText: "Extension No", backgroundColor: AppColor.neutral100,
backgroundColor: AppColor.neutral100, initialValue: widget.uExtensionNo,
initialValue: userProvider.userInfoModel.extensionNo, textAlign: TextAlign.center,
textAlign: TextAlign.center, labelStyle: AppTextStyles.textFieldLabelStyle,
labelStyle: AppTextStyles.textFieldLabelStyle, textInputType: const TextInputType.numberWithOptions(decimal: true),
textInputType: TextInputType.text, showShadow: false,
showShadow: false, onChange: (value) {
onChange: (value) { extensionNo = value;
userProvider.userInfoModel.extensionNo = value; },
}, style: Theme.of(context).textTheme.titleMedium,
style: Theme.of(context).textTheme.titleMedium, ),
), 12.height,
], AppFilledButton(
), label: "Update",
), buttonColor: AppColor.neutral50,
Container( onPressed: () async {
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight), FocusManager.instance.primaryFocus!.unfocus();
color: AppColor.white10,
child: AppFilledButton( if (email.isEmpty || !Validator.isEmail(email)) {
label: "Update", "Please enter valid email".showToast;
buttonColor: AppColor.neutral50, return;
onPressed: () async { }
//TODO update user details and save to preferences.. if (phoneNo.isEmpty || phoneNo.length != 10) {
// await userProvider.updateContactInfo(context: context); "Please enter valid phone number".showToast;
// Navigator.pop(context); return;
}, }
), if (extensionNo.isEmpty) {
), "Please enter extension".showToast;
], return;
); }
} showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
bool status = await context.userProvider.updateContactInfo(widget.userID, email, phoneNo, extensionNo);
Navigator.pop(context);
if (status) {
Navigator.pop(context);
widget.onUpdate(email!, phoneNo!, extensionNo!);
}
},
),
],
); );
} }
} }
//
// class UpdateUserContactInfoBottomSheet extends StatelessWidget {
// final String userID;
// final String? uEmail;
// final String? uPhoneNo;
// final String? uExtensionNo;
// final Function(String, String, String) onUpdate;
//
// UpdateUserContactInfoBottomSheet(this.userID, {super.key, this.uEmail = "", this.uPhoneNo = "", this.uExtensionNo = "", required this.onUpdate});
//
// TextEditingController? email;
// TextEditingController? phoneNo;
// TextEditingController? extensionNo;
//
// @override
// Widget build(BuildContext context) {
// email ??= TextEditingController(text: uEmail);
// phoneNo ??= TextEditingController(text: uPhoneNo);
// extensionNo ??= TextEditingController(text: uExtensionNo);
// return Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
// children: [
// 8.height,
// Align(
// alignment: AlignmentDirectional.centerStart,
// child: "Update Information".bottomSheetHeadingTextStyle(context),
// ),
// 16.height,
// AppTextFormField(
// labelText: "Email",
// backgroundColor: AppColor.neutral100,
// initialValue: uEmail,
// controller: email,
// textAlign: TextAlign.center,
// labelStyle: AppTextStyles.textFieldLabelStyle,
// textInputType: TextInputType.emailAddress,
// showShadow: false,
// onChange: (value) {
// // email = value;
// },
// style: Theme.of(context).textTheme.titleMedium,
// ),
// 12.height,
// AppTextFormField(
// labelText: "Phone Number",
// backgroundColor: AppColor.neutral100,
// initialValue: uPhoneNo,
// controller: phoneNo,
// textAlign: TextAlign.center,
// labelStyle: AppTextStyles.textFieldLabelStyle,
// textInputType: TextInputType.phone,
// showShadow: false,
// onChange: (value) {
// // phoneNo = value;
// },
// style: Theme.of(context).textTheme.titleMedium,
// ),
// 12.height,
// AppTextFormField(
// labelText: "Extension No",
// backgroundColor: AppColor.neutral100,
// initialValue: uExtensionNo,
// textAlign: TextAlign.center,
// controller: extensionNo,
// labelStyle: AppTextStyles.textFieldLabelStyle,
// textInputType: const TextInputType.numberWithOptions(decimal: true),
// showShadow: false,
// onChange: (value) {
// // extensionNo = value;
// },
// style: Theme.of(context).textTheme.titleMedium,
// ),
// 12.height,
// AppFilledButton(
// label: "Update",
// buttonColor: AppColor.neutral50,
// onPressed: () async {
// FocusManager.instance.primaryFocus!.unfocus();
// print("email!.text:${email!.text}");
// print("phoneNo!.text:${phoneNo!.text}");
// print("extensionNo!.text:${extensionNo!.text}");
//
// if (email!.text.isEmpty || !Validator.isEmail(email!.text)) {
// "Please enter valid email".showToast;
// return;
// }
// if (phoneNo!.text.isEmpty || phoneNo!.text.length != 10) {
// "Please enter valid phone number".showToast;
// return;
// }
// if (extensionNo!.text.isEmpty) {
// "Please enter valid phone number".showToast;
// return;
// }
// showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
// bool status = await context.userProvider.updateContactInfo(userID, email!.text, phoneNo!.text, extensionNo!.text);
// Navigator.pop(context);
// if (status) {
// Navigator.pop(context);
// onUpdate(email!.text, phoneNo!.text, extensionNo!.text);
// }
// },
// ),
// ],
// );
// }
// }

Write Preview
Loading…
Cancel
Save