Rename "KeyToken" to "Used Key"

flutter/analysis_options.yaml

@@ -3,6 +3,10 @@ include:
  - package:lints/recommended.yaml
  - package:flutter_lints/flutter.yaml
 
+formatter:
+  page_width: 512
+  trailing_commas: preserve
+
 linter:
   
   

flutter/lib/pages/message_view/message_view.dart

@@ -166,20 +166,34 @@ class _MessageViewPageState extends State<MessageViewPage> {
               title: 'Sender',
               values: [message.senderName!],
               mainAction: () => {
-                Navi.push(context, () => FilteredMessageViewPage(title: message.senderName!, alertText: 'All message sent from \'${message.senderName!}\'', filter: MessageFilter(senderNames: [message.senderName!])))
+                Navi.push(
+                  context,
+                  () => FilteredMessageViewPage(
+                    title: message.senderName!,
+                    alertText: 'All message sent from \'${message.senderName!}\'',
+                    filter: MessageFilter(senderNames: [message.senderName!]),
+                  ),
+                ),
               },
             ),
           if (cfg.showExtendedAttributes)
             UI.metaCard(
               context: context,
               icon: FontAwesomeIcons.solidGearCode,
-              title: 'KeyToken',
+              title: 'Used Key',
               values: [message.usedKeyID, token?.name ?? '...'],
               mainAction: () {
                 if (message.senderUserID == userAccUserID) {
                   Navi.push(context, () => KeyTokenViewPage(keytokenID: message.usedKeyID, preloadedData: null, needsReload: null));
                 } else {
-                  Navi.push(context, () => FilteredMessageViewPage(title: token?.name ?? message.usedKeyID, alertText: 'All message sent with the specified key', filter: MessageFilter(usedKeys: [message.usedKeyID])));
+                  Navi.push(
+                    context,
+                    () => FilteredMessageViewPage(
+                      title: token?.name ?? message.usedKeyID,
+                      alertText: 'All message sent with the specified key',
+                      filter: MessageFilter(usedKeys: [message.usedKeyID]),
+                    ),
+                  );
                 }
               },
             ),
@@ -187,13 +201,20 @@ class _MessageViewPageState extends State<MessageViewPage> {
             UI.metaCard(
               context: context,
               icon: FontAwesomeIcons.solidGearCode,
-              title: 'KeyToken',
+              title: 'Used Key',
               values: [token.name],
               mainAction: () {
                 if (message.senderUserID == userAccUserID) {
                   Navi.push(context, () => KeyTokenViewPage(keytokenID: message.usedKeyID, preloadedData: null, needsReload: null));
                 } else {
-                  Navi.push(context, () => FilteredMessageViewPage(title: token.name, alertText: 'All message sent with key \'${token.name}\'', filter: MessageFilter(usedKeys: [message.usedKeyID])));
+                  Navi.push(
+                    context,
+                    () => FilteredMessageViewPage(
+                      title: token.name,
+                      alertText: 'All message sent with key \'${token.name}\'',
+                      filter: MessageFilter(usedKeys: [message.usedKeyID]),
+                    ),
+                  );
                 }
               },
             ),
@@ -208,19 +229,21 @@ class _MessageViewPageState extends State<MessageViewPage> {
                   }
                 : null,
           ),
-          UI.metaCard(
+          UI.metaCard(context: context, icon: FontAwesomeIcons.solidTimer, title: 'Timestamp', values: [message.timestamp]),
-            context: context,
-            icon: FontAwesomeIcons.solidTimer,
-            title: 'Timestamp',
-            values: [message.timestamp],
-          ),
           if (cfg.showExtendedAttributes)
             UI.metaCard(
               context: context,
               icon: FontAwesomeIcons.solidUser,
               title: 'User',
               values: [user?.userID ?? message.senderUserID, if (user?.username != null) user?.username ?? ''],
-              mainAction: () => Navi.push(context, () => FilteredMessageViewPage(title: user?.username ?? message.senderUserID, alertText: 'All message sent by the specified account', filter: MessageFilter(senderUserID: [message.senderUserID]))),
+              mainAction: () => Navi.push(
+                context,
+                () => FilteredMessageViewPage(
+                  title: user?.username ?? message.senderUserID,
+                  alertText: 'All message sent by the specified account',
+                  filter: MessageFilter(senderUserID: [message.senderUserID]),
+                ),
+              ),
             ),
           if (!cfg.showExtendedAttributes)
             UI.metaCard(
@@ -228,14 +251,28 @@ class _MessageViewPageState extends State<MessageViewPage> {
               icon: FontAwesomeIcons.solidUser,
               title: 'User',
               values: [user?.username ?? user?.userID ?? message.senderUserID],
-              mainAction: () => Navi.push(context, () => FilteredMessageViewPage(title: user?.username ?? message.senderUserID, alertText: 'All message sent by the specified account', filter: MessageFilter(senderUserID: [message.senderUserID]))),
+              mainAction: () => Navi.push(
+                context,
+                () => FilteredMessageViewPage(
+                  title: user?.username ?? message.senderUserID,
+                  alertText: 'All message sent by the specified account',
+                  filter: MessageFilter(senderUserID: [message.senderUserID]),
+                ),
+              ),
             ),
           UI.metaCard(
             context: context,
             icon: FontAwesomeIcons.solidBolt,
             title: 'Priority',
             values: [_prettyPrintPriority(message.priority)],
-            mainAction: () => Navi.push(context, () => FilteredMessageViewPage(title: "Priority ${message.priority}", alertText: 'All message sent with priority ' + _prettyPrintPriority(message.priority), filter: MessageFilter(priority: [message.priority]))),
+            mainAction: () => Navi.push(
+              context,
+              () => FilteredMessageViewPage(
+                title: "Priority ${message.priority}",
+                alertText: 'All message sent with priority ' + _prettyPrintPriority(message.priority),
+                filter: MessageFilter(priority: [message.priority]),
+              ),
+            ),
           ),
           if (message.senderUserID == userAccUserID)
             UI.button(
@@ -243,7 +280,8 @@ class _MessageViewPageState extends State<MessageViewPage> {
               onPressed: () {
                 Toaster.info("Not Implemented", "... will be implemented in a later version"); // TODO
               },
-                color: Colors.red[900]),
+              color: Colors.red[900],
+            ),
         ],
       ),
     );
@@ -261,16 +299,11 @@ class _MessageViewPageState extends State<MessageViewPage> {
           thumbVisibility: false,
           interactive: true,
           controller: _controller,
-          child: SingleChildScrollView(
+          child: SingleChildScrollView(controller: _controller, child: child),
-            controller: _controller,
-            child: child,
-          ),
         ),
       );
     } else {
-      return SingleChildScrollView(
+      return SingleChildScrollView(child: child);
-        child: child,
-      );
     }
   }
 
@@ -284,12 +317,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
     return [
       Row(
         children: [
-          UI.channelChip(
+          UI.channelChip(context: context, text: _resolveChannelName(channel, message), margin: const EdgeInsets.fromLTRB(0, 0, 4, 0), fontSize: 16),
-            context: context,
-            text: _resolveChannelName(channel, message),
-            margin: const EdgeInsets.fromLTRB(0, 0, 4, 0),
-            fontSize: 16,
-          ),
           Expanded(child: SizedBox()),
           Text(dateFormat.format(DateTime.parse(message.timestamp)), style: const TextStyle(fontSize: 14)),
         ],
@@ -337,12 +365,7 @@ class _MessageViewPageState extends State<MessageViewPage> {
               ),
               borderColor: (message.priority == 2) ? Colors.red[900] : null,
             )
-          : UI.box(
+          : UI.box(context: context, padding: const EdgeInsets.all(4), child: Text(message.content ?? ''), borderColor: (message.priority == 2) ? Colors.red[900] : null),
-              context: context,
-              padding: const EdgeInsets.all(4),
-              child: Text(message.content ?? ''),
-              borderColor: (message.priority == 2) ? Colors.red[900] : null,
-            )
     ];
   }
 

flutter/lib/state/app_settings.dart

@@ -160,7 +160,14 @@ class AppSettings extends ChangeNotifier {
 
 class AppNotificationSettings {
   // Immutable
-  AppNotificationSettings({this.enableLights = false, this.enableVibration = true, this.playSound = true, this.sound = null, this.silent = false, this.timeoutAfter = null});
+  AppNotificationSettings({
+    this.enableLights = false,
+    this.enableVibration = true,
+    this.playSound = true,
+    this.sound = null,
+    this.silent = false,
+    this.timeoutAfter = null,
+  });
 
   final bool enableLights;
   final bool enableVibration;
@@ -199,7 +206,14 @@ class AppNotificationSettings {
     final silent = prefs.getBool('${prefix}.silent') ?? def.silent;
     final timeoutAfter = _decode(prefs.getString('${prefix}.timeoutAfter'), def.timeoutAfter);
 
-    return AppNotificationSettings(enableLights: enableLights, enableVibration: enableVibration, playSound: playSound, sound: sound, silent: silent, timeoutAfter: timeoutAfter);
+    return AppNotificationSettings(
+      enableLights: enableLights,
+      enableVibration: enableVibration,
+      playSound: playSound,
+      sound: sound,
+      silent: silent,
+      timeoutAfter: timeoutAfter,
+    );
   }
 }