Compare commits

..

No commits in common. "d672a2356444081ed32967be25be80904d34118c" and "477eb5d2b1945e420742bd9ff976249270a392e1" have entirely different histories.

5 changed files with 15 additions and 19 deletions

View File

@ -1,7 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET"/>
<application <application
android:label="cims investment" android:label="cims_apps"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:enableOnBackInvokedCallback="true" android:enableOnBackInvokedCallback="true"

View File

@ -175,9 +175,7 @@ class DisplayPictureScreen extends StatelessWidget {
marginVertical: 8.0, marginVertical: 8.0,
name: 'Next', name: 'Next',
onPressed: () { onPressed: () {
provider.nextSubmission(context); routePush(context, page: SubmissionParent());
routePush(context,
page: const SubmissionParent());
}, },
), ),
), ),

View File

@ -10,8 +10,8 @@ import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_v
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class SubmitPhotoKtp extends StatelessWidget { class InitialTakePhoto extends StatelessWidget {
const SubmitPhotoKtp({Key? key}) : super(key: key); const InitialTakePhoto({Key? key}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -100,7 +100,7 @@ class SubmitPhotoKtp extends StatelessWidget {
routePush(context, routePush(context,
page: TakePictureScreen( page: TakePictureScreen(
camera: cameras.first, camera: cameras.first,
takeContent: 'ktp', takeContent: 'selfie',
)); ));
}); });
}, },

View File

@ -2,7 +2,7 @@ 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/route/route.dart'; import 'package:cims_apps/core/route/route.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/submit_photo_ktp.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:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
@ -40,7 +40,7 @@ class _SubmissionParentState extends State<SubmissionParent> {
case 2: case 2:
return const SubmitEmail(); return const SubmitEmail();
case 3: case 3:
return const SubmitPhotoKtp(); return const InitialTakePhoto();
case 4: case 4:
return Container( return Container(
child: Text("Step 4"), child: Text("Step 4"),
@ -101,7 +101,7 @@ class _SubmissionParentState extends State<SubmissionParent> {
provider.stepAmount, provider.stepAmount,
(index) => _stepItem( (index) => _stepItem(
isCurrentStep: isCurrentStep:
provider.getCurrentStep == index + 1, provider.currentStep == index + 1,
), ),
), ),
), ),
@ -110,10 +110,10 @@ class _SubmissionParentState extends State<SubmissionParent> {
child: Container( child: Container(
padding: padding:
const EdgeInsets.symmetric(horizontal: 16.0), const EdgeInsets.symmetric(horizontal: 16.0),
child: _content(provider.getCurrentStep), child: _content(provider.currentStep),
), ),
), ),
provider.getCurrentStep == 3 provider.currentStep == 3
? const SizedBox() ? const SizedBox()
: Align( : Align(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,

View File

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