desktop tx details + edit note ui

lib/pages/wallet_view/transaction_views/all_transactions_view.dart

@@ -23,6 +23,7 @@ import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
+import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
 import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
 import 'package:stackwallet/widgets/desktop/secondary_button.dart';
 import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
@@ -865,6 +866,20 @@ class _DesktopTransactionCardRowState
             );
             return;
           }
+          if (Util.isDesktop) {
+            await showDialog<void>(
+              context: context,
+              builder: (context) => DesktopDialog(
+                maxHeight: MediaQuery.of(context).size.height - 64,
+                maxWidth: 580,
+                child: TransactionDetailsView(
+                  transaction: _transaction,
+                  coin: coin,
+                  walletId: walletId,
+                ),
+              ),
+            );
+          } else {
             unawaited(
               Navigator.of(context).pushNamed(
                 TransactionDetailsView.routeName,
@@ -875,6 +890,7 @@ class _DesktopTransactionCardRowState
                 ),
               ),
             );
+          }
         },
         child: Padding(
           padding: const EdgeInsets.symmetric(

lib/pages/wallet_view/transaction_views/edit_note_view.dart

@@ -4,13 +4,14 @@ import 'package:stackwallet/providers/providers.dart';
 import 'package:stackwallet/utilities/constants.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
+import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
+import 'package:stackwallet/widgets/desktop/desktop_dialog_close_button.dart';
+import 'package:stackwallet/widgets/desktop/primary_button.dart';
 import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
 import 'package:stackwallet/widgets/stack_text_field.dart';
 import 'package:stackwallet/widgets/textfield_icon_button.dart';
 
-import 'package:stackwallet/utilities/util.dart';
-
 class EditNoteView extends ConsumerStatefulWidget {
   const EditNoteView({
     Key? key,
@@ -33,8 +34,11 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
   late final TextEditingController _noteController;
   final noteFieldFocusNode = FocusNode();
 
+  late final bool isDesktop;
+
   @override
   void initState() {
+    isDesktop = Util.isDesktop;
     _noteController = TextEditingController();
     _noteController.text = widget.note;
     super.initState();
@@ -50,15 +54,20 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Theme.of(context).extension<StackColors>()!.background,
+      backgroundColor: isDesktop
-        appBar: AppBar(
+          ? Colors.transparent
+          : Theme.of(context).extension<StackColors>()!.background,
+      appBar: isDesktop
+          ? null
+          : AppBar(
               backgroundColor:
                   Theme.of(context).extension<StackColors>()!.background,
               leading: AppBarBackButton(
                 onPressed: () async {
                   if (FocusScope.of(context).hasFocus) {
                     FocusScope.of(context).unfocus();
-                await Future<void>.delayed(const Duration(milliseconds: 75));
+                    await Future<void>.delayed(
+                        const Duration(milliseconds: 75));
                   }
                   if (mounted) {
                     Navigator.of(context).pop();
@@ -70,21 +79,34 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
                 style: STextStyles.navBarTitle(context),
               ),
             ),
-        body: Padding(
+      body: MobileEditNoteScaffold(
-          padding: const EdgeInsets.all(12),
-          child: LayoutBuilder(builder: (context, constraints) {
-            return SingleChildScrollView(
-              child: ConstrainedBox(
-                constraints: BoxConstraints(
-                  minHeight: constraints.maxHeight,
-                ),
-                child: IntrinsicHeight(
-                  child: Padding(
-                    padding: const EdgeInsets.all(4),
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
-                        ClipRRect(
+            if (isDesktop)
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 32,
+                  bottom: 12,
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      "Edit note",
+                      style: STextStyles.desktopH3(context),
+                    ),
+                    const DesktopDialogCloseButton(),
+                  ],
+                ),
+              ),
+            Padding(
+              padding: isDesktop
+                  ? const EdgeInsets.symmetric(
+                      horizontal: 32,
+                    )
+                  : const EdgeInsets.all(0),
+              child: ClipRRect(
                 borderRadius: BorderRadius.circular(
                   Constants.size.circularBorderRadius,
                 ),
@@ -92,13 +114,29 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
                   autocorrect: Util.isDesktop ? false : true,
                   enableSuggestions: Util.isDesktop ? false : true,
                   controller: _noteController,
-                            style: STextStyles.field(context),
+                  style: isDesktop
+                      ? STextStyles.desktopTextExtraSmall(context).copyWith(
+                          color: Theme.of(context)
+                              .extension<StackColors>()!
+                              .textFieldActiveText,
+                          height: 1.8,
+                        )
+                      : STextStyles.field(context),
                   focusNode: noteFieldFocusNode,
                   decoration: standardInputDecoration(
                     "Note",
                     noteFieldFocusNode,
                     context,
+                    desktopMed: isDesktop,
                   ).copyWith(
+                    contentPadding: isDesktop
+                        ? const EdgeInsets.only(
+                            left: 16,
+                            top: 11,
+                            bottom: 12,
+                            right: 5,
+                          )
+                        : null,
                     suffixIcon: _noteController.text.isNotEmpty
                         ? Padding(
                             padding: const EdgeInsets.only(right: 0),
@@ -121,12 +159,33 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
                   ),
                 ),
               ),
+            ),
+            // if (!isDesktop)
             const Spacer(),
+            if (isDesktop)
+              Padding(
+                padding: const EdgeInsets.all(32),
+                child: PrimaryButton(
+                  label: "Save",
+                  onPressed: () async {
+                    await ref
+                        .read(
+                            notesServiceChangeNotifierProvider(widget.walletId))
+                        .editOrAddNote(
+                          txid: widget.txid,
+                          note: _noteController.text,
+                        );
+                    if (mounted) {
+                      Navigator.of(context).pop();
+                    }
+                  },
+                ),
+              ),
+            if (!isDesktop)
               TextButton(
                 onPressed: () async {
                   await ref
-                                .read(notesServiceChangeNotifierProvider(
+                      .read(notesServiceChangeNotifierProvider(widget.walletId))
-                                    widget.walletId))
                       .editOrAddNote(
                         txid: widget.txid,
                         note: _noteController.text,
@@ -146,10 +205,43 @@ class _EditNoteViewState extends ConsumerState<EditNoteView> {
           ],
         ),
       ),
+    );
+  }
+}
+
+class MobileEditNoteScaffold extends StatelessWidget {
+  const MobileEditNoteScaffold({
+    Key? key,
+    required this.child,
+  }) : super(key: key);
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    if (Util.isDesktop) {
+      return child;
+    } else {
+      return Padding(
+        padding: const EdgeInsets.all(12),
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            return SingleChildScrollView(
+              child: ConstrainedBox(
+                constraints: BoxConstraints(
+                  minHeight: constraints.maxHeight,
+                ),
+                child: IntrinsicHeight(
+                  child: Padding(
+                    padding: const EdgeInsets.all(4),
+                    child: child,
+                  ),
                 ),
               ),
             );
-          }),
+          },
-        ));
+        ),
+      );
+    }
   }
 }

lib/widgets/icon_widgets/copy_icon.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/theme/stack_colors.dart';
+
+class CopyIcon extends StatelessWidget {
+  const CopyIcon({
+    Key? key,
+    this.width = 18,
+    this.height = 18,
+    this.color,
+  }) : super(key: key);
+
+  final double width;
+  final double height;
+  final Color? color;
+
+  @override
+  Widget build(BuildContext context) {
+    return SvgPicture.asset(
+      Assets.svg.copy,
+      width: width,
+      height: height,
+      color: color ?? Theme.of(context).extension<StackColors>()!.textDark3,
+    );
+  }
+}

lib/widgets/icon_widgets/pencil_icon.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:stackwallet/utilities/assets.dart';
+import 'package:stackwallet/utilities/theme/stack_colors.dart';
+
+class PencilIcon extends StatelessWidget {
+  const PencilIcon({
+    Key? key,
+    this.width = 18,
+    this.height = 18,
+    this.color,
+  }) : super(key: key);
+
+  final double width;
+  final double height;
+  final Color? color;
+
+  @override
+  Widget build(BuildContext context) {
+    return SvgPicture.asset(
+      Assets.svg.pencil,
+      width: width,
+      height: height,
+      color: color ?? Theme.of(context).extension<StackColors>()!.textDark3,
+    );
+  }
+}

lib/widgets/transaction_card.dart

@@ -14,6 +14,7 @@ import 'package:stackwallet/utilities/format.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
 import 'package:tuple/tuple.dart';
 
 class TransactionCard extends ConsumerStatefulWidget {
@@ -138,6 +139,20 @@ class _TransactionCardState extends ConsumerState<TransactionCard> {
               ));
               return;
             }
+            if (Util.isDesktop) {
+              await showDialog<void>(
+                context: context,
+                builder: (context) => DesktopDialog(
+                  maxHeight: MediaQuery.of(context).size.height - 64,
+                  maxWidth: 580,
+                  child: TransactionDetailsView(
+                    transaction: _transaction,
+                    coin: coin,
+                    walletId: walletId,
+                  ),
+                ),
+              );
+            } else {
               unawaited(
                 Navigator.of(context).pushNamed(
                   TransactionDetailsView.routeName,
@@ -148,6 +163,7 @@ class _TransactionCardState extends ConsumerState<TransactionCard> {
                   ),
                 ),
               );
+            }
           },
           child: Padding(
             padding: const EdgeInsets.all(8),

pubspec.lock

@@ -42,7 +42,7 @@ packages:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.0"
+    version: "3.1.11"
   args:
     dependency: transitive
     description:
@@ -63,7 +63,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.0"
+    version: "2.8.2"
   barcode_scan2:
     dependency: "direct main"
     description:
@@ -190,7 +190,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
+  charcode:
+    dependency: transitive
+    description:
+      name: charcode
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -204,7 +211,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
@@ -274,7 +281,7 @@ packages:
       name: coverage
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0"
+    version: "1.2.0"
   cross_file:
     dependency: transitive
     description:
@@ -428,7 +435,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   ffi:
     dependency: "direct main"
     description:
@@ -857,21 +864,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -983,7 +990,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   path_drawing:
     dependency: transitive
     description:
@@ -1359,7 +1366,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -1417,35 +1424,35 @@ packages:
       name: sync_http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.1"
+    version: "0.3.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   test:
     dependency: transitive
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.21.4"
+    version: "1.21.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.9"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.16"
+    version: "0.4.13"
   time:
     dependency: transitive
     description:
@@ -1494,7 +1501,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   universal_io:
     dependency: transitive
     description:
@@ -1578,7 +1585,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.0.0"
+    version: "8.2.2"
   wakelock:
     dependency: "direct main"
     description: