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

merge conflict

Browse Source
This commit is contained in:
Dian Bayu Nugroho
2024-02-16 11:46:28 +07:00
parent a574f30424 ce2bf8a777
commit 368f326123
17 changed files with 272 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/features/auth/login/view/login_view.dart
View File

@@ -1,5 +1,5 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_button_view.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_form/text_form_view.dart';
@@ -61,7 +61,7 @@ class _LoginViewState extends State<LoginView> {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ButtonBack(),
BackButtonView(),
const Text('Sign In'),
SizedBox(
width: SizeConfig.width * 0.1,

6
lib/features/auth/login/view/phone_number_view.dart
View File

@@ -1,6 +1,7 @@
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/numeric_pad/numeric_pad.dart';
import 'package:cims_apps/application/component/text_form/text_form_view.dart';
import 'package:cims_apps/application/component/text_title/text_title.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
@@ -35,6 +36,7 @@ class PhoneNumberView extends StatelessWidget {
inputFormatters: [
FilteringTextInputFormatter.deny(RegExp(r'^0'))
],
contentPadding: EdgeInsets.all(1),
prefixIcon: Container(
width: SizeConfig.width * .23,
padding:
@@ -108,6 +110,10 @@ class PhoneNumberView extends StatelessWidget {
)
)
],
),
NumericPad(
onNumberSelected: (p0) {
},
)
],
),

4
lib/features/auth/registration/view/submission_data/data_bank/confirm_bank_account.dart
View File

@@ -1,4 +1,4 @@
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_button_view.dart';
import 'package:cims_apps/application/component/button/button_view.dart';
import 'package:cims_apps/application/component/list_tile/list_tile_view.dart';
import 'package:cims_apps/application/component/text_caption/text_caption.dart';
@@ -28,7 +28,7 @@ class ConfirmBankAccount extends StatelessWidget {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const ButtonBack(),
const BackButtonView(),
const Text('Registration'),
SizedBox(
width: SizeConfig.width * 0.1,

4
lib/features/auth/registration/view/submission_data/data_bank/guide_screen.dart
View File

@@ -1,5 +1,5 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_button_view.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';
@@ -93,7 +93,7 @@ class GuideScreen extends StatelessWidget {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const ButtonBack(),
const BackButtonView(),
const Text('Guide'),
SizedBox(
width: SizeConfig.width * 0.1,

4
lib/features/auth/registration/view/submission_data/risk_profile/question_view.dart
View File

@@ -1,5 +1,5 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_button_view.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/theme/color_palette.dart';
@@ -37,7 +37,7 @@ class _QuestionViewState extends State<QuestionView> {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ButtonBack(),
BackButtonView(),
const Text('Risk Profile', textAlign: TextAlign.center),
SizedBox(width: SizeConfig.width * 0.1)
],

4
lib/features/auth/registration/view/submission_data/risk_profile/results_view.dart
View File

@@ -1,5 +1,5 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_button_view.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/theme/color_palette.dart';
@@ -26,7 +26,7 @@ class ResultsView extends StatelessWidget {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ButtonBack(),
BackButtonView(),
const Text('Risk Profile', textAlign: TextAlign.center),
SizedBox(
width: SizeConfig.width * 0.1

4
lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart
View File

@@ -1,5 +1,5 @@
import 'package:cims_apps/application/assets/path_assets.dart';
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_button_view.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/theme/color_palette.dart';
@@ -22,7 +22,7 @@ class RiskProfileView extends StatelessWidget {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ButtonBack(),
BackButtonView(),
const Text('Risk Profile', textAlign: TextAlign.center),
SizedBox(width: SizeConfig.width * 0.1)
],

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

@@ -1,4 +1,4 @@
import 'package:cims_apps/application/component/button/button_back.dart';
import 'package:cims_apps/application/component/button/back_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/core/route/route.dart';
@@ -86,7 +86,7 @@ class _SubmissionParentState extends State<SubmissionParent> {
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const ButtonBack(),
const BackButtonView(),
const Text('Registration'),
SizedBox(
width: SizeConfig.width * 0.1,