notifications prettier

Author: gustavonrm

AgendappDEMO/lib/Model/Globals.dart

@@ -1,4 +1,5 @@
 library my_app.globals;
 
 bool generated = false;
-int notificationId= 1;
+
+int talkId = 0;

AgendappDEMO/lib/Model/Talk.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'ThemeTalk.dart';
 
 class Talk {
+  int id; //eventually can be changed with id from the database
   DateTime dateInitial;
   DateTime dateFinal;
   String name;
@@ -15,7 +16,7 @@ class Talk {
   String location = "";
   List<ThemeTalk> themes = new List<ThemeTalk>();
 
-  Talk(this.dateInitial, this.dateFinal, this.name, this.information,
+  Talk(this.id,this.dateInitial, this.dateFinal, this.name, this.information,
       this.location, this.selected, this.notify,this.speakers, this.themes);
 
   void addSpeaker(String speaker){
@@ -30,4 +31,7 @@ class Talk {
     return themes[0].color;
   }
 
+  void turnOffNotification(){
+    this.notify = false;
+  }
 }

AgendappDEMO/lib/Notification/notification_page.dart

@@ -26,7 +26,6 @@ class _NotificationPageState extends State<NotificationPage> {
   void initState(){
     super.initState();
     notificationFuture = _notificationPlugin.getScheduleNotifications();
-    print(globals.generated);
     if(!globals.generated){
       generateAllNotifications();
       globals.generated=true;
@@ -81,6 +80,11 @@ class _NotificationPageState extends State<NotificationPage> {
   //erase notification
   Future<void> dismissNotification(int id)async{
     await _notificationPlugin.cancelNotifications(id);
+    widget.talkList.forEach((element)=>{
+      if(element.id == id){
+        element.notify=false
+      }
+    });
     refreshNotification();
   }
   //refresh notification list
@@ -94,9 +98,8 @@ class _NotificationPageState extends State<NotificationPage> {
   Future<void> createTalkNotification(Time timeTalk,Day dayTalk,String titleTalk,String descriptionTalk) async{
 
     final title = titleTalk;
-    //final description = descriptionTalk; //it will make a sting with day and hour
     final time = timeTalk;
-    final day = dayTalk; //todo to be used when i integrate weekly notification
+    final day = dayTalk;
     final description = 'Day: Hour: ';
 
 
@@ -111,7 +114,7 @@ class _NotificationPageState extends State<NotificationPage> {
           id=i;
         }
       }
-      await _notificationPlugin.showWeeklyAtDayTime( //todo change to weekly at time
+      await _notificationPlugin.showWeeklyAtDayTime(
           notificationData.time,
           notificationData.day,
           id,
@@ -128,15 +131,95 @@ class _NotificationPageState extends State<NotificationPage> {
     int i=0;
     widget.talkList.forEach((element) =>({
       if(element.selected && element.notify){
-        //todo convert time
-        _notificationPlugin.showWeeklyAtDayTime(Time(element.dateInitial.hour, element.dateInitial.minute),Day(element.dateInitial.day),globals.notificationId++, element.name,
-            ("Date: " + element.dateInitial.month.toString() + "/" + element.dateInitial.day.toString() + " Hour: " + element.dateInitial.hour.toString() + ":" + element.dateInitial.minute.toString() ))
+        //element.dateInitial.subtract(new Duration(minutes: 15)) //convert time //esta linguagem e so autista...
+        _notificationPlugin.showWeeklyAtDayTime(Time(element.dateInitial.hour, element.dateInitial.minute),Day(element.dateInitial.day),element.id, element.name,
+            (weakToString(element.dateInitial.weekday.toString()) +" "+ element.dateInitial.day.toString() + " " +monthToString(element.dateInitial.month.toString())  + " - " + hourToString(element.dateInitial.hour.toString()) + "h" + minToString(element.dateInitial.minute.toString()) ))
       }
       //createTalkNotification(Time(element.dateInitial.hour, element.dateInitial.minute), Day(element.dateInitial.day), element.name, element.information)
     }
     ));
   }
+  String hourToString(String hourNum){
+    if(hourNum.length == 1)
+      return '0'+ hourNum;
+    return hourNum;
+
+  }
 
+  String minToString(String minNum){
+    if(minNum.length == 1 )
+      return '0'+minNum;
+    return minNum;
+  }
+
+  String weakToString(String weakNum){
+    switch(weakNum){
+      case "1":
+        return "Sun";
+        break;
+      case "2":
+        return "Mon";
+        break;
+      case "3":
+        return "Tue";
+        break;
+      case "4":
+        return "Wed";
+        break;
+      case "5":
+        return "Thu";
+        break;
+      case "6":
+        return "Fri";
+        break;
+      case "7":
+        return "Sat";
+        break;
+    }
+    return null;
+  }
+
+  String monthToString(String monthNum){
+    switch(monthNum){
+      case "1":
+        return "Jan";
+        break;
+      case "2":
+        return "Fev";
+        break;
+      case "3":
+        return "Mar";
+        break;
+      case "4":
+        return "Apr";
+        break;
+      case "5":
+        return "May";
+        break;
+      case "6":
+        return "Jun";
+        break;
+      case "7":
+        return "Jul";
+        break;
+      case "8":
+        return "Aug";
+        break;
+      case "9":
+        return "Sep";
+        break;
+      case "10":
+        return "Oct";
+        break;
+      case "11":
+        return "Nov";
+        break;
+      case "12":
+        return "Dec";
+        break;
+    }
+    return null;
+  }
 }
 
 class NotificationTile extends StatelessWidget{
@@ -152,6 +235,12 @@ class NotificationTile extends StatelessWidget{
   @override
   Widget build(BuildContext context){
     return Card(
+      shape: StadiumBorder(
+        side: BorderSide(
+          color: Colors.black,
+          width: 2.0,
+        ),
+      ),
       child: ListTile(
         title: Text(notification.title),
         subtitle: Text(notification.body),

AgendappDEMO/lib/Screens/MenuOpen.dart

@@ -6,6 +6,7 @@ import 'package:flutter_login_page/Screens/Account_Screen/Account_Screen.dart';
 import 'package:flutter_login_page/Screens/Schedule_Screen/schedule_screen.dart';
 import 'package:flutter_login_page/Screens/All_Talks_Screen/AllTalks.dart';
 import 'package:flutter_login_page/Screens/Schedule_List_Screen/home.dart';
+import 'package:flutter_login_page/Model/Globals.dart' as globals;
 
 final List<ThemeTalk> allThemes = [
   new ThemeTalk("Auto/Tech", Color(0xFF1E90FF)),
@@ -35,24 +36,24 @@ final List<ThemeTalk> interests = [allThemes[1], allThemes[2], allThemes[3]];
 final user = new User("Tiago Miller", "tigasmiller@gmail.com", allThemes, "https://yt3.ggpht.com/a/AGF-l791z2rgw2RhBFQ2vnnI3wuxwMdZSNXI3U1LgQ=s176-c-k-c0x00ffffff-no-rj-mo");
 
 final List<Talk> _talkList = [
-  new Talk(new DateTime(2019, 12, 8, 8, 0), new DateTime(2019, 12, 8, 9, 30), "Drones and food delivery: A marriage made in Heaven", "There are so many food delivery unicorns, but could getting your food delivery be bad for the planet?", "Room 101", false, false, [speakers[0], speakers[3]], [allThemes[0]]),
-  new Talk(new DateTime(2019, 12, 8, 12, 0), new DateTime(2019, 12, 8, 13, 0),
+  new Talk(globals.talkId++,new DateTime(2019, 12, 8, 8, 0), new DateTime(2019, 12, 8, 9, 30), "Drones and food delivery: A marriage made in Heaven", "There are so many food delivery unicorns, but could getting your food delivery be bad for the planet?", "Room 101", false, false, [speakers[0], speakers[3]], [allThemes[0]]),
+  new Talk(globals.talkId++,new DateTime(2019, 12, 8, 12, 0), new DateTime(2019, 12, 8, 13, 0),
       "Breakout startups",
       "Are these the companies everyone will be talking about in 2020? Dozens of the world’s leading investors think so. Each morning and lunchtime on Centre Stage you’ll get an introduction to some of the world’s most exciting early and growth stage startups. Each of the startups have been hand-selected by some of the world’s most successful investors. You’re in for a treat.",
       "Room 102", true, true, [speakers[1]], [allThemes[1], allThemes[2], allThemes[3]]),
-  new Talk(new DateTime(2019, 12, 8, 14, 0), new DateTime(2019, 12, 8, 15, 0),
+  new Talk(globals.talkId++,new DateTime(2019, 12, 8, 14, 0), new DateTime(2019, 12, 8, 15, 0),
       "Building the next great ad empire",
       "One of the most prominent names in the advertising industry outlines his big vision for the industry.",
       "Room 103", false,false, [speakers[3], speakers[4]], allThemes),
-  new Talk(new DateTime(2019, 12, 8, 16, 0), new DateTime(2019, 12, 8, 17, 0),
+  new Talk(globals.talkId++,new DateTime(2019, 12, 8, 16, 0), new DateTime(2019, 12, 8, 17, 0),
       "Welcome to the future of mobile robots",
       "A pioneering company at the cutting edge of robotics showcases its vision for the future of robotic technology that interacts with the world.",
       "Room 104", false,false, [speakers[2]], [allThemes[2]]),
-  new Talk(new DateTime(2019, 12, 10, 9, 0), new DateTime(2019, 12, 10, 10, 0),
+  new Talk(globals.talkId++,new DateTime(2019, 12, 10, 9, 0), new DateTime(2019, 12, 10, 10, 0),
       "Predicting the future of brand design",
       "Despite cultural, political and technological change, one thing remains constant: Companies will keep trying to sell you stuff, and they’ll keep coming up with new ways to do it. Let's hear what the experts think of where the industry is going.",
       "Room 105", true,true,[speakers[3]], [allThemes[3]]),
-  new Talk(new DateTime(2019, 12, 10, 16, 0), new DateTime(2019, 12, 10, 17, 30),
+  new Talk(globals.talkId++,new DateTime(2019, 12, 10, 16, 0), new DateTime(2019, 12, 10, 17, 30),
       "Learn to win",
       "DJI presents a ground-breaking educational robot that helps to understand science, programming and more through captivating gameplay modes and intelligent features.",
       "Room 106", false,false, [speakers[0]], [allThemes[0]]),