Skip to content

Commit 8de3087

Browse files
sambitrazesambitraze
committed
up
1 parent 747335b commit 8de3087

File tree

15 files changed

+337
-132
lines changed

15 files changed

+337
-132
lines changed

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apply plugin: 'com.google.gms.google-services'
3333
}
3434

3535
android {
36-
compileSdkVersion 30
36+
compileSdkVersion 31
3737

3838
sourceSets {
3939
main.java.srcDirs += 'src/main/kotlin'

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.6.10'
33
repositories {
44
google()
55
jcenter()

‎lib/main.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ scheduleIncoming(
5555
RemoteMessage message) async {
5656
var scheduledNotificationStartTime =
5757
determineScheduledTime(message.data['startTime']);
58-
var android = AndroidNotificationDetails("id", "channel", "description");
58+
var android = AndroidNotificationDetails("id", "channel", channelDescription: "description");
5959
var ios = IOSNotificationDetails();
6060
var platform = new NotificationDetails(android: android, iOS: ios);
6161
// ignore: deprecated_member_use
@@ -73,7 +73,7 @@ scheduleOutgoing(
7373
var scheduledNotificationEndTime =
7474
determineScheduledTime(message.data['endTime']);
7575

76-
var android = AndroidNotificationDetails("id", "channel", "description");
76+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description");
7777

7878
var ios = IOSNotificationDetails();
7979

@@ -97,7 +97,7 @@ DateTime determineScheduledTime(String time) {
9797
const AndroidNotificationChannel channel = AndroidNotificationChannel(
9898
'high_importance_channel', // id
9999
'High Importance Notifications', // title
100-
'This channel is used for important notifications.', // description
100+
description: 'This channel is used for important notifications.', // description
101101
importance: Importance.high,
102102
);
103103

‎lib/services/reminderService.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ReminderService extends ChangeNotifier {
2929

3030
//Instant Notifications
3131
Future instantNofitication() async {
32-
var android = AndroidNotificationDetails("id", "channel", "description");
32+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description");
3333

3434
var ios = IOSNotificationDetails();
3535

@@ -50,7 +50,7 @@ class ReminderService extends ChangeNotifier {
5050
htmlFormatContent: true,
5151
htmlFormatContentTitle: true);
5252

53-
var android = AndroidNotificationDetails("id", "channel", "description",
53+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description",
5454
styleInformation: bigPicture);
5555

5656
var ios = IOSNotificationDetails();
@@ -64,7 +64,7 @@ class ReminderService extends ChangeNotifier {
6464

6565
//Stylish Notification
6666
Future stylishNotification() async {
67-
var android = AndroidNotificationDetails("id", "channel", "description",
67+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description",
6868
color: Colors.deepOrange,
6969
enableLights: true,
7070
enableVibration: true,
@@ -94,7 +94,7 @@ class ReminderService extends ChangeNotifier {
9494
htmlFormatContent: true,
9595
htmlFormatContentTitle: true);
9696

97-
var android = AndroidNotificationDetails("id", "channel", "description",
97+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description",
9898
styleInformation: bigPicture);
9999

100100
var ios = IOSNotificationDetails();

‎lib/views/Admin/TaskManager/SearchTask.dart‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ class _SearchTaskState extends State<SearchTask> with TickerProviderStateMixin {
418418
itemCount: pendingTaskList.length,
419419
itemBuilder: (BuildContext context,
420420
int index) {
421+
pendingTaskList.sort((a, b) => b
422+
.updatedAt
423+
.compareTo(a.updatedAt));
421424
return TaskCard(
422425
taskElement:
423426
pendingTaskList[index],
@@ -458,6 +461,9 @@ class _SearchTaskState extends State<SearchTask> with TickerProviderStateMixin {
458461
itemCount: pendingTaskList2.length,
459462
itemBuilder: (BuildContext context,
460463
int index) {
464+
pendingTaskList2.sort((a, b) => b
465+
.updatedAt
466+
.compareTo(a.updatedAt));
461467
return TaskCard(
462468
taskElement:
463469
pendingTaskList2[index],
@@ -510,6 +516,9 @@ class _SearchTaskState extends State<SearchTask> with TickerProviderStateMixin {
510516
itemCount: unApprovedTaskList.length,
511517
itemBuilder: (BuildContext context,
512518
int index) {
519+
unApprovedTaskList.sort((a, b) => b
520+
.updatedAt
521+
.compareTo(a.updatedAt));
513522
return TaskCard(
514523
taskElement:
515524
unApprovedTaskList[index],
@@ -561,6 +570,9 @@ class _SearchTaskState extends State<SearchTask> with TickerProviderStateMixin {
561570
itemCount: unApprovedTaskList2.length,
562571
itemBuilder: (BuildContext context,
563572
int index) {
573+
unApprovedTaskList2.sort((a, b) => b
574+
.updatedAt
575+
.compareTo(a.updatedAt));
564576
return TaskCard(
565577
taskElement:
566578
unApprovedTaskList2[index],
@@ -624,6 +636,9 @@ class _SearchTaskState extends State<SearchTask> with TickerProviderStateMixin {
624636
itemCount: completedTaskList.length,
625637
itemBuilder: (BuildContext context,
626638
int index) {
639+
completedTaskList.sort((a, b) => b
640+
.updatedAt
641+
.compareTo(a.updatedAt));
627642
return TaskCard(
628643
taskElement:
629644
completedTaskList[index],
@@ -653,6 +668,9 @@ class _SearchTaskState extends State<SearchTask> with TickerProviderStateMixin {
653668
itemCount: completedTaskList2.length,
654669
itemBuilder: (BuildContext context,
655670
int index) {
671+
completedTaskList2.sort((a, b) => b
672+
.updatedAt
673+
.compareTo(a.updatedAt));
656674
return TaskCard(
657675
taskElement:
658676
completedTaskList2[index],

‎lib/views/Admin/TaskManager/TaskManagerHome.dart‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,9 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
351351
padding: EdgeInsets.only(top: 0),
352352
itemCount: pendingTaskList.length,
353353
itemBuilder: (context, index) {
354+
pendingTaskList.sort((a, b) => b
355+
.updatedAt
356+
.compareTo(a.updatedAt));
354357
return TaskCard(
355358
taskElement:
356359
pendingTaskList[index],
@@ -389,6 +392,9 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
389392
itemCount:
390393
unApprovedTaskList.length,
391394
itemBuilder: (context, index) {
395+
unApprovedTaskList.sort((a, b) =>
396+
b.updatedAt
397+
.compareTo(a.updatedAt));
392398
return TaskCard(
393399
taskElement:
394400
unApprovedTaskList[index],
@@ -443,6 +449,9 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
443449
padding: EdgeInsets.only(top: 0),
444450
itemCount: completedTaskList.length,
445451
itemBuilder: (context, index) {
452+
completedTaskList.sort((a, b) => b
453+
.updatedAt
454+
.compareTo(a.updatedAt));
446455
return TaskCard(
447456
taskElement:
448457
completedTaskList[index],
@@ -532,6 +541,10 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
532541
itemBuilder:
533542
(BuildContext context,
534543
int index) {
544+
pendingTaskList2.sort(
545+
(a, b) => b.updatedAt
546+
.compareTo(
547+
a.updatedAt));
535548
return TaskCard(
536549
taskElement:
537550
pendingTaskList2[
@@ -582,6 +595,10 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
582595
itemBuilder:
583596
(BuildContext context,
584597
int index) {
598+
unApprovedTaskList2.sort(
599+
(a, b) => b.updatedAt
600+
.compareTo(
601+
a.updatedAt));
585602
return TaskCard(
586603
taskElement:
587604
unApprovedTaskList2[
@@ -659,6 +676,10 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
659676
itemBuilder:
660677
(BuildContext context,
661678
int index) {
679+
completedTaskList2.sort(
680+
(a, b) => b.updatedAt
681+
.compareTo(
682+
a.updatedAt));
662683
return TaskCard(
663684
taskElement:
664685
completedTaskList2[

‎lib/views/Admin/landingPage.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ class _LandingScreenState extends State<LandingScreen> {
212212
var scheduledNotificationStartTime =
213213
determineScheduledTime(message.data['startTime']);
214214

215-
var android = AndroidNotificationDetails("id", "channel", "description");
215+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description");
216216
var ios = IOSNotificationDetails();
217217
var platform = new NotificationDetails(android: android, iOS: ios);
218218
// ignore: deprecated_member_use
@@ -230,7 +230,7 @@ class _LandingScreenState extends State<LandingScreen> {
230230
var scheduledNotificationEndTime =
231231
determineScheduledTime(message.data['endTime']);
232232

233-
var android = AndroidNotificationDetails("id", "channel", "description");
233+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description");
234234

235235
var ios = IOSNotificationDetails();
236236

‎lib/views/Employee/TaskManager/TaskManagerHome.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,13 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
4848
List<TaskElement> tempList =
4949
await TaskService.getAllSelfTaskByIdAndType(user.userId, "Rejected");
5050
pendingTaskList.addAll(tempList);
51+
pendingTaskList.sort((a, b) => b.taskId.compareTo(a.taskId));
5152
unApprovedTaskList =
5253
await TaskService.getAllSelfTaskByIdAndType(user.userId, "Unapproved");
54+
unApprovedTaskList.sort((a, b) => b.taskId.compareTo(a.taskId));
5355
completedTaskList =
5456
await TaskService.getAllSelfTaskByIdAndType(user.userId, "Completed");
57+
completedTaskList.sort((a, b) => b.taskId.compareTo(a.taskId));
5558
setState(() {
5659
loading = false;
5760
});
@@ -270,6 +273,8 @@ class _TaskMangerHomeState extends State<TaskMangerHome>
270273
padding: EdgeInsets.only(top: 0),
271274
itemCount: unApprovedTaskList.length,
272275
itemBuilder: (context, index) {
276+
unApprovedTaskList.sort(
277+
(a, b) => b.taskId.compareTo(a.taskId));
273278
return TaskCard(
274279
taskElement: unApprovedTaskList[index],
275280
currentUser: user,

‎lib/views/Employee/landingPage.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class _LandingScreenState extends State<LandingScreen> {
210210
RemoteMessage message) async {
211211
var scheduledNotificationStartTime =
212212
determineScheduledTime(message.data['startTime']);
213-
var android = AndroidNotificationDetails("id", "channel", "description");
213+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description");
214214
var ios = IOSNotificationDetails();
215215
var platform = new NotificationDetails(android: android, iOS: ios);
216216
// ignore: deprecated_member_use
@@ -227,7 +227,7 @@ class _LandingScreenState extends State<LandingScreen> {
227227
RemoteMessage message) async {
228228
var scheduledNotificationEndTime =
229229
determineScheduledTime(message.data['endTime']);
230-
var android = AndroidNotificationDetails("id", "channel", "description");
230+
var android = AndroidNotificationDetails("id", "channel",channelDescription: "description");
231231

232232
var ios = IOSNotificationDetails();
233233

0 commit comments

Comments
 (0)