Skip to content

add counting down while verifying email address #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlaaElattar merged 7 commits into from
Dec 2, 2024
Merged

add counting down while verifying email address #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8695561
add counting down and disable btn for 1 min
AlaaElattar Nov 4, 2024
73f1a9f
Merge branch 'development' into development_email_counter
AlaaElattar Nov 19, 2024
6c2850c
disable changing email if counter is active
AlaaElattar Nov 24, 2024
39b2a7f
start counter when changing email from dialog
AlaaElattar Nov 27, 2024
0908945
fix counter bug
AlaaElattar Nov 28, 2024
8683eba
handle counter to countinue even if user changed the page
AlaaElattar Dec 1, 2024
d25bf49
improve counter function to startOrResumeEmailCountdown
AlaaElattar Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/lib/helpers/globals.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ class Globals {
int smsMinutesCoolDown = 5;
int spendingLimit = 0;

int emailSentOn = 0;
int emailMinutesCoolDown = 1;

ValueNotifier<bool> hidePhoneButton = ValueNotifier(false);

static final Globals _singleton = Globals._internal();
Expand Down
156 changes: 122 additions & 34 deletions app/lib/screens/identity_verification_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'dart:core';
import 'package:flutter/gestures.dart';
Expand Down Expand Up @@ -62,10 +63,53 @@ class _IdentityVerificationScreenState

double spending = 0.0;

int emailCountdown = 60;
Timer? emailTimer;
ValueNotifier<int> countdownNotifier = ValueNotifier(-1);

void startOrResumeEmailCountdown({bool startNew = false}) {
int currentTime = DateTime.now().millisecondsSinceEpoch;
int lockedUntil =
Globals().emailSentOn + (Globals().emailMinutesCoolDown * 60 * 1000);
int timeLeft = ((lockedUntil - currentTime) / 1000).round();

if (startNew) {
Globals().emailSentOn = currentTime;
timeLeft = Globals().emailMinutesCoolDown * 60;
}

if (timeLeft > 0) {
emailCountdown = timeLeft;
countdownNotifier.value = emailCountdown;

emailTimer?.cancel();

emailTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
int currentTime = DateTime.now().millisecondsSinceEpoch;
int lockedUntil = Globals().emailSentOn +
(Globals().emailMinutesCoolDown * 60 * 1000);
int remainingTime = ((lockedUntil - currentTime) / 1000).round();

if (remainingTime > 0) {
countdownNotifier.value = remainingTime;
} else {
countdownNotifier.value = -1;
timer.cancel();
}
});
} else {
countdownNotifier.value = -1;
}
}

setEmailVerified() {
if (mounted) {
setState(() {
emailVerified = Globals().emailVerified.value;
if (emailVerified) {
countdownNotifier.value = -1;
emailTimer?.cancel();
}
});
}
}
Expand Down Expand Up @@ -103,9 +147,16 @@ class _IdentityVerificationScreenState
Globals().phoneVerified.addListener(setPhoneVerified);
Globals().identityVerified.addListener(setIdentityVerified);
Globals().hidePhoneButton.addListener(setHidePhoneVerify);

checkPhoneStatus();
getUserValues();
startOrResumeEmailCountdown();
}

@override
void dispose() {
emailTimer?.cancel();
countdownNotifier.dispose();
super.dispose();
}

checkPhoneStatus() {
Expand Down Expand Up @@ -795,7 +846,7 @@ class _IdentityVerificationScreenState
Widget currentPhaseWidget(step, text, icon) {
return GestureDetector(
onTap: () async {
if (step == 1) {
if (step == 1 && countdownNotifier.value == -1) {
return _changeEmailDialog(false);
}

Expand Down Expand Up @@ -836,7 +887,7 @@ class _IdentityVerificationScreenState
right: const BorderSide(color: Colors.grey, width: 0.5),
bottom: const BorderSide(color: Colors.grey, width: 0.5),
top: const BorderSide(color: Colors.grey, width: 0.5))),
height: 75,
height: 90,
width: MediaQuery.of(context).size.width * 100,
child: Row(
children: [
Expand Down Expand Up @@ -907,6 +958,35 @@ class _IdentityVerificationScreenState
)
],
),
if (step == 1)
ValueListenableBuilder<int>(
valueListenable: countdownNotifier,
builder: (context, countdownValue, child) {
if (countdownValue > 0) {
return Row(
children: <Widget>[
Expanded(
child: Text(
'Verification email sent, retry in $countdownValue second${countdownValue == 1 ? '' : 's'}',
overflow: TextOverflow.clip,
style: Theme.of(context)
.textTheme
.bodySmall!
.copyWith(
fontWeight:
FontWeight.bold,
color: Theme.of(context)
.colorScheme
.warning),
),
),
],
);
} else {
return Container();
}
},
),
step == 2 &&
Globals().hidePhoneButton.value == true
? const SizedBox(
Expand Down Expand Up @@ -935,36 +1015,43 @@ class _IdentityVerificationScreenState
]))),
Globals().hidePhoneButton.value == true && step == 2
? Container()
: ElevatedButton(
onPressed: () async {
switch (step) {
// Verify email
case 1:
{
verifyEmail();
}
break;

// Verify phone
case 2:
{
await verifyPhone();
}
break;

// Verify identity
case 3:
{
termsAndConditionsDialog();
// await verifyIdentityProcess();
}
break;
default:
{}
break;
}
},
child: const Text('Verify'))
: ValueListenableBuilder<int>(
valueListenable: countdownNotifier,
builder: (context, countdownValue, child) {
return ElevatedButton(
onPressed: countdownValue > 0
? null
: () async {
switch (step) {
// Verify email
case 1:
{
startOrResumeEmailCountdown(
startNew: true);
verifyEmail();
}
break;

// Verify phone
case 2:
{
await verifyPhone();
}
break;

// Verify identity
case 3:
{
await verifyIdentityProcess();
}
break;
default:
{}
break;
}
},
child: const Text('Verify'));
})
],
),
const Padding(padding: EdgeInsets.only(right: 10)),
Expand Down Expand Up @@ -1619,6 +1706,7 @@ class _IdentityVerificationScreenState
Navigator.pop(context);
Navigator.pop(dialogContext);
resendEmailDialog(context);
startOrResumeEmailCountdown(startNew: true);

setState(() {});
} catch (e) {
Expand Down Expand Up @@ -1706,7 +1794,7 @@ class _IdentityVerificationScreenState
return;
}

if (email == '') {
if (email == '' && countdownNotifier.value == -1) {
return _changeEmailDialog(true);
}

Expand Down