Skip to content

Commit 4c353ad

Browse files
codeZe-uscodeZe-us
authored
Merge pull request #63 from OnyemaAnthony/reset-password46
Reset password46
2 parents c1f4ddd + a37d45f commit 4c353ad

24 files changed

+727
-286
lines changed

‎assets/icons/user.svg

+1-1
Loading

‎assets/images/gradient_background.png

75.9 KB
Loading

‎assets/images/images.dart

Whitespace-only changes.

‎assets/images/people.png

21.9 KB
Loading

‎ios/Podfile.lock

+1-115
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,29 @@
11
PODS:
2-
- DKImagePickerController/Core (4.3.4):
3-
- DKImagePickerController/ImageDataManager
4-
- DKImagePickerController/Resource
5-
- DKImagePickerController/ImageDataManager (4.3.4)
6-
- DKImagePickerController/PhotoGallery (4.3.4):
7-
- DKImagePickerController/Core
8-
- DKPhotoGallery
9-
- DKImagePickerController/Resource (4.3.4)
10-
- DKPhotoGallery (0.0.17):
11-
- DKPhotoGallery/Core (= 0.0.17)
12-
- DKPhotoGallery/Model (= 0.0.17)
13-
- DKPhotoGallery/Preview (= 0.0.17)
14-
- DKPhotoGallery/Resource (= 0.0.17)
15-
- SDWebImage
16-
- SwiftyGif
17-
- DKPhotoGallery/Core (0.0.17):
18-
- DKPhotoGallery/Model
19-
- DKPhotoGallery/Preview
20-
- SDWebImage
21-
- SwiftyGif
22-
- DKPhotoGallery/Model (0.0.17):
23-
- SDWebImage
24-
- SwiftyGif
25-
- DKPhotoGallery/Preview (0.0.17):
26-
- DKPhotoGallery/Model
27-
- DKPhotoGallery/Resource
28-
- SDWebImage
29-
- SwiftyGif
30-
- DKPhotoGallery/Resource (0.0.17):
31-
- SDWebImage
32-
- SwiftyGif
33-
- file_picker (0.0.1):
34-
- DKImagePickerController/PhotoGallery
35-
- Flutter
362
- Flutter (1.0.0)
373
- flutter_native_splash (2.4.3):
384
- Flutter
39-
- flutter_secure_storage (6.0.0):
40-
- Flutter
41-
- fluttertoast (0.0.2):
42-
- Flutter
43-
- Toast
44-
- image_picker_ios (0.0.1):
45-
- Flutter
46-
- images_picker (0.0.1):
47-
- Flutter
48-
- ZLPhotoBrowser (= 4.2.5)
49-
- local_auth_darwin (0.0.1):
50-
- Flutter
51-
- FlutterMacOS
525
- path_provider_foundation (0.0.1):
536
- Flutter
547
- FlutterMacOS
55-
- SDWebImage (5.16.0):
56-
- SDWebImage/Core (= 5.16.0)
57-
- SDWebImage/Core (5.16.0)
58-
- shared_preferences_foundation (0.0.1):
59-
- Flutter
60-
- FlutterMacOS
61-
- smart_auth (0.0.1):
62-
- Flutter
63-
- sqflite_darwin (0.0.4):
64-
- Flutter
65-
- FlutterMacOS
66-
- SwiftyGif (5.4.4)
67-
- Toast (4.0.0)
68-
- ZLPhotoBrowser (4.2.5):
69-
- ZLPhotoBrowser/Core (= 4.2.5)
70-
- ZLPhotoBrowser/Core (4.2.5)
718

729
DEPENDENCIES:
73-
- file_picker (from `.symlinks/plugins/file_picker/ios`)
7410
- Flutter (from `Flutter`)
7511
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
76-
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
77-
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
78-
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
79-
- images_picker (from `.symlinks/plugins/images_picker/ios`)
80-
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
8112
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
82-
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
83-
- smart_auth (from `.symlinks/plugins/smart_auth/ios`)
84-
- sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
85-
86-
SPEC REPOS:
87-
trunk:
88-
- DKImagePickerController
89-
- DKPhotoGallery
90-
- SDWebImage
91-
- SwiftyGif
92-
- Toast
93-
- ZLPhotoBrowser
9413

