check phone impl
This commit is contained in:
parent
214dfe3262
commit
1ca1a45126
@ -3,6 +3,7 @@ import 'package:dartz/dartz.dart';
|
||||
import 'package:freezed_annotation/freezed_annotation.dart';
|
||||
import 'package:injectable/injectable.dart';
|
||||
|
||||
import '../../../common/function/app_function.dart';
|
||||
import '../../../domain/auth/auth.dart';
|
||||
|
||||
part 'check_phone_form_event.dart';
|
||||
@ -40,7 +41,7 @@ class CheckPhoneFormBloc
|
||||
|
||||
if (phoneNumberValid) {
|
||||
failureOrCheckPhone = await _repository.checkPhone(
|
||||
phoneNumber: state.phoneNumber,
|
||||
phoneNumber: getNormalizePhone(state.phoneNumber),
|
||||
);
|
||||
emit(
|
||||
state.copyWith(
|
||||
|
||||
@ -7,7 +7,7 @@ part 'date_extension.dart';
|
||||
extension StringExt on String {
|
||||
CheckPhoneStatus toCheckPhoneStatus() {
|
||||
switch (this) {
|
||||
case 'NO_REGISTERED':
|
||||
case 'NOT_REGISTERED':
|
||||
return CheckPhoneStatus.notRegistered;
|
||||
case 'PASSWORD_REQUIRED':
|
||||
return CheckPhoneStatus.passwordRequired;
|
||||
|
||||
@ -6,3 +6,10 @@ void dismissKeyboard(BuildContext context) {
|
||||
FocusManager.instance.primaryFocus?.unfocus();
|
||||
}
|
||||
}
|
||||
|
||||
String getNormalizePhone(String phoneNumber) {
|
||||
final normalizedPhone = phoneNumber.startsWith('08')
|
||||
? phoneNumber.replaceFirst('0', '')
|
||||
: phoneNumber;
|
||||
return '62$normalizedPhone';
|
||||
}
|
||||
|
||||
@ -41,6 +41,13 @@ class AuthRemoteDataProvider {
|
||||
AuthFailure.dynamicErrorMessage('No. Telepon Tidak Boleh Kosong'),
|
||||
);
|
||||
}
|
||||
if (response.data['errors'][0]['code'] == 304) {
|
||||
return DC.error(
|
||||
AuthFailure.dynamicErrorMessage(
|
||||
response.data['errors'][0]['cause'],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -78,20 +78,20 @@ extension GetItInjectableX on _i174.GetIt {
|
||||
gh.factory<_i510.LoginFormBloc>(
|
||||
() => _i510.LoginFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i869.CheckPhoneFormBloc>(
|
||||
() => _i869.CheckPhoneFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i260.RegisterFormBloc>(
|
||||
() => _i260.RegisterFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i521.VerifyFormBloc>(
|
||||
() => _i521.VerifyFormBloc(gh<_i995.IAuthRepository>()),
|
||||
gh.factory<_i627.ResendFormBloc>(
|
||||
() => _i627.ResendFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i174.SetPasswordFormBloc>(
|
||||
() => _i174.SetPasswordFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i627.ResendFormBloc>(
|
||||
() => _i627.ResendFormBloc(gh<_i995.IAuthRepository>()),
|
||||
gh.factory<_i260.RegisterFormBloc>(
|
||||
() => _i260.RegisterFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i869.CheckPhoneFormBloc>(
|
||||
() => _i869.CheckPhoneFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
gh.factory<_i521.VerifyFormBloc>(
|
||||
() => _i521.VerifyFormBloc(gh<_i995.IAuthRepository>()),
|
||||
);
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_spinkit/flutter_spinkit.dart';
|
||||
|
||||
import '../../../common/theme/theme.dart';
|
||||
|
||||
|
||||
@ -7,12 +7,14 @@ class AppElevatedButton extends StatelessWidget {
|
||||
required this.title,
|
||||
this.width = double.infinity,
|
||||
this.height = 48.0,
|
||||
this.isLoading = false,
|
||||
});
|
||||
|
||||
final Function()? onPressed;
|
||||
final String title;
|
||||
final double width;
|
||||
final double height;
|
||||
final bool isLoading;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@ -21,7 +23,23 @@ class AppElevatedButton extends StatelessWidget {
|
||||
height: height,
|
||||
child: ElevatedButton(
|
||||
onPressed: onPressed,
|
||||
child: Text(
|
||||
child: isLoading
|
||||
? Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
SpinKitFadingCircle(color: AppColor.white, size: 24),
|
||||
SizedBox(width: 8),
|
||||
Text(
|
||||
'Loading',
|
||||
style: AppStyle.lg.copyWith(
|
||||
color: AppColor.white,
|
||||
fontWeight: FontWeight.w700,
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
: Text(
|
||||
title,
|
||||
style: AppStyle.lg.copyWith(
|
||||
color: AppColor.white,
|
||||
|
||||
@ -11,6 +11,7 @@ class AppTextFormField extends StatelessWidget {
|
||||
this.suffixIcon,
|
||||
this.keyboardType,
|
||||
this.onChanged,
|
||||
this.validator,
|
||||
});
|
||||
|
||||
final String? hintText;
|
||||
@ -21,6 +22,7 @@ class AppTextFormField extends StatelessWidget {
|
||||
final Widget? suffixIcon;
|
||||
final TextInputType? keyboardType;
|
||||
final ValueChanged<String>? onChanged;
|
||||
final String? Function(String?)? validator;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@ -39,6 +41,7 @@ class AppTextFormField extends StatelessWidget {
|
||||
color: AppColor.textPrimary,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
validator: validator,
|
||||
decoration: InputDecoration(
|
||||
hintText: hintText,
|
||||
prefixIcon: prefixIcon,
|
||||
|
||||
54
lib/presentation/components/toast/flushbar.dart
Normal file
54
lib/presentation/components/toast/flushbar.dart
Normal file
@ -0,0 +1,54 @@
|
||||
import 'package:another_flushbar/flushbar.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import '../../../common/theme/theme.dart';
|
||||
import '../../../domain/auth/auth.dart';
|
||||
|
||||
class AppFlushbar {
|
||||
static void showSuccess(BuildContext context, String message) {
|
||||
Flushbar(
|
||||
messageText: Text(
|
||||
message,
|
||||
style: AppStyle.lg.copyWith(
|
||||
color: Colors.white,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
icon: const Icon(Icons.check_circle, color: Colors.white),
|
||||
duration: const Duration(seconds: 2),
|
||||
flushbarPosition: FlushbarPosition.BOTTOM,
|
||||
backgroundColor: AppColor.secondary,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
margin: const EdgeInsets.all(12),
|
||||
).show(context);
|
||||
}
|
||||
|
||||
static void showError(BuildContext context, String message) {
|
||||
Flushbar(
|
||||
messageText: Text(
|
||||
message,
|
||||
style: AppStyle.lg.copyWith(
|
||||
color: Colors.white,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 16,
|
||||
),
|
||||
),
|
||||
icon: const Icon(Icons.error, color: Colors.white),
|
||||
duration: const Duration(seconds: 3),
|
||||
flushbarPosition: FlushbarPosition.BOTTOM,
|
||||
backgroundColor: AppColor.error,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
margin: const EdgeInsets.all(12),
|
||||
).show(context);
|
||||
}
|
||||
|
||||
static void showAuthFailureToast(BuildContext context, AuthFailure failure) =>
|
||||
showError(
|
||||
context,
|
||||
failure.map(
|
||||
serverError: (value) => value.failure.toStringFormatted(context),
|
||||
dynamicErrorMessage: (value) => value.erroMessage,
|
||||
unexpectedError: (value) => 'Terjadi kesalahan, silahkan coba lagi',
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -1,21 +1,58 @@
|
||||
import 'dart:developer';
|
||||
|
||||
import 'package:auto_route/auto_route.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../application/auth/check_phone_form/check_phone_form_bloc.dart';
|
||||
import '../../../../common/theme/theme.dart';
|
||||
import '../../../../domain/auth/auth.dart';
|
||||
import '../../../../injection.dart';
|
||||
import '../../../components/button/button.dart';
|
||||
import '../../../components/toast/flushbar.dart';
|
||||
import '../../../router/app_router.gr.dart';
|
||||
import 'widgets/phone_field.dart';
|
||||
|
||||
@RoutePage()
|
||||
class LoginPage extends StatelessWidget {
|
||||
class LoginPage extends StatelessWidget implements AutoRouteWrapper {
|
||||
const LoginPage({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
return BlocListener<CheckPhoneFormBloc, CheckPhoneFormState>(
|
||||
listenWhen: (p, c) =>
|
||||
p.failureOrCheckPhoneOption != c.failureOrCheckPhoneOption,
|
||||
listener: (context, state) {
|
||||
state.failureOrCheckPhoneOption.fold(
|
||||
() => null,
|
||||
(either) => either.fold(
|
||||
(f) => AppFlushbar.showAuthFailureToast(context, f),
|
||||
(data) {
|
||||
AppFlushbar.showSuccess(context, data.message);
|
||||
Future.delayed(Duration(milliseconds: 1000), () {
|
||||
log(data.toString());
|
||||
if (data.status.isNotRegistered) {
|
||||
context.router.push(RegisterRoute());
|
||||
} else if (data.status.isPasswordRequired) {
|
||||
context.router.push(
|
||||
PasswordRoute(phoneNumber: data.phoneNumber),
|
||||
);
|
||||
}
|
||||
});
|
||||
},
|
||||
),
|
||||
);
|
||||
},
|
||||
child: Scaffold(
|
||||
appBar: AppBar(title: const Text('Masuk')),
|
||||
body: Padding(
|
||||
body: BlocBuilder<CheckPhoneFormBloc, CheckPhoneFormState>(
|
||||
builder: (context, state) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24.0),
|
||||
child: Form(
|
||||
autovalidateMode: state.showErrorMessages
|
||||
? AutovalidateMode.always
|
||||
: AutovalidateMode.disabled,
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@ -28,9 +65,14 @@ class LoginPage extends StatelessWidget {
|
||||
|
||||
// Continue Button
|
||||
AppElevatedButton(
|
||||
onPressed: () {
|
||||
context.router.push(RegisterRoute());
|
||||
onPressed: state.isSubmitting
|
||||
? null
|
||||
: () {
|
||||
context.read<CheckPhoneFormBloc>().add(
|
||||
CheckPhoneFormEvent.submitted(),
|
||||
);
|
||||
},
|
||||
isLoading: state.isSubmitting,
|
||||
title: 'Lanjutkan',
|
||||
),
|
||||
|
||||
@ -47,7 +89,8 @@ class LoginPage extends StatelessWidget {
|
||||
),
|
||||
children: [
|
||||
const TextSpan(
|
||||
text: 'Dengan masuk Enaklo, kamu telah\nmenyetujui ',
|
||||
text:
|
||||
'Dengan masuk Enaklo, kamu telah\nmenyetujui ',
|
||||
),
|
||||
TextSpan(
|
||||
text: 'Syarat & Ketentuan',
|
||||
@ -74,5 +117,15 @@ class LoginPage extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget wrappedRoute(BuildContext context) => BlocProvider(
|
||||
create: (context) => getIt<CheckPhoneFormBloc>(),
|
||||
child: this,
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../../../../application/auth/check_phone_form/check_phone_form_bloc.dart';
|
||||
import '../../../../../common/theme/theme.dart';
|
||||
import '../../../../components/field/field.dart';
|
||||
|
||||
@ -45,6 +47,13 @@ class _LoginPhoneFieldState extends State<LoginPhoneField> {
|
||||
controller: _controller,
|
||||
focusNode: _focusNode,
|
||||
keyboardType: TextInputType.phone,
|
||||
validator: (value) {
|
||||
if (context.read<CheckPhoneFormBloc>().state.phoneNumber.isEmpty) {
|
||||
return 'Masukkan no telepon';
|
||||
}
|
||||
|
||||
return null;
|
||||
},
|
||||
prefixIcon: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: Text(
|
||||
@ -64,7 +73,9 @@ class _LoginPhoneFieldState extends State<LoginPhoneField> {
|
||||
)
|
||||
: null,
|
||||
onChanged: (value) {
|
||||
setState(() {});
|
||||
context.read<CheckPhoneFormBloc>().add(
|
||||
CheckPhoneFormEvent.phoneNumberChanged(value),
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
@ -7,12 +7,13 @@ import '../../../router/app_router.gr.dart';
|
||||
|
||||
@RoutePage()
|
||||
class PasswordPage extends StatelessWidget {
|
||||
const PasswordPage({super.key});
|
||||
final String phoneNumber;
|
||||
const PasswordPage({super.key, required this.phoneNumber});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(title: const Text('Buat Kata Sandi')),
|
||||
appBar: AppBar(title: const Text('Kata Sandi')),
|
||||
body: Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 24.0),
|
||||
child: Column(
|
||||
|
||||
@ -255,7 +255,7 @@ class LoginRoute extends _i33.PageRouteInfo<void> {
|
||||
static _i33.PageInfo page = _i33.PageInfo(
|
||||
name,
|
||||
builder: (data) {
|
||||
return const _i12.LoginPage();
|
||||
return _i33.WrappedRoute(child: const _i12.LoginPage());
|
||||
},
|
||||
);
|
||||
}
|
||||
@ -432,20 +432,41 @@ class OtpRoute extends _i33.PageRouteInfo<void> {
|
||||
|
||||
/// generated route for
|
||||
/// [_i21.PasswordPage]
|
||||
class PasswordRoute extends _i33.PageRouteInfo<void> {
|
||||
const PasswordRoute({List<_i33.PageRouteInfo>? children})
|
||||
: super(PasswordRoute.name, initialChildren: children);
|
||||
class PasswordRoute extends _i33.PageRouteInfo<PasswordRouteArgs> {
|
||||
PasswordRoute({
|
||||
_i34.Key? key,
|
||||
required String phoneNumber,
|
||||
List<_i33.PageRouteInfo>? children,
|
||||
}) : super(
|
||||
PasswordRoute.name,
|
||||
args: PasswordRouteArgs(key: key, phoneNumber: phoneNumber),
|
||||
initialChildren: children,
|
||||
);
|
||||
|
||||
static const String name = 'PasswordRoute';
|
||||
|
||||
static _i33.PageInfo page = _i33.PageInfo(
|
||||
name,
|
||||
builder: (data) {
|
||||
return const _i21.PasswordPage();
|
||||
final args = data.argsAs<PasswordRouteArgs>();
|
||||
return _i21.PasswordPage(key: args.key, phoneNumber: args.phoneNumber);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
class PasswordRouteArgs {
|
||||
const PasswordRouteArgs({this.key, required this.phoneNumber});
|
||||
|
||||
final _i34.Key? key;
|
||||
|
||||
final String phoneNumber;
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'PasswordRouteArgs{key: $key, phoneNumber: $phoneNumber}';
|
||||
}
|
||||
}
|
||||
|
||||
/// generated route for
|
||||
/// [_i22.PaymentPage]
|
||||
class PaymentRoute extends _i33.PageRouteInfo<void> {
|
||||
|
||||
16
pubspec.lock
16
pubspec.lock
@ -17,6 +17,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "7.7.1"
|
||||
another_flushbar:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: another_flushbar
|
||||
sha256: "2b99671c010a7d5770acf5cb24c9f508b919c3a7948b6af9646e773e7da7b757"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "1.12.32"
|
||||
archive:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -478,6 +486,14 @@ packages:
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.0.0"
|
||||
flutter_spinkit:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: flutter_spinkit
|
||||
sha256: "77850df57c00dc218bfe96071d576a8babec24cf58b2ed121c83cca4a2fdce7f"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "5.2.2"
|
||||
flutter_svg:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
||||
@ -34,6 +34,8 @@ dependencies:
|
||||
audioplayers: ^6.5.1
|
||||
flutter_bloc: ^9.1.1
|
||||
bloc: ^9.0.0
|
||||
another_flushbar: ^1.12.32
|
||||
flutter_spinkit: ^5.2.2
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user