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,

41
lib/features/bottom_navigation_view.dart
View File

@@ -1,5 +1,6 @@
import 'package:cims_apps/application/theme/color_palette.dart';
import 'package:cims_apps/features/dashboard/dashboard_account/view/homepage/homepage_view.dart';
import 'package:cims_apps/features/dashboard/dashboard_account/view/plan/plan_view.dart';
import 'package:cims_apps/features/dashboard/dashboard_account/view/portfolio/portfolio_view.dart';
import 'package:flutter/material.dart';
@@ -18,9 +19,7 @@ class _BottomNavigationViewState extends State<BottomNavigationView> {
///TODO: masukan pagenya dilistWidget ini
List<Widget> listWidget = [
HomeView(),
Container(
color: Colors.redAccent,
),
PlanView(),
Container(),
PortofolioView(),
Container(),
@@ -32,8 +31,8 @@ class _BottomNavigationViewState extends State<BottomNavigationView> {
label: 'Home',
),
BottomNavigationBarItem(
icon: Icon(Icons.search),
label: 'Search',
icon: Icon(Icons.file_open),
label: 'Plan',
),
BottomNavigationBarItem(
icon: Icon(Icons.compare_arrows),
@@ -51,20 +50,24 @@ class _BottomNavigationViewState extends State<BottomNavigationView> {
return Scaffold(
body: listWidget[_selectedIndex],
bottomNavigationBar: BottomNavigationBar(
onTap: (value) {
setState(() {
_selectedIndex = value;
});
},
currentIndex: _selectedIndex,
items: listNavigation,
type: BottomNavigationBarType.fixed,
showUnselectedLabels: true,
selectedItemColor: ColorPalette.primary,
unselectedItemColor: Colors.black,
selectedLabelStyle: const TextStyle(color: ColorPalette.primary),
unselectedLabelStyle: const TextStyle(color: Colors.black),
bottomNavigationBar: Padding(
padding: const EdgeInsets.symmetric(vertical: 12),
child: BottomNavigationBar(
elevation: 0,
onTap: (value) {
setState(() {
_selectedIndex = value;
});
},
currentIndex: _selectedIndex,
items: listNavigation,
type: BottomNavigationBarType.fixed,
showUnselectedLabels: true,
selectedItemColor: ColorPalette.primary,
unselectedItemColor: Colors.black,
selectedLabelStyle: const TextStyle(color: ColorPalette.primary),
unselectedLabelStyle: const TextStyle(color: Colors.black),
),
),
);
}

4
lib/features/dashboard/dashboard_account/view/invest_type/invest_type_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/image/image_view.dart';
import 'package:cims_apps/application/component/text_title/text_title.dart';
import 'package:cims_apps/application/theme/color_palette.dart';
@@ -53,7 +53,7 @@ class _InvestTypeViewState extends State<InvestTypeView> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const ButtonBack(),
const BackButtonView(),
TextTitle(title: widget.title, color: Colors.white),
SizedBox(
width: SizeConfig.width * 0.1,

22
lib/features/dashboard/dashboard_account/view/plan/plan_view.dart Normal file
View File

@@ -0,0 +1,22 @@
import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
import 'package:cims_apps/application/component/goal_investing_view.dart';
import 'package:flutter/material.dart';
class PlanView extends StatelessWidget {
const PlanView({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CustomAppBar(height: 70, title: 'Investment Plan'),
body: SingleChildScrollView(
padding: EdgeInsets.all(24),
child: Column(
children: [
GoalInvestingView()
],
),
),
);
}
}

4
lib/features/dashboard/dashboard_account/view/product/product_view.dart
View File

@@ -1,7 +1,7 @@
import 'dart:math';
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';
@@ -112,7 +112,7 @@ class _ProductViewState extends State<ProductView> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ButtonBack(),
BackButtonView(),
Wrap(
spacing: 12,
children: [