fix: submission data regis

This commit is contained in:
Dian Bayu Nugroho 2024-02-05 18:11:16 +07:00
parent 1616f22925
commit ff1886cec1
5 changed files with 183 additions and 86 deletions

View File

@ -155,7 +155,7 @@ class TextFormView extends StatelessWidget {
hintStyle: hintTextStyle ?? hintStyle: hintTextStyle ??
const TextStyle( const TextStyle(
fontSize: 14, fontSize: 14,
color: Colors.grey, color: ColorPalette.greyFont,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
), ),
isDense: true, isDense: true,
@ -167,19 +167,19 @@ class TextFormView extends StatelessWidget {
disabledBorder: OutlineInputBorder( disabledBorder: OutlineInputBorder(
borderRadius: _borderRadius, borderRadius: _borderRadius,
borderSide: BorderSide( borderSide: BorderSide(
color: disabledborderColor ?? ColorPalette.greyFont, color: disabledborderColor ?? ColorPalette.greyBorder,
), ),
), ),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: _borderRadius, borderRadius: _borderRadius,
borderSide: BorderSide( borderSide: BorderSide(
color: enabledborderColor ?? ColorPalette.greyBase, color: enabledborderColor ?? ColorPalette.greyBorder,
), ),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderRadius: _borderRadius, borderRadius: _borderRadius,
borderSide: BorderSide( borderSide: BorderSide(
color: focusedBorderColor ?? ColorPalette.greyBase, color: focusedBorderColor ?? ColorPalette.greyBorder,
), ),
), ),
border: OutlineInputBorder(borderRadius: _borderRadius), border: OutlineInputBorder(borderRadius: _borderRadius),

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

View File

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

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_caption/text_caption.dart';
import 'package:cims_apps/application/component/text_form/text_form_view.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:flutter/material.dart';
import 'package:provider/provider.dart';
class SubmitEmail extends StatelessWidget { class SubmitEmail extends StatelessWidget {
const SubmitEmail({Key? key}) : super(key: key); const SubmitEmail({Key? key}) : super(key: key);
@override Widget _emailVerify() {
Widget build(BuildContext context) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const TextCaption(title: 'Enter your e-mail'), const ImageView(image: PathAssets.imgEmail),
TextFormView( Align(
name: 'E-mail Address', alignment: Alignment.center,
hintText: 'Input e-mail address', 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(),
],
);
});
});
}
} }

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/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:flutter/material.dart';
import 'package:provider/provider.dart';
class SubmitPersonalData extends StatelessWidget { class SubmitPersonalData extends StatelessWidget {
const SubmitPersonalData({Key? key}) : super(key: key); const SubmitPersonalData({Key? key}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Column( 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, crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
TextCaption(title: 'Your personal details'), 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) {},
),
],
),
); );
});
});
} }
} }