Merge remote-tracking branch 'origin/master'

Author: 810Teams

lib/gui/homepage.dart

@@ -17,6 +17,7 @@ import 'package:mediccare/core/appointment.dart';
 import 'package:mediccare/core/doctor.dart';
 import 'package:mediccare/core/medicine.dart';
 import 'package:mediccare/core/medicine_overview_data.dart';
+import 'package:mediccare/core/user.dart';
 import 'package:mediccare/core/user_setting.dart';
 import 'package:mediccare/gui/add_appointment_page.dart';
 import 'package:mediccare/gui/add_doctor_page.dart';
@@ -136,7 +137,8 @@ class _HomepageState extends State<Homepage> {
           )
         ],
       ),
-      trailing: trailing ?? Icon(Icons.keyboard_arrow_right, color: Colors.blue[300], size: 30.0),
+      trailing: trailing ??
+          Icon(Icons.keyboard_arrow_right, color: Colors.blue[300], size: 30.0),
       onTap: onTap ?? () {},
     );
   }
@@ -241,7 +243,11 @@ class _HomepageState extends State<Homepage> {
         month = 'December';
         break;
     }
-    return dateTime.day.toString() + ' ' + month + ' ' + dateTime.year.toString();
+    return dateTime.day.toString() +
+        ' ' +
+        month +
+        ' ' +
+        dateTime.year.toString();
   }
 
   // Map Search Area
@@ -286,7 +292,9 @@ class _HomepageState extends State<Homepage> {
           onError: onError,
           mode: Mode.overlay,
           language: 'en',
-          location: center == null ? null : Location(center.latitude, center.longitude),
+          location: center == null
+              ? null
+              : Location(center.latitude, center.longitude),
           radius: center == null ? null : 10000);
 
       print(' this is placeID ${p.placeId}');
@@ -307,7 +315,9 @@ class _HomepageState extends State<Homepage> {
       searchMedText = medicineSearch.text;
       if (searchMedText.trim() == '' || searchMedText == null) {
         searchMed.add(medicines[i]);
-      } else if (item.toLowerCase().contains(searchMedText.toLowerCase().trim())) {
+      } else if (item
+          .toLowerCase()
+          .contains(searchMedText.toLowerCase().trim())) {
         searchMed.add(medicines[i]);
       }
     }
@@ -720,17 +730,24 @@ class _HomepageState extends State<Homepage> {
   List<Widget> getRemainingIndoseList(List<Medicine> medicineList) {
     List<Widget> list = List<Widget>();
 
-    final List<MedicineOverviewData> medicineOverviewDataList = List<MedicineOverviewData>();
+    final List<MedicineOverviewData> medicineOverviewDataList =
+        List<MedicineOverviewData>();
     List<DateTime> temp = List<DateTime>();
 
     for (int i = 0; i < medicineList.length; i++) {
-      temp = medicineList[i].getMedicineSchedule(UserSettings()); // TODO: Pass user settings here!
-      for (int j = 0; j < temp.length; j++) {
-        medicineOverviewDataList.add(MedicineOverviewData(
-          medicine: medicineList[i],
-          dateTime: temp[j],
-        ));
+      void doAddSchedule() async {
+        User user = await FirebaseUtils.getUser();
+
+        temp = medicineList[i].getMedicineSchedule(user.userSettings);
+        for (int j = 0; j < temp.length; j++) {
+          medicineOverviewDataList.add(MedicineOverviewData(
+            medicine: medicineList[i],
+            dateTime: temp[j],
+          ));
+        }
       }
+
+      doAddSchedule();
     }
 
     medicineOverviewDataList.sort((a, b) => a.dateTime.compareTo(b.dateTime));
@@ -745,8 +762,10 @@ class _HomepageState extends State<Homepage> {
 
       List<DateTime> dateList = List<DateTime>();
       medicineOverviewDataList.forEach((e) {
-        if (!dateList.contains(DateTime(e.dateTime.year, e.dateTime.month, e.dateTime.day))) {
-          dateList.add(DateTime(e.dateTime.year, e.dateTime.month, e.dateTime.day));
+        if (!dateList.contains(
+            DateTime(e.dateTime.year, e.dateTime.month, e.dateTime.day))) {
+          dateList
+              .add(DateTime(e.dateTime.year, e.dateTime.month, e.dateTime.day));
         }
       });
 
@@ -767,13 +786,17 @@ class _HomepageState extends State<Homepage> {
         );
 
         medicineOverviewDataList.forEach((f) {
-          if (e.year == f.dateTime.year && e.month == f.dateTime.month && e.day == f.dateTime.day) {
+          if (e.year == f.dateTime.year &&
+              e.month == f.dateTime.month &&
+              e.day == f.dateTime.day) {
             list.add(
               getCustomCard(
                 name: f.medicine.name,
                 subtitle: f.getSubtitle(),
                 icon: CustomIcons.medicine,
-                trailing: (DateTime.now().compareTo(f.dateTime.subtract(Duration(hours: 1))) > 0 &&
+                trailing: (DateTime.now().compareTo(
+                                f.dateTime.subtract(Duration(hours: 1))) >
+                            0 &&
                         DateTime(
                               f.dateTime.year,
                               f.dateTime.month,
@@ -884,7 +907,9 @@ class _HomepageState extends State<Homepage> {
       searchDocText = doctorSearch.text;
       if (searchDocText.trim() == '' || searchDocText == null) {
         searchDoc.add(doctors[i]);
-      } else if (item.toLowerCase().contains(searchDocText.toLowerCase().trim())) {
+      } else if (item
+          .toLowerCase()
+          .contains(searchDocText.toLowerCase().trim())) {
         searchDoc.add(doctors[i]);
       }
     }
@@ -943,7 +968,8 @@ class _HomepageState extends State<Homepage> {
             Padding(
               padding: const EdgeInsets.symmetric(vertical: 30),
               child: Text('Add your personal doctors now!',
-                  style: TextStyle(color: Colors.grey, fontWeight: FontWeight.w500)),
+                  style: TextStyle(
+                      color: Colors.grey, fontWeight: FontWeight.w500)),
             )
           ],
         ),
@@ -1000,26 +1026,28 @@ class _HomepageState extends State<Homepage> {
     _getAppointments = FirebaseUtils.getAppointments();
     this._currentIndex = widget.initialIndex;
 
-    var initializationSettingsAndroid = new AndroidInitializationSettings('@mipmap/ic_launcher');
+    var initializationSettingsAndroid =
+        new AndroidInitializationSettings('@mipmap/ic_launcher');
     var initializationSettingsIOS = new IOSInitializationSettings();
-    var initializationSettings =
-        new InitializationSettings(initializationSettingsAndroid, initializationSettingsIOS);
+    var initializationSettings = new InitializationSettings(
+        initializationSettingsAndroid, initializationSettingsIOS);
     flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
     flutterLocalNotificationsPlugin.initialize(
       initializationSettings,
     );
 
     _firebaseMessaging.configure(
       onMessage: (Map<String, dynamic> message) {
-        Map<String, dynamic> notification = Map<String, dynamic>.from(message['notification']);
+        Map<String, dynamic> notification =
+            Map<String, dynamic>.from(message['notification']);
 
         Future _showNotification() async {
           var androidPlatformChannelSpecifics = new AndroidNotificationDetails(
               'mediccare', 'MedicCare', 'MedicCare App',
               importance: Importance.Max, priority: Priority.High);
           var iOSPlatformChannelSpecifics = new IOSNotificationDetails();
-          var platformChannelSpecifics =
-              new NotificationDetails(androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics);
+          var platformChannelSpecifics = new NotificationDetails(
+              androidPlatformChannelSpecifics, iOSPlatformChannelSpecifics);
           await flutterLocalNotificationsPlugin.show(
             0,
             notification['title'],

lib/gui/medicine_page.dart

@@ -176,6 +176,40 @@ class _MedicinePageState extends State<MedicinePage> {
               ),
             ),
           ),
+          Container(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  children: <Widget>[
+                    SizedBox(
+                      height: 10.0,
+                    ),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: <Widget>[
+                        Align(
+                          alignment: Alignment.center,
+                          child: CircleAvatar(
+                            radius: 80,
+                            backgroundColor: Color(0xffffffff),
+                            child: ClipOval(
+                              child: SizedBox(
+                                width: 150.0,
+                                height: 150.0,
+                                child: (widget._medicine.image != null)
+                                    ? Image.network(widget._medicine.image, fit: BoxFit.fill)
+                                    : Image.asset(
+                                        "assets/medicine.png",
+                                        fit: BoxFit.fill,
+                                      ),
+                              ),
+                            ),
+                          ),
+                        )
+                      ],
+                    )
+                  ],
+                ),
+              ),
           Container(
             padding: EdgeInsets.fromLTRB(0, 10, 0, 0),
             child: Column(