add pickups

This commit is contained in:
Sai Naw Wun
2020-05-31 15:00:11 +06:30
parent d5847722d8
commit 3f6a66b887
57 changed files with 1368 additions and 1236 deletions

View File

@@ -31,6 +31,11 @@ class _NotificationListState extends State<NotificationList> {
inAsyncCall: _isLoading,
child: Scaffold(
appBar: AppBar(
centerTitle: true,
leading: new IconButton(
icon: new Icon(Icons.close, ),
onPressed: () => Navigator.of(context).pop(),
),
backgroundColor: primaryColor,
title: LocalText(
context,
@@ -38,68 +43,6 @@ class _NotificationListState extends State<NotificationList> {
fontSize: 18,
color: Colors.white,
),
// actions: <Widget>[
// PopupMenuButton<PopupMenu>(
// elevation: 3.2,
// onSelected: (selected) {
// setState(() {
// this._selectedIndex = selected.index;
// });
// notificationModel.filter(selected.index);
// },
// icon: Container(
// width: 30,
// height: 30,
// decoration: new BoxDecoration(
// shape: BoxShape.circle,
// color: Colors.white,
// ),
// child: Stack(
// fit: StackFit.expand,
// children: <Widget>[
// Icon(
// Icons.filter_list,
// color: primaryColor,
// ),
// _selectedIndex != 0
// ? Positioned(
// bottom: 0,
// right: 0,
// child: Container(
// width: 10,
// height: 10,
// decoration: new BoxDecoration(
// shape: BoxShape.circle,
// color: secondaryColor,
// ),
// ),
// )
// : Container()
// ],
// )),
// itemBuilder: (BuildContext context) {
// return notificationMenu.map((PopupMenu choice) {
// return PopupMenuItem<PopupMenu>(
// value: choice,
// child: Row(
// children: <Widget>[
// Text(choice.status),
// SizedBox(
// width: 10,
// ),
// _selectedIndex != null &&
// _selectedIndex == choice.index
// ? Icon(
// Icons.check,
// color: Colors.grey,
// )
// : Container(),
// ],
// ),
// );
// }).toList();
// }),
// ],
),
body: new ListView.separated(
separatorBuilder: (context, index) => Divider(
@@ -133,25 +76,31 @@ class _NotificationListState extends State<NotificationList> {
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
noti.marketPlace == null
? Container()
: new Text(
noti.marketPlace,
style: new TextStyle(
fontSize: 15.0,
color: secondaryColor),
),
new Text(
noti.getDesc,
style: new TextStyle(
fontSize: 15.0,
color: secondaryColor),
color: primaryColor),
),
new Text(
noti.status == null ? "" : noti.status,
style: new TextStyle(
fontSize: 13.0,
color: secondaryColor),
noti.marketPlace == null
? Container()
: Padding(
padding: const EdgeInsets.only(top:8.0),
child: new Text(
noti.marketPlace,
style: new TextStyle(
fontSize: 15.0,
color: primaryColor),
),
),
Padding(
padding: const EdgeInsets.only(top:8.0),
child: new Text(
noti.status == null ? "" : noti.status,
style: new TextStyle(
fontSize: 16.0,
color: Colors.grey),
),
),
],
),
@@ -174,32 +123,7 @@ class _NotificationListState extends State<NotificationList> {
)
],
),
),
// noti.seen
// ? Container()
// : new Positioned(
// left: 11,
// top: 11,
// child: new Container(
// padding: EdgeInsets.all(2),
// decoration: new BoxDecoration(
// color: Colors.red,
// borderRadius: BorderRadius.circular(6),
// ),
// constraints: BoxConstraints(
// minWidth: 18,
// minHeight: 18,
// ),
// child: Text(
// 'new',
// style: TextStyle(
// color: Colors.white,
// fontSize: 14,
// ),
// textAlign: TextAlign.center,
// ),
// ),
// )
),
],
);
}),