Add support for alternate link sources (#1516)

* Support alternative link sources * Alternative -> Alternate * Ensure alternate navigation occurs within same webview
thunder-app · Sep 26, 2024 · cc58c97 · cc58c97
1 parent 08fc608
commit cc58c97
Show file tree

Hide file tree

Showing 8 changed files with 221 additions and 62 deletions.
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -101,6 +101,10 @@
   },
   "alreadyPostedTo": "Already posted to",
   "@alreadyPostedTo": {},
+  "alternateSources": "Alternate Sources",
+  "@alternateSources": {
+    "description": "Action for viewing a link from alternate sources"
+  },
   "always": "Always",
   "@always": {},
   "andXMore": "and {count} more",

diff --git a/lib/post/pages/legacy_post_page.dart b/lib/post/pages/legacy_post_page.dart
@@ -16,6 +16,7 @@ import 'package:super_sliver_list/super_sliver_list.dart';
 import 'package:thunder/comment/utils/navigate_comment.dart';
 import 'package:thunder/core/auth/bloc/auth_bloc.dart';
 import 'package:thunder/core/enums/fab_action.dart';
+import 'package:thunder/core/enums/media_type.dart';
 import 'package:thunder/core/models/comment_view_tree.dart';
 import 'package:thunder/core/models/post_view_media.dart';
 import 'package:thunder/core/singletons/lemmy_client.dart';
@@ -31,6 +32,7 @@ import 'package:thunder/shared/snackbar.dart';
 import 'package:thunder/shared/text/selectable_text_modal.dart';
 import 'package:thunder/shared/thunder_popup_menu_item.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
+import 'package:thunder/utils/links.dart';
 
 @Deprecated('Use the new PostPage widget')
 class PostPage extends StatefulWidget {
@@ -231,6 +233,19 @@ class _PostPageState extends State<PostPage> {
                       icon: Icons.select_all_rounded,
                       title: l10n.selectText,
                     ),
+                    if (state.postView?.media.first.mediaType == MediaType.link && state.postView!.media.first.originalUrl?.isNotEmpty == true)
+                      ThunderPopupMenuItem(
+                        onTap: () {
+                          handleLinkLongPress(
+                            context,
+                            state.postView!.media.first.originalUrl!,
+                            state.postView!.media.first.originalUrl!,
+                            initialPage: LinkBottomSheetPage.alternateLinks,
+                          );
+                        },
+                        icon: Icons.link_rounded,
+                        title: l10n.alternateSources,
+                      ),
                   ],
                 ),
               ],

diff --git a/lib/post/widgets/post_page_app_bar.dart b/lib/post/widgets/post_page_app_bar.dart
@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:thunder/core/enums/media_type.dart';
 import 'package:thunder/core/models/post_view_media.dart';
 
 import 'package:thunder/core/singletons/lemmy_client.dart';
@@ -12,6 +13,7 @@ import 'package:thunder/shared/sort_picker.dart';
 import 'package:thunder/shared/thunder_popup_menu_item.dart';
 import 'package:thunder/thunder/bloc/thunder_bloc.dart';
 import 'package:thunder/user/widgets/user_selector.dart';
+import 'package:thunder/utils/links.dart';
 
 /// Holds the app bar for the post page.
 class PostPageAppBar extends StatelessWidget {
@@ -201,6 +203,19 @@ class PostAppBarActions extends StatelessWidget {
               icon: Icons.people_alt_rounded,
               title: l10n.viewPostAsDifferentAccount,
             ),
+            if (state.postView?.media.first.mediaType == MediaType.link && state.postView!.media.first.originalUrl?.isNotEmpty == true)
+              ThunderPopupMenuItem(
+                onTap: () {
+                  handleLinkLongPress(
+                    context,
+                    state.postView!.media.first.originalUrl!,
+                    state.postView!.media.first.originalUrl!,
+                    initialPage: LinkBottomSheetPage.alternateLinks,
+                  );
+                },
+                icon: Icons.link_rounded,
+                title: l10n.alternateSources,
+              ),
           ],
         ),
       ],

diff --git a/lib/shared/common_markdown_body.dart b/lib/shared/common_markdown_body.dart
@@ -158,7 +158,7 @@ class CommonMarkdownBody extends StatelessWidget {
         );
       },
       onTapLink: (text, url, title) => handleLinkTap(context, state, text, url),
-      onLongPressLink: (text, url, title) => handleLinkLongPress(context, state, text, url),
+      onLongPressLink: (text, url, title) => handleLinkLongPress(context, text, url),
       styleSheet: hideContent
           ? spoilerMarkdownStyleSheet
           : MarkdownStyleSheet.fromTheme(theme).copyWith(

diff --git a/lib/shared/link_information.dart b/lib/shared/link_information.dart
@@ -73,7 +73,7 @@ class _LinkInformationState extends State<LinkInformation> {
           }
 
           if (widget.mediaType == MediaType.link) {
-            handleLinkLongPress(context, state, widget.originURL!, widget.originURL);
+            handleLinkLongPress(context, widget.originURL!, widget.originURL);
           }
         },
         child: Container(

diff --git a/lib/shared/link_preview_card.dart b/lib/shared/link_preview_card.dart
@@ -138,7 +138,7 @@ class LinkPreviewCard extends StatelessWidget {
                   child: InkWell(
                     splashColor: theme.colorScheme.primary.withOpacity(0.4),
                     onTap: () => triggerOnTap(context),
-                    onLongPress: originURL != null ? () => handleLinkLongPress(context, thunderState, originURL!, originURL) : null,
+                    onLongPress: originURL != null ? () => handleLinkLongPress(context, originURL!, originURL) : null,
                     borderRadius: BorderRadius.circular((edgeToEdgeImages ? 0 : 12)),
                   ),
                 ),
@@ -226,7 +226,7 @@ class LinkPreviewCard extends StatelessWidget {
                 child: InkWell(
                   splashColor: theme.colorScheme.primary.withOpacity(0.4),
                   onTap: () => triggerOnTap(context),
-                  onLongPress: originURL != null ? () => handleLinkLongPress(context, thunderState, originURL!, originURL) : null,
+                  onLongPress: originURL != null ? () => handleLinkLongPress(context, originURL!, originURL) : null,
                 ),
               ),
             ),

diff --git a/lib/shared/webview.dart b/lib/shared/webview.dart
@@ -6,6 +6,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:thunder/shared/thunder_popup_menu_item.dart';
+import 'package:thunder/utils/links.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import 'package:webview_flutter/webview_flutter.dart';
@@ -162,6 +163,19 @@ class NavigationControls extends StatelessWidget {
                   icon: Icons.share_rounded,
                   title: l10n.share,
                 ),
+                ThunderPopupMenuItem(
+                  onTap: () {
+                    handleLinkLongPress(
+                      context,
+                      url,
+                      url,
+                      initialPage: LinkBottomSheetPage.alternateLinks,
+                      customNavigation: (url) => webViewController.loadRequest(Uri.parse(url)),
+                    );
+                  },
+                  icon: Icons.link_rounded,
+                  title: l10n.alternateSources,
+                ),
               ],
             ),
             const SizedBox(width: 8.0),