nugrohob825/cims_apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into yoga

Browse Source 
# Conflicts:
#	lib/application/assets/path_assets.dart
#	pubspec.yaml
This commit is contained in:
Prajna Prayoga
2024-02-06 11:14:51 +07:00
parent f407eca735 e63e5588fb
commit d82d427bcc
12 changed files with 500 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/features/auth/registration/view/registration_view.dart
View File

@@ -3,7 +3,6 @@ import 'package:cims_apps/application/component/text_caption/text_caption.dart';
import 'package:cims_apps/application/component/text_form/text_form_view.dart';
import 'package:cims_apps/core/route/route.dart';
import 'package:cims_apps/features/auth/registration/view/initial_registration_step.dart';
import 'package:cims_apps/features/bottom_navigation_view.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
@@ -42,7 +41,7 @@ class RegistrationView extends StatelessWidget {
text: 'Already have an account? ',
style: TextStyle(
color: Colors.black,
decoration: TextDecoration.underline,
decoration: TextDecoration.none,
),
),
TextSpan(

91
lib/features/auth/registration/view/submission_data/initial_take_photo.dart Normal file
View File

@@ -0,0 +1,91 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_view.dart';
import 'package:cims_apps/application/component/image/image_view.dart';
import 'package:cims_apps/application/component/text_caption/text_caption.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
import 'package:cims_apps/core/utils/size_config.dart';
import 'package:flutter/material.dart';
class InitialTakePhoto extends StatelessWidget {
const InitialTakePhoto({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
List listImg = [
{'urlImg': PathAssets.imgKtpBlur, 'tag': 'Blurry Photo'},
{'urlImg': PathAssets.imgKtpLight, 'tag': 'Light Reflection'},
{'urlImg': PathAssets.imgKtpCropped, 'tag': 'Cropped Photo'},
{'urlImg': PathAssets.imgKtpClear, 'tag': 'Clear Photo'},
];
return SizedBox(
height: SizeConfig.height * .75,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const TextCaption(
title: 'Take a photo your ID card',
subtitle:
'Make sure your photo is clearly legible for identity verification purposes',
),
SizedBox(
width: SizeConfig.height,
child: Wrap(
alignment: WrapAlignment.spaceBetween,
spacing: 10,
runSpacing: 10,
children: List.generate(listImg.length, (index) {
final urlList = listImg[index]['urlImg'];
final tag = listImg[index]['tag'];
return Column(
children: [
ImageView(
image: urlList,
width: SizeConfig.width * .42,
),
const SizedBox(
height: 8,
),
Text(
tag,
style: const TextStyle(
color: ColorPalette.slate800,
fontWeight: FontWeight.w600),
),
],
);
}),
),
),
// const Spacer(),
const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ImageView(
image: PathAssets.iconShield,
width: 20,
height: 22,
),
SizedBox(
width: 8,
),
Expanded(
child: Text(
'In accordance with OJK regulations, an ID card is required to purchase mutual funds.',
style: TextStyle(
fontWeight: FontWeight.w600,
color: ColorPalette.primary,
),
),
)
],
),
ButtonView(
name: 'Take a Photo',
marginVertical: 16.0,
onPressed: () {},
)
],
),
);
}
}

132
lib/features/auth/registration/view/submission_data/submission_parent.dart
View File

@@ -1,9 +1,12 @@
import 'package:cims_apps/application/component/button/button_view.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
import 'package:cims_apps/core/utils/size_config.dart';
import 'package:cims_apps/features/auth/registration/view/submission_data/initial_take_photo.dart';
import 'package:cims_apps/features/auth/registration/view/submission_data/submit_email.dart';
import 'package:cims_apps/features/auth/registration/view/submission_data/submit_personal_data.dart';
import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class SubmissionParent extends StatefulWidget {
static const routeName = '/SubmissionParent';
@@ -14,29 +17,16 @@ class SubmissionParent extends StatefulWidget {
}
class _SubmissionParentState extends State<SubmissionParent> {
int _currentStep = 1;
final int _stepAmount = 9;
Widget _stepItem({bool isCurrentStep = false, bool isDone = false}) {
return GestureDetector(
onTap: () {
setState(() {
if (_currentStep > 1) {
_currentStep--;
} else if (_currentStep == 1) {
_currentStep++;
}
});
},
child: Container(
margin: const EdgeInsets.only(right: 4.0, left: 4.0),
height: 6,
width: SizeConfig.width * .08,
decoration: BoxDecoration(
color: isCurrentStep || isDone
? ColorPalette.primary
: ColorPalette.greyBorderNeutrals,
borderRadius: BorderRadius.circular(50),
),
return Container(
margin: const EdgeInsets.only(right: 4.0, left: 4.0),
height: 6,
width: SizeConfig.width * .08,
decoration: BoxDecoration(
color: isCurrentStep || isDone
? ColorPalette.primary
: ColorPalette.greyBorderNeutrals,
borderRadius: BorderRadius.circular(50),
),
);
}
@@ -48,9 +38,7 @@ class _SubmissionParentState extends State<SubmissionParent> {
case 2:
return const SubmitEmail();
case 3:
return Container(
child: Text("Step 3"),
);
return const InitialTakePhoto();
case 4:
return Container(
child: Text("Step 4"),
@@ -80,48 +68,58 @@ class _SubmissionParentState extends State<SubmissionParent> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Registration'),
),
body: Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16.0, vertical: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
_stepAmount,
(index) => _stepItem(
isCurrentStep: _currentStep == index + 1,
),
),
),
),
Container(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: _content(_currentStep),
)
],
),
Align(
alignment: Alignment.bottomCenter,
child: ButtonView(
name: 'Next',
marginVertical: 16.0,
onPressed: () {
setState(() {
_currentStep++;
});
},
return ChangeNotifierProvider(
create: (context) => SubmissionDataViewModel(),
builder: (context, child) {
return Scaffold(
appBar: AppBar(
title: const Text('Registration'),
),
)
],
),
);
body: Stack(
children: [
Consumer<SubmissionDataViewModel>(
builder: (context, provider, child) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16.0, vertical: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
provider.stepAmount,
(index) => _stepItem(
isCurrentStep: provider.currentStep == index + 1,
),
),
),
),
Expanded(
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: _content(provider.currentStep),
),
),
provider.currentStep == 3
? const SizedBox()
: Align(
alignment: Alignment.bottomCenter,
child: ButtonView(
name: 'Next',
marginVertical: 16.0,
onPressed: () {
provider.nextSubmission(context);
},
),
)
],
);
}),
],
),
);
});
}
}

