smartfarm
/
mobile-app
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

notification screen

master
daivph 5 years ago
parent
f18a89d244
commit
02c0d2cda7
5 changed files with 184 additions and 146 deletions
Split View Show Diff Stats
  1. +6
    -0
      assets/svg/ic_notification_item.svg
  2. +25
    -22
      lib/presentation/custom_widgets/app_bar_widget.dart
  3. +33
    -0
      lib/presentation/custom_widgets/dash_line_widget.dart
  4. +119
    -124
      lib/presentation/screens/notification/sc_notification.dart
  5. +1
    -0
      lib/utils/const_icons.dart

+ 6
- 0
assets/svg/ic_notification_item.svg View File

@@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle r="16" transform="matrix(-1 0 0 1 16 16)" fill="#EECE52"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10 10.75C10 10.7507 9.99999 10.7539 10.0023 10.7615C10.0048 10.7698 10.0111 10.7863 10.0263 10.8111C10.0581 10.8629 10.1231 10.9409 10.2447 11.0367C10.4923 11.2319 10.8971 11.4405 11.4642 11.6295C12.5905 12.0049 14.1942 12.25 16 12.25C17.8058 12.25 19.4095 12.0049 20.5358 11.6295C21.1029 11.4405 21.5077 11.2319 21.7553 11.0367C21.8769 10.9409 21.9419 10.8629 21.9737 10.8111C21.9889 10.7863 21.9952 10.7698 21.9977 10.7615C22 10.7539 22 10.7507 22 10.75C22 10.7495 22.0001 10.7463 21.9977 10.7385C21.9952 10.7302 21.9889 10.7137 21.9737 10.6889C21.9419 10.6371 21.8769 10.5591 21.7553 10.4633C21.5077 10.2681 21.1029 10.0595 20.5358 9.87052C19.4095 9.49508 17.8058 9.25 16 9.25C14.1942 9.25 12.5905 9.49508 11.4642 9.87052C10.8971 10.0595 10.4923 10.2681 10.2447 10.4633C10.1231 10.5591 10.0581 10.6371 10.0263 10.6889C10.0111 10.7137 10.0048 10.7302 10.0023 10.7385C9.99999 10.7461 10 10.7493 10 10.75ZM10.9899 8.4475C12.3066 8.0086 14.0779 7.75 16 7.75C17.9221 7.75 19.6934 8.0086 21.0101 8.4475C21.6646 8.66564 22.2483 8.94192 22.6838 9.28514C23.1108 9.62169 23.5 10.111 23.5 10.75C23.5 11.389 23.1108 11.8783 22.6838 12.2149C22.2483 12.5581 21.6646 12.8344 21.0101 13.0525C19.6934 13.4914 17.9221 13.75 16 13.75C14.0779 13.75 12.3066 13.4914 10.9899 13.0525C10.3354 12.8344 9.75172 12.5581 9.31622 12.2149C8.88917 11.8783 8.5 11.389 8.5 10.75C8.5 10.111 8.88917 9.62169 9.31622 9.28514C9.75172 8.94192 10.3354 8.66564 10.9899 8.4475Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.25 15.25C9.66421 15.25 10 15.5858 10 16C10 16.0014 10.0001 16.0053 10.0026 16.0135C10.0052 16.0223 10.0116 16.0391 10.0267 16.0638C10.0583 16.1157 10.1226 16.1935 10.2431 16.289C10.4887 16.4836 10.8909 16.6917 11.4562 16.8805C12.5792 17.2554 14.1826 17.5 16 17.5C17.8174 17.5 19.4208 17.2554 20.5438 16.8805C21.1091 16.6917 21.5113 16.4836 21.7569 16.289C21.8774 16.1935 21.9417 16.1157 21.9733 16.0638C21.9884 16.0391 21.9948 16.0223 21.9974 16.0135C21.9999 16.0053 22 16.0014 22 16C22 15.5858 22.3358 15.25 22.75 15.25C23.1642 15.25 23.5 15.5858 23.5 16C23.5 16.637 23.1151 17.1265 22.6885 17.4646C22.2543 17.8086 21.6722 18.0851 21.0187 18.3033C19.7042 18.7421 17.9326 19 16 19C14.0674 19 12.2958 18.7421 10.9813 18.3033C10.3278 18.0851 9.74568 17.8086 9.31155 17.4646C8.8849 17.1265 8.5 16.637 8.5 16C8.5 15.5858 8.83579 15.25 9.25 15.25Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.25 10C9.66421 10 10 10.3358 10 10.75V21.25C10 21.2514 10.0001 21.2553 10.0026 21.2635C10.0052 21.2723 10.0116 21.2891 10.0267 21.3138C10.0583 21.3657 10.1226 21.4435 10.2431 21.539C10.4887 21.7336 10.8909 21.9417 11.4562 22.1305C12.5792 22.5054 14.1826 22.75 16 22.75C17.8174 22.75 19.4208 22.5054 20.5438 22.1305C21.1091 21.9417 21.5113 21.7336 21.7569 21.539C21.8774 21.4435 21.9417 21.3657 21.9733 21.3138C21.9884 21.2891 21.9948 21.2723 21.9974 21.2635C21.9999 21.2553 22 21.2514 22 21.25V10.75C22 10.3358 22.3358 10 22.75 10C23.1642 10 23.5 10.3358 23.5 10.75V21.25C23.5 21.887 23.1151 22.3765 22.6885 22.7146C22.2543 23.0586 21.6722 23.3351 21.0187 23.5533C19.7042 23.9921 17.9326 24.25 16 24.25C14.0674 24.25 12.2958 23.9921 10.9813 23.5533C10.3278 23.3351 9.74568 23.0586 9.31155 22.7146C8.8849 22.3765 8.5 21.887 8.5 21.25V10.75C8.5 10.3358 8.83579 10 9.25 10Z" fill="white"/>
</svg>

