Merge branch 'develop'

invoiceninja · Jul 12, 2024 · c4218ee · c4218ee
2 parents 861b182 + b03faea
commit c4218ee
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 21 deletions.
diff --git a/lib/ui/app/portal_links.dart b/lib/ui/app/portal_links.dart
@@ -6,17 +6,24 @@ import 'package:invoiceninja_flutter/ui/app/icon_text.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+enum PortalLinkStyle {
+  buttons,
+  dropdown,
+}
+
 class PortalLinks extends StatelessWidget {
   const PortalLinks({
     Key? key,
     required this.viewLink,
     required this.copyLink,
     required this.client,
+    this.style,
   }) : super(key: key);
 
   final String viewLink;
   final String copyLink;
   final ClientEntity? client;
+  final PortalLinkStyle? style;
 
   @override
   Widget build(BuildContext context) {
@@ -39,25 +46,53 @@ class PortalLinks extends StatelessWidget {
       showToast(localization!.copiedToClipboard.replaceFirst(':value ', ''));
     };
 
-    return PopupMenuButton<String>(
-      itemBuilder: (BuildContext context) => [
-        PopupMenuItem(
-          child:
-              IconText(text: localization!.viewPortal, icon: Icons.open_in_new),
-          value: localization.viewPortal,
-        ),
-        PopupMenuItem(
-          child: IconText(text: localization.copyLink, icon: Icons.copy),
-          value: localization.copyLink,
-        ),
-      ],
-      onSelected: (value) {
-        if (value == localization!.viewPortal) {
-          viewLinkPressed();
-        } else {
-          copyLinkPressed();
-        }
-      },
-    );
+    if (style == PortalLinkStyle.dropdown) {
+      return PopupMenuButton<String>(
+        itemBuilder: (BuildContext context) => [
+          PopupMenuItem(
+            child: IconText(
+                text: localization!.viewPortal, icon: Icons.open_in_new),
+            value: localization.viewPortal,
+          ),
+          PopupMenuItem(
+            child: IconText(text: localization.copyLink, icon: Icons.copy),
+            value: localization.copyLink,
+          ),
+        ],
+        onSelected: (value) {
+          if (value == localization!.viewPortal) {
+            viewLinkPressed();
+          } else {
+            copyLinkPressed();
+          }
+        },
+      );
+    } else {
+      return Row(
+        children: [
+          Expanded(
+            child: OutlinedButton(
+                onPressed: viewLinkPressed,
+                child: Text(
+                  localization!.viewPortal,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                  textAlign: TextAlign.center,
+                )),
+          ),
+          SizedBox(width: 8),
+          Expanded(
+            child: OutlinedButton(
+                onPressed: copyLinkPressed,
+                child: Text(
+                  localization.copyLink,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                  textAlign: TextAlign.center,
+                )),
+          ),
+        ],
+      );
+    }
   }
-}
+}
diff --git a/lib/ui/client/view/client_view_fullwidth.dart b/lib/ui/client/view/client_view_fullwidth.dart
@@ -394,6 +394,7 @@ class _ClientViewFullwidthState extends State<ClientViewFullwidth>
                           client: client,
                           viewLink: contact.silentLink,
                           copyLink: contact.link,
+                          style: PortalLinkStyle.dropdown,
                         )
                       ],
                     );

diff --git a/lib/ui/vendor/view/vendor_view_fullwidth.dart b/lib/ui/vendor/view/vendor_view_fullwidth.dart
@@ -302,6 +302,7 @@ class _VendorViewFullwidthState extends State<VendorViewFullwidth>
                           client: null,
                           viewLink: contact.silentLink,
                           copyLink: contact.link,
+                          style: PortalLinkStyle.dropdown,
                         )
                       ],
                     );