9514
EXTERNAL SOURCES:
96-
file_picker:
97-
:path: ".symlinks/plugins/file_picker/ios"
9815
Flutter:
9916
:path: Flutter
10017
flutter_native_splash:
10118
:path: ".symlinks/plugins/flutter_native_splash/ios"
102-
flutter_secure_storage:
103-
:path: ".symlinks/plugins/flutter_secure_storage/ios"
104-
fluttertoast:
105-
:path: ".symlinks/plugins/fluttertoast/ios"
106-
image_picker_ios:
107-
:path: ".symlinks/plugins/image_picker_ios/ios"
108-
images_picker:
109-
:path: ".symlinks/plugins/images_picker/ios"
110-
local_auth_darwin:
111-
:path: ".symlinks/plugins/local_auth_darwin/darwin"
11219
path_provider_foundation:
11320
:path: ".symlinks/plugins/path_provider_foundation/darwin"
114-
shared_preferences_foundation:
115-
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
116-
smart_auth:
117-
:path: ".symlinks/plugins/smart_auth/ios"
118-
sqflite_darwin:
119-
:path: ".symlinks/plugins/sqflite_darwin/darwin"
12021

12122
SPEC CHECKSUMS:
122-
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
123-
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
124-
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
12523
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
12624
flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
127-
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
128-
fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
129-
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
130-
images_picker: fa9364e3a7d3083c49f865fcfb2b9e7cdc574d3a
131-
local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
13225
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
133-
SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
134-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
135-
smart_auth: 4bedbc118723912d0e45a07e8ab34039c19e04f2
136-
sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
137-
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
138-
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
139-
ZLPhotoBrowser: 4bfab86b851042e18d7f413284472aa68759626a
14026

14127
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
14228

143-
COCOAPODS: 1.16.2
29+
COCOAPODS: 1.13.0

‎lib/core/constants/app_icons.dart

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
class AppIcons {
22
static const _baseAssetUrl = 'assets/icons/';
3+
static const _baseImageAssetUrl = 'assets/images/';
34

45
//! AUTH
56
static String backIcon = '${_baseAssetUrl}back_icon.svg';
67
static String headsetIcon = '${_baseAssetUrl}headset_icon.svg';
78
static String lockIcon = '${_baseAssetUrl}lock_icon.svg';
89
static String eyeIcon = '${_baseAssetUrl}eye_icon.svg';
910
static String crossEyeIcon = '${_baseAssetUrl}cross_eye.svg';
10-
11+
static String userIcon = '${_baseAssetUrl}user.svg';
12+
13+
///Image icons
14+
static String people = '${_baseImageAssetUrl}people.png';
15+
static String gradientBackground =
16+
'${_baseImageAssetUrl}gradientBackground.png';
1117
}

‎lib/core/constants/app_texts.dart

+33-20
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
class AppTexts {
2-
3-
// ! let's get started
4-
static String letsGetToKnowYouTitle="Lets Get to know you";
5-
static String letsGetToKnowYouSub="Securely access your account and manage payroll with ease.";
6-
static String email="Email";
7-
static String istName="Enter First Name";
8-
static String lastName="Enter Last Name";
9-
static String gender="Gender";
10-
static String tacText= "By creating an account, you agree to our ";
11-
static String tosText= "Terms of Service";
12-
static String ppText="Privacy Policy";
13-
static String male ="Male";
14-
static String female="Female";
15-
static String signUpSuccess="Sign-up successful!";
16-
static String continueButton= "Continue";
2+
// ! let's get started
3+
static String letsGetToKnowYouTitle = "Lets Get to know you";
4+
static String letsGetToKnowYouSub =
5+
"Securely access your account and manage payroll with ease.";
6+
static String email = "Email";
7+
static String istName = "Enter First Name";
8+
static String lastName = "Enter Last Name";
9+
static String gender = "Gender";
10+
static String tacText = "By creating an account, you agree to our ";
11+
static String tosText = "Terms of Service";
12+
static String ppText = "Privacy Policy";
13+
static String male = "Male";
14+
static String female = "Female";
15+
static String signUpSuccess = "Sign-up successful!";
16+
static String continueButton = "Continue";
1717

1818
//! AUTHENTICATION
1919
static String createAccount = "Create an account";
@@ -60,7 +60,7 @@ static String signUpSuccess="Sign-up successful!";
6060
static String usernameAlreadyTaken = "Username Already Exists";
6161
static String dashboard = "Get Started";
6262
static String forgotPassword = "Forget Password";
63-
static String neeHelp="Need Help?";
63+
static String neeHelp = "Need Help?";
6464
static String forgotPasswordDesc =
6565
"Ooops! don’t worry,\nthe process is simpler than you thought";
6666
static String forgotPasswordButton = "Continue";
@@ -154,13 +154,26 @@ static String signUpSuccess="Sign-up successful!";
154154
static String setPasscode = "Set a 6-digit passcode for login";
155155
static String passcode = "Passcode";
156156
static String createAPassword = "Create a Password";
157-
static String addAPasswordToKeepAccountSafe = "Add a password to keep your account safe and secure, make sure to add a strong and secure password";
157+
static String addAPasswordToKeepAccountSafe =
158+
"Add a password to keep your account safe and secure, make sure to add a strong and secure password";
158159
static String needHelp = "Need Help?";
159-
static String enterPassword = "password";
160160
static String minOf8Char = "Minimum of 8 characters";
161161
static String atLestOneUpperCase = "At least one uppercase letter (A-Z)";
162162
static String atLestOneNumber = "At least one number (0-9)";
163-
static String atLestOneSpecialChar = "At least one special character (!@#\$%^&*)";
163+
static String atLestOneSpecialChar =
164+
"At least one special character (!@#\$%^&*)";
164165
static String passwordMatch = "Password match";
165-
166+
static String enterPassword = "Enter password";
167+
static String continuee = "Continue";
168+
static String passwordReset = "Password Reset";
169+
static String forgetPassword = "Forget Password";
170+
static String passwordResetSuccessfully =
171+
"Password has been reset successfully, You can proceed to login with your new Password.";
172+
static String verifyOtp = "Verify OTP";
173+
static String resendCode = "Resend code 60secs";
174+
static String enterOtpCode =
175+
"Enter the OTP code sent to the email ending with";
176+
static String oppsDontWorry = "Ooops! don’t worry,";
177+
static String theProcessIsSimpler = "the process is simpler than you thought";
178+
static String confirmOtp = "Confirm OTP";
166179
}