+ 25
- 22
lib/presentation/custom_widgets/app_bar_widget.dart View File

@@ -12,28 +12,31 @@ class AppBarWidget extends StatelessWidget implements PreferredSizeWidget {
backgroundColor: Colors.white,
elevation: 0,
centerTitle: false,
title: InkWell(
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.keyboard_arrow_left,
color: AppColors.YELLOW,
size: 35,
),
Text(
'Quay lại',
maxLines: 1,
style: TextStyle(
color: AppColors.YELLOW, fontWeight: FontWeight.normal),
),
],
),
onTap: () {
if (Get.isSnackbarOpen) Get.back();
Get.back();
},
),
title: isBack
? InkWell(
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.keyboard_arrow_left,
color: AppColors.YELLOW,
size: 35,
),
Text(
'Quay lại',
maxLines: 1,
style: TextStyle(
color: AppColors.YELLOW,
fontWeight: FontWeight.normal),
),
],
),
onTap: () {
if (Get.isSnackbarOpen) Get.back();
Get.back();
},
)
: SizedBox(),
automaticallyImplyLeading: false,
),
);

+ 33
- 0
lib/presentation/custom_widgets/dash_line_widget.dart View File

@@ -0,0 +1,33 @@
import 'package:flutter/material.dart';

class DashLineWidget extends StatelessWidget {
final double height;
final Color color;

const DashLineWidget({this.height = 1, this.color = Colors.grey});

@override
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
final boxWidth = constraints.constrainWidth();
final dashWidth = 2.0;
final dashHeight = height;
final dashCount = (boxWidth / (2 * dashWidth)).floor();
return Flex(
children: List.generate(dashCount, (_) {
return SizedBox(
width: dashWidth,
height: dashHeight,
child: DecoratedBox(
decoration: BoxDecoration(color: color),
),
);
}),
mainAxisAlignment: MainAxisAlignment.spaceBetween,
direction: Axis.horizontal,
);
},
);
}
}

+ 119
- 124
lib/presentation/screens/notification/sc_notification.dart View File

@@ -1,14 +1,18 @@
import 'package:farm_tpf/custom_model/NotificationDTO.dart';
import 'package:farm_tpf/data/repository/repository.dart';
import 'package:farm_tpf/presentation/custom_widgets/app_bar_widget.dart';
import 'package:farm_tpf/presentation/custom_widgets/bottom_loader.dart';
import 'package:farm_tpf/presentation/custom_widgets/dash_line_widget.dart';
import 'package:farm_tpf/presentation/custom_widgets/loading_list_page.dart';
import 'package:farm_tpf/presentation/screens/plot_detail/sc_plot_detail.dart';
import 'package:farm_tpf/presentation/screens/plot_detail/sc_plot_information.dart';
import 'package:farm_tpf/utils/const_icons.dart';
import 'package:farm_tpf/utils/pref.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:farm_tpf/utils/formatter.dart';
import 'package:flutter_svg/svg.dart';

import 'bloc/noti_bloc.dart';

@@ -55,29 +59,8 @@ class HoldInfinityWidget extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
key: _scaffoldKey,
appBar: AppBar(
centerTitle: true,
title: Text("Thông báo"),
actions: <Widget>[
BlocBuilder<NotiBloc, NotiState>(
cubit: notiBloc,
builder: (context, state) {
if (state is NotiSuccess) {
if (state.items.length > 0) {
return IconButton(
icon: Icon(Icons.done_all),
onPressed: () {
notiBloc.add(MarkAllNotificationUpdate(status: "1"));
});
} else {
return SizedBox();
}
} else {
return SizedBox();
}
},
)
],
appBar: AppBarWidget(
isBack: false,
),
body: BlocBuilder<NotiBloc, NotiState>(
cubit: notiBloc,
@@ -107,7 +90,6 @@ class _InfinityViewState extends State<InfinityView> {
bool isUpdatingFromApi = true;

var pref = LocalPref();
// final SocketService socketService = injector.get<SocketService>();
var token;
Future<Null> getSharedPrefs() async {
_scrollController.addListener(() {
@@ -144,9 +126,41 @@ class _InfinityViewState extends State<InfinityView> {
return Column(
children: <Widget>[
Container(
child:
countNotification(unread: state.unread, read: state.read),
),
padding: EdgeInsets.all(8),
color: Colors.white,
child: Row(
children: [
Expanded(
child: Text(
'Thông báo',
style: TextStyle(
fontWeight: FontWeight.w500, fontSize: 22),
)),
BlocBuilder<NotiBloc, NotiState>(
cubit: widget.notiBloc,
builder: (context, state) {
if (state is NotiSuccess) {
if (state.items.length > 0) {
return FlatButton(
onPressed: () {
widget.notiBloc.add(
MarkAllNotificationUpdate(status: "1"));
},
child: Text('Đánh dấu đã đọc tất cả',
style: TextStyle(
fontWeight: FontWeight.normal,
fontSize: 14,
color: Colors.blue)));
} else {
return SizedBox();
}
} else {
return SizedBox();
}
},
)
],
)),
Expanded(
child: RefreshIndicator(
child: ListView.builder(
@@ -183,47 +197,9 @@ class _InfinityViewState extends State<InfinityView> {
);
}

Widget countNotification({num unread, num read}) {
return Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.max,
children: <Widget>[
Expanded(
child: OutlineButton(
child: RichText(
text: TextSpan(
text: "Chưa đọc ",
style: TextStyle(
color: Colors.black, fontWeight: FontWeight.bold),
children: <TextSpan>[
TextSpan(
text: "($unread)",
style: TextStyle(color: Colors.blue)),
])),
onPressed: () {})),
Expanded(
child: OutlineButton(
child: RichText(
text: TextSpan(
text: "Đã đọc ",
style: TextStyle(
color: Colors.black, fontWeight: FontWeight.bold),
children: <TextSpan>[
TextSpan(
text: "($read)",
style: TextStyle(color: Colors.grey)),
])),
onPressed: () {}))
],
),
);
}

@override
void dispose() {
_scrollController.dispose();
// socketService.disconnect();
super.dispose();
}
}
@@ -250,66 +226,85 @@ class ItemInfinityWidget extends StatelessWidget {

@override
Widget build(BuildContext context) {
return GestureDetector(
child: Card(
margin: EdgeInsets.all(4.0),
child: ListTile(
title: Text(item.subject),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(item.message),
Text(
item.sendDate.format_DDMMYY_HHmm(),
style: TextStyle(
color: item.isRead == 1 ? Colors.grey : Colors.blue),
),
return Column(
children: [
GestureDetector(
child: Container(
margin: EdgeInsets.all(4.0),
child: Column(
children: [
ListTile(
title: Text(item.subject),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(item.message),
Row(children: [
Icon(Icons.access_time,
color: item.isRead == 1
? Colors.grey
: Colors.blue,
size: 18),
SizedBox(
width: 4,
),
Text(item.sendDate.format_DDMMYY_HHmm(),
style: TextStyle(
color: item.isRead == 1
? Colors.grey
: Colors.blue))
]),
],
),
leading: SvgPicture.asset(AppIcons.icNotificationItem)),
],
),
leading: Icon(
Icons.notifications_active,
color: item.isRead == 1 ? Colors.grey : Colors.blue,
))),
onTap: () {
if (item.contents == "ENV_UPDATE") {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => PlotDetailScreen(
cropId: item.tbCropId,
cropType: item.type,
))).then((value) {
if (item.isRead == 0) {
_updateReadNotification(
context: context,
unread: unread,
read: read,
item: item,
currentItems: currentItems,
currentPage: currentPage,
currentReachedMax: currentReachedMax);
}
});
} else if (item.contents == "PIC_UPDATE") {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => PlotInformationScreen(
cropId: item.tbCropId,
))).then((value) {
if (item.isRead == 0) {
_updateReadNotification(
context: context,
unread: unread,
read: read,
item: item,
currentItems: currentItems,
currentPage: currentPage,
currentReachedMax: currentReachedMax);
}
});
} else {}
});
)),
onTap: () {
if (item.contents == "ENV_UPDATE") {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => PlotDetailScreen(
cropId: item.tbCropId,
cropType: item.type,
))).then((value) {
if (item.isRead == 0) {
_updateReadNotification(
context: context,
unread: unread,
read: read,
item: item,
currentItems: currentItems,
currentPage: currentPage,
currentReachedMax: currentReachedMax);
}
});
} else if (item.contents == "PIC_UPDATE") {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) =>
PlotInformationScreen(
cropId: item.tbCropId,
))).then((value) {
if (item.isRead == 0) {
_updateReadNotification(
context: context,
unread: unread,
read: read,
item: item,
currentItems: currentItems,
currentPage: currentPage,
currentReachedMax: currentReachedMax);
}
});
} else {}
}),
Container(
padding: EdgeInsets.only(left: 16, right: 16),
child: DashLineWidget())
],
);
}

_updateReadNotification(

+ 1
- 0
lib/utils/const_icons.dart View File

@@ -7,4 +7,5 @@ class AppIcons {
static const icNotification = baseAssets + 'ic_notification.svg';
static const icQr = baseAssets + 'ic_qr.svg';
static const icPerson = baseAssets + 'ic_person.svg';
static const icNotificationItem = baseAssets + 'ic_notification_item.svg';
}

Write Preview
Loading…
Cancel
Save