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

fix: widget overflow

Browse Source
This commit is contained in:
Dian Bayu Nugroho 2024-02-20 15:14:25 +07:00
parent 9761dc369c
commit dfb947dce5
3 changed files with 323 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
lib/application/component/subscribe/total_payment_view.dart
View File

@ -24,11 +24,10 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return SingleChildScrollView(
child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white, borderRadius: BorderRadius.circular(16)),
borderRadius: BorderRadius.circular(16)
),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -37,56 +36,54 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
const Text('Your Investment Today', const Text(
'Your Investment Today',
style: TextStyle( style: TextStyle(
color: ColorPalette.slate800, color: ColorPalette.slate800,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16 fontSize: 16),
),
), ),
GestureDetector( GestureDetector(
onTap: () => Navigator.pop(context), onTap: () => Navigator.pop(context),
child: const Icon(Icons.close_rounded) child: const Icon(Icons.close_rounded))
)
], ],
), ),
), ),
...widget.listProduct.asMap().entries.map((e) { ...widget.listProduct.asMap().entries.map((e) {
return Container( return Container(
padding: const EdgeInsets.only(left: 16, right: 24, bottom: 16, top: 16), padding: const EdgeInsets.only(
left: 16, right: 24, bottom: 16, top: 16),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
left: BorderSide( left: BorderSide(
width: 8, width: 8,
color: ColorPalette.investTypeColor[e.value.type]! color:
) ColorPalette.investTypeColor[e.value.type]!))),
)
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Expanded( Expanded(
flex: 5, flex: 5,
child: Text(e.value.name ?? '', child: Text(
e.value.name ?? '',
style: const TextStyle( style: const TextStyle(
color: ColorPalette.slate400, color: ColorPalette.slate400,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16 fontSize: 16),
), )),
)
),
Expanded( Expanded(
flex: 7, flex: 7,
child: Text( child: Text(
NumberFormatter.numberCurrency(widget.totalInvest * e.value.totalPercent!, 'Rp ', 'id_ID'), NumberFormatter.numberCurrency(
widget.totalInvest * e.value.totalPercent!,
'Rp ',
'id_ID'),
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 18, fontSize: 18,
color: ColorPalette.slate800 color: ColorPalette.slate800),
), ))
)
)
], ],
), ),
); );
@ -97,44 +94,47 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text('Purchase Commission', Text(
'Purchase Commission',
style: TextStyle( style: TextStyle(
color: ColorPalette.slate400, color: ColorPalette.slate400,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16 fontSize: 16),
), ),
), Text(
Text('Free', 'Free',
style: TextStyle( style: TextStyle(
color: ColorPalette.primary, color: ColorPalette.primary,
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.w700 fontWeight: FontWeight.w700),
),
) )
], ],
), ),
), ),
const SizedBox(height: 16,), const SizedBox(
height: 16,
),
Container( Container(
color: ColorPalette.slate200.withOpacity(0.5), color: ColorPalette.slate200.withOpacity(0.5),
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16), padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
const Text('Total', const Text(
'Total',
style: TextStyle( style: TextStyle(
color: ColorPalette.slate400, color: ColorPalette.slate400,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16 fontSize: 16),
), ),
), Text(
Text(NumberFormatter.numberCurrency(widget.totalInvest, 'Rp ', 'id_ID'), NumberFormatter.numberCurrency(
widget.totalInvest, 'Rp ', 'id_ID'),
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 18, fontSize: 18,
color: ColorPalette.slate800 color: ColorPalette.slate800),
),
) )
], ],
), ),
@ -145,20 +145,21 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
const Text('Total Payment', const Text(
'Total Payment',
style: TextStyle( style: TextStyle(
color: ColorPalette.slate400, color: ColorPalette.slate400,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16 fontSize: 16),
), ),
), Text(
Text(NumberFormatter.numberCurrency(widget.totalInvest, 'Rp ', 'id_ID'), NumberFormatter.numberCurrency(
widget.totalInvest, 'Rp ', 'id_ID'),
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 18, fontSize: 18,
color: ColorPalette.slate800 color: ColorPalette.slate800),
),
) )
], ],
), ),
@ -167,7 +168,8 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
disabled: !isAgreement, disabled: !isAgreement,
name: 'Subscribe Now', name: 'Subscribe Now',
onPressed: () { onPressed: () {
routePush(context, page: PaymentMethodView( routePush(context,
page: PaymentMethodView(
totalInvest: widget.totalInvest, totalInvest: widget.totalInvest,
)); ));
}, },
@ -179,6 +181,7 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
) )
], ],
), ),
),
); );
} }
@ -205,48 +208,46 @@ class _TotalPaymentViewState extends State<TotalPaymentView> {
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all( border: Border.all(
color: isAgree ? ColorPalette.primary : ColorPalette.slate200 color: isAgree
) ? ColorPalette.primary
), : ColorPalette.slate200)),
child: AnimatedContainer( child: AnimatedContainer(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: isAgree ? ColorPalette.primary : ColorPalette.white, color:
shape: BoxShape.circle isAgree ? ColorPalette.primary : ColorPalette.white,
shape: BoxShape.circle),
), ),
), ),
), ),
), ),
const SizedBox(
width: 12,
), ),
const SizedBox(width: 12,),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Text('I agree to buy the mutual fund on this page and have read and agreed to all the contents of the Prospectus and summary information and understand the risks of my investment decision.', const Text(
'I agree to buy the mutual fund on this page and have read and agreed to all the contents of the Prospectus and summary information and understand the risks of my investment decision.',
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: ColorPalette.slate400 color: ColorPalette.slate400),
),
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {},
child: const Text(
}, 'Read More',
child: const Text('Read More',
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
decoration: TextDecoration.underline, decoration: TextDecoration.underline,
color: ColorPalette.primary color: ColorPalette.primary),
), ))
)
)
], ],
) ))
)
], ],
), ),
); );