74
lib/features/auth/registration/view/submission_data/submit_email.dart
View File

@@ -1,21 +1,81 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/image/image_view.dart';
import 'package:cims_apps/application/component/text_caption/text_caption.dart';
import 'package:cims_apps/application/component/text_form/text_form_view.dart';
import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class SubmitEmail extends StatelessWidget {
const SubmitEmail({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
Widget _emailVerify() {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const TextCaption(title: 'Enter your e-mail'),
TextFormView(
name: 'E-mail Address',
hintText: 'Input e-mail address',
const ImageView(image: PathAssets.imgEmail),
Align(
alignment: Alignment.center,
child: RichText(
textAlign: TextAlign.center,
text: TextSpan(children: [
const TextSpan(
text:
'We have sent a verification link to your e-mail. \nPlease check your email for ',
style: TextStyle(
color: Colors.black,
decoration: TextDecoration.none,
),
),
TextSpan(
recognizer: TapGestureRecognizer()
..onTap = () {
print('object');
},
text: 'verification',
style: const TextStyle(
color: Colors.blue,
),
),
const TextSpan(
text: ' to \ncontinue registration.',
style: TextStyle(
color: Colors.black,
decoration: TextDecoration.none,
),
),
]),
),
),
],
);
}
@override
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (context) => SubmissionDataViewModel(),
builder: (context, child) {
return Consumer<SubmissionDataViewModel>(
builder: (context, provider, child) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
!provider.isEmailVerify
? const TextCaption(title: 'Enter your e-mail')
: const TextCaption(title: 'Check your e-mail '),
!provider.isEmailVerify
? TextFormView(
name: 'E-mail Address',
hintText: 'Input e-mail address',
onTap: () {
provider.submitEmail();
},
)
: _emailVerify(),
],
);
});
});
}
}

52
lib/features/auth/registration/view/submission_data/submit_personal_data.dart
View File

@@ -1,16 +1,56 @@
import 'package:cims_apps/application/component/select_form/select_form_view.dart';
import 'package:cims_apps/application/component/text_caption/text_caption.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class SubmitPersonalData extends StatelessWidget {
const SubmitPersonalData({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextCaption(title: 'Your personal details'),
],
);
List<ItemSelectForm> listForm = [
ItemSelectForm('key1', 'text'),
ItemSelectForm('key2', 'text'),
ItemSelectForm('key3', 'text'),
ItemSelectForm('key4', 'text'),
ItemSelectForm('key5', 'text'),
];
return ChangeNotifierProvider(
create: (context) => SubmissionDataViewModel(),
builder: (context, child) {
return Consumer<SubmissionDataViewModel>(
builder: (context, provider, child) {
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const TextCaption(title: 'Your personal details'),
SelectFormView(
name: 'Occupation',
hintText: 'Select occupation ',
bottomSheetTitle: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text('Occupation'),
IconButton(
onPressed: () => Navigator.pop(context),
icon: const Icon(
Icons.clear,
size: 20,
color: ColorPalette.greyBase,
)),
],
),
listItem: listForm,
onSelect: (value) {},
),
],
),
);
});
});
}
}

31
lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart Normal file
View File

@@ -0,0 +1,31 @@
import 'package:flutter/material.dart';
class SubmissionDataViewModel extends ChangeNotifier {
int currentStep = 1;
int stepAmount = 9;
bool _isEmailVerify = false;
bool get isEmailVerify => _isEmailVerify;
submitEmail() {
_isEmailVerify = !_isEmailVerify;
notifyListeners();
}
onWillPopSubmission(BuildContext context) {
if (currentStep != 1) {
currentStep--;
notifyListeners();
} else {
Navigator.of(context).pop(true);
}
}
nextSubmission(BuildContext context) {
if (currentStep < stepAmount) {
currentStep++;
} else {
//ToDo : Go To next step after completing the submission
}
notifyListeners();
}
}