flutter/Hacki
1
0
Fork 0
mirror of https://github.com/Livinglist/Hacki.git synced 2025-08-06 18:24:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

v0.2.18 (#49)

Browse Source 
* allow plaintext http connections (#48)

via https://stackoverflow.com/a/56837613

I was unable to open an article just now, and a fww minutes later unable to open a comment (since the webview is still being forced on my not-yet-updated client, i have to find the artocle to open it.

* bumped version.

* improved link preview.

* added share button.

* added ability to launch third party app for url on Android.

* added support for siri suggestions.

* bumped version.

* added support for app links on Android.

Co-authored-by: Efreak <Efreak@users.noreply.github.com>
This commit is contained in:
Jiaqi Feng
2022-06-16 00:56:45 -06:00
committed by GitHub
parent 1a73a6991e
commit fefc86275d
17 changed files with 343 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/app/src/main/AndroidManifest.xml
View File

@ -17,7 +17,8 @@
<application
android:label="hacki"
android:icon="@mipmap/ic_launcher">
android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="true">
<activity
android:name=".MainActivity"
android:launchMode="singleTop"
@ -52,6 +53,21 @@
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="*/*" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="http"
android:host="news.ycombinator.com"
android:pathPrefix="/item" />
<data
android:scheme="https"
android:host="news.ycombinator.com"
android:pathPrefix="/item" />
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

BIN
assets/screenshots/07.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 121 KiB

BIN
assets/screenshots/08.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 KiB

After

Width:  |  Height:  |  Size: 375 KiB

7
fastlane/metadata/android/en-US/changelogs/57.txt Normal file
View File

@ -0,0 +1,7 @@
- You can share links.
- You can now add filters for searching.
- 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.

BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 121 KiB

BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 384 KiB

After

Width:  |  Height:  |  Size: 375 KiB

12
ios/Podfile.lock
View File

@ -14,6 +14,8 @@ PODS:
- Flutter
- flutter_secure_storage (3.3.1):
- Flutter
- flutter_siri_suggestions (0.0.1):
- Flutter
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
@ -23,6 +25,8 @@ PODS:
- ReachabilitySwift (5.0.0)
- receive_sharing_intent (0.0.1):
- Flutter
- share_plus (0.0.1):
- Flutter
- shared_preferences_ios (0.0.1):
- Flutter
- sqflite (0.0.2):
@ -47,8 +51,10 @@ DEPENDENCIES:
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- flutter_siri_suggestions (from `.symlinks/plugins/flutter_siri_suggestions/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
@ -75,10 +81,14 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_local_notifications/ios"
flutter_secure_storage:
:path: ".symlinks/plugins/flutter_secure_storage/ios"
flutter_siri_suggestions:
:path: ".symlinks/plugins/flutter_siri_suggestions/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
receive_sharing_intent:
:path: ".symlinks/plugins/receive_sharing_intent/ios"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
sqflite:
@ -102,11 +112,13 @@ SPEC CHECKSUMS:
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7

12
ios/Runner.xcodeproj/project.pbxproj
View File

@ -568,7 +568,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = QMWX3X2NF7;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -577,7 +577,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.17;
MARKETING_VERSION = 0.2.18;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -705,7 +705,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = QMWX3X2NF7;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -714,7 +714,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.17;
MARKETING_VERSION = 0.2.18;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -736,7 +736,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = QMWX3X2NF7;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -745,7 +745,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.17;
MARKETING_VERSION = 0.2.18;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

15
lib/main.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
import 'package:hacki/blocs/blocs.dart';
import 'package:hacki/config/custom_router.dart';
import 'package:hacki/config/locator.dart';
@ -24,6 +25,10 @@ import 'package:workmanager/workmanager.dart';
final BehaviorSubject<String?> selectNotificationSubject =
BehaviorSubject<String?>();
// For receiving payload event from siri suggestions.
final BehaviorSubject<String?> siriSuggestionSubject =
BehaviorSubject<String?>();
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
@ -57,6 +62,16 @@ Future<void> main() async {
badge: true,
sound: true,
);
FlutterSiriSuggestions.instance.configure(
onLaunch: (Map<String, dynamic> message) async {
final String? storyId = message['key'] as String?;
if (storyId == null) return;
siriSuggestionSubject.add(storyId);
},
);
}
final Directory tempDir = await getTemporaryDirectory();

39
lib/screens/home_screen.dart
View File

@ -2,6 +2,7 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:badges/badges.dart';
import 'package:feature_discovery/feature_discovery.dart';
@ -10,6 +11,7 @@ import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_fadein/flutter_fadein.dart';
import 'package:flutter_siri_suggestions/flutter_siri_suggestions.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:hacki/blocs/blocs.dart';
import 'package:hacki/config/constants.dart';
@ -52,6 +54,7 @@ class _HomeScreenState extends State<HomeScreen>
late final TabController tabController;
late final StreamSubscription<String> intentDataStreamSubscription;
late final StreamSubscription<String?> notificationStreamSubscription;
late final StreamSubscription<String?> siriSuggestionStreamSubscription;
int currentIndex = 0;
@ -88,6 +91,11 @@ class _HomeScreenState extends State<HomeScreen>
selectNotificationSubject.stream.listen(onNotificationTapped);
}
if (!siriSuggestionSubject.hasListener) {
siriSuggestionStreamSubscription =
siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
}
SchedulerBinding.instance
..addPostFrameCallback((_) {
FeatureDiscovery.discoverFeatures(
@ -132,6 +140,7 @@ class _HomeScreenState extends State<HomeScreen>
tabController.dispose();
intentDataStreamSubscription.cancel();
notificationStreamSubscription.cancel();
siriSuggestionStreamSubscription.cancel();
super.dispose();
}
@ -390,6 +399,18 @@ class _HomeScreenState extends State<HomeScreen>
story: story,
),
);
if (Platform.isIOS) {
FlutterSiriSuggestions.instance.registerActivity(
FlutterSiriActivity(
story.title,
story.id.toString(),
suggestedInvocationPhrase: '',
contentDescription: story.text,
persistentIdentifier: story.id.toString(),
),
);
}
}
void showOnboarding() {
@ -421,6 +442,24 @@ class _HomeScreenState extends State<HomeScreen>
}
}
Future<void> onSiriSuggestionTapped(String? id) async {
if (id == null) return;
final int? storyId = int.tryParse(id);
if (storyId == null) return;
await locator
.get<StoriesRepository>()
.fetchStoryBy(storyId)
.then((Story? story) {
if (story == null) {
showSnackBar(content: 'Something went wrong...');
return;
}
final StoryScreenArgs args = StoryScreenArgs(story: story);
goToStoryScreen(args: args);
});
}
Future<void> onNotificationTapped(String? payload) async {
if (payload == null) return;

2
lib/screens/profile/profile_screen.dart
View File

@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
showAboutDialog(
context: context,
applicationName: 'Hacki',
applicationVersion: 'v0.2.17',
applicationVersion: 'v0.2.18',
applicationIcon: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(12),

20
lib/screens/story/story_screen.dart
View File

@ -22,10 +22,12 @@ import 'package:hacki/services/services.dart';
import 'package:hacki/utils/utils.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:responsive_builder/responsive_builder.dart';
import 'package:share_plus/share_plus.dart';
enum _MenuAction {
upvote,
downvote,
share,
block,
flag,
cancel,
@ -756,7 +758,7 @@ class _StoryScreenState extends State<StoryScreen> {
final bool upvoted = voteState.vote == Vote.up;
final bool downvoted = voteState.vote == Vote.down;
return Container(
height: item is Comment ? 370 : 390,
height: item is Comment ? 430 : 450,
color: Theme.of(context).canvasColor,
child: Material(
color: Colors.transparent,
@ -860,6 +862,16 @@ class _StoryScreenState extends State<StoryScreen> {
),
onTap: context.read<VoteCubit>().downvote,
),
ListTile(
leading: const Icon(FeatherIcons.share),
title: const Text(
'Share',
),
onTap: () => Navigator.pop(
context,
_MenuAction.share,
),
),
ListTile(
leading: const Icon(Icons.local_police),
title: const Text(
@ -907,6 +919,9 @@ class _StoryScreenState extends State<StoryScreen> {
break;
case _MenuAction.downvote:
break;
case _MenuAction.share:
onShareTapped(item);
break;
case _MenuAction.flag:
onFlagTapped(item);
break;
@ -920,6 +935,9 @@ class _StoryScreenState extends State<StoryScreen> {
});
}
void onShareTapped(Item item) =>
Share.share('https://news.ycombinator.com/item?id=${item.id}');
void onFlagTapped(Item item) {
showDialog<bool>(
context: context,

63
lib/screens/widgets/link_preview/link_preview.dart
View File

@ -141,7 +141,7 @@ class _LinkPreviewState extends State<LinkPreview> {
);
} else {
_info = await WebAnalyzer.getInfo(
widget.story.id.toString(),
null,
story: widget.story,
cache: widget.cache,
);
@ -188,8 +188,8 @@ class _LinkPreviewState extends State<LinkPreview> {
key: widget.key ?? Key(widget.link),
metadata: widget.story.simpleMetadata,
url: widget.link,
title: title!,
description: desc!,
title: widget.story.title,
description: desc ?? title ?? 'no comments yet.',
imageUri: imageUri,
imagePath: Constants.hackerNewsLogoPath,
onTap: _launchURL,
@ -228,40 +228,29 @@ class _LinkPreviewState extends State<LinkPreview> {
Widget loadedWidget;
if (_info is WebImageInfo) {
final String img = (_info as WebImageInfo?)?.image ?? '';
loadedWidget = _buildLinkContainer(
_height,
title: _errorTitle,
desc: _errorBody,
imageUri:
widget.showMultimedia ? (img.trim() == '' ? null : img) : null,
);
} else {
final WebInfo? info = _info as WebInfo?;
loadedWidget = _info == null
? _buildLinkContainer(
_height,
title: _errorTitle,
desc: _errorBody,
imageUri: null,
)
: _buildLinkContainer(
_height,
title: _errorTitle,
desc: WebAnalyzer.isNotEmpty(info!.description)
? info.description
: _errorBody,
imageUri: widget.showMultimedia
? (WebAnalyzer.isNotEmpty(info.image)
? info.image
: WebAnalyzer.isNotEmpty(info.icon)
? info.icon
: null)
: null,
isIcon: !WebAnalyzer.isNotEmpty(info.image),
);
}
final WebInfo? info = _info as WebInfo?;
loadedWidget = _info == null
? _buildLinkContainer(
_height,
title: _errorTitle,
desc: _errorBody,
imageUri: null,
)
: _buildLinkContainer(
_height,
title: _errorTitle,
desc: WebAnalyzer.isNotEmpty(info!.description)
? info.description
: _errorBody,
imageUri: widget.showMultimedia
? (WebAnalyzer.isNotEmpty(info.image)
? info.image
: WebAnalyzer.isNotEmpty(info.icon)
? info.icon
: null)
: null,
isIcon: !WebAnalyzer.isNotEmpty(info.image),
);
return AnimatedCrossFade(
firstChild: loadingWidget,

238
lib/screens/widgets/link_preview/web_analyzer.dart
View File

@ -5,7 +5,6 @@ import 'dart:io';
import 'package:collection/collection.dart' show IterableExtension;
import 'package:fast_gbk/fast_gbk.dart';
import 'package:flutter/foundation.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart';
@ -16,6 +15,7 @@ import 'package:http/io_client.dart';
abstract class InfoBase {
late DateTime _timeout;
late bool _shouldRetry;
Map<String, dynamic> toJson();
}
@ -114,22 +114,29 @@ class WebAnalyzer {
bool multimedia = true,
}) async {
InfoBase? info = getInfoFromCache(url);
if (info != null) return info;
if (story.url.isEmpty && story.text.isNotEmpty) {
info = WebInfo(
title: story.title,
description: story.text,
).._timeout = DateTime.now().add(cache);
)
.._timeout = DateTime.now().add(cache)
.._shouldRetry = false;
cacheMap[story.id.toString()] = info;
return info;
}
try {
info = await _getInfoByIsolate(url, multimedia);
info = await _getInfoByIsolate(
url: url,
multimedia: multimedia,
story: story,
);
if (info != null) {
if (info != null && !info._shouldRetry) {
info._timeout = DateTime.now().add(cache);
cacheMap[url] = info;
}
@ -137,42 +144,6 @@ class WebAnalyzer {
//locator.get<Logger>().log(Level.error, e);
}
if ((info == null ||
info is WebImageInfo ||
(info is WebInfo && (info.description?.isEmpty ?? true))) &&
story.kids.isNotEmpty) {
bool shouldRetry = false;
final Comment? comment = await locator
.get<StoriesRepository>()
.fetchCommentBy(id: story.kids.first)
.catchError((Object err) async {
int index = 0;
Comment? comment;
while (comment == null && index < story.kids.length) {
comment = await locator
.get<CacheRepository>()
.getCachedComment(id: story.kids.elementAt(index));
index++;
}
shouldRetry = true;
return comment;
});
info = WebInfo(
description:
comment != null ? '${comment.by}: ${comment.text}' : 'no comments',
image: info is WebInfo ? info.image : (info as WebImageInfo?)?.image,
icon: info is WebInfo ? info.icon : null,
);
if (!shouldRetry) {
info._timeout = DateTime.now().add(cache);
cacheMap[url] = info;
}
}
return info;
}
@ -195,60 +166,114 @@ class WebAnalyzer {
return _getWebInfo(response, url, multimedia);
}
static Future<InfoBase?> _getInfoByIsolate(
static Future<InfoBase?> _getInfoByIsolate({
String? url,
bool multimedia,
) async {
final List<dynamic>? res = await compute(
_isolate,
<dynamic>[url, multimedia],
);
required bool multimedia,
required Story story,
}) async {
List<dynamic>? res;
if (url != null) {
res = await compute(
_fetchInfoFromUrl,
<dynamic>[url, multimedia],
);
}
late final bool shouldRetry;
InfoBase? info;
String? fallbackDescription;
if (res == null || isEmpty(res[2] as String?)) {
final String? commentText = await compute(
_fetchInfoFromStoryId,
story.kids,
);
shouldRetry = commentText == null;
fallbackDescription = commentText ?? 'no comments yet';
} else {
shouldRetry = false;
}
if (res != null) {
if (res[0] == '0') {
info = WebInfo(
title: res[1] as String?,
description:
res[2] == null ? null : (res[2] as String).removeAllEmojis(),
title: story.title,
description: isEmpty(res[2] as String?)
? (fallbackDescription ??
(story.text.isEmpty ? res[1] as String? : story.text))
: (res[2] as String).removeAllEmojis(),
icon: res[3] as String?,
image: res[4] as String?,
);
} else if (res[0] == '1') {
info = WebVideoInfo(image: res[1] as String);
} else if (res[0] == '2') {
info = WebImageInfo(image: res[1] as String);
).._shouldRetry = shouldRetry;
} else {
info = WebInfo(
image: res[1] as String,
title: story.title,
description: story.text.isEmpty ? fallbackDescription : story.text,
).._shouldRetry = shouldRetry;
}
} else {
return WebInfo(
title: story.title,
description: fallbackDescription,
).._shouldRetry = shouldRetry;
}
return info;
}
static Future<List<dynamic>?> _isolate(dynamic message) async {
// ignore: avoid_dynamic_calls
final String url = message[0] as String;
// ignore: avoid_dynamic_calls
final bool multimedia = message[1] as bool;
static Future<List<dynamic>?> _fetchInfoFromUrl(dynamic message) async {
try {
// ignore: avoid_dynamic_calls
final String url = message[0] as String;
// ignore: avoid_dynamic_calls
final bool multimedia = message[1] as bool;
final InfoBase? info = await _getInfo(url, multimedia);
final InfoBase? info = await _getInfo(url, multimedia);
if (info is WebInfo) {
return <dynamic>[
'0',
info.title,
info.description,
info.icon,
info.image
];
} else if (info is WebVideoInfo) {
return <dynamic>['1', info.image];
} else if (info is WebImageInfo) {
return <dynamic>['2', info.image];
} else {
if (info is WebInfo) {
return <dynamic>[
'0',
info.title,
info.description,
info.icon,
info.image
];
} else if (info is WebVideoInfo) {
return <dynamic>['1', info.image];
} else if (info is WebImageInfo) {
return <dynamic>['2', info.image];
} else {
return null;
}
} catch (_) {
return null;
}
}
static Future<String?> _fetchInfoFromStoryId(List<int> kids) async {
if (kids.isEmpty) return null;
final Comment? comment = await StoriesRepository()
.fetchCommentBy(id: kids.first)
.catchError((Object err) async {
int index = 0;
Comment? comment;
while (comment == null && index < kids.length) {
comment =
await CacheRepository().getCachedComment(id: kids.elementAt(index));
index++;
}
return comment;
});
return comment != null ? '${comment.by}: ${comment.text}' : null;
}
static bool _certificateCheck(X509Certificate cert, String host, int port) =>
true;
@ -275,46 +300,45 @@ class WebAnalyzer {
..headers['accept'] =
'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9';
final IOStreamedResponse stream =
await client.send(request).catchError((dynamic err) {
// locator.get<Logger>().log(
// Level.error,
// 'Error in getting the link => ${request.url}\n$err',
// );
});
try {
final IOStreamedResponse stream =
await client.send(request).timeout(const Duration(seconds: 10));
if (stream.statusCode == HttpStatus.movedTemporarily ||
stream.statusCode == HttpStatus.movedPermanently) {
if (stream.isRedirect && count < 6) {
final String? location = stream.headers['location'];
if (location != null) {
url = location;
if (location.startsWith('/')) {
url = uri.origin + location;
if (stream.statusCode == HttpStatus.movedTemporarily ||
stream.statusCode == HttpStatus.movedPermanently) {
if (stream.isRedirect && count < 6) {
final String? location = stream.headers['location'];
if (location != null) {
url = location;
if (location.startsWith('/')) {
url = uri.origin + location;
}
}
if (stream.headers['set-cookie'] != null) {
cookie = stream.headers['set-cookie'];
}
count++;
client.close();
return _requestUrl(url, count: count, cookie: cookie);
}
if (stream.headers['set-cookie'] != null) {
cookie = stream.headers['set-cookie'];
}
count++;
client.close();
return _requestUrl(url, count: count, cookie: cookie);
}
} else if (stream.statusCode == HttpStatus.ok) {
res = await Response.fromStream(stream);
if (uri.host == 'm.tb.cn') {
final RegExpMatch? match =
RegExp(r"var url = \'(.*)\'").firstMatch(res.body);
if (match != null) {
final String? newUrl = match.group(1);
if (newUrl != null) {
return _requestUrl(newUrl, count: count, cookie: cookie);
} else if (stream.statusCode == HttpStatus.ok) {
res = await Response.fromStream(stream);
if (uri.host == 'm.tb.cn') {
final RegExpMatch? match =
RegExp(r"var url = \'(.*)\'").firstMatch(res.body);
if (match != null) {
final String? newUrl = match.group(1);
if (newUrl != null) {
return _requestUrl(newUrl, count: count, cookie: cookie);
}
}
}
}
client.close();
return res;
} catch (_) {
return null;
}
client.close();
return res;
}
static Future<InfoBase?> _getWebInfo(

26
lib/utils/link_util.dart
View File

@ -1,3 +1,5 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:url_launcher/url_launcher.dart';
@ -20,17 +22,21 @@ abstract class LinkUtil {
canLaunchUrl(uri).then((bool val) {
if (val) {
if (link.contains('http')) {
_browser
.open(
url: uri,
options: ChromeSafariBrowserClassOptions(
ios: IOSSafariOptions(
entersReaderIfAvailable: useReader,
preferredControlTintColor: Colors.orange,
if (Platform.isAndroid) {
launchUrl(uri, mode: LaunchMode.externalApplication);
} else {
_browser
.open(
url: uri,
options: ChromeSafariBrowserClassOptions(
ios: IOSSafariOptions(
entersReaderIfAvailable: useReader,
preferredControlTintColor: Colors.orange,
),
),
),
)
.onError((_, __) => launchUrl(uri));
)
.onError((_, __) => launchUrl(uri));
}
} else {
launchUrl(uri);
}

51
pubspec.lock
View File

@ -414,6 +414,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.2"
flutter_siri_suggestions:
dependency: "direct main"
description:
name: flutter_siri_suggestions
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
flutter_slidable:
dependency: "direct main"
description:
@ -804,6 +811,48 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.2.0"
share_plus:
dependency: "direct main"
description:
name: share_plus
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.8"
share_plus_linux:
dependency: transitive
description:
name: share_plus_linux
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
share_plus_macos:
dependency: transitive
description:
name: share_plus_macos
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
share_plus_platform_interface:
dependency: transitive
description:
name: share_plus_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.3"
share_plus_web:
dependency: transitive
description:
name: share_plus_web
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
share_plus_windows:
dependency: transitive
description:
name: share_plus_windows
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.1"
shared_preferences:
dependency: "direct main"
description:
@ -1032,7 +1081,7 @@ packages:
name: url_launcher
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.2"
version: "6.1.3"
url_launcher_android:
dependency: transitive
description:

6
pubspec.yaml
View File

@ -1,6 +1,6 @@
name: hacki
description: A Hacker News reader.
version: 0.2.17+56
version: 0.2.18+57
publish_to: none
environment:
@ -33,6 +33,7 @@ dependencies:
flutter_linkify: ^5.0.2
flutter_local_notifications: ^9.5.0
flutter_secure_storage: ^5.0.2
flutter_siri_suggestions: ^2.1.0
flutter_slidable: ^1.2.1
font_awesome_flutter: ^9.2.0
gbk_codec: ^0.4.0
@ -56,6 +57,7 @@ dependencies:
responsive_builder: ^0.4.2
rxdart: ^0.27.3
sembast: ^3.1.1+1
share_plus: ^4.0.8
shared_preferences: ^2.0.11
shared_preferences_android: ^2.0.11
shared_preferences_ios: ^2.0.11
@ -64,7 +66,7 @@ dependencies:
path: components/synced_shared_preferences
tuple: ^2.0.0
universal_platform: ^1.0.0+1
url_launcher: ^6.0.10
url_launcher: ^6.1.3
wakelock: ^0.6.1+2
workmanager: ^0.5.0