Skip to content

Commit 334a53c

Browse files
author
Wilker Oliveira
committed
menu widget created and bank layout adjustments started.
1 parent 7d7cbe1 commit 334a53c

File tree

5 files changed

+52
-40
lines changed

5 files changed

+52
-40
lines changed

lib/src/ui/resources/app_dimen.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ class AppDimen {
6666

6767
static const double cardDetailWidth = 100.0;
6868

69-
static const double menuCardHeight = 300.0;
69+
static const double menuCardHeight = 150.0;
7070
}

lib/src/ui/screens/card/card_screen.dart

+12-23
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
import 'package:bank_cards/generated/i18n.dart';
2+
import 'package:bank_cards/src/models/card/card.dart' as model;
3+
import 'package:bank_cards/src/repository/card/service/card/card_response.dart';
24
import 'package:bank_cards/src/router.dart';
3-
import 'package:bank_cards/src/ui/resources/decorations.dart';
45
import 'package:bank_cards/src/ui/resources/app_dimen.dart';
56
import 'package:bank_cards/src/ui/resources/app_styles.dart';
7+
import 'package:bank_cards/src/ui/resources/decorations.dart';
68
import 'package:bank_cards/src/ui/screens/base/base_screen.dart';
79
import 'package:bank_cards/src/ui/screens/base/base_widget.dart';
810
import 'package:bank_cards/src/ui/widgets/common/common_widgets.dart';
911
import 'package:bank_cards/src/ui/widgets/credit_card/credit_card_front.dart';
10-
import 'package:flutter/material.dart';
11-
import 'package:flutter_swiper/flutter_swiper.dart';
12-
import 'package:provider/provider.dart';
13-
import 'package:bank_cards/src/models/card/card.dart' as model;
1412
import 'package:bank_cards/src/ui/widgets/custom_circular_progress_indicator.dart';
13+
import 'package:bank_cards/src/ui/widgets/menu/horizontal_menu_widget.dart';
1514
import 'package:bank_cards/src/utils/formatter.dart';
1615
import 'package:bank_cards/src/viewmodel/base/base_viewmodel.dart';
1716
import 'package:bank_cards/src/viewmodel/card/card_viewmodel.dart';
18-
import 'package:bank_cards/src/repository/card/service/card/card_response.dart';
17+
import 'package:flutter/material.dart';
18+
import 'package:flutter_swiper/flutter_swiper.dart';
19+
import 'package:provider/provider.dart';
1920

2021
class CardPage extends StatefulWidget {
2122
@override
@@ -107,7 +108,11 @@ class _CardPageState extends State<CardPage> {
107108
Column(
108109
children: <Widget>[
109110
this.cardDetails(model),
110-
this.menu(model),
111+
//this.menu(model),
112+
HorizontalMenuWidget(
113+
screenUtil: BaseScreen.screenUtil,
114+
menuItems: this._menuItems,
115+
),
111116
],
112117
),
113118
],
@@ -234,22 +239,6 @@ class _CardPageState extends State<CardPage> {
234239
return amount <= 0 ? Colors.red : Colors.green;
235240
}
236241

237-
Widget menu(model) {
238-
return Container(
239-
height: BaseScreen.screenUtil.setHeight(AppDimen.menuCardHeight),
240-
child: GridView.count(
241-
primary: false,
242-
padding: EdgeInsets.all(
243-
BaseScreen.screenUtil.setWidth(20.0),
244-
),
245-
crossAxisSpacing: 10.0,
246-
mainAxisSpacing: 10.0,
247-
crossAxisCount: 3,
248-
children: this._menuItems,
249-
),
250-
);
251-
}
252-
253242
Widget createNewItem(img, text, position) {
254243
return new GestureDetector(
255244
onTap: () {

lib/src/ui/screens/home/bank_screen.dart

+10-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import 'package:bank_cards/src/ui/resources/decorations.dart';
2+
import 'package:bank_cards/src/ui/screens/base/base_screen.dart';
23
import 'package:bank_cards/src/ui/widgets/common/common_widgets.dart';
4+
import 'package:bank_cards/src/ui/widgets/menu/horizontal_menu_widget.dart';
35
import 'package:flutter/material.dart';
46
import 'package:bank_cards/src/ui/widgets/common/account_header.dart';
57
import 'package:bank_cards/generated/i18n.dart';
@@ -32,6 +34,8 @@ class _BankPageState extends State<BankPage> with TickerProviderStateMixin {
3234

3335
@override
3436
Widget build(BuildContext context) {
37+
BaseScreen.initScreenUtil(context: context);
38+
3539
return new Container(
3640
decoration: BoxDecoration(
3741
gradient: Decorations.gradientDecoration(),
@@ -42,7 +46,12 @@ class _BankPageState extends State<BankPage> with TickerProviderStateMixin {
4246
children: <Widget>[
4347
AccountHeader(),
4448
this.balance(context),
45-
SingleChildScrollView(child: this.menu()),
49+
SingleChildScrollView(
50+
child: HorizontalMenuWidget(
51+
screenUtil: BaseScreen.screenUtil,
52+
menuItems: this._menuItems,
53+
),
54+
),
4655
//this.lastTransactions(),
4756
],
4857
),
@@ -125,21 +134,6 @@ class _BankPageState extends State<BankPage> with TickerProviderStateMixin {
125134
);
126135
}
127136

128-
Widget menu() {
129-
return Container(
130-
margin: EdgeInsets.symmetric(vertical: 20.0),
131-
height: 300.0,
132-
child: GridView.count(
133-
primary: false,
134-
padding: const EdgeInsets.all(20.0),
135-
crossAxisSpacing: 10.0,
136-
mainAxisSpacing: 10.0,
137-
crossAxisCount: 3,
138-
children: this._menuItems,
139-
),
140-
);
141-
}
142-
143137
Widget createNewItem(img, text, position) {
144138
return new GestureDetector(
145139
onTap: () {},

lib/src/ui/widgets/common/common_widgets.dart

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class CommonWidgets {
3636

3737
static Widget menuItem(img, text) {
3838
return Container(
39+
margin: EdgeInsets.all(8),
3940
height: 90,
4041
width: 112,
4142
decoration: new BoxDecoration(
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import 'package:bank_cards/src/ui/resources/app_dimen.dart';
2+
import 'package:flutter/material.dart';
3+
import 'package:flutter_screenutil/flutter_screenutil.dart';
4+
5+
class HorizontalMenuWidget extends StatelessWidget {
6+
final ScreenUtil screenUtil;
7+
final List<Widget> menuItems;
8+
9+
const HorizontalMenuWidget(
10+
{Key key, @required this.screenUtil, @required this.menuItems})
11+
: super(key: key);
12+
13+
@override
14+
Widget build(BuildContext context) {
15+
return Container(
16+
margin: EdgeInsets.only(
17+
left: screenUtil.setWidth(AppDimen.extraMargin),
18+
right: screenUtil.setWidth(AppDimen.extraMargin),
19+
),
20+
height: screenUtil.setHeight(AppDimen.menuCardHeight),
21+
child: ListView(
22+
scrollDirection: Axis.horizontal,
23+
children: this.menuItems,
24+
),
25+
);
26+
;
27+
}
28+
}

0 commit comments

Comments
 (0)