refactor: feedback on 'Copy Error'

yukino-org · Nov 12, 2021 · ca0aae1 · ca0aae1
1 parent a35ae29
commit ca0aae1
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 19 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -6,7 +6,7 @@ import './modules/database/database.dart';
 import './modules/helpers/logger.dart';
 import './modules/helpers/ui.dart';
 import './modules/translator/translator.dart';
-import './modules/utils/list.dart';
+import './modules/utils/utils.dart';
 import './ui/router.dart';
 
 Future<void> main(final List<String> args) async {

diff --git a/lib/modules/translator/translations.dart b/lib/modules/translator/translations.dart
@@ -157,4 +157,5 @@ abstract class TranslationSentences {
   String previousEpisode();
   String nextEpisode();
   String ignoreBadHttpSslCertificates();
+  String copiedErrorToClipboard();
 }
diff --git a/lib/modules/translator/translations/en.dart b/lib/modules/translator/translations/en.dart
@@ -459,4 +459,7 @@ class Sentences extends TranslationSentences {
 
   @override
   String ignoreBadHttpSslCertificates() => 'Ignore bad HTTP SSL certificates';
+
+  @override
+  String copiedErrorToClipboard() => 'Copied error to clipboard';
 }
diff --git a/lib/modules/utils/utils.dart b/lib/modules/utils/utils.dart
@@ -1,5 +1,6 @@
 export './crypto.dart';
 export './duration.dart';
+export './error.dart';
 export './function.dart';
 export './list.dart';
 export './string.dart';
diff --git a/lib/ui/components/error_widget.dart b/lib/ui/components/error_widget.dart
@@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 import '../../modules/helpers/faces.dart';
 import '../../modules/helpers/ui.dart';
 import '../../modules/translator/translator.dart';
-import '../../modules/utils/error.dart';
-import '../../modules/utils/list.dart';
+import '../../modules/utils/utils.dart';
 
 class KawaiiErrorWidget extends StatelessWidget {
   const KawaiiErrorWidget({
@@ -131,9 +130,23 @@ class KawaiiErrorWidget extends StatelessWidget {
                         <String>[
                           'Message: $message',
                           if (error != null) 'Error: $error',
-                          if (stack != null) 'Stack trace: $stack',
+                          if (stack != null) 'Stack trace:\n$stack',
                         ].join('\n'),
                       );
+
+                      FunctionUtils.withValue(
+                        context,
+                        (final BuildContext context) =>
+                            ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(
+                              Translator.t.copiedErrorToClipboard(),
+                              style: Theme.of(context).textTheme.bodyText1,
+                            ),
+                            backgroundColor: Theme.of(context).cardColor,
+                          ),
+                        ),
+                      );
                     },
                   ),
                 ),

diff --git a/lib/ui/components/material_tiles/header.dart b/lib/ui/components/material_tiles/header.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import '../../../modules/helpers/ui.dart';
-import '../../../modules/utils/function.dart';
+import '../../../modules/utils/utils.dart';
 
 class MaterialHeaderTile extends StatelessWidget {
   const MaterialHeaderTile({

diff --git a/lib/ui/components/material_tiles/utils.dart b/lib/ui/components/material_tiles/utils.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import '../../../modules/helpers/ui.dart';
-import '../../../modules/utils/function.dart';
+import '../../../modules/utils/utils.dart';
 
 abstract class MaterialTileUtils {
   static Widget buildWrapper(

diff --git a/lib/ui/components/settings/keyboard_tite.dart b/lib/ui/components/settings/keyboard_tite.dart
@@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
 import '../../../modules/helpers/keyboard.dart';
 import '../../../modules/helpers/ui.dart';
 import '../../../modules/translator/translator.dart';
-import '../../../modules/utils/function.dart';
+import '../../../modules/utils/utils.dart';
 import '../material_tiles/base.dart';
 
 class SettingsKeyboardTile extends StatefulWidget {

diff --git a/lib/ui/components/trackers/detailed_item.dart b/lib/ui/components/trackers/detailed_item.dart
@@ -7,7 +7,7 @@ import '../../../modules/helpers/assets.dart';
 import '../../../modules/helpers/ui.dart';
 import '../../../modules/trackers/provider.dart';
 import '../../../modules/translator/translator.dart';
-import '../../../modules/utils/string.dart';
+import '../../../modules/utils/utils.dart';
 import '../../pages/search_page/search_page.dart' as search_page;
 import '../../router.dart';
 

diff --git a/lib/ui/pages/anime_page/anime_page.dart b/lib/ui/pages/anime_page/anime_page.dart
@@ -11,7 +11,7 @@ import '../../../modules/helpers/ui.dart';
 import '../../../modules/state/hooks.dart';
 import '../../../modules/state/stateful_holder.dart';
 import '../../../modules/translator/translator.dart';
-import '../../../modules/utils/error.dart';
+import '../../../modules/utils/utils.dart';
 import '../../components/error_widget.dart';
 import '../../components/placeholder_appbar.dart';
 import '../../components/reactive_state_builder.dart';

diff --git a/lib/ui/pages/settings_page/setting_labels/about.dart b/lib/ui/pages/settings_page/setting_labels/about.dart
@@ -5,7 +5,7 @@ import '../../../../modules/database/database.dart';
 import '../../../../modules/helpers/assets.dart';
 import '../../../../modules/helpers/ui.dart';
 import '../../../../modules/translator/translator.dart';
-import '../../../../modules/utils/function.dart';
+import '../../../../modules/utils/utils.dart';
 import '../../../components/material_tiles/base.dart';
 import '../../../components/size_aware_builder.dart';
 

diff --git a/lib/ui/pages/settings_page/setting_labels/developers.dart b/lib/ui/pages/settings_page/setting_labels/developers.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import '../../../../modules/database/database.dart';
 import '../../../../modules/helpers/logger.dart';
 import '../../../../modules/translator/translator.dart';
-import '../../../../modules/utils/function.dart';
+import '../../../../modules/utils/utils.dart';
 import '../../../components/material_tiles/base.dart';
 import '../../../components/material_tiles/switch.dart';
 

diff --git a/lib/ui/pages/settings_page/settings_page.dart b/lib/ui/pages/settings_page/settings_page.dart
@@ -9,7 +9,7 @@ import '../../../modules/app/state.dart';
 import '../../../modules/database/database.dart';
 import '../../../modules/helpers/ui.dart';
 import '../../../modules/translator/translator.dart';
-import '../../../modules/utils/function.dart';
+import '../../../modules/utils/utils.dart';
 import '../../components/material_tiles/base.dart';
 import '../../components/size_aware_builder.dart';
 

diff --git a/packages/extensions/lib/hetu/helpers/error.dart b/packages/extensions/lib/hetu/helpers/error.dart
@@ -49,17 +49,20 @@ class HError implements Error {
   ]) =>
       HError(err.err, stack ?? err.stack, task ?? err.task);
 
-  @override
-  StackTrace? get stackTrace =>
-      stack != null ? StackTrace.fromString(stack!) : null;
+  String prettyString() => '$err\n$stackTrace';
 
   @override
-  String toString() {
-    final String stack = indentString(stackTrace?.toString() ?? '-', '  ');
-    final String task = indentString(this.task?.toString() ?? '-', '  ');
+  StackTrace get stackTrace {
+    final String stackString = indentString(stack?.toString() ?? '-', '  ');
+    final String taskString = indentString(task?.toString() ?? '-', '  ');
 
-    return 'Error: $err\nStack Trace:\n$stack\nTask Trace:\n$task';
+    return StackTrace.fromString(
+      'Stack Trace:\n$stackString\nTask Trace:\n$taskString',
+    );
   }
+
+  @override
+  String toString() => err;
 }
 
 class HErrorClassBinding extends HTExternalClass {