‎lib/core/routers/_routes.dart

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import 'package:defifundr_mobile/core/routers/routes_constant.dart';
22
import 'package:defifundr_mobile/feature/create_password/create_password_screen.dart';
33
import 'package:defifundr_mobile/features/authentication/presentation/forgot_password/view/forgot_password_screen.dart';
4+
import 'package:defifundr_mobile/features/authentication/presentation/reset_password/confirm_reset_password_screen.dart';
5+
import 'package:defifundr_mobile/features/authentication/presentation/reset_password/reset_password_screen.dart';
6+
import 'package:defifundr_mobile/features/authentication/presentation/reset_password/verify_otp_screen.dart';
47
import 'package:flutter/material.dart';
58
import 'package:go_router/go_router.dart';
69

7-
part '../routers/routers.dart';
10+
part '../routers/routers.dart';

‎lib/core/shared/appbar/appbar.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ class DeFiRaiseAppBar extends StatelessWidget {
3737
actions: actions,
3838
leading: isBack!
3939
? IconButton(
40-
icon: SvgPicture.asset(AppIcons.backIcon),
41-
onPressed: () {
42-
context.pop();
43-
},
44-
)
40+
icon: SvgPicture.asset(AppIcons.backIcon),
41+
onPressed: () {
42+
context.pop();
43+
},
44+
)
4545
: leading,
4646
);
4747
}

‎lib/core/shared/auth_header.dart

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import 'package:flutter/material.dart';
2+
23
import '../constants/size.dart';
34
import '../themes/color_scheme.dart';
45

56
class AuthHeader extends StatelessWidget {
6-
const AuthHeader({
7-
super.key,
8-
required this.title,
9-
required this.subtitle
10-
});
7+
const AuthHeader({super.key, required this.title, required this.subtitle});
118

129
final String title, subtitle;
1310

@@ -16,15 +13,17 @@ class AuthHeader extends StatelessWidget {
1613
return Column(
1714
crossAxisAlignment: CrossAxisAlignment.start,
1815
children: [
19-
Text(title,
20-
style: Config.h2(context).copyWith(
21-
fontSize: 26,
22-
),
16+
Text(
17+
title,
18+
style: Config.h2(context).copyWith(
19+
fontSize: 26,
20+
),
2321
),
24-
Text(subtitle,
25-
style: Config.b3(context).copyWith(
26-
color: AppColors.grey100,
27-
),
22+
Text(
23+
subtitle,
24+
style: Config.b3(context).copyWith(
25+
color: AppColors.grey100,
26+
),
2827
),
2928
],
3029
);

0 commit comments

Comments
 (0)