fix text scaling and url parsing. (#237)

README.md

@@ -29,6 +29,7 @@ Features:
 - Download stories and comments for offline reading.
 - Pick up where you left off.
 - Synced favorites and pins across devices. (iOS only)
+- Export or import your favorites. 
 - Launch from system share sheet.
 - And more...
 

ios/Podfile.lock

@@ -27,12 +27,16 @@ PODS:
     - Flutter
   - integration_test (0.0.1):
     - Flutter
+  - MTBBarcodeScanner (5.0.11)
   - OrderedSet (5.0.0)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - qr_code_scanner (0.2.0):
+    - Flutter
+    - MTBBarcodeScanner
   - ReachabilitySwift (5.0.0)
   - receive_sharing_intent (0.0.1):
     - Flutter
@@ -68,6 +72,7 @@ DEPENDENCIES:
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -81,6 +86,7 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - FMDB
+    - MTBBarcodeScanner
     - OrderedSet
     - ReachabilitySwift
 
@@ -109,6 +115,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
+  qr_code_scanner:
+    :path: ".symlinks/plugins/qr_code_scanner/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
   share_plus:
@@ -140,9 +148,11 @@ SPEC CHECKSUMS:
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
   integration_test: 13825b8a9334a850581300559b8839134b124670
+  MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
+  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
   share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028

ios/Runner/Info.plist

@@ -76,5 +76,9 @@
 	<false/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+    <string>This app needs camera access to scan QR codes</string>
+    <key>io.flutter.embedded_views_preview</key>
+    <true/>
 </dict>
 </plist>

lib/blocs/stories/stories_bloc.dart

@@ -133,6 +133,8 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     StoriesRefresh event,
     Emitter<StoriesState> emit,
   ) async {
+    if (state.statusByType[event.type] == StoriesStatus.loading) return;
+
     emit(
       state.copyWithStatusUpdated(
         type: event.type,

lib/config/custom_router.dart

@@ -11,10 +11,14 @@ class CustomRouter {
     switch (settings.name) {
       case HomeScreen.routeName:
         return HomeScreen.route();
-      case ItemScreen.routeName:
-        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
       case SubmitScreen.routeName:
         return SubmitScreen.route();
+      case QrCodeScannerScreen.routeName:
+        return QrCodeScannerScreen.route();
+      case ItemScreen.routeName:
+        return ItemScreen.route(settings.arguments! as ItemScreenArgs);
+      case QrCodeViewScreen.routeName:
+        return QrCodeViewScreen.route(data: settings.arguments! as String);
       default:
         return _errorRoute();
     }

lib/cubits/pin/pin_cubit.dart

@@ -27,7 +27,7 @@ class PinCubit extends Cubit<PinState> {
       emit(state.copyWith(pinnedStoriesIds: ids));
 
       _storiesRepository.fetchStoriesStream(ids: ids).listen(_onStoryFetched);
-    });
+    }).whenComplete(() => emit(state.copyWith(status: Status.loaded)));
   }
 
   void pinStory(Story story) {
@@ -52,7 +52,10 @@ class PinCubit extends Cubit<PinState> {
     _preferenceRepository.updatePinnedStoriesIds(state.pinnedStoriesIds);
   }
 
-  void refresh() => init();
+  void refresh() {
+    if (state.status == Status.loading) return;
+    init();
+  }
 
   void _onStoryFetched(Story story) {
     emit(state.copyWith(pinnedStories: <Story>[...state.pinnedStories, story]));

lib/cubits/pin/pin_state.dart

@@ -4,22 +4,27 @@ class PinState extends Equatable {
   const PinState({
     required this.pinnedStoriesIds,
     required this.pinnedStories,
+    required this.status,
   });
 
   PinState.init()
       : pinnedStoriesIds = <int>[],
-        pinnedStories = <Story>[];
+        pinnedStories = <Story>[],
+        status = Status.idle;
 
   final List<int> pinnedStoriesIds;
   final List<Story> pinnedStories;
+  final Status status;
 
   PinState copyWith({
     List<int>? pinnedStoriesIds,
     List<Story>? pinnedStories,
+    Status? status,
   }) {
     return PinState(
       pinnedStoriesIds: pinnedStoriesIds ?? this.pinnedStoriesIds,
       pinnedStories: pinnedStories ?? this.pinnedStories,
+      status: status ?? this.status,
     );
   }
 
@@ -27,5 +32,6 @@ class PinState extends Equatable {
   List<Object?> get props => <Object?>[
         pinnedStoriesIds,
         pinnedStories,
+        status,
       ];
 }

lib/models/export_destination.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart' show IconData, Icons;
+
+enum ExportDestination {
+  qrCode('QR code', icon: Icons.qr_code),
+  clipBoard('ClipBoard', icon: Icons.copy);
+
+  const ExportDestination(
+    this.label, {
+    required this.icon,
+  });
+
+  final String label;
+  final IconData icon;
+}

lib/models/font_size.dart

@@ -4,7 +4,8 @@ enum FontSize {
   small('Small', TextDimens.pt15),
   regular('Regular', TextDimens.pt16),
   large('Large', TextDimens.pt17),
-  xlarge('XLarge', TextDimens.pt18);
+  xlarge('XLarge', TextDimens.pt18),
+  xxlarge('XXLarge', TextDimens.pt19);
 
   const FontSize(this.description, this.fontSize);
 

lib/models/models.dart

@@ -1,4 +1,5 @@
 export 'comments_order.dart';
+export 'export_destination.dart';
 export 'fetch_mode.dart';
 export 'font.dart';
 export 'font_size.dart';
@@ -6,5 +7,6 @@ export 'item/item.dart';
 export 'post_data.dart';
 export 'preference.dart';
 export 'search_params.dart';
+export 'status.dart';
 export 'story_type.dart';
 export 'user.dart';

lib/models/preference.dart

@@ -146,7 +146,7 @@ class AutoScrollModePreference extends BooleanPreference {
 
   @override
   String get subtitle =>
-      '''Automatically scroll to next comment when you collapse a comment.''';
+      '''automatically scroll to next comment when you collapse a comment.''';
 }
 
 /// The value deciding whether or not the story

lib/models/status.dart

@@ -0,0 +1,6 @@
+enum Status {
+  idle,
+  loading,
+  loaded,
+  error,
+}

lib/screens/item/widgets/custom_app_bar.dart

@@ -43,6 +43,7 @@ class CustomAppBar extends AppBar {
                   fontFamily: FeatherIcons.type.fontFamily,
                   package: FeatherIcons.type.fontPackage,
                 ),
+                textScaleFactor: 1,
               ),
               onPressed: onFontSizeTap,
             ),

lib/screens/item/widgets/main_view.dart

@@ -255,6 +255,8 @@ class _ParentItemSection extends StatelessWidget {
                           style: const TextStyle(
                             color: Palette.orange,
                           ),
+                          textScaleFactor:
+                              MediaQuery.of(context).textScaleFactor,
                         ),
                         const Spacer(),
                         Text(
@@ -262,6 +264,8 @@ class _ParentItemSection extends StatelessWidget {
                           style: const TextStyle(
                             color: Palette.grey,
                           ),
+                          textScaleFactor:
+                              MediaQuery.of(context).textScaleFactor,
                         ),
                       ],
                     ),
@@ -334,9 +338,8 @@ class _ParentItemSection extends StatelessWidget {
                                     ],
                                   ),
                                   textAlign: TextAlign.center,
-                                  textScaleFactor: MediaQuery.of(
+                                  textScaleFactor:
-                                    context,
+                                      MediaQuery.of(context).textScaleFactor,
-                                  ).textScaleFactor,
                                 ),
                               ),
                             )
@@ -354,6 +357,8 @@ class _ParentItemSection extends StatelessWidget {
                                   ),
                                   child: ItemText(
                                     item: state.item,
+                                    textScaleFactor:
+                                        MediaQuery.of(context).textScaleFactor,
                                   ),
                                 ),
                               ),
@@ -402,6 +407,7 @@ class _ParentItemSection extends StatelessWidget {
                     style: const TextStyle(
                       fontSize: TextDimens.pt13,
                     ),
+                    textScaleFactor: 1,
                   ),
                 ] else ...<Widget>[
                   const SizedBox(
@@ -444,6 +450,7 @@ class _ParentItemSection extends StatelessWidget {
                               style: TextStyle(
                                 fontSize: TextDimens.pt13,
                               ),
+                              textScaleFactor: 1,
                             ),
                     ),
                   ),
@@ -462,6 +469,7 @@ class _ParentItemSection extends StatelessWidget {
                               style: const TextStyle(
                                 fontSize: TextDimens.pt13,
                               ),
+                              textScaleFactor: 1,
                             ),
                           ),
                         )
@@ -483,6 +491,7 @@ class _ParentItemSection extends StatelessWidget {
                             style: const TextStyle(
                               fontSize: TextDimens.pt13,
                             ),
+                            textScaleFactor: 1,
                           ),
                         ),
                       )

lib/screens/item/widgets/reply_box.dart

@@ -345,6 +345,8 @@ class _ReplyBoxState extends State<ReplyBox> {
                       child: SingleChildScrollView(
                         child: ItemText(
                           item: replyingTo,
+                          textScaleFactor:
+                              MediaQuery.of(context).textScaleFactor,
                         ),
                       ),
                     ),

lib/screens/profile/qr_code_scanner_screen.dart

@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import 'package:hacki/main.dart';
+import 'package:hacki/styles/styles.dart';
+import 'package:qr_code_scanner/qr_code_scanner.dart';
+
+class QrCodeScannerScreen extends StatefulWidget {
+  const QrCodeScannerScreen({super.key});
+
+  static const String routeName = '/qr-code-scanner';
+
+  static Route<dynamic> route() {
+    return MaterialPageRoute<String?>(
+      settings: const RouteSettings(name: routeName),
+      builder: (_) => const QrCodeScannerScreen(),
+    );
+  }
+
+  @override
+  State<QrCodeScannerScreen> createState() => _QrCodeScannerScreenState();
+}
+
+class _QrCodeScannerScreenState extends State<QrCodeScannerScreen> {
+  final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
+  QRViewController? controller;
+  bool isFlashOn = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Palette.transparent,
+        actions: <Widget>[
+          IconButton(
+            icon: Icon(isFlashOn ? Icons.flash_off : Icons.flash_on),
+            onPressed: () {
+              controller?.toggleFlash();
+              setState(() {
+                isFlashOn = !isFlashOn;
+              });
+            },
+          ),
+          IconButton(
+            icon: const Icon(Icons.cameraswitch_outlined),
+            onPressed: controller?.flipCamera,
+          ),
+        ],
+      ),
+      extendBodyBehindAppBar: true,
+      body: Column(
+        children: <Widget>[
+          Expanded(
+            child: QRView(
+              key: qrKey,
+              onQRViewCreated: onQRViewCreated,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void onQRViewCreated(QRViewController controller) {
+    setState(() {
+      this.controller = controller;
+    });
+    controller.scannedDataStream.listen((Barcode scanData) {
+      controller.stopCamera();
+      HackiApp.navigatorKey.currentState?.pop(scanData.code);
+    });
+  }
+
+  @override
+  void dispose() {
+    controller?.dispose();
+    super.dispose();
+  }
+}

lib/screens/profile/qr_code_view_screen.dart

@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:hacki/styles/palette.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+
+class QrCodeViewScreen extends StatelessWidget {
+  const QrCodeViewScreen({
+    required this.data,
+    super.key,
+  });
+
+  final String data;
+
+  static const String routeName = '/qr-code-view';
+
+  static Route<dynamic> route({required String data}) {
+    return MaterialPageRoute<QrCodeViewScreen>(
+      settings: const RouteSettings(name: routeName),
+      builder: (_) => QrCodeViewScreen(
+        data: data,
+      ),
+    );
+  }
+
+  static const int qrCodeVersion = 4;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        backgroundColor: Palette.transparent,
+      ),
+      body: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: <Widget>[
+          Center(
+            child: QrImageView(
+              data: data,
+              dataModuleStyle: QrDataModuleStyle(
+                dataModuleShape: QrDataModuleShape.square,
+                color: Theme.of(context).colorScheme.onSurface,
+              ),
+              eyeStyle: QrEyeStyle(
+                eyeShape: QrEyeShape.square,
+                color: Theme.of(context).colorScheme.onSurface,
+              ),
+              version: qrCodeVersion,
+              size: 300,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/screens/profile/widgets/settings.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:io';
 
 import 'package:adaptive_theme/adaptive_theme.dart';
@@ -14,9 +15,12 @@ import 'package:hacki/config/constants.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
+import 'package:hacki/main.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/screens/profile/models/page_type.dart';
+import 'package:hacki/screens/profile/qr_code_scanner_screen.dart';
+import 'package:hacki/screens/profile/qr_code_view_screen.dart';
 import 'package:hacki/screens/profile/widgets/offline_list_tile.dart';
 import 'package:hacki/screens/profile/widgets/tab_bar_settings.dart';
 import 'package:hacki/screens/widgets/widgets.dart';
@@ -244,6 +248,13 @@ class _SettingsState extends State<Settings> {
                     ),
                     onTap: onExportFavoritesTapped,
                   ),
+                  ListTile(
+                    title: const Text(
+                      'Import Favorites',
+                    ),
+                    onTap: () =>
+                        onImportFavoritesTapped(context.read<FavCubit>()),
+                  ),
                   ListTile(
                     title: const Text(
                       'Clear Favorites',
@@ -754,20 +765,68 @@ class _SettingsState extends State<Settings> {
   }
 
   Future<void> onExportFavoritesTapped() async {
-    final List<int> allFavorites = context.read<FavCubit>().state.favIds;
+    return showModalBottomSheet<ExportDestination>(
+      context: context,
+      builder: (BuildContext context) {
+        return SafeArea(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              ...ExportDestination.values.map(
+                (ExportDestination e) => ListTile(
+                  leading: Icon(e.icon),
+                  title: Text(e.label),
+                  onTap: () => Navigator.pop<ExportDestination>(context, e),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    ).then(
+      (ExportDestination? destination) => exportFavorites(to: destination),
+    );
+  }
 
+  Future<void> onImportFavoritesTapped(FavCubit favCubit) async {
+    final String? res = await HackiApp.navigatorKey.currentState
+        ?.pushNamed(QrCodeScannerScreen.routeName) as String?;
+    final List<int>? ids =
+        res?.split('\n').map(int.tryParse).whereType<int>().toList();
+    if (ids == null) return;
+    for (final int id in ids) {
+      await favCubit.addFav(id);
+    }
+    showSnackBar(content: 'Favorites imported successfully.');
+  }
+
+  Future<void> exportFavorites({required ExportDestination? to}) async {
+    final ExportDestination? destination = to;
+    if (destination == null) return;
+
+    final List<int> allFavorites = context.read<FavCubit>().state.favIds;
     if (allFavorites.isEmpty) {
       showSnackBar(content: "You don't have any favorite item.");
       return;
     }
+    final String allFavoritesStr = allFavorites.join('\n');
 
-    try {
+    switch (destination) {
-      await FlutterClipboard.copy(
+      case ExportDestination.qrCode:
-        allFavorites.join('\n'),
+        await HackiApp.navigatorKey.currentState?.pushNamed(
-      ).whenComplete(HapticFeedbackUtil.selection);
+          QrCodeViewScreen.routeName,
-      showSnackBar(content: 'Ids of favorites have been copied to clipboard.');
+          arguments: allFavoritesStr,
-    } catch (error, stackTrace) {
+        );
-      error.logError(stackTrace: stackTrace);
+      case ExportDestination.clipBoard:
+        try {
+          await FlutterClipboard.copy(allFavoritesStr)
+              .whenComplete(HapticFeedbackUtil.selection);
+          showSnackBar(
+            content: 'Ids of favorites have been copied to clipboard.',
+          );
+        } catch (error, stackTrace) {
+          error.logError(stackTrace: stackTrace);
+        }
     }
   }
 

lib/screens/screens.dart

@@ -1,6 +1,8 @@
 export 'home/home_screen.dart';
 export 'item/item_screen.dart';
 export 'profile/profile_screen.dart';
+export 'profile/qr_code_scanner_screen.dart';
+export 'profile/qr_code_view_screen.dart';
 export 'search/search_screen.dart';
 export 'submit/submit_screen.dart';
 export 'web_view/web_view_screen.dart';

lib/screens/widgets/comment_tile.dart

@@ -143,6 +143,8 @@ class CommentTile extends StatelessWidget {
                                       ? orange
                                       : color,
                                 ),
+                                textScaleFactor:
+                                    MediaQuery.of(context).textScaleFactor,
                               ),
                               if (comment.by == opUsername)
                                 const Text(
@@ -157,6 +159,8 @@ class CommentTile extends StatelessWidget {
                                 style: const TextStyle(
                                   color: Palette.grey,
                                 ),
+                                textScaleFactor:
+                                    MediaQuery.of(context).textScaleFactor,
                               ),
                             ],
                           ),
@@ -196,6 +200,8 @@ class CommentTile extends StatelessWidget {
                                       child: ItemText(
                                         key: ValueKey<int>(comment.id),
                                         item: comment,
+                                        textScaleFactor: MediaQuery.of(context)
+                                            .textScaleFactor,
                                         onTap: () {
                                           if (onTap == null) {
                                             _onTextTapped(context);

lib/screens/widgets/custom_linkify/custom_linkify.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart';
 import 'package:hacki/styles/palette.dart';
 import 'package:hacki/utils/utils.dart';
-import 'package:linkify/linkify.dart';
+import 'package:linkify/linkify.dart' hide UrlLinkifier;
 
 export 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart';
 export 'package:linkify/linkify.dart'
@@ -14,9 +14,7 @@ export 'package:linkify/linkify.dart'
         Linkifier,
         LinkifyElement,
         LinkifyOptions,
-        TextElement,
+        TextElement;
-        UrlElement,
-        UrlLinkifier;
 
 /// Callback clicked link
 typedef LinkCallback = void Function(LinkableElement link);

lib/screens/widgets/custom_linkify/linkifiers/linkifiers.dart

@@ -1,2 +1,3 @@
 export 'emphasis_linkifier.dart';
 export 'quote_linkifier.dart';
+export 'url_linkifier.dart';

lib/screens/widgets/custom_linkify/linkifiers/url_linkifier.dart

@@ -0,0 +1,121 @@
+import 'package:flutter/foundation.dart';
+import 'package:linkify/linkify.dart';
+
+final RegExp _urlRegex = RegExp(
+  r'^(.*?)((?:https?:\/\/|www\.)[^\s/$.?#].[\/\\\%:\?=&#@;A-Za-z0-9_.~-]*)',
+  caseSensitive: false,
+  dotAll: true,
+);
+
+final RegExp _looseUrlRegex = RegExp(
+  r'''^(.*?)((https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//="'`]*))''',
+  caseSensitive: false,
+  dotAll: true,
+);
+
+final RegExp _protocolIdentifierRegex = RegExp(
+  r'^(https?:\/\/)',
+  caseSensitive: false,
+);
+
+class UrlLinkifier extends Linkifier {
+  const UrlLinkifier();
+
+  @override
+  List<LinkifyElement> parse(
+    List<LinkifyElement> elements,
+    LinkifyOptions options,
+  ) {
+    final List<LinkifyElement> list = <LinkifyElement>[];
+
+    for (final LinkifyElement element in elements) {
+      if (element is TextElement) {
+        final RegExpMatch? match = options.looseUrl
+            ? _looseUrlRegex.firstMatch(element.text)
+            : _urlRegex.firstMatch(element.text);
+
+        if (match == null) {
+          list.add(element);
+        } else {
+          final String text = element.text.replaceFirst(match.group(0)!, '');
+
+          if (match.group(1)?.isNotEmpty ?? false) {
+            list.add(TextElement(match.group(1)!));
+          }
+
+          if (match.group(2)?.isNotEmpty ?? false) {
+            String originalUrl = match.group(2)!;
+            String originText = originalUrl;
+            String? end;
+
+            if ((options.excludeLastPeriod) &&
+                originalUrl[originalUrl.length - 1] == '.') {
+              end = '.';
+              originText = originText.substring(0, originText.length - 1);
+              originalUrl = originalUrl.substring(0, originalUrl.length - 1);
+            }
+
+            String url = originalUrl;
+
+            if (!originalUrl.startsWith(_protocolIdentifierRegex)) {
+              originalUrl = (options.defaultToHttps ? 'https://' : 'http://') +
+                  originalUrl;
+            }
+
+            if ((options.humanize) || (options.removeWww)) {
+              if (options.humanize) {
+                url = url.replaceFirst(RegExp('https?://'), '');
+              }
+              if (options.removeWww) {
+                url = url.replaceFirst(RegExp(r'www\.'), '');
+              }
+
+              list.add(
+                UrlElement(
+                  originalUrl,
+                  url,
+                  originText,
+                ),
+              );
+            } else {
+              list.add(UrlElement(originalUrl, null, originText));
+            }
+
+            if (end != null) {
+              list.add(TextElement(end));
+            }
+          }
+
+          if (text.isNotEmpty) {
+            list.addAll(parse(<LinkifyElement>[TextElement(text)], options));
+          }
+        }
+      } else {
+        list.add(element);
+      }
+    }
+
+    return list;
+  }
+}
+
+/// Represents an element containing a link
+@immutable
+class UrlElement extends LinkableElement {
+  UrlElement(String url, [String? text, String? originText])
+      : super(text, url, originText);
+
+  @override
+  String toString() {
+    return "LinkElement: '$url' ($text)";
+  }
+
+  @override
+  bool operator ==(Object other) => equals(other);
+
+  @override
+  int get hashCode => Object.hash(text, originText, url);
+
+  @override
+  bool equals(dynamic other) => other is UrlElement && super.equals(other);
+}

lib/screens/widgets/device_gesture_wrapper.dart

@@ -17,7 +17,7 @@ class DeviceGestureWrapper extends StatelessWidget {
   Widget build(BuildContext context) {
     return MediaQuery(
       data: const MediaQueryData(
-        gestureSettings: DeviceGestureSettings(touchSlop: 7.9),
+        gestureSettings: DeviceGestureSettings(touchSlop: 12),
       ),
       child: child,
     );

lib/screens/widgets/item_text.dart

@@ -10,12 +10,14 @@ import 'package:hacki/utils/utils.dart';
 class ItemText extends StatelessWidget {
   const ItemText({
     required this.item,
+    required this.textScaleFactor,
     super.key,
     this.onTap,
   });
 
   final Item item;
   final VoidCallback? onTap;
+  final double textScaleFactor;
 
   @override
   Widget build(BuildContext context) {
@@ -37,7 +39,7 @@ class ItemText extends StatelessWidget {
           onOpen: (LinkableElement link) => LinkUtil.launch(link.url),
         ),
         onTap: onTap,
-        textScaleFactor: MediaQuery.of(context).textScaleFactor,
+        textScaleFactor: textScaleFactor,
         contextMenuBuilder: (
           BuildContext context,
           EditableTextState editableTextState,
@@ -52,7 +54,7 @@ class ItemText extends StatelessWidget {
     } else {
       return SelectableLinkify(
         text: item.text,
-        textScaleFactor: MediaQuery.of(context).textScaleFactor,
+        textScaleFactor: textScaleFactor,
         style: style,
         linkStyle: linkStyle,
         onOpen: (LinkableElement link) => LinkUtil.launch(link.url),

lib/styles/dimens.dart

@@ -33,6 +33,7 @@ abstract class TextDimens {
   static const double pt16 = 16;
   static const double pt17 = 17;
   static const double pt18 = 18;
+  static const double pt19 = 19;
   static const double pt20 = 20;
   static const double pt24 = 24;
   static const double pt26 = 26;

lib/utils/link_util.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:hacki/config/constants.dart';
 import 'package:hacki/config/locator.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/main.dart';
@@ -54,17 +53,7 @@ abstract class LinkUtil {
       return;
     }
 
-    Uri rinseLink(String link) {
+    final Uri uri = Uri.parse(link);
-      final RegExp regex = RegExp(RegExpConstants.linkSuffix);
-      if (!link.contains('en.wikipedia.org') && link.contains(regex)) {
-        final String match = regex.stringMatch(link) ?? '';
-        return Uri.parse(link.replaceAll(match, ''));
-      }
-
-      return Uri.parse(link);
-    }
-
-    final Uri uri = rinseLink(link);
     canLaunchUrl(uri).then((bool val) {
       if (val) {
         if (link.contains('http')) {

lib/utils/linkifier_util.dart

@@ -1,5 +1,5 @@
 import 'package:hacki/screens/widgets/custom_linkify/linkifiers/linkifiers.dart';
-import 'package:linkify/linkify.dart';
+import 'package:linkify/linkify.dart' hide UrlLinkifier;
 
 abstract class LinkifierUtil {
   static const LinkifyOptions linkifyOptions = LinkifyOptions(humanize: false);

pubspec.lock

@@ -840,6 +840,30 @@ packages:
       url: "https://github.com/livinglist/flutter_pulltorefresh"
     source: git
     version: "2.0.0"
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  qr_code_scanner:
+    dependency: "direct main"
+    description:
+      name: qr_code_scanner
+      sha256: f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  qr_flutter:
+    dependency: "direct main"
+    description:
+      name: qr_flutter
+      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
   receive_sharing_intent:
     dependency: "direct main"
     description:
@@ -1390,4 +1414,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.0.0 <4.0.0"
-  flutter: ">=3.10.3"
+  flutter: ">=3.10.5"

pubspec.yaml

@@ -1,11 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 1.7.2+113
+version: 1.8.1+117
 publish_to: none
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: "3.10.3"
+  flutter: "3.10.5"
 
 dependencies:
   adaptive_theme: ^3.2.0
@@ -58,6 +58,8 @@ dependencies:
     git:
       url: https://github.com/livinglist/flutter_pulltorefresh
       ref: master
+  qr_code_scanner: ^1.0.1
+  qr_flutter: ^4.1.0
   receive_sharing_intent: ^1.4.5
   responsive_builder: ^0.7.0
   rxdart: ^0.27.7