general cleanup

maxisme · May 2, 2021 · c7b8755 · c7b8755
1 parent 4913613
commit c7b8755
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 https://flutter.dev/docs/get-started/install
 ```bash
-flutter channel master
+flutter channel dev
 flutter upgrade
 ```
 

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -28,6 +28,10 @@
 	<array>
 		<string>_dartobservatory._tcp</string>
 	</array>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+    <string>FLogs would like to save photos from the app to your gallery</string>
+    <key>NSPhotoLibraryUsageDescription</key>
+    <string>FLogs would like to access your photo gallery for uploading images to the app</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>We don&apos;t access your calendar</string>
 	<key>NSContactsUsageDescription</key>

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app_badger/flutter_app_badger.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
@@ -22,7 +23,8 @@ Future<void> main() async {
   await loadDotEnv();
 
   if (shouldUseFirebase()) {
-    initFirebase();
+    final AuthorizationStatus status = await initFirebase();
+    L.i(status.toString());
   }
 
   final DBProvider db = DBProvider('notifications.db');

diff --git a/lib/notifications/notification.dart b/lib/notifications/notification.dart
@@ -25,12 +25,14 @@ class NotificationUI extends StatefulWidget {
     this.link,
     this.id,
     this.read,
+    this.canExpand,
     Key key,
   }) : super(key: key) {
     message = message ?? '';
     image = image ?? '';
     link = link ?? '';
     read = read ?? false;
+    canExpand = canExpand ?? false;
   }
 
   factory NotificationUI.fromJson(Map<String, dynamic> json) =>
@@ -44,6 +46,7 @@ class NotificationUI extends StatefulWidget {
   String link;
   int id;
   bool read;
+  bool canExpand;
   bool isExpanded = false;
   int index;
   void Function(int id) toggleExpand;
@@ -230,7 +233,7 @@ class NotificationUIState extends State<NotificationUI> {
                                             size: iconSize,
                                             color: MyColour.grey,
                                           ))),
-                                  if (_canExpand)
+                                  if (widget.canExpand)
                                     InkWell(
                                         onTap: () {
                                           setState(() {
@@ -286,10 +289,12 @@ class NotificationUIState extends State<NotificationUI> {
                                       valueListenable: _timeStr,
                                       builder: (BuildContext context,
                                           String timeStr, Widget child) {
-                                        return SelectableText(timeStr,
-                                            style: const TextStyle(
-                                                color: MyColour.grey,
-                                                fontSize: 12));
+                                        return Expanded(
+                                          child: SelectableText(timeStr,
+                                              style: const TextStyle(
+                                                  color: MyColour.grey,
+                                                  fontSize: 12)),
+                                        );
                                       })
                                 ]),
 
@@ -315,8 +320,6 @@ class NotificationUIState extends State<NotificationUI> {
     super.dispose();
   }
 
-  bool _canExpand = false;
-
   void _canExpandHandler(BuildContext context) {
     bool canExpand = false;
     // for title
@@ -332,7 +335,7 @@ class NotificationUIState extends State<NotificationUI> {
     }
 
     if (canExpand) {
-      _canExpand = true;
+      widget.canExpand = true;
       setState(() {});
     }
   }

diff --git a/lib/notifications/notifis.dart b/lib/notifications/notifis.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/widgets.dart';
+import 'package:flutter_app_badger/flutter_app_badger.dart';
 import 'package:notifi/notifications/db_provider.dart';
 import 'package:notifi/notifications/notification.dart';
 import 'package:notifi/utils/utils.dart';
-import 'package:flutter_app_badger/flutter_app_badger.dart';
 
 class Notifications extends ChangeNotifier {
   Notifications(this.notifications, this.db, this.tableNotifier,
@@ -27,11 +27,13 @@ class Notifications extends ChangeNotifier {
   }
 
   void scrollToTop() {
-    tableController.animateTo(
-      tableController.position.minScrollExtent,
-      duration: const Duration(milliseconds: 250),
-      curve: Curves.easeOut,
-    );
+    if (tableController.hasClients) {
+      tableController.animateTo(
+        0,
+        duration: const Duration(milliseconds: 250),
+        curve: Curves.easeOut,
+      );
+    }
   }
 
   int get unreadCnt {

diff --git a/lib/screens/home.dart b/lib/screens/home.dart
@@ -48,7 +48,7 @@ class HomeScreen extends StatelessWidget {
                             color: MyColour.darkGrey, size: 45)),
                   ),
                   SizedBox(
-                      height: double.infinity,
+                      height: 30,
                       child: Container(color: MyColour.offGrey, width: 1)),
                   Expanded(
                     child: SizedBox(

diff --git a/lib/screens/logs.dart b/lib/screens/logs.dart
@@ -17,45 +17,48 @@ class _LogsScreenState extends State<LogsScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-        appBar: AppBar(
-          toolbarHeight: 80,
-          leading: IconButton(
-              icon: const Icon(
-                Akaricons.chevronLeft,
-                color: MyColour.darkGrey,
-                size: 22,
+    return FutureBuilder<ListView>(
+        future: logListView(),
+        // ignore: always_specify_types
+        builder: (BuildContext context, AsyncSnapshot f) {
+          Widget widget = const Center(child: CircularProgressIndicator());
+          if (f.connectionState != ConnectionState.done || f.data == null) {
+            widget = const Center(child: CircularProgressIndicator());
+          } else {
+            widget = Scrollbar(thickness: 4, child: f.data);
+          }
+
+          return Scaffold(
+              appBar: AppBar(
+                toolbarHeight: 80,
+                leading: IconButton(
+                    icon: const Icon(
+                      Akaricons.chevronLeft,
+                      color: MyColour.darkGrey,
+                      size: 22,
+                    ),
+                    onPressed: () {
+                      Navigator.pop(context);
+                    }),
+                title: Column(children: <Widget>[
+                  // ignore: always_specify_types
+                  DropdownButton(
+                      items: <DropdownMenuItem<LogLevel>>[
+                        _menuItem(LogLevel.DEBUG),
+                        _menuItem(LogLevel.INFO),
+                        _menuItem(LogLevel.WARNING),
+                        _menuItem(LogLevel.ERROR),
+                      ],
+                      value: _logLevel,
+                      onChanged: (LogLevel val) {
+                        setState(() {
+                          _logLevel = val;
+                        });
+                      })
+                ]),
               ),
-              onPressed: () {
-                Navigator.pop(context);
-              }),
-          title: Column(children: <Widget>[
-            const Text('Logs'),
-            // ignore: always_specify_types
-            DropdownButton(
-                items: <DropdownMenuItem<LogLevel>>[
-                  _menuItem(LogLevel.DEBUG),
-                  _menuItem(LogLevel.INFO),
-                  _menuItem(LogLevel.WARNING),
-                  _menuItem(LogLevel.ERROR),
-                ],
-                value: _logLevel,
-                onChanged: (LogLevel val) {
-                  setState(() {
-                    _logLevel = val;
-                  });
-                })
-          ]),
-        ),
-        body: FutureBuilder<ListView>(
-            future: logListView(),
-            // ignore: always_specify_types
-            builder: (BuildContext context, AsyncSnapshot f) {
-              if (f.connectionState != ConnectionState.done) {
-                return const Center(child: CircularProgressIndicator());
-              }
-              return Scrollbar(thickness: 4, child: f.data);
-            }));
+              body: widget);
+        });
   }
 
   Future<ListView> logListView() async {

diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
@@ -252,7 +252,6 @@ class SettingOption extends StatelessWidget {
         padding: const EdgeInsets.only(right: 10),
         child: Icon(icon, size: 20, color: MyColour.black));
 
-    // switch or link
     Widget setting;
     if (switchCallback == null) {
       setting = Container(
@@ -270,7 +269,7 @@ class SettingOption extends StatelessWidget {
     } else {
       switchValue ??= false;
       setting = Container(
-          padding: const EdgeInsets.only(left: 23, right: 7, top: 10),
+          padding: const EdgeInsets.only(left: 15, right: 7, top: 10),
           child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[

diff --git a/test/golden-asserts/screen/no-notifications.png b/test/golden-asserts/screen/no-notifications.png
diff --git a/test/golden-asserts/screen/notification.png b/test/golden-asserts/screen/notification.png
diff --git a/test/golden-asserts/screen/settings.png b/test/golden-asserts/screen/settings.png