update dev link. (#197)

lib/config/constants.dart

@@ -7,7 +7,7 @@ abstract class Constants {
       'https://github.com/Livinglist/Hacki/blob/master/assets/privacy_policy.md';
   static const String hackerNewsLogoLink =
       'https://pbs.twimg.com/profile_images/469397708986269696/iUrYEOpJ_400x400.png';
-  static const String portfolioLink = 'https://livinglist.github.io';
+  static const String portfolioLink = 'https://github.com/Livinglist';
   static const String githubLink = 'https://github.com/Livinglist/Hacki';
   static const String appStoreLink =
       'https://apps.apple.com/us/app/hacki/id1602043763?action=write-review';

lib/cubits/preference/preference_state.dart

@@ -52,8 +52,6 @@ class PreferenceState extends Equatable {
 
   bool get complexStoryTileEnabled => _isOn<DisplayModePreference>();
 
-  bool get webFirstEnabled => _isOn<NavigationModePreference>();
-
   bool get eyeCandyEnabled => _isOn<EyeCandyModePreference>();
 
   bool get trueDarkEnabled => _isOn<TrueDarkModePreference>();

lib/models/preference.dart

@@ -31,7 +31,6 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
       const NotificationModePreference(),
       const SwipeGesturePreference(),
       const CollapseModePreference(),
-      const NavigationModePreference(),
       const ReaderModePreference(),
       const MarkReadStoriesModePreference(),
       const EyeCandyModePreference(),
@@ -54,7 +53,6 @@ abstract class IntPreference extends Preference<int> {
 const bool _notificationModeDefaultValue = true;
 const bool _swipeGestureModeDefaultValue = false;
 const bool _displayModeDefaultValue = true;
-const bool _navigationModeDefaultValue = false;
 const bool _eyeCandyModeDefaultValue = false;
 const bool _trueDarkModeDefaultValue = false;
 const bool _readerModeDefaultValue = true;
@@ -189,29 +187,6 @@ class StoryUrlModePreference extends BooleanPreference {
   String get subtitle => '''show url in story tile.''';
 }
 
-/// The value deciding whether or not user should be
-/// navigated to web view first. Defaults to false.
-class NavigationModePreference extends BooleanPreference {
-  const NavigationModePreference({bool? val})
-      : super(
-          val: val ?? _navigationModeDefaultValue,
-        );
-
-  @override
-  NavigationModePreference copyWith({required bool? val}) {
-    return NavigationModePreference(val: val);
-  }
-
-  @override
-  String get key => 'navigationMode';
-
-  @override
-  String get title => 'Show Web Page First';
-
-  @override
-  String get subtitle => '''show web page first after tapping on story.''';
-}
-
 class ReaderModePreference extends BooleanPreference {
   const ReaderModePreference({bool? val})
       : super(val: val ?? _readerModeDefaultValue);

lib/screens/home/home_screen.dart

@@ -210,12 +210,9 @@ class _HomeScreenState extends State<HomeScreen>
   }
 
   void onStoryTapped(Story story, {bool isPin = false}) {
-    final bool showWebFirst =
-        context.read<PreferenceCubit>().state.webFirstEnabled;
     final bool useReader = context.read<PreferenceCubit>().state.readerEnabled;
     final bool offlineReading =
         context.read<StoriesBloc>().state.isOfflineReading;
-    final bool hasRead = isPin || context.read<StoriesBloc>().hasRead(story);
     final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
 
     // If a story is a job story and it has a link to the job posting,
@@ -245,7 +242,7 @@ class _HomeScreenState extends State<HomeScreen>
       }
     }
 
-    if (story.url.isNotEmpty && (isJobWithLink || (showWebFirst && !hasRead))) {
+    if (story.url.isNotEmpty && isJobWithLink) {
       LinkUtil.launch(
         story.url,
         useReader: useReader,

lib/screens/widgets/link_preview/link_preview.dart

@@ -7,13 +7,13 @@ import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/link_preview/link_view.dart';
 import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class LinkPreview extends StatefulWidget {
   const LinkPreview({
     super.key,
     required this.link,
     required this.story,
+    required this.onTap,
     required this.showMetadata,
     required this.showUrl,
     required this.isOfflineReading,
@@ -34,6 +34,7 @@ class LinkPreview extends StatefulWidget {
   });
 
   final Story story;
+  final VoidCallback onTap;
 
   /// Web address (Url that need to be parsed)
   /// For IOS & Web, only HTTP and HTTPS are support
@@ -141,19 +142,6 @@ class _LinkPreviewState extends State<LinkPreview> {
     }
   }
 
-  Future<void> _launchURL(String url) async {
-    final Uri uri = Uri.parse(url);
-    if (await canLaunchUrl(uri)) {
-      await launchUrl(uri);
-    } else {
-      try {
-        await launchUrl(uri);
-      } catch (err) {
-        throw Exception('Could not launch $url. Error: $err');
-      }
-    }
-  }
-
   Widget _buildLinkContainer(
     double height, {
     String? title = '',
@@ -184,7 +172,7 @@ class _LinkPreviewState extends State<LinkPreview> {
         description: desc ?? title ?? 'no comment yet.',
         imageUri: imageUri,
         imagePath: Constants.hackerNewsLogoPath,
-        onTap: _launchURL,
+        onTap: widget.onTap,
         titleTextStyle: widget.titleStyle,
         bodyTextOverflow: widget.bodyTextOverflow,
         bodyMaxLines: widget.bodyMaxLines,

lib/screens/widgets/link_preview/link_view.dart

@@ -5,7 +5,9 @@ import 'package:flutter/material.dart';
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/screens/widgets/link_preview/models/models.dart';
+import 'package:hacki/screens/widgets/tap_down_wrapper.dart';
 import 'package:hacki/styles/styles.dart';
+import 'package:hacki/utils/link_util.dart';
 
 class LinkView extends StatelessWidget {
   LinkView({
@@ -41,7 +43,7 @@ class LinkView extends StatelessWidget {
   final String description;
   final String? imageUri;
   final String? imagePath;
-  final void Function(String) onTap;
+  final VoidCallback onTap;
   final TextStyle titleTextStyle;
   final bool showMultiMedia;
   final TextOverflow? bodyTextOverflow;
@@ -176,17 +178,26 @@ class LinkView extends StatelessWidget {
           titleStyle,
         );
 
-        return InkWell(
+        return Row(
-          onTap: () => onTap(url),
+          children: <Widget>[
-          child: Row(
+            if (showMultiMedia)
-            children: <Widget>[
+              Padding(
-              if (showMultiMedia)
+                padding: const EdgeInsets.only(
-                Padding(
+                  right: 8,
-                  padding: const EdgeInsets.only(
+                  top: 5,
-                    right: 8,
+                  bottom: 5,
-                    top: 5,
+                ),
-                    bottom: 5,
+                child: TapDownWrapper(
-                  ),
+                  onTap: () {
+                    if (url.isNotEmpty) {
+                      LinkUtil.launch(
+                        url,
+                        useHackiForHnLink: false,
+                      );
+                    } else {
+                      onTap();
+                    }
+                  },
                   child: SizedBox(
                     height: layoutHeight,
                     width: layoutHeight,
@@ -207,10 +218,13 @@ class LinkView extends StatelessWidget {
                             },
                           ),
                   ),
-                )
+                ),
-              else
+              )
-                const SizedBox(width: Dimens.pt5),
+            else
-              SizedBox(
+              const SizedBox(width: Dimens.pt5),
+            TapDownWrapper(
+              onTap: onTap,
+              child: SizedBox(
                 height: layoutHeight,
                 width: layoutWidth - layoutHeight - 8,
                 child: Column(
@@ -258,8 +272,8 @@ class LinkView extends StatelessWidget {
                   ],
                 ),
               ),
-            ],
+            ),
-          ),
+          ],
         );
       },
     );

lib/screens/widgets/story_tile.dart

@@ -37,37 +37,33 @@ class StoryTile extends StatelessWidget {
       return Semantics(
         label: story.screenReaderLabel,
         excludeSemantics: true,
-        child: TapDownWrapper(
+        child: Padding(
-          onTap: onTap,
+          padding: const EdgeInsets.symmetric(
-          child: Padding(
+            horizontal: Dimens.pt12,
-            padding: const EdgeInsets.symmetric(
+          ),
-              horizontal: Dimens.pt12,
+          child: LinkPreview(
+            story: story,
+            link: story.url,
+            isOfflineReading:
+                context.read<StoriesBloc>().state.isOfflineReading,
+            placeholderWidget: _LinkPreviewPlaceholder(
+              height: height,
             ),
-            child: AbsorbPointer(
+            errorImage: Constants.hackerNewsLogoLink,
-              child: LinkPreview(
+            backgroundColor: Palette.transparent,
-                story: story,
+            borderRadius: Dimens.zero,
-                link: story.url,
+            removeElevation: true,
-                isOfflineReading:
+            bodyMaxLines: context.storyTileMaxLines,
-                    context.read<StoriesBloc>().state.isOfflineReading,
+            errorTitle: story.title,
-                placeholderWidget: _LinkPreviewPlaceholder(
+            titleStyle: TextStyle(
-                  height: height,
+              color: hasRead
-                ),
+                  ? Palette.grey[500]
-                errorImage: Constants.hackerNewsLogoLink,
+                  : Theme.of(context).textTheme.bodyLarge?.color,
-                backgroundColor: Palette.transparent,
+              fontWeight: FontWeight.bold,
-                borderRadius: Dimens.zero,
-                removeElevation: true,
-                bodyMaxLines: context.storyTileMaxLines,
-                errorTitle: story.title,
-                titleStyle: TextStyle(
-                  color: hasRead
-                      ? Palette.grey[500]
-                      : Theme.of(context).textTheme.bodyLarge?.color,
-                  fontWeight: FontWeight.bold,
-                ),
-                showMetadata: showMetadata,
-                showUrl: showUrl,
-              ),
             ),
+            showMetadata: showMetadata,
+            showUrl: showUrl,
+            onTap: onTap,
           ),
         ),
       );

pubspec.lock

@@ -1375,4 +1375,4 @@ packages:
     version: "3.1.1"
 sdks:
   dart: ">=2.19.0 <3.0.0"
-  flutter: ">=3.7.9"
+  flutter: ">=3.7.10"

pubspec.yaml

@@ -1,11 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 1.4.1+105
+version: 1.4.2+106
 publish_to: none
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
-  flutter: "3.7.9"
+  flutter: "3.7.10"
 
 dependencies:
   adaptive_theme: ^3.2.0