138
lib/features/dashboard/dashboard_account/view/invest_type/invest_type_view.dart
View File

@ -20,11 +20,25 @@ class InvestTypeView extends StatefulWidget {
} }
class _InvestTypeViewState extends State<InvestTypeView> { class _InvestTypeViewState extends State<InvestTypeView> {
List<Product> listProduct = [ List<Product> listProduct = [
Product(name: 'Gemilang Dana Kas Maxima', type: '', yield: 8.17, priceUnit: 2600.79, funds: 6300000), Product(
Product(name: 'Gemilang Dana Likuid', type: '', yield: 6.42, priceUnit: 1600.79, funds: 2340000), name: 'Gemilang Dana Kas Maxima',
Product(name: 'Gemilang Income Fund', type: '', yield: 8.17, priceUnit: 2600.79, funds: 6300000) type: '',
yield: 8.17,
priceUnit: 2600.79,
funds: 6300000),
Product(
name: 'Gemilang Dana Likuid',
type: '',
yield: 6.42,
priceUnit: 1600.79,
funds: 2340000),
Product(
name: 'Gemilang Income Fund',
type: '',
yield: 8.17,
priceUnit: 2600.79,
funds: 6300000)
]; ];
@override @override
@ -41,8 +55,7 @@ class _InvestTypeViewState extends State<InvestTypeView> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider<ProductViewModel>( return ChangeNotifierProvider<ProductViewModel>(
create: (context) => ProductViewModel(), create: (context) => ProductViewModel(),
child: Consumer<ProductViewModel>( child: Consumer<ProductViewModel>(builder: (context, provider, child) {
builder: (context, provider, child) {
return Scaffold( return Scaffold(
body: SizedBox( body: SizedBox(
width: SizeConfig.width, width: SizeConfig.width,
@ -52,8 +65,8 @@ class _InvestTypeViewState extends State<InvestTypeView> {
const ImageView(image: PathAssets.imgDashboardAccount), const ImageView(image: PathAssets.imgDashboardAccount),
Column( Column(
children: [ children: [
const SizedBox( SizedBox(
height: 50, height: SizeConfig.height * .1,
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 24), padding: const EdgeInsets.symmetric(horizontal: 24),
@ -71,12 +84,14 @@ class _InvestTypeViewState extends State<InvestTypeView> {
const SizedBox( const SizedBox(
height: 24, height: 24,
), ),
Container( Expanded(
child: Container(
padding: const EdgeInsets.all(24), padding: const EdgeInsets.all(24),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
color: Colors.white color: Colors.white),
), child: SingleChildScrollView(
scrollDirection: Axis.vertical,
child: Column( child: Column(
children: [ children: [
filters(), filters(),
@ -86,10 +101,12 @@ class _InvestTypeViewState extends State<InvestTypeView> {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
provider.setSelectedProduct(e.value); provider.setSelectedProduct(e.value);
routePush(context, page: ProductView(widget.title)); routePush(context,
page: ProductView(widget.title));
}, },
child: Padding( child: Padding(
padding: EdgeInsets.only(top: e.key != 0 ? 24 : 0), padding: EdgeInsets.only(
top: e.key != 0 ? 24 : 0),
child: cardProduct(e.value), child: cardProduct(e.value),
), ),
); );
@ -98,14 +115,15 @@ class _InvestTypeViewState extends State<InvestTypeView> {
], ],
), ),
), ),
),
),
], ],
) )
], ],
), ),
), ),
); );
} }),
),
); );
} }
@ -115,9 +133,25 @@ class _InvestTypeViewState extends State<InvestTypeView> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
segmentFilter(const Icon(Icons.filter_alt_outlined, color: ColorPalette.slate400,), 'Filter', () { }), segmentFilter(
segmentFilter(const RotatedBox(quarterTurns: 1, child: Icon(Icons.compare_arrows, color: ColorPalette.slate400)), 'Sort', () { }), const Icon(
segmentFilter(const Icon(Icons.dashboard_outlined, color: ColorPalette.slate400), 'Compare', () { }), Icons.filter_alt_outlined,
color: ColorPalette.slate400,
),
'Filter',
() {}),
segmentFilter(
const RotatedBox(
quarterTurns: 1,
child:
Icon(Icons.compare_arrows, color: ColorPalette.slate400)),
'Sort',
() {}),
segmentFilter(
const Icon(Icons.dashboard_outlined,
color: ColorPalette.slate400),
'Compare',
() {}),
], ],
), ),
); );
@ -130,8 +164,7 @@ class _InvestTypeViewState extends State<InvestTypeView> {
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16), padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(color: ColorPalette.slate200), border: Border.all(color: ColorPalette.slate200),
borderRadius: BorderRadius.circular(56) borderRadius: BorderRadius.circular(56)),
),
child: Row( child: Row(
children: [ children: [
leading, leading,
@ -142,9 +175,7 @@ class _InvestTypeViewState extends State<InvestTypeView> {
text, text,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: const TextStyle( style: const TextStyle(
color: ColorPalette.slate500, color: ColorPalette.slate500, fontWeight: FontWeight.w700),
fontWeight: FontWeight.w700
),
) )
], ],
), ),
@ -163,7 +194,10 @@ class _InvestTypeViewState extends State<InvestTypeView> {
children: [ children: [
Row( Row(
children: [ children: [
ImageView(image: PathAssets.imgProduct, width: SizeConfig.width * .12,), ImageView(
image: PathAssets.imgProduct,
width: SizeConfig.width * .12,
),
const SizedBox( const SizedBox(
width: 8, width: 8,
), ),
@ -171,9 +205,7 @@ class _InvestTypeViewState extends State<InvestTypeView> {
child: Text( child: Text(
product.name ?? '', product.name ?? '',
style: const TextStyle( style: const TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold, fontSize: 18),
fontSize: 18
),
), ),
) )
], ],
@ -187,36 +219,53 @@ class _InvestTypeViewState extends State<InvestTypeView> {
children: [ children: [
Column( Column(
children: [ children: [
const Text('Yield', style: TextStyle(color: ColorPalette.slate400, fontWeight: FontWeight.w600),), const Text(
'Yield',
style: TextStyle(
color: ColorPalette.slate400,
fontWeight: FontWeight.w600),
),
Row( Row(
children: [ children: [
Text( Text(
'${product.yield.toString()}%', '${product.yield.toString()}%',
style: const TextStyle( style: const TextStyle(
color: ColorPalette.green400, color: ColorPalette.green400,
fontWeight: FontWeight.w600 fontWeight: FontWeight.w600),
),
), ),
const Text('/'), const Text('/'),
const Text('3year', style: TextStyle(color: ColorPalette.slate400, fontWeight: FontWeight.w600),) const Text(
'3year',
style: TextStyle(
color: ColorPalette.slate400,
fontWeight: FontWeight.w600),
)
], ],
) )
], ],
), ),
Column( Column(
children: [ children: [
const Text('Price/unit', style: TextStyle(color: ColorPalette.slate400, fontWeight: FontWeight.w600),), const Text(
'Price/unit',
style: TextStyle(
color: ColorPalette.slate400,
fontWeight: FontWeight.w600),
),
Row( Row(
children: [ children: [
const Icon(Icons.trending_up_outlined, size: 18, color: ColorPalette.green400,), const Icon(
Icons.trending_up_outlined,
size: 18,
color: ColorPalette.green400,
),
const SizedBox( const SizedBox(
width: 2, width: 2,
), ),
Text( Text(
NumberFormatter.numberCurrency(product.priceUnit, 'Rp', 'id_ID'), NumberFormatter.numberCurrency(
style: const TextStyle( product.priceUnit, 'Rp', 'id_ID'),
fontWeight: FontWeight.w600 style: const TextStyle(fontWeight: FontWeight.w600),
),
), ),
], ],
) )
@ -224,14 +273,18 @@ class _InvestTypeViewState extends State<InvestTypeView> {
), ),
Column( Column(
children: [ children: [
const Text('Managed funds', style: TextStyle(color: ColorPalette.slate400, fontWeight: FontWeight.w600),), const Text(
'Managed funds',
style: TextStyle(
color: ColorPalette.slate400,
fontWeight: FontWeight.w600),
),
Row( Row(
children: [ children: [
Text( Text(
NumberFormatter.compactCurrency(product.funds, 'Rp ', 'id_ID'), NumberFormatter.compactCurrency(
style: const TextStyle( product.funds, 'Rp ', 'id_ID'),
fontWeight: FontWeight.w600 style: const TextStyle(fontWeight: FontWeight.w600),
),
), ),
], ],
) )
@ -243,5 +296,4 @@ class _InvestTypeViewState extends State<InvestTypeView> {
), ),
); );
} }
} }

4
lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart
View File

@ -6,6 +6,7 @@ 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/login/view/login_view.dart'; import 'package:cims_apps/features/auth/login/view/login_view.dart';
import 'package:cims_apps/features/auth/registration/view/registration_view.dart'; import 'package:cims_apps/features/auth/registration/view/registration_view.dart';
import 'package:cims_apps/features/bottom_navigation_view.dart';
import 'package:cims_apps/features/dashboard/dashboard_public/viewmodel/dashboard_public_viewmodel.dart'; import 'package:cims_apps/features/dashboard/dashboard_public/viewmodel/dashboard_public_viewmodel.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -102,7 +103,8 @@ class DashboardPublicView extends StatelessWidget {
width: 26, width: 26,
), ),
onPressed: () { onPressed: () {
provider.loginGoogle(context); // provider.loginGoogle(context);
routePush(context, page: const BottomNavigationView());
}, },
), ),
Row( Row(