v0.2.13 (#34 )

* fixed #32 and #33 * fall back to default browser #31 * fixed story tile. * fixed version. * use Listview.builder instead of listview. * updated link utls.
updated README.md
2025-08-06 18:24:42 +08:00 · 2022-06-03 00:26:30 -07:00 · 2022-06-01 09:13:35 -07:00
18 changed files with 275 additions and 234 deletions
--- a/README.md
+++ b/README.md
@ -34,20 +34,19 @@ Features:
 - Launch from system share sheet.
 - And more...

-
 <p align="center">
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799288-6e98352a-fe89-4a2e-8a74-c5782463a1e1.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799297-75b52eac-2066-4df9-bdfc-7c82bf7b81c8.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799302-860c61b8-abba-486a-9592-bc84a6af3232.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799305-308743d3-1c89-45de-9645-3b6ec789c282.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798176-5212e9bf-296d-4d9b-ab48-19b741684c8a.png"> 
+   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450528-02c561ed-0ebb-4c1b-9ee0-a935211db0f2.png"> 
+   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450536-ea61c176-37d7-4744-8674-4668e0e7e774.png"> 
+   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450541-a9af3417-526f-4dbd-96d7-781c95c886d3.png"> 
+   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450543-fb631b02-5f46-4455-b8ff-9ef119a486f1.png"> 
+   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450548-38e98b02-6201-48c9-9674-87bdfc61f456.png"> 
   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798179-72edbe49-7444-4e54-a07c-fc1244447a74.png"> 
   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798182-28397805-a7cc-4124-b65b-c02c80afbbec.png"> 
   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798183-c2984270-ee99-4419-841e-65e98890464f.png"> 
   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798184-2fce5d97-710e-44a7-b99a-3296ebcf273b.png"> 
   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798185-d7c81348-956e-483c-a1bc-5cd872bdad62.png"> 
   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png"> 
-   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798187-4404adea-b2bc-472e-8568-2379e6db01a4.png"> 
+   <img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.png"> 
   
   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162711-a9146326-9645-4db6-a04e-1f82e6133e40.png"> 
   <img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162726-ef1d3f2a-5179-417c-8a5f-0cddb52249da.png"> 
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -9,6 +9,10 @@
            <action android:name="android.intent.action.VIEW" />
            <data android:scheme="https" />
        </intent>
+        <intent>
+            <action android:name="android.intent.action.SEND" />
+            <data android:mimeType="*/*" />
+        </intent>
    </queries>

   <application
--- a/fastlane/metadata/android/en-US/changelogs/52.txt
+++ b/fastlane/metadata/android/en-US/changelogs/52.txt
@ -0,0 +1,5 @@
+- You can now participate in polls.
+- Pick up where you left off.
+- Swipe left on comment tile to view its parents without scrolling all the way up.
+- Huge performance boost.
+- Bugfixes.
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -577,7 +577,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.12;
+				MARKETING_VERSION = 0.2.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -714,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.12;
+				MARKETING_VERSION = 0.2.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -745,7 +745,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.12;
+				MARKETING_VERSION = 0.2.13;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -39,6 +39,12 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>https</string>
+		<string>http</string>
+		<string>mailto</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>
--- a/lib/cubits/collapse/collapse_cubit.dart
+++ b/lib/cubits/collapse/collapse_cubit.dart
@ -55,21 +55,21 @@ class CollapseCubit extends Cubit<CollapseState> {
  }

  void hiddenCommentsStreamListener(Map<int, Set<int>> event) {
+    int collapsedCount = 0;
    for (final int key in event.keys) {
      if (key == _commentId && !isClosed) {
-        emit(
-          state.copyWith(
-            collapsedCount: event[key]?.length ?? 0,
-          ),
-        );
-        return;
+        collapsedCount = event[key]?.length ?? 0;
+        break;
      }
    }

    for (final Set<int> val in event.values) {
      if (val.contains(_commentId) && !isClosed) {
        emit(
-          state.copyWith(hidden: true),
+          state.copyWith(
+            hidden: true,
+            collapsedCount: collapsedCount,
+          ),
        );
        return;
      }
@ -77,7 +77,10 @@ class CollapseCubit extends Cubit<CollapseState> {

    if (!isClosed) {
      emit(
-        state.copyWith(hidden: false),
+        state.copyWith(
+          hidden: false,
+          collapsedCount: collapsedCount,
+        ),
      );
    }
  }
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@ -445,7 +445,7 @@ class _HomeScreenState extends State<HomeScreen>
    }

    if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
-      LinkUtil.launchUrl(story.url, useReader: useReader);
+      LinkUtil.launch(story.url, useReader: useReader);
    }

    context.read<StoriesBloc>().add(
--- a/lib/screens/profile/profile_screen.dart
+++ b/lib/screens/profile/profile_screen.dart
@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                  showAboutDialog(
                                    context: context,
                                    applicationName: 'Hacki',
-                                    applicationVersion: 'v0.2.12',
+                                    applicationVersion: 'v0.2.13',
                                    applicationIcon: ClipRRect(
                                      borderRadius: const BorderRadius.all(
                                        Radius.circular(12),
@ -420,7 +420,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                    ),
                                    children: <Widget>[
                                      ElevatedButton(
-                                        onPressed: () => LinkUtil.launchUrl(
+                                        onPressed: () => LinkUtil.launch(
                                          Constants.portfolioLink,
                                        ),
                                        child: Row(
@ -436,7 +436,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                        ),
                                      ),
                                      ElevatedButton(
-                                        onPressed: () => LinkUtil.launchUrl(
+                                        onPressed: () => LinkUtil.launch(
                                          Constants.githubLink,
                                        ),
                                        child: Row(
@ -452,7 +452,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                        ),
                                      ),
                                      ElevatedButton(
-                                        onPressed: () => LinkUtil.launchUrl(
+                                        onPressed: () => LinkUtil.launch(
                                          Platform.isIOS
                                              ? Constants.appStoreLink
                                              : Constants.googlePlayLink,
@ -823,7 +823,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                              child: Transform.translate(
                                offset: const Offset(0, 1),
                                child: TapDownWrapper(
-                                  onTap: () => LinkUtil.launchUrl(
+                                  onTap: () => LinkUtil.launch(
                                    Constants.endUserAgreementLink,
                                  ),
                                  child: const Text(
--- a/lib/screens/profile/widgets/inbox_view.dart
+++ b/lib/screens/profile/widgets/inbox_view.dart
@ -107,7 +107,7 @@ class InboxView extends StatelessWidget {
                                          ),
                                          maxLines: 4,
                                          onOpen: (LinkableElement link) =>
-                                              LinkUtil.launchUrl(link.url),
+                                              LinkUtil.launch(link.url),
                                        ),
                                      ),
                                    ),
--- a/lib/screens/story/story_screen.dart
+++ b/lib/screens/story/story_screen.dart
@ -140,6 +140,7 @@ class _StoryScreenState extends State<StoryScreen> {
    delay: _featureDiscoveryDismissThrottleDelay,
  );

+  static const int _extraItemsCount = 2;
  static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
  static const Duration _featureDiscoveryDismissThrottleDelay =
      Duration(seconds: 1);
@ -269,209 +270,229 @@ class _StoryScreenState extends State<StoryScreen> {
                onLoading: () {
                  context.read<CommentsCubit>().loadMore();
                },
-                child: ListView(
+                child: ListView.builder(
                  primary: false,
-                  children: <Widget>[
-                    SizedBox(
-                      height: topPadding,
-                    ),
-                    if (!widget.splitViewEnabled)
-                      const Padding(
-                        padding: EdgeInsets.only(bottom: 6),
-                        child: OfflineBanner(),
-                      ),
-                    Slidable(
-                      startActionPane: ActionPane(
-                        motion: const BehindMotion(),
+                  itemCount: state.comments.length + _extraItemsCount,
+                  itemBuilder: (BuildContext context, int index) {
+                    if (index == 0) {
+                      return Column(
                        children: <Widget>[
-                          SlidableAction(
-                            onPressed: (_) {
-                              HapticFeedback.lightImpact();
-
-                              if (widget.story !=
-                                  context.read<EditCubit>().state.replyingTo) {
-                                commentEditingController.clear();
-                              }
-                              context
-                                  .read<EditCubit>()
-                                  .onReplyTapped(widget.story);
-                              focusNode.requestFocus();
-                            },
-                            backgroundColor: Colors.orange,
-                            foregroundColor: Colors.white,
-                            icon: Icons.message,
+                          SizedBox(
+                            height: topPadding,
                          ),
-                          SlidableAction(
-                            onPressed: (_) => onMorePressed(widget.story),
-                            backgroundColor: Colors.orange,
-                            foregroundColor: Colors.white,
-                            icon: Icons.more_horiz,
-                          ),
-                        ],
-                      ),
-                      child: Column(
-                        children: <Widget>[
-                          Padding(
-                            padding: const EdgeInsets.only(
-                              left: 6,
-                              right: 6,
+                          if (!widget.splitViewEnabled)
+                            const Padding(
+                              padding: EdgeInsets.only(bottom: 6),
+                              child: OfflineBanner(),
                            ),
-                            child: Row(
+                          Slidable(
+                            startActionPane: ActionPane(
+                              motion: const BehindMotion(),
                              children: <Widget>[
-                                Text(
-                                  widget.story.by,
-                                  style: const TextStyle(
-                                    color: Colors.orange,
-                                  ),
+                                SlidableAction(
+                                  onPressed: (_) {
+                                    HapticFeedback.lightImpact();
+
+                                    if (widget.story !=
+                                        context
+                                            .read<EditCubit>()
+                                            .state
+                                            .replyingTo) {
+                                      commentEditingController.clear();
+                                    }
+                                    context
+                                        .read<EditCubit>()
+                                        .onReplyTapped(widget.story);
+                                    focusNode.requestFocus();
+                                  },
+                                  backgroundColor: Colors.orange,
+                                  foregroundColor: Colors.white,
+                                  icon: Icons.message,
                                ),
-                                const Spacer(),
-                                Text(
-                                  widget.story.postedDate,
-                                  style: const TextStyle(
-                                    color: Colors.grey,
-                                  ),
+                                SlidableAction(
+                                  onPressed: (_) => onMorePressed(widget.story),
+                                  backgroundColor: Colors.orange,
+                                  foregroundColor: Colors.white,
+                                  icon: Icons.more_horiz,
                                ),
                              ],
                            ),
-                          ),
-                          InkWell(
-                            onTap: () => LinkUtil.launchUrl(
-                              widget.story.url,
-                              useReader: context
-                                  .read<PreferenceCubit>()
-                                  .state
-                                  .useReader,
-                            ),
-                            child: Padding(
-                              padding: const EdgeInsets.only(
-                                left: 6,
-                                right: 6,
-                                bottom: 12,
-                                top: 12,
-                              ),
-                              child: Text(
-                                widget.story.title,
-                                textAlign: TextAlign.center,
-                                style: TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                  color: widget.story.url.isNotEmpty
-                                      ? Colors.orange
-                                      : null,
+                            child: Column(
+                              children: <Widget>[
+                                Padding(
+                                  padding: const EdgeInsets.only(
+                                    left: 6,
+                                    right: 6,
+                                  ),
+                                  child: Row(
+                                    children: <Widget>[
+                                      Text(
+                                        widget.story.by,
+                                        style: const TextStyle(
+                                          color: Colors.orange,
+                                        ),
+                                      ),
+                                      const Spacer(),
+                                      Text(
+                                        widget.story.postedDate,
+                                        style: const TextStyle(
+                                          color: Colors.grey,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
                                ),
-                              ),
+                                InkWell(
+                                  onTap: () => LinkUtil.launch(
+                                    widget.story.url,
+                                    useReader: context
+                                        .read<PreferenceCubit>()
+                                        .state
+                                        .useReader,
+                                  ),
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(
+                                      left: 6,
+                                      right: 6,
+                                      bottom: 12,
+                                      top: 12,
+                                    ),
+                                    child: Text(
+                                      widget.story.title,
+                                      textAlign: TextAlign.center,
+                                      style: TextStyle(
+                                        fontWeight: FontWeight.bold,
+                                        color: widget.story.url.isNotEmpty
+                                            ? Colors.orange
+                                            : null,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                                if (widget.story.text.isNotEmpty)
+                                  Padding(
+                                    padding: const EdgeInsets.symmetric(
+                                      horizontal: 10,
+                                    ),
+                                    child: SelectableLinkify(
+                                      text: widget.story.text,
+                                      style: TextStyle(
+                                        fontSize: MediaQuery.of(context)
+                                                .textScaleFactor *
+                                            15,
+                                      ),
+                                      linkStyle: TextStyle(
+                                        fontSize: MediaQuery.of(context)
+                                                .textScaleFactor *
+                                            15,
+                                        color: Colors.orange,
+                                      ),
+                                      onOpen: (LinkableElement link) {
+                                        if (link.url.contains(
+                                          'news.ycombinator.com/item',
+                                        )) {
+                                          onStoryLinkTapped(link.url);
+                                        } else {
+                                          LinkUtil.launch(link.url);
+                                        }
+                                      },
+                                    ),
+                                  ),
+                                if (widget.story.isPoll)
+                                  PollView(
+                                    onLoginTapped: onLoginTapped,
+                                  ),
+                              ],
                            ),
                          ),
                          if (widget.story.text.isNotEmpty)
-                            Padding(
-                              padding: const EdgeInsets.symmetric(
-                                horizontal: 10,
-                              ),
-                              child: SelectableLinkify(
-                                text: widget.story.text,
-                                style: TextStyle(
-                                  fontSize:
-                                      MediaQuery.of(context).textScaleFactor *
-                                          15,
-                                ),
-                                linkStyle: TextStyle(
-                                  fontSize:
-                                      MediaQuery.of(context).textScaleFactor *
-                                          15,
-                                  color: Colors.orange,
-                                ),
-                                onOpen: (LinkableElement link) {
-                                  if (link.url.contains(
-                                    'news.ycombinator.com/item',
-                                  )) {
-                                    onStoryLinkTapped(link.url);
-                                  } else {
-                                    LinkUtil.launchUrl(link.url);
-                                  }
-                                },
+                            const SizedBox(
+                              height: 8,
+                            ),
+                          const Divider(
+                            height: 0,
+                          ),
+                          if (state.onlyShowTargetComment) ...<Widget>[
+                            TextButton(
+                              onPressed: () => context
+                                  .read<CommentsCubit>()
+                                  .loadAll(widget.story),
+                              child: const Text('View all comments'),
+                            ),
+                            const Divider(
+                              height: 0,
+                            ),
+                          ],
+                          if (state.comments.isEmpty &&
+                              state.status ==
+                                  CommentsStatus.allLoaded) ...<Widget>[
+                            const SizedBox(
+                              height: 240,
+                            ),
+                            const Center(
+                              child: Text(
+                                'Nothing yet',
+                                style: TextStyle(color: Colors.grey),
                              ),
                            ),
-                          if (widget.story.isPoll)
-                            PollView(
-                              onLoginTapped: onLoginTapped,
-                            ),
+                          ],
                        ],
-                      ),
-                    ),
-                    if (widget.story.text.isNotEmpty)
-                      const SizedBox(
-                        height: 8,
-                      ),
-                    const Divider(
-                      height: 0,
-                    ),
-                    if (state.onlyShowTargetComment) ...<Widget>[
-                      TextButton(
-                        onPressed: () =>
-                            context.read<CommentsCubit>().loadAll(widget.story),
-                        child: const Text('View all comments'),
-                      ),
-                      const Divider(
-                        height: 0,
-                      ),
-                    ],
-                    if (state.comments.isEmpty &&
-                        state.status == CommentsStatus.allLoaded) ...<Widget>[
-                      const SizedBox(
-                        height: 240,
-                      ),
-                      const Center(
-                        child: Text(
-                          'Nothing yet',
-                          style: TextStyle(color: Colors.grey),
-                        ),
-                      ),
-                    ],
-                    for (final Comment e in state.comments)
-                      FadeIn(
-                        child: CommentTile(
-                          comment: e,
-                          level: e.level,
-                          myUsername:
-                              authState.isLoggedIn ? authState.username : null,
-                          opUsername: widget.story.by,
-                          onReplyTapped: (Comment cmt) {
-                            HapticFeedback.lightImpact();
-                            if (cmt.deleted || cmt.dead) {
-                              return;
-                            }
+                      );
+                    } else if (index ==
+                        state.comments.length + _extraItemsCount - 1) {
+                      if ((state.status == CommentsStatus.allLoaded &&
+                              state.comments.isNotEmpty) ||
+                          state.onlyShowTargetComment) {
+                        return SizedBox(
+                          height: 240,
+                          child: Center(
+                            child: Text(happyFace),
+                          ),
+                        );
+                      }

-                            if (cmt !=
-                                context.read<EditCubit>().state.replyingTo) {
-                              commentEditingController.clear();
-                            }
+                      return const SizedBox.shrink();
+                    }

-                            context.read<EditCubit>().onReplyTapped(cmt);
-                            focusNode.requestFocus();
-                          },
-                          onEditTapped: (Comment cmt) {
-                            HapticFeedback.lightImpact();
-                            if (cmt.deleted || cmt.dead) {
-                              return;
-                            }
+                    final Comment comment = state.comments.elementAt(index - 1);
+
+                    return FadeIn(
+                      key: ValueKey<int>(comment.id),
+                      child: CommentTile(
+                        comment: comment,
+                        level: comment.level,
+                        myUsername:
+                            authState.isLoggedIn ? authState.username : null,
+                        opUsername: widget.story.by,
+                        onReplyTapped: (Comment cmt) {
+                          HapticFeedback.lightImpact();
+                          if (cmt.deleted || cmt.dead) {
+                            return;
+                          }
+
+                          if (cmt !=
+                              context.read<EditCubit>().state.replyingTo) {
                            commentEditingController.clear();
-                            context.read<EditCubit>().onEditTapped(cmt);
-                            focusNode.requestFocus();
-                          },
-                          onMoreTapped: onMorePressed,
-                          onStoryLinkTapped: onStoryLinkTapped,
-                          onTimeMachineActivated: onTimeMachineActivated,
-                        ),
+                          }
+
+                          context.read<EditCubit>().onReplyTapped(cmt);
+                          focusNode.requestFocus();
+                        },
+                        onEditTapped: (Comment cmt) {
+                          HapticFeedback.lightImpact();
+                          if (cmt.deleted || cmt.dead) {
+                            return;
+                          }
+                          commentEditingController.clear();
+                          context.read<EditCubit>().onEditTapped(cmt);
+                          focusNode.requestFocus();
+                        },
+                        onMoreTapped: onMorePressed,
+                        onStoryLinkTapped: onStoryLinkTapped,
+                        onTimeMachineActivated: onTimeMachineActivated,
                      ),
-                    if ((state.status == CommentsStatus.allLoaded &&
-                            state.comments.isNotEmpty) ||
-                        state.onlyShowTargetComment)
-                      SizedBox(
-                        height: 240,
-                        child: Center(
-                          child: Text(happyFace),
-                        ),
-                      ),
-                  ],
+                    );
+                  },
                ),
              );

@ -674,7 +695,7 @@ class _StoryScreenState extends State<StoryScreen> {
        });
      });
    } else {
-      LinkUtil.launchUrl(link);
+      LinkUtil.launch(link);
    }
  }

@ -1093,7 +1114,7 @@ class _StoryScreenState extends State<StoryScreen> {
                              child: Transform.translate(
                                offset: const Offset(0, 1),
                                child: TapDownWrapper(
-                                  onTap: () => LinkUtil.launchUrl(
+                                  onTap: () => LinkUtil.launch(
                                    Constants.endUserAgreementLink,
                                  ),
                                  child: const Text(
--- a/lib/screens/story/widgets/link_icon_button.dart
+++ b/lib/screens/story/widgets/link_icon_button.dart
@ -47,7 +47,7 @@ class LinkIconButton extends StatelessWidget {
        ),
      ),
      onPressed: () =>
-          LinkUtil.launchUrl('https://news.ycombinator.com/item?id=$storyId'),
+          LinkUtil.launch('https://news.ycombinator.com/item?id=$storyId'),
    );
  }
 }
--- a/lib/screens/story/widgets/reply_box.dart
+++ b/lib/screens/story/widgets/reply_box.dart
@ -273,7 +273,7 @@ class _ReplyBoxState extends State<ReplyBox> {
                            color: Colors.orange,
                          ),
                          onOpen: (LinkableElement link) =>
-                              LinkUtil.launchUrl(link.url),
+                              LinkUtil.launch(link.url),
                          text: replyingTo?.text ?? '',
                        ),
                      ),
--- a/lib/screens/widgets/comment_tile.dart
+++ b/lib/screens/widgets/comment_tile.dart
@ -229,7 +229,7 @@ class CommentTile extends StatelessWidget {
                                        )) {
                                          onStoryLinkTapped.call(link.url);
                                        } else {
-                                          LinkUtil.launchUrl(link.url);
+                                          LinkUtil.launch(link.url);
                                        }
                                      },
                                    ),
--- a/lib/screens/widgets/items_list_view.dart
+++ b/lib/screens/widgets/items_list_view.dart
@ -141,7 +141,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
                                      color: Colors.orange,
                                    ),
                                    onOpen: (LinkableElement link) =>
-                                        LinkUtil.launchUrl(link.url),
+                                        LinkUtil.launch(link.url),
                                  ),
                                ),
                              ),
--- a/lib/screens/widgets/link_preview/link_preview.dart
+++ b/lib/screens/widgets/link_preview/link_preview.dart
@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';

 import 'package:flutter/material.dart';
 import 'package:hacki/config/constants.dart';
@ -210,11 +209,11 @@ class _LinkPreviewState extends State<LinkPreview> {
  @override
  Widget build(BuildContext context) {
    final double screenWidth = MediaQuery.of(context).size.width;
-    final bool showSmallerPreviewPic =
-        Platform.isIOS && screenWidth > 428.0 && screenWidth < 850;
+    final bool showSmallerPreviewPic = screenWidth > 428.0 && screenWidth < 850;
    final double _height = showSmallerPreviewPic
        ? 100.0
        : (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
+
    final Widget loadingWidget = widget.placeholderWidget ??
        Container(
          height: _height,
--- a/lib/screens/widgets/story_tile.dart
+++ b/lib/screens/widgets/story_tile.dart
@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_fadein/flutter_fadein.dart';
 import 'package:hacki/config/constants.dart';
@ -30,7 +28,7 @@ class StoryTile extends StatelessWidget {
    if (showWebPreview) {
      final double screenWidth = MediaQuery.of(context).size.width;
      final bool showSmallerPreviewPic =
-          Platform.isIOS && screenWidth > 428.0 && screenWidth < 850;
+          screenWidth > 428.0 && screenWidth < 850;
      final double height = showSmallerPreviewPic
          ? 100.0
          : (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
--- a/lib/utils/link_util.dart
+++ b/lib/utils/link_util.dart
@ -5,10 +5,10 @@ import 'package:url_launcher/url_launcher.dart';
 abstract class LinkUtil {
  static final ChromeSafariBrowser _browser = ChromeSafariBrowser();

-  static void launchUrl(String link, {bool useReader = false}) {
+  static void launch(String link, {bool useReader = false}) {
    Uri rinseLink(String link) {
-      if (link.contains(')')) {
-        final RegExp regex = RegExp(r'\).*$');
+      final RegExp regex = RegExp(r'\)|].*$');
+      if (!link.contains('en.wikipedia.org') && link.contains(regex)) {
        final String match = regex.stringMatch(link) ?? '';
        return Uri.parse(link.replaceAll(match, ''));
      }
@ -19,15 +19,21 @@ abstract class LinkUtil {
    final Uri uri = rinseLink(link);
    canLaunchUrl(uri).then((bool val) {
      if (val) {
-        _browser.open(
-          url: uri,
-          options: ChromeSafariBrowserClassOptions(
-            ios: IOSSafariOptions(
-              entersReaderIfAvailable: useReader,
-              preferredControlTintColor: Colors.orange,
-            ),
-          ),
-        );
+        if (link.contains('http')) {
+          _browser
+              .open(
+                url: uri,
+                options: ChromeSafariBrowserClassOptions(
+                  ios: IOSSafariOptions(
+                    entersReaderIfAvailable: useReader,
+                    preferredControlTintColor: Colors.orange,
+                  ),
+                ),
+              )
+              .onError((_, __) => launchUrl(uri));
+        } else {
+          launchUrl(uri);
+        }
      }
    });
  }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,6 +1,6 @@
 name: hacki
 description: A Hacker News reader.
-version: 0.2.12+51
+version: 0.2.13+52
 publish_to: none

 environment:
@ -12,7 +12,7 @@ dependencies:
  bloc: ^8.0.3
  cached_network_image: ^3.2.1
  clipboard: ^0.1.3
-  collection:
+  collection: ^1.16.0
  connectivity_plus: ^2.2.1
  dio: ^4.0.4
  equatable: 2.0.3
Author	SHA1	Message	Date
Jiaqi Feng	4e8cf9837f	v0.2.13 (#34 ) * fixed #32 and #33 * fall back to default browser #31 * fixed story tile. * fixed version. * use Listview.builder instead of listview. * updated link utls.	2022-06-03 00:26:30 -07:00
Jiaqi Feng	f73269404a	updated README.md	2022-06-01 09:13:35 -07:00