Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
feelver
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2F-ART
feelver
Commits
23705804
Commit
23705804
authored
Aug 31, 2020
by
Mobile : Art
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update ui
parent
218ffcf6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
100 deletions
+53
-100
lib/ui/payment/mycart.dart
+21
-18
lib/ui/payment/payment_detail.dart
+30
-71
lib/ui/payment/payment_page.dart
+0
-0
lib/ui/shop/shop_list_detail.dart
+1
-1
pubspec.lock
+0
-7
pubspec.yaml
+1
-3
No files found.
lib/ui/payment/mycart.dart
View file @
23705804
...
...
@@ -12,6 +12,7 @@ class _MyCartState extends State<MyCart> {
bool
checkBoxValue
=
false
;
int
a
=
1
;
int
b
=
1
;
List
<
int
>
_counter
=
List
();
@override
Widget
build
(
BuildContext
context
)
{
...
...
@@ -161,15 +162,14 @@ class _MyCartState extends State<MyCart> {
return
Column
(
children:
<
Widget
>[
header
(),
// SizedBox(
// height: SizeConfig.getHeight(10),
// ),
_getlist
(),
_getlist
(),
],
);
}
_getlist
()
{
int
_itemCount
=
0
;
return
Expanded
(
child:
Container
(
margin:
EdgeInsets
.
only
(
...
...
@@ -178,28 +178,31 @@ class _MyCartState extends State<MyCart> {
right:
SizeConfig
.
getPadding
(
16
),
bottom:
SizeConfig
.
getPadding
(
16
),
),
// child: presenter.shopModel == null
// ? Container()
// :
child:
ListView
.
builder
(
itemCount:
3
,
itemBuilder:
(
context
,
i
)
{
return
list1
();
},),
child:
ListView
.
builder
(
itemCount:
1
,
itemBuilder:
(
context
,
i
)
{
return
InkWell
(
onTap:
()
{
print
(
i
);
},
child:
list1
(),
);
},
),
),
);
}
Widget
list1
()
{
return
Card
(
elevation:
5
,
child:
Container
(
padding:
EdgeInsets
.
only
(
left:
SizeConfig
.
getPadding
(
8
),
top:
SizeConfig
.
getPadding
(
8
),
bottom:
SizeConfig
.
getPadding
(
16
),
),
left:
SizeConfig
.
getPadding
(
8
),
top:
SizeConfig
.
getPadding
(
8
),
bottom:
SizeConfig
.
getPadding
(
16
),
),
child:
Row
(
mainAxisAlignment:
MainAxisAlignment
.
start
,
children:
<
Widget
>[
...
...
@@ -360,7 +363,7 @@ class _MyCartState extends State<MyCart> {
),
Positioned
(
top:
SizeConfig
.
getPadding
(
50
),
left:
SizeConfig
.
getPadding
(
MediaQuery
.
of
(
context
).
size
.
width
/
3.
5
),
left:
SizeConfig
.
getPadding
(
MediaQuery
.
of
(
context
).
size
.
width
/
3.
3
),
child:
Container
(
alignment:
Alignment
.
topCenter
,
child:
Image
.
asset
(
...
...
lib/ui/payment/payment_detail.dart
View file @
23705804
...
...
@@ -194,82 +194,41 @@ class _PaymentdetailState extends State<Paymentdetail> {
}
Widget
header
()
{
return
Container
(
child:
Stack
(
children:
<
Widget
>[
Container
(
color:
Color
.
fromRGBO
(
69
,
85
,
79
,
1
),
height:
SizeConfig
.
getHeight
(
200
),
width:
MediaQuery
.
of
(
context
).
size
.
width
,
),
Positioned
(
top:
SizeConfig
.
getPadding
(
50
),
left:
SizeConfig
.
getPadding
(
MediaQuery
.
of
(
context
).
size
.
width
/
3.5
),
child:
Container
(
alignment:
Alignment
.
topCenter
,
child:
Image
.
asset
(
'assets/images/feelver_banner.png'
,
width:
MediaQuery
.
of
(
context
).
size
.
width
/
2.5
,
),
),
),
Positioned
(
top:
SizeConfig
.
getPadding
(
77
),
left:
SizeConfig
.
getPadding
(
16
),
child:
Container
(
child:
GestureDetector
(
onTap:
()
{
showDialog
(
context:
context
,
builder:
(
BuildContext
context
)
{
return
NavDrawer
();
},
);
},
child:
Image
.
asset
(
'assets/images/ic_menu.png'
,
height:
SizeConfig
.
getWidth
(
24
),
width:
SizeConfig
.
getWidth
(
30
),
fit:
BoxFit
.
cover
,
),
),
),
),
Positioned
(
top:
SizeConfig
.
getPadding
(
77
),
right:
SizeConfig
.
getPadding
(
60
),
child:
Container
(
child:
Image
.
asset
(
'assets/images/ic_noti.png'
,
height:
SizeConfig
.
getWidth
(
30
),
width:
SizeConfig
.
getWidth
(
30
),
fit:
BoxFit
.
cover
,
),
return
Stack
(
children:
<
Widget
>[
Container
(
color:
Color
.
fromRGBO
(
69
,
85
,
79
,
1
),
height:
SizeConfig
.
getHeight
(
150
),
width:
MediaQuery
.
of
(
context
).
size
.
width
,
),
Positioned
(
top:
SizeConfig
.
getPadding
(
50
),
left:
SizeConfig
.
getPadding
(
MediaQuery
.
of
(
context
).
size
.
width
/
3.2
),
child:
Container
(
alignment:
Alignment
.
topCenter
,
child:
Image
.
asset
(
'assets/images/feelver_banner.png'
,
width:
MediaQuery
.
of
(
context
).
size
.
width
/
2.5
,
),
),
Positioned
(
top:
SizeConfig
.
getPadding
(
77
),
right:
SizeConfig
.
getPadding
(
20
),
child:
InkWell
(
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(builder: (context) => LoginPage()),
// );
// },
child:
Container
(
child:
Image
.
asset
(
'assets/images/ic_userimg.png'
,
height:
SizeConfig
.
getWidth
(
30
),
width:
SizeConfig
.
getWidth
(
30
),
fit:
BoxFit
.
cover
,
),
),
Positioned
(
top:
SizeConfig
.
getPadding
(
70
),
left:
SizeConfig
.
getPadding
(
16
),
child:
Container
(
child:
GestureDetector
(
onTap:
()
{
Navigator
.
pop
(
context
);
},
child:
Icon
(
Icons
.
keyboard_arrow_left
,
color:
Colors
.
white
,
size:
SizeConfig
.
getFontSize
(
40
),
),
),
),
]
,
)
,
)
,
]
,
);
}
}
lib/ui/payment/payment_page.dart
View file @
23705804
This diff is collapsed.
Click to expand it.
lib/ui/shop/shop_list_detail.dart
View file @
23705804
...
...
@@ -78,7 +78,7 @@ class _ShopListDetailState extends State<ShopListDetail> {
Positioned
(
top:
SizeConfig
.
getPadding
(
50
),
left:
SizeConfig
.
getPadding
(
MediaQuery
.
of
(
context
).
size
.
width
/
3.
5
),
MediaQuery
.
of
(
context
).
size
.
width
/
3.
3
),
child:
Container
(
alignment:
Alignment
.
topCenter
,
child:
Image
.
asset
(
...
...
pubspec.lock
View file @
23705804
...
...
@@ -92,13 +92,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "5.2.1"
firebase_crashlytics:
dependency: "direct main"
description:
name: firebase_crashlytics
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.4+1"
flutter:
dependency: "direct main"
description: flutter
...
...
pubspec.yaml
View file @
23705804
...
...
@@ -37,9 +37,7 @@ dependencies:
date_format
:
^1.0.8
flutter_datetime_picker
:
^1.4.0
carousel_slider
:
^2.2.1
firebase_crashlytics
:
^0.1.4+1
# firebase_crashlytics: ^0.1.4+1
dev_dependencies
:
flutter_test
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment