Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Notifications UI fix

Browse Source
merge-requests/442/head
haroon amjad 3 years ago
parent f60684ad08
commit 43c67a5a84
1 changed files with 74 additions and 82 deletions
Show Stats Download Patch File Download Diff File

156
lib/pages/DrawerPages/notifications/notifications_page.dart
Unescape Escape View File

@ -4,8 +4,8 @@ import 'package:diplomaticquarterapp/pages/DrawerPages/notifications/notificatio
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -44,93 +44,85 @@ class NotificationsPage extends StatelessWidget {
model.getNotifications(getNotificationsRequestModel, context);
},
builder: (_, model, widget) =>
AppScaffold(
isShowAppBar: true,
showNewAppBar: true,
showNewAppBarTitle: true,
appBarTitle: TranslationBase
.of(context)
.notifications,
baseViewModel: model,
body: ListView.separated(
itemBuilder: (context, index) {
return InkWell(
onTap: () async {
if (!model.notifications[index].isRead) {
model.markAsRead(model.notifications[index].id);
}
Navigator.push(
context,
FadePage(
page: NotificationsDetailsPage(
notification: model.notifications[index],
)));
},
child: Container(
width: double.infinity,
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: model.notifications[index].isRead ? Theme
.of(context)
.scaffoldBackgroundColor : CustomColors.accentColor.withOpacity(0.05),
border: Border(
left: BorderSide(
color: model.notifications[index].isRead ? Theme
.of(context)
.scaffoldBackgroundColor : CustomColors.accentColor,
width: 5.0,
),
),
builder: (_, model, widget) => AppScaffold(
isShowAppBar: true,
showNewAppBar: true,
showNewAppBarTitle: true,
appBarTitle: TranslationBase.of(context).notifications,
baseViewModel: model,
body: ListView.separated(
itemBuilder: (context, index) {
return InkWell(
onTap: () async {
if (!model.notifications[index].isRead) {
model.markAsRead(model.notifications[index].id);
}
Navigator.push(
context,
FadePage(
page: NotificationsDetailsPage(
notification: model.notifications[index],
)));
},
child: Container(
width: double.infinity,
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: model.notifications[index].isRead ? Theme.of(context).scaffoldBackgroundColor : CustomColors.accentColor.withOpacity(0.05),
border: Border(
left: BorderSide(
color: model.notifications[index].isRead ? Theme.of(context).scaffoldBackgroundColor : CustomColors.accentColor,
width: 5.0,
),
child: Row(
children: <Widget>[
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(model.notifications[index].createdOn)) +
" " +
DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(model.notifications[index].createdOn), false)),
SizedBox(
height: 5,
),
Row(
children: [
Expanded(child: Texts(model.notifications[index].message)),
if (model.notifications[index].messageType == "image")
Icon(
FontAwesomeIcons.images,
color: CustomColors.grey,
)
],
),
SizedBox(
height: 5,
),
),
),
child: Row(
children: <Widget>[
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Texts(DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(model.notifications[index].createdOn)) +
" " +
DateUtil.formatDateToTimeLang(DateUtil.convertStringToDate(model.notifications[index].createdOn), false)),
SizedBox(
height: 5,
),
Row(
children: [
Expanded(child: Texts(model.notifications[index].message)),
if (model.notifications[index].messageType == "image")
Icon(
FontAwesomeIcons.images,
color: CustomColors.grey,
)
],
),
),
SizedBox(
height: 5,
),
],
),
],
),
),
);
},
separatorBuilder: (context, index) {
return Column(
children: [
Divider(
color: Colors.grey[300],
thickness: 2.0,
),
),
],
);
},
itemCount: model.notifications.length)
),
),
),
);
},
separatorBuilder: (context, index) {
return Column(
children: [
Divider(
color: Colors.grey[300],
thickness: 2.0,
),
],
);
},
itemCount: model.notifications.length)),
// ListView(
// children: model.notifications
// .map(

Write Preview
Loading…
Cancel
Save