refactor: Magic numbers

lib/main.dart

@@ -99,9 +99,10 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
       initial: AdaptiveThemeMode.system,
       builder: (theme, darkTheme) => LayoutBuilder(
         builder: (context, constraints) {
+          const maxColumns = 3;
           var newColumns =
               (constraints.maxWidth / FluffyThemes.columnWidth).floor();
-          if (newColumns > 3) newColumns = 3;
+          if (newColumns > maxColumns) newColumns = maxColumns;
           columnMode ??= newColumns > 1;
           _router ??= GlobalKey<VRouterState>();
           if (columnMode != newColumns > 1) {

lib/pages/chat.dart

@@ -552,50 +552,50 @@ class ChatController extends State<Chat> {
     if (eventIndex == -1) {
       // event id not found...maybe we can fetch it?
       // the try...finally is here to start and close the loading dialog reliably
-      final task = Future.microtask(() async {
+      await showFutureLoadingDialog(
-        // okay, we first have to fetch if the event is in the room
+          context: context,
-        try {
+          future: () async {
-          final event = await timeline.getEventById(eventId);
+            // okay, we first have to fetch if the event is in the room
-          if (event == null) {
+            try {
-            // event is null...meaning something is off
+              final event = await timeline.getEventById(eventId);
-            return;
+              if (event == null) {
-          }
+                // event is null...meaning something is off
-        } catch (err) {
+                return;
-          if (err is MatrixException && err.errcode == 'M_NOT_FOUND') {
+              }
-            // event wasn't found, as the server gave a 404 or something
+            } catch (err) {
-            return;
+              if (err is MatrixException && err.errcode == 'M_NOT_FOUND') {
-          }
+                // event wasn't found, as the server gave a 404 or something
-          rethrow;
+                return;
-        }
+              }
-        // okay, we know that the event *is* in the room
+              rethrow;
-        while (eventIndex == -1) {
-          if (!canLoadMore) {
-            // we can't load any more events but still haven't found ours yet...better stop here
-            return;
-          }
-          try {
-            await timeline.requestHistory(historyCount: _loadHistoryCount);
-          } catch (err) {
-            if (err is TimeoutException) {
-              // loading the history timed out...so let's do nothing
-              return;
             }
-            rethrow;
+            // okay, we know that the event *is* in the room
-          }
+            while (eventIndex == -1) {
-          eventIndex = filteredEvents.indexWhere((e) => e.eventId == eventId);
+              if (!canLoadMore) {
-        }
+                // we can't load any more events but still haven't found ours yet...better stop here
-      });
+                return;
-      if (context != null) {
+              }
-        await showFutureLoadingDialog(context: context, future: () => task);
+              try {
-      } else {
+                await timeline.requestHistory(historyCount: _loadHistoryCount);
-        await task;
+              } catch (err) {
-      }
+                if (err is TimeoutException) {
+                  // loading the history timed out...so let's do nothing
+                  return;
+                }
+                rethrow;
+              }
+              eventIndex =
+                  filteredEvents.indexWhere((e) => e.eventId == eventId);
+            }
+          });
     }
     if (!mounted) {
       return;
     }
-    await scrollController.scrollToIndex(eventIndex,
+    await scrollController.scrollToIndex(
-        preferPosition: AutoScrollPosition.middle);
+      eventIndex,
+      preferPosition: AutoScrollPosition.middle,
+    );
     _updateScrollController();
   }
 

lib/pages/chat_details.dart

@@ -294,11 +294,13 @@ class ChatDetailsController extends State<ChatDetails> {
     }
   }
 
+  static const fixedWidth = 360.0;
+
   @override
   Widget build(BuildContext context) {
     members ??= Matrix.of(context).client.getRoomById(roomId).getParticipants();
     return SizedBox(
-      width: 360.0,
+      width: fixedWidth,
       child: ChatDetailsView(this),
     );
   }

lib/pages/image_viewer.dart

@@ -27,11 +27,13 @@ class ImageViewerController extends State<ImageViewer> {
   /// Save this file with a system call.
   void saveFileAction() => widget.event.saveFile(context);
 
+  static const maxScaleFactor = 1.5;
+
   /// Go back if user swiped it away
   void onInteractionEnds(ScaleEndDetails endDetails) {
     if (PlatformInfos.usesTouchscreen == false) {
       if (endDetails.velocity.pixelsPerSecond.dy >
-          MediaQuery.of(context).size.height * 1.50) {
+          MediaQuery.of(context).size.height * maxScaleFactor) {
         Navigator.of(context, rootNavigator: false).pop();
       }
     }

lib/pages/key_verification_dialog.dart

@@ -155,10 +155,7 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
         );
         buttons.add(AdaptiveFlatButton(
           label: L10n.of(context).submit,
-          onPressed: () {
+          onPressed: () => checkInput(textEditingController.text),
-            input = textEditingController.text;
-            checkInput(input);
-          },
         ));
         buttons.add(AdaptiveFlatButton(
           label: L10n.of(context).skip,
@@ -207,11 +204,9 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
         buttons.add(AdaptiveFlatButton(
           label: L10n.of(context).reject,
           textColor: Colors.red,
-          onPressed: () {
+          onPressed: () => widget.request
-            widget.request.rejectVerification().then((_) {
+              .rejectVerification()
-              Navigator.of(context, rootNavigator: false).pop();
+              .then((_) => Navigator.of(context, rootNavigator: false).pop()),
-            });
-          },
         ));
         buttons.add(AdaptiveFlatButton(
           label: L10n.of(context).accept,

lib/pages/search.dart

@@ -104,6 +104,8 @@ class SearchController extends State<Search> {
   String currentSearchTerm;
   List<Profile> foundProfiles = [];
 
+  static const searchUserDirectoryLimit = 10;
+
   void searchUser(BuildContext context, String text) async {
     if (text.isEmpty) {
       setState(() {
@@ -115,7 +117,10 @@ class SearchController extends State<Search> {
     final matrix = Matrix.of(context);
     SearchUserDirectoryResponse response;
     try {
-      response = await matrix.client.searchUserDirectory(text, limit: 10);
+      response = await matrix.client.searchUserDirectory(
+        text,
+        limit: searchUserDirectoryLimit,
+      );
     } catch (_) {}
     foundProfiles = List<Profile>.from(response?.results ?? []);
     if (foundProfiles.isEmpty && text.isValidMatrixId && text.sigil == '@') {

lib/pages/send_file_dialog.dart

@@ -24,11 +24,13 @@ class SendFileDialog extends StatefulWidget {
 class _SendFileDialogState extends State<SendFileDialog> {
   bool origImage = false;
   bool _isSending = false;
+
+  static const maxWidth = 1600;
   Future<void> _send() async {
     var file = widget.file;
     if (file is MatrixImageFile && !origImage) {
       try {
-        file = await resizeImage(file, max: 1600);
+        file = await resizeImage(file, max: maxWidth);
       } catch (e) {
         // couldn't resize
       }

lib/pages/settings_emotes.dart

@@ -198,6 +198,8 @@ class EmotesSettingsController extends State<EmotesSettings> {
     });
   }
 
+  static const maxImageWidth = 1600;
+
   void imagePickerAction(
       ValueNotifier<ImagePackImageContent> controller) async {
     final result =
@@ -208,7 +210,7 @@ class EmotesSettingsController extends State<EmotesSettings> {
       name: result.fileName,
     );
     try {
-      file = await resizeImage(file, max: 1600);
+      file = await resizeImage(file, max: maxImageWidth);
     } catch (_) {
       // do nothing
     }