BASE: Update Icons & Name Of The App.
This commit is contained in:
@@ -3,7 +3,7 @@ import 'package:customer/themes/show_toast_dialog.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:firebase_auth/firebase_auth.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:get/get.dart' hide Trans;
|
||||
import '../constant/constant.dart';
|
||||
import '../models/user_model.dart';
|
||||
import '../screen_ui/auth_screens/login_screen.dart';
|
||||
@@ -63,15 +63,27 @@ class OtpVerifyController extends GetxController {
|
||||
try {
|
||||
ShowToastDialog.showLoader("Verifying OTP...".tr());
|
||||
|
||||
final credential = PhoneAuthProvider.credential(verificationId: verificationId.value, smsCode: otpController.value.text.trim());
|
||||
final credential = PhoneAuthProvider.credential(
|
||||
verificationId: verificationId.value,
|
||||
smsCode: otpController.value.text.trim(),
|
||||
);
|
||||
|
||||
final fcmToken = await NotificationService.getToken();
|
||||
final result = await _auth.signInWithCredential(credential);
|
||||
|
||||
if (result.additionalUserInfo?.isNewUser == true) {
|
||||
final userModel = UserModel(id: result.user!.uid, countryCode: countryCode.value, phoneNumber: phoneNumber.value, fcmToken: fcmToken, active: true);
|
||||
final userModel = UserModel(
|
||||
id: result.user!.uid,
|
||||
countryCode: countryCode.value,
|
||||
phoneNumber: phoneNumber.value,
|
||||
fcmToken: fcmToken,
|
||||
active: true,
|
||||
);
|
||||
ShowToastDialog.closeLoader();
|
||||
Get.to(() => const SignUpScreen(), arguments: {'type': 'mobileNumber', 'userModel': userModel});
|
||||
Get.to(
|
||||
() => const SignUpScreen(),
|
||||
arguments: {'type': 'mobileNumber', 'userModel': userModel},
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -79,8 +91,16 @@ class OtpVerifyController extends GetxController {
|
||||
ShowToastDialog.closeLoader();
|
||||
|
||||
if (!exists) {
|
||||
final userModel = UserModel(id: result.user!.uid, countryCode: countryCode.value, phoneNumber: phoneNumber.value, fcmToken: fcmToken);
|
||||
Get.off(() => const SignUpScreen(), arguments: {'type': 'mobileNumber', 'userModel': userModel});
|
||||
final userModel = UserModel(
|
||||
id: result.user!.uid,
|
||||
countryCode: countryCode.value,
|
||||
phoneNumber: phoneNumber.value,
|
||||
fcmToken: fcmToken,
|
||||
);
|
||||
Get.off(
|
||||
() => const SignUpScreen(),
|
||||
arguments: {'type': 'mobileNumber', 'userModel': userModel},
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -102,7 +122,10 @@ class OtpVerifyController extends GetxController {
|
||||
await FireStoreUtils.updateUser(userModel);
|
||||
|
||||
if (userModel.shippingAddress?.isNotEmpty ?? false) {
|
||||
final defaultAddress = userModel.shippingAddress!.firstWhere((e) => e.isDefault == true, orElse: () => userModel.shippingAddress!.first);
|
||||
final defaultAddress = userModel.shippingAddress!.firstWhere(
|
||||
(e) => e.isDefault == true,
|
||||
orElse: () => userModel.shippingAddress!.first,
|
||||
);
|
||||
Constant.selectedLocation = defaultAddress;
|
||||
|
||||
Get.offAll(() => const ServiceListScreen());
|
||||
|
||||
Reference in New Issue
Block a user