Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
fefc86275d | |||
1a73a6991e | |||
36d7f4606e | |||
9312c56dd0 | |||
6e71de5913 |
@ -4,7 +4,6 @@
|
|||||||
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
|
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
|
||||||
|
|
||||||
[](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
|
[](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
|
||||||
[](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
|
|
||||||
[](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
|
[](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
|
||||||
[](https://github.com/Livinglist/Hacki/releases/latest)
|
[](https://github.com/Livinglist/Hacki/releases/latest)
|
||||||
[](https://badges.pufler.dev)
|
[](https://badges.pufler.dev)
|
||||||
|
@ -17,7 +17,8 @@
|
|||||||
|
|
||||||
<application
|
<application
|
||||||
android:label="hacki"
|
android:label="hacki"
|
||||||
android:icon="@mipmap/ic_launcher">
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:usesCleartextTraffic="true">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:launchMode="singleTop"
|
android:launchMode="singleTop"
|
||||||
@ -52,6 +53,21 @@
|
|||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<data android:mimeType="*/*" />
|
<data android:mimeType="*/*" />
|
||||||
</intent-filter>
|
</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>
|
</activity>
|
||||||
<!-- Don't delete the meta-data below.
|
<!-- Don't delete the meta-data below.
|
||||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
||||||
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 121 KiB |
Before Width: | Height: | Size: 384 KiB After Width: | Height: | Size: 375 KiB |
6
fastlane/metadata/android/en-US/changelogs/56.txt
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
- 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.
|
7
fastlane/metadata/android/en-US/changelogs/57.txt
Normal 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.
|
Before Width: | Height: | Size: 102 KiB After Width: | Height: | Size: 121 KiB |
Before Width: | Height: | Size: 384 KiB After Width: | Height: | Size: 375 KiB |
@ -14,6 +14,8 @@ PODS:
|
|||||||
- Flutter
|
- Flutter
|
||||||
- flutter_secure_storage (3.3.1):
|
- flutter_secure_storage (3.3.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
|
- flutter_siri_suggestions (0.0.1):
|
||||||
|
- Flutter
|
||||||
- FMDB (2.7.5):
|
- FMDB (2.7.5):
|
||||||
- FMDB/standard (= 2.7.5)
|
- FMDB/standard (= 2.7.5)
|
||||||
- FMDB/standard (2.7.5)
|
- FMDB/standard (2.7.5)
|
||||||
@ -23,6 +25,8 @@ PODS:
|
|||||||
- ReachabilitySwift (5.0.0)
|
- ReachabilitySwift (5.0.0)
|
||||||
- receive_sharing_intent (0.0.1):
|
- receive_sharing_intent (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
|
- share_plus (0.0.1):
|
||||||
|
- Flutter
|
||||||
- shared_preferences_ios (0.0.1):
|
- shared_preferences_ios (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
- sqflite (0.0.2):
|
- sqflite (0.0.2):
|
||||||
@ -47,8 +51,10 @@ DEPENDENCIES:
|
|||||||
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
|
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
|
||||||
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
|
||||||
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/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`)
|
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
|
||||||
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/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`)
|
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
|
||||||
- sqflite (from `.symlinks/plugins/sqflite/ios`)
|
- sqflite (from `.symlinks/plugins/sqflite/ios`)
|
||||||
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
|
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
|
||||||
@ -75,10 +81,14 @@ EXTERNAL SOURCES:
|
|||||||
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
:path: ".symlinks/plugins/flutter_local_notifications/ios"
|
||||||
flutter_secure_storage:
|
flutter_secure_storage:
|
||||||
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
||||||
|
flutter_siri_suggestions:
|
||||||
|
:path: ".symlinks/plugins/flutter_siri_suggestions/ios"
|
||||||
path_provider_ios:
|
path_provider_ios:
|
||||||
:path: ".symlinks/plugins/path_provider_ios/ios"
|
:path: ".symlinks/plugins/path_provider_ios/ios"
|
||||||
receive_sharing_intent:
|
receive_sharing_intent:
|
||||||
:path: ".symlinks/plugins/receive_sharing_intent/ios"
|
:path: ".symlinks/plugins/receive_sharing_intent/ios"
|
||||||
|
share_plus:
|
||||||
|
:path: ".symlinks/plugins/share_plus/ios"
|
||||||
shared_preferences_ios:
|
shared_preferences_ios:
|
||||||
:path: ".symlinks/plugins/shared_preferences_ios/ios"
|
:path: ".symlinks/plugins/shared_preferences_ios/ios"
|
||||||
sqflite:
|
sqflite:
|
||||||
@ -102,11 +112,13 @@ SPEC CHECKSUMS:
|
|||||||
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
|
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
|
||||||
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
|
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
|
||||||
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
|
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
|
||||||
|
flutter_siri_suggestions: 226fb7ef33d25d3fe0d4aa2a8bcf4b72730c466f
|
||||||
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
|
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
|
||||||
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
|
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
|
||||||
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
|
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
|
||||||
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
|
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
|
||||||
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
|
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
|
||||||
|
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
|
||||||
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
|
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
|
||||||
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
|
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
|
||||||
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
|
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
|
||||||
|
@ -577,7 +577,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.16;
|
MARKETING_VERSION = 0.2.18;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@ -714,7 +714,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.16;
|
MARKETING_VERSION = 0.2.18;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@ -745,7 +745,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.16;
|
MARKETING_VERSION = 0.2.18;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
@ -2,6 +2,7 @@ import 'dart:async';
|
|||||||
|
|
||||||
import 'package:bloc/bloc.dart';
|
import 'package:bloc/bloc.dart';
|
||||||
import 'package:equatable/equatable.dart';
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
import 'package:hacki/config/locator.dart';
|
||||||
import 'package:hacki/models/models.dart';
|
import 'package:hacki/models/models.dart';
|
||||||
import 'package:hacki/repositories/repositories.dart';
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
@ -159,10 +160,19 @@ class CommentsCubit extends Cubit<CommentsState> {
|
|||||||
..addKid(comment.id, to: comment.parent)
|
..addKid(comment.id, to: comment.parent)
|
||||||
..cacheComment(comment);
|
..cacheComment(comment);
|
||||||
_sembastRepository.cacheComment(comment);
|
_sembastRepository.cacheComment(comment);
|
||||||
|
|
||||||
|
final List<LinkifyElement> elements = linkify(
|
||||||
|
comment.text,
|
||||||
|
);
|
||||||
|
|
||||||
|
final BuildableComment buildableComment =
|
||||||
|
BuildableComment.fromComment(comment, elements: elements);
|
||||||
|
|
||||||
final List<Comment> updatedComments = <Comment>[
|
final List<Comment> updatedComments = <Comment>[
|
||||||
...state.comments,
|
...state.comments,
|
||||||
comment
|
buildableComment
|
||||||
];
|
];
|
||||||
|
|
||||||
emit(state.copyWith(comments: updatedComments));
|
emit(state.copyWith(comments: updatedComments));
|
||||||
|
|
||||||
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
||||||
@ -180,6 +190,31 @@ class CommentsCubit extends Cubit<CommentsState> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<LinkifyElement> linkify(
|
||||||
|
String text, {
|
||||||
|
LinkifyOptions options = const LinkifyOptions(),
|
||||||
|
List<Linkifier> linkifiers = const <Linkifier>[
|
||||||
|
UrlLinkifier(),
|
||||||
|
EmailLinkifier(),
|
||||||
|
],
|
||||||
|
}) {
|
||||||
|
List<LinkifyElement> list = <LinkifyElement>[TextElement(text)];
|
||||||
|
|
||||||
|
if (text.isEmpty) {
|
||||||
|
return <LinkifyElement>[];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (linkifiers.isEmpty) {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (final Linkifier linkifier in linkifiers) {
|
||||||
|
list = linkifier.parse(list, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<void> close() async {
|
Future<void> close() async {
|
||||||
await _streamSubscription?.cancel();
|
await _streamSubscription?.cancel();
|
||||||
|
@ -14,4 +14,5 @@ export 'search/search_cubit.dart';
|
|||||||
export 'split_view/split_view_cubit.dart';
|
export 'split_view/split_view_cubit.dart';
|
||||||
export 'submit/submit_cubit.dart';
|
export 'submit/submit_cubit.dart';
|
||||||
export 'time_machine/time_machine_cubit.dart';
|
export 'time_machine/time_machine_cubit.dart';
|
||||||
|
export 'user/user_cubit.dart';
|
||||||
export 'vote/vote_cubit.dart';
|
export 'vote/vote_cubit.dart';
|
||||||
|
26
lib/cubits/user/user_cubit.dart
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:hacki/config/locator.dart';
|
||||||
|
import 'package:hacki/models/models.dart';
|
||||||
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
|
|
||||||
|
part 'user_state.dart';
|
||||||
|
|
||||||
|
class UserCubit extends Cubit<UserState> {
|
||||||
|
UserCubit({StoriesRepository? storiesRepository})
|
||||||
|
: _storiesRepository =
|
||||||
|
storiesRepository ?? locator.get<StoriesRepository>(),
|
||||||
|
super(UserState.init());
|
||||||
|
|
||||||
|
final StoriesRepository _storiesRepository;
|
||||||
|
|
||||||
|
void init({required String userId}) {
|
||||||
|
emit(state.copyWith(status: UserStatus.loading));
|
||||||
|
_storiesRepository.fetchUserBy(userId: userId).then((User user) {
|
||||||
|
emit(state.copyWith(user: user, status: UserStatus.loaded));
|
||||||
|
}).onError((_, __) {
|
||||||
|
emit(state.copyWith(status: UserStatus.failure));
|
||||||
|
return;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
38
lib/cubits/user/user_state.dart
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
part of 'user_cubit.dart';
|
||||||
|
|
||||||
|
enum UserStatus {
|
||||||
|
initial,
|
||||||
|
loading,
|
||||||
|
loaded,
|
||||||
|
failure,
|
||||||
|
}
|
||||||
|
|
||||||
|
class UserState extends Equatable {
|
||||||
|
const UserState({
|
||||||
|
required this.user,
|
||||||
|
required this.status,
|
||||||
|
});
|
||||||
|
|
||||||
|
UserState.init()
|
||||||
|
: user = User.empty(),
|
||||||
|
status = UserStatus.initial;
|
||||||
|
|
||||||
|
final User user;
|
||||||
|
final UserStatus status;
|
||||||
|
|
||||||
|
UserState copyWith({
|
||||||
|
User? user,
|
||||||
|
UserStatus? status,
|
||||||
|
}) {
|
||||||
|
return UserState(
|
||||||
|
user: user ?? this.user,
|
||||||
|
status: status ?? this.status,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => <Object?>[
|
||||||
|
user,
|
||||||
|
status,
|
||||||
|
];
|
||||||
|
}
|
@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter/scheduler.dart';
|
import 'package:flutter/scheduler.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_local_notifications/flutter_local_notifications.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/blocs/blocs.dart';
|
||||||
import 'package:hacki/config/custom_router.dart';
|
import 'package:hacki/config/custom_router.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
import 'package:hacki/config/locator.dart';
|
||||||
@ -24,6 +25,10 @@ import 'package:workmanager/workmanager.dart';
|
|||||||
final BehaviorSubject<String?> selectNotificationSubject =
|
final BehaviorSubject<String?> selectNotificationSubject =
|
||||||
BehaviorSubject<String?>();
|
BehaviorSubject<String?>();
|
||||||
|
|
||||||
|
// For receiving payload event from siri suggestions.
|
||||||
|
final BehaviorSubject<String?> siriSuggestionSubject =
|
||||||
|
BehaviorSubject<String?>();
|
||||||
|
|
||||||
Future<void> main() async {
|
Future<void> main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
@ -57,6 +62,16 @@ Future<void> main() async {
|
|||||||
badge: true,
|
badge: true,
|
||||||
sound: 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();
|
final Directory tempDir = await getTemporaryDirectory();
|
||||||
|
33
lib/models/buildable_comment.dart
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||||
|
import 'package:hacki/models/comment.dart';
|
||||||
|
import 'package:hacki/models/models.dart';
|
||||||
|
|
||||||
|
class BuildableComment extends Comment {
|
||||||
|
BuildableComment({
|
||||||
|
required super.id,
|
||||||
|
required super.time,
|
||||||
|
required super.parent,
|
||||||
|
required super.score,
|
||||||
|
required super.by,
|
||||||
|
required super.text,
|
||||||
|
required super.kids,
|
||||||
|
required super.deleted,
|
||||||
|
required super.level,
|
||||||
|
required this.elements,
|
||||||
|
});
|
||||||
|
|
||||||
|
BuildableComment.fromComment(Comment comment, {required this.elements})
|
||||||
|
: super(
|
||||||
|
id: comment.id,
|
||||||
|
time: comment.time,
|
||||||
|
parent: comment.parent,
|
||||||
|
score: comment.score,
|
||||||
|
by: comment.by,
|
||||||
|
text: comment.text,
|
||||||
|
kids: comment.kids,
|
||||||
|
deleted: comment.deleted,
|
||||||
|
level: comment.level,
|
||||||
|
);
|
||||||
|
|
||||||
|
final List<LinkifyElement> elements;
|
||||||
|
}
|
@ -1,3 +1,4 @@
|
|||||||
|
export 'buildable_comment.dart';
|
||||||
export 'comment.dart';
|
export 'comment.dart';
|
||||||
export 'item.dart';
|
export 'item.dart';
|
||||||
export 'poll_option.dart';
|
export 'poll_option.dart';
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
class User {
|
class User {
|
||||||
User({
|
User({
|
||||||
required this.about,
|
required this.about,
|
||||||
@ -29,6 +31,12 @@ class User {
|
|||||||
final String id;
|
final String id;
|
||||||
final int karma;
|
final int karma;
|
||||||
|
|
||||||
|
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
|
||||||
|
|
||||||
|
String get description {
|
||||||
|
return '''$karma karma, created on ${_dateTimeFormatter.format(DateTime.fromMillisecondsSinceEpoch(created * 1000))}''';
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
final String prettyString =
|
final String prettyString =
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:badges/badges.dart';
|
import 'package:badges/badges.dart';
|
||||||
import 'package:feature_discovery/feature_discovery.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/services.dart';
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:flutter_fadein/flutter_fadein.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:flutter_slidable/flutter_slidable.dart';
|
||||||
import 'package:hacki/blocs/blocs.dart';
|
import 'package:hacki/blocs/blocs.dart';
|
||||||
import 'package:hacki/config/constants.dart';
|
import 'package:hacki/config/constants.dart';
|
||||||
@ -52,6 +54,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
late final TabController tabController;
|
late final TabController tabController;
|
||||||
late final StreamSubscription<String> intentDataStreamSubscription;
|
late final StreamSubscription<String> intentDataStreamSubscription;
|
||||||
late final StreamSubscription<String?> notificationStreamSubscription;
|
late final StreamSubscription<String?> notificationStreamSubscription;
|
||||||
|
late final StreamSubscription<String?> siriSuggestionStreamSubscription;
|
||||||
|
|
||||||
int currentIndex = 0;
|
int currentIndex = 0;
|
||||||
|
|
||||||
@ -88,6 +91,11 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
selectNotificationSubject.stream.listen(onNotificationTapped);
|
selectNotificationSubject.stream.listen(onNotificationTapped);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!siriSuggestionSubject.hasListener) {
|
||||||
|
siriSuggestionStreamSubscription =
|
||||||
|
siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
|
||||||
|
}
|
||||||
|
|
||||||
SchedulerBinding.instance
|
SchedulerBinding.instance
|
||||||
..addPostFrameCallback((_) {
|
..addPostFrameCallback((_) {
|
||||||
FeatureDiscovery.discoverFeatures(
|
FeatureDiscovery.discoverFeatures(
|
||||||
@ -132,6 +140,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
tabController.dispose();
|
tabController.dispose();
|
||||||
intentDataStreamSubscription.cancel();
|
intentDataStreamSubscription.cancel();
|
||||||
notificationStreamSubscription.cancel();
|
notificationStreamSubscription.cancel();
|
||||||
|
siriSuggestionStreamSubscription.cancel();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,7 +180,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.orangeAccent.withOpacity(0.2),
|
color: Colors.orangeAccent.withOpacity(0.2),
|
||||||
child: StoryTile(
|
child: StoryTile(
|
||||||
key: ObjectKey(story),
|
key: ValueKey<String>('${story.id}-PinnedStoryTile'),
|
||||||
story: story,
|
story: story,
|
||||||
onTap: () => onStoryTapped(story, isPin: true),
|
onTap: () => onStoryTapped(story, isPin: true),
|
||||||
showWebPreview: preferenceState.showComplexStoryTile,
|
showWebPreview: preferenceState.showComplexStoryTile,
|
||||||
@ -390,6 +399,18 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
story: story,
|
story: story,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (Platform.isIOS) {
|
||||||
|
FlutterSiriSuggestions.instance.registerActivity(
|
||||||
|
FlutterSiriActivity(
|
||||||
|
story.title,
|
||||||
|
story.id.toString(),
|
||||||
|
suggestedInvocationPhrase: '',
|
||||||
|
contentDescription: story.text,
|
||||||
|
persistentIdentifier: story.id.toString(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void showOnboarding() {
|
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 {
|
Future<void> onNotificationTapped(String? payload) async {
|
||||||
if (payload == null) return;
|
if (payload == null) return;
|
||||||
|
|
||||||
@ -543,7 +582,7 @@ class _TabletStoryView extends StatelessWidget {
|
|||||||
previous.storyScreenArgs != current.storyScreenArgs,
|
previous.storyScreenArgs != current.storyScreenArgs,
|
||||||
builder: (BuildContext context, SplitViewState state) {
|
builder: (BuildContext context, SplitViewState state) {
|
||||||
if (state.storyScreenArgs != null) {
|
if (state.storyScreenArgs != null) {
|
||||||
return StoryScreen.build(state.storyScreenArgs!);
|
return StoryScreen.build(context, state.storyScreenArgs!);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Material(
|
return Material(
|
||||||
|
@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
|||||||
showAboutDialog(
|
showAboutDialog(
|
||||||
context: context,
|
context: context,
|
||||||
applicationName: 'Hacki',
|
applicationName: 'Hacki',
|
||||||
applicationVersion: 'v0.2.16',
|
applicationVersion: 'v0.2.18',
|
||||||
applicationIcon: ClipRRect(
|
applicationIcon: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(
|
borderRadius: const BorderRadius.all(
|
||||||
Radius.circular(12),
|
Radius.circular(12),
|
||||||
|
@ -22,10 +22,12 @@ import 'package:hacki/services/services.dart';
|
|||||||
import 'package:hacki/utils/utils.dart';
|
import 'package:hacki/utils/utils.dart';
|
||||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||||
import 'package:responsive_builder/responsive_builder.dart';
|
import 'package:responsive_builder/responsive_builder.dart';
|
||||||
|
import 'package:share_plus/share_plus.dart';
|
||||||
|
|
||||||
enum _MenuAction {
|
enum _MenuAction {
|
||||||
upvote,
|
upvote,
|
||||||
downvote,
|
downvote,
|
||||||
|
share,
|
||||||
block,
|
block,
|
||||||
flag,
|
flag,
|
||||||
cancel,
|
cancel,
|
||||||
@ -88,29 +90,39 @@ class StoryScreen extends StatefulWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Widget build(StoryScreenArgs args) {
|
static Widget build(BuildContext context, StoryScreenArgs args) {
|
||||||
return MultiBlocProvider(
|
return WillPopScope(
|
||||||
key: ValueKey<StoryScreenArgs>(args),
|
onWillPop: () async {
|
||||||
providers: <BlocProvider<dynamic>>[
|
if (context.read<SplitViewCubit>().state.expanded) {
|
||||||
BlocProvider<CommentsCubit>(
|
context.read<SplitViewCubit>().zoom();
|
||||||
create: (BuildContext context) => CommentsCubit(
|
return false;
|
||||||
offlineReading: context.read<StoriesBloc>().state.offlineReading,
|
} else {
|
||||||
story: args.story,
|
return true;
|
||||||
)..init(
|
}
|
||||||
onlyShowTargetComment: args.onlyShowTargetComment,
|
},
|
||||||
targetParents: args.targetComments,
|
child: MultiBlocProvider(
|
||||||
),
|
key: ValueKey<StoryScreenArgs>(args),
|
||||||
),
|
providers: <BlocProvider<dynamic>>[
|
||||||
if (args.story.isPoll)
|
BlocProvider<CommentsCubit>(
|
||||||
BlocProvider<PollCubit>(
|
create: (BuildContext context) => CommentsCubit(
|
||||||
create: (BuildContext context) =>
|
offlineReading: context.read<StoriesBloc>().state.offlineReading,
|
||||||
PollCubit(story: args.story)..init(),
|
story: args.story,
|
||||||
|
)..init(
|
||||||
|
onlyShowTargetComment: args.onlyShowTargetComment,
|
||||||
|
targetParents: args.targetComments,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
if (args.story.isPoll)
|
||||||
child: StoryScreen(
|
BlocProvider<PollCubit>(
|
||||||
story: args.story,
|
create: (BuildContext context) =>
|
||||||
parentComments: args.targetComments ?? <Comment>[],
|
PollCubit(story: args.story)..init(),
|
||||||
splitViewEnabled: true,
|
),
|
||||||
|
],
|
||||||
|
child: StoryScreen(
|
||||||
|
story: args.story,
|
||||||
|
parentComments: args.targetComments ?? <Comment>[],
|
||||||
|
splitViewEnabled: true,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -140,7 +152,6 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
delay: _featureDiscoveryDismissThrottleDelay,
|
delay: _featureDiscoveryDismissThrottleDelay,
|
||||||
);
|
);
|
||||||
|
|
||||||
static const int _extraItemsCount = 2;
|
|
||||||
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
||||||
static const Duration _featureDiscoveryDismissThrottleDelay =
|
static const Duration _featureDiscoveryDismissThrottleDelay =
|
||||||
Duration(seconds: 1);
|
Duration(seconds: 1);
|
||||||
@ -270,229 +281,210 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
onLoading: () {
|
onLoading: () {
|
||||||
context.read<CommentsCubit>().loadMore();
|
context.read<CommentsCubit>().loadMore();
|
||||||
},
|
},
|
||||||
child: ListView.builder(
|
child: ListView(
|
||||||
primary: false,
|
primary: false,
|
||||||
itemCount: state.comments.length + _extraItemsCount,
|
children: <Widget>[
|
||||||
itemBuilder: (BuildContext context, int index) {
|
SizedBox(
|
||||||
if (index == 0) {
|
height: topPadding,
|
||||||
return Column(
|
),
|
||||||
|
if (!widget.splitViewEnabled)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 6),
|
||||||
|
child: OfflineBanner(),
|
||||||
|
),
|
||||||
|
Slidable(
|
||||||
|
startActionPane: ActionPane(
|
||||||
|
motion: const BehindMotion(),
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
SizedBox(
|
SlidableAction(
|
||||||
height: topPadding,
|
onPressed: (_) {
|
||||||
),
|
HapticFeedback.lightImpact();
|
||||||
if (!widget.splitViewEnabled)
|
|
||||||
const Padding(
|
|
||||||
padding: EdgeInsets.only(bottom: 6),
|
|
||||||
child: OfflineBanner(),
|
|
||||||
),
|
|
||||||
Slidable(
|
|
||||||
startActionPane: ActionPane(
|
|
||||||
motion: const BehindMotion(),
|
|
||||||
children: <Widget>[
|
|
||||||
SlidableAction(
|
|
||||||
onPressed: (_) {
|
|
||||||
HapticFeedback.lightImpact();
|
|
||||||
|
|
||||||
if (widget.story !=
|
if (widget.story !=
|
||||||
context
|
context.read<EditCubit>().state.replyingTo) {
|
||||||
.read<EditCubit>()
|
commentEditingController.clear();
|
||||||
.state
|
}
|
||||||
.replyingTo) {
|
context
|
||||||
commentEditingController.clear();
|
.read<EditCubit>()
|
||||||
}
|
.onReplyTapped(widget.story);
|
||||||
context
|
focusNode.requestFocus();
|
||||||
.read<EditCubit>()
|
},
|
||||||
.onReplyTapped(widget.story);
|
backgroundColor: Colors.orange,
|
||||||
focusNode.requestFocus();
|
foregroundColor: Colors.white,
|
||||||
},
|
icon: Icons.message,
|
||||||
backgroundColor: Colors.orange,
|
),
|
||||||
foregroundColor: Colors.white,
|
SlidableAction(
|
||||||
icon: Icons.message,
|
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,
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
children: <Widget>[
|
||||||
|
Text(
|
||||||
|
widget.story.by,
|
||||||
|
style: const TextStyle(
|
||||||
|
color: Colors.orange,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SlidableAction(
|
const Spacer(),
|
||||||
onPressed: (_) => onMorePressed(widget.story),
|
Text(
|
||||||
backgroundColor: Colors.orange,
|
widget.story.postedDate,
|
||||||
foregroundColor: Colors.white,
|
style: const TextStyle(
|
||||||
icon: Icons.more_horiz,
|
color: Colors.grey,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
child: Column(
|
),
|
||||||
children: <Widget>[
|
InkWell(
|
||||||
Padding(
|
onTap: () => LinkUtil.launch(
|
||||||
padding: const EdgeInsets.only(
|
widget.story.url,
|
||||||
left: 6,
|
useReader: context
|
||||||
right: 6,
|
.read<PreferenceCubit>()
|
||||||
),
|
.state
|
||||||
child: Row(
|
.useReader,
|
||||||
children: <Widget>[
|
),
|
||||||
Text(
|
child: Padding(
|
||||||
widget.story.by,
|
padding: const EdgeInsets.only(
|
||||||
style: const TextStyle(
|
left: 6,
|
||||||
color: Colors.orange,
|
right: 6,
|
||||||
),
|
bottom: 12,
|
||||||
),
|
top: 12,
|
||||||
const Spacer(),
|
),
|
||||||
Text(
|
child: Text(
|
||||||
widget.story.postedDate,
|
widget.story.title,
|
||||||
style: const TextStyle(
|
textAlign: TextAlign.center,
|
||||||
color: Colors.grey,
|
style: TextStyle(
|
||||||
),
|
fontWeight: FontWeight.bold,
|
||||||
),
|
color: widget.story.url.isNotEmpty
|
||||||
],
|
? Colors.orange
|
||||||
),
|
: null,
|
||||||
),
|
),
|
||||||
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)
|
if (widget.story.text.isNotEmpty)
|
||||||
const SizedBox(
|
Padding(
|
||||||
height: 8,
|
padding: const EdgeInsets.symmetric(
|
||||||
),
|
horizontal: 10,
|
||||||
const Divider(
|
),
|
||||||
height: 0,
|
child: SelectableLinkify(
|
||||||
),
|
text: widget.story.text,
|
||||||
if (state.onlyShowTargetComment) ...<Widget>[
|
style: TextStyle(
|
||||||
TextButton(
|
fontSize:
|
||||||
onPressed: () => context
|
MediaQuery.of(context).textScaleFactor *
|
||||||
.read<CommentsCubit>()
|
15,
|
||||||
.loadAll(widget.story),
|
),
|
||||||
child: const Text('View all comments'),
|
linkStyle: TextStyle(
|
||||||
),
|
fontSize:
|
||||||
const Divider(
|
MediaQuery.of(context).textScaleFactor *
|
||||||
height: 0,
|
15,
|
||||||
),
|
color: Colors.orange,
|
||||||
],
|
),
|
||||||
if (state.comments.isEmpty &&
|
onOpen: (LinkableElement link) {
|
||||||
state.status ==
|
if (link.url.contains(
|
||||||
CommentsStatus.allLoaded) ...<Widget>[
|
'news.ycombinator.com/item',
|
||||||
const SizedBox(
|
)) {
|
||||||
height: 240,
|
onStoryLinkTapped(link.url);
|
||||||
),
|
} else {
|
||||||
const Center(
|
LinkUtil.launch(link.url);
|
||||||
child: Text(
|
}
|
||||||
'Nothing yet',
|
},
|
||||||
style: TextStyle(color: Colors.grey),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
if (widget.story.isPoll)
|
||||||
|
PollView(
|
||||||
|
onLoginTapped: onLoginTapped,
|
||||||
|
),
|
||||||
],
|
],
|
||||||
);
|
|
||||||
} 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),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
}
|
|
||||||
|
|
||||||
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>().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 (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 comment in state.comments)
|
||||||
|
FadeIn(
|
||||||
|
key: ValueKey<String>('${comment.id}-FadeIn'),
|
||||||
|
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>().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),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -766,12 +758,82 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
final bool upvoted = voteState.vote == Vote.up;
|
final bool upvoted = voteState.vote == Vote.up;
|
||||||
final bool downvoted = voteState.vote == Vote.down;
|
final bool downvoted = voteState.vote == Vote.down;
|
||||||
return Container(
|
return Container(
|
||||||
height: 300,
|
height: item is Comment ? 430 : 450,
|
||||||
color: Theme.of(context).canvasColor,
|
color: Theme.of(context).canvasColor,
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Colors.transparent,
|
color: Colors.transparent,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
|
BlocProvider<UserCubit>(
|
||||||
|
create: (BuildContext context) =>
|
||||||
|
UserCubit()..init(userId: item.by),
|
||||||
|
child: BlocBuilder<UserCubit, UserState>(
|
||||||
|
builder: (BuildContext context, UserState state) {
|
||||||
|
return ListTile(
|
||||||
|
leading: const Icon(
|
||||||
|
Icons.account_circle,
|
||||||
|
),
|
||||||
|
title: Text(item.by),
|
||||||
|
subtitle: Text(
|
||||||
|
state.user.description,
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
showDialog<void>(
|
||||||
|
context: context,
|
||||||
|
builder: (BuildContext context) =>
|
||||||
|
SimpleDialog(
|
||||||
|
title: Text('About ${state.user.id}'),
|
||||||
|
contentPadding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 24,
|
||||||
|
vertical: 12,
|
||||||
|
),
|
||||||
|
children: <Widget>[
|
||||||
|
SelectableLinkify(
|
||||||
|
text: HtmlUtil.parseHtml(
|
||||||
|
state.user.about,
|
||||||
|
),
|
||||||
|
linkStyle: const TextStyle(
|
||||||
|
color: Colors.orange,
|
||||||
|
),
|
||||||
|
onOpen: (LinkableElement link) {
|
||||||
|
if (link.url.contains(
|
||||||
|
'news.ycombinator.com/item',
|
||||||
|
)) {
|
||||||
|
onStoryLinkTapped.call(link.url);
|
||||||
|
} else {
|
||||||
|
LinkUtil.launch(link.url);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
ButtonBar(
|
||||||
|
children: <Widget>[
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: () =>
|
||||||
|
Navigator.pop(context),
|
||||||
|
style: ButtonStyle(
|
||||||
|
backgroundColor:
|
||||||
|
MaterialStateProperty.all(
|
||||||
|
Colors.deepOrange,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'Okay',
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: Icon(
|
leading: Icon(
|
||||||
FeatherIcons.chevronUp,
|
FeatherIcons.chevronUp,
|
||||||
@ -800,6 +862,16 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
onTap: context.read<VoteCubit>().downvote,
|
onTap: context.read<VoteCubit>().downvote,
|
||||||
),
|
),
|
||||||
|
ListTile(
|
||||||
|
leading: const Icon(FeatherIcons.share),
|
||||||
|
title: const Text(
|
||||||
|
'Share',
|
||||||
|
),
|
||||||
|
onTap: () => Navigator.pop(
|
||||||
|
context,
|
||||||
|
_MenuAction.share,
|
||||||
|
),
|
||||||
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: const Icon(Icons.local_police),
|
leading: const Icon(Icons.local_police),
|
||||||
title: const Text(
|
title: const Text(
|
||||||
@ -847,6 +919,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
break;
|
break;
|
||||||
case _MenuAction.downvote:
|
case _MenuAction.downvote:
|
||||||
break;
|
break;
|
||||||
|
case _MenuAction.share:
|
||||||
|
onShareTapped(item);
|
||||||
|
break;
|
||||||
case _MenuAction.flag:
|
case _MenuAction.flag:
|
||||||
onFlagTapped(item);
|
onFlagTapped(item);
|
||||||
break;
|
break;
|
||||||
@ -860,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) {
|
void onFlagTapped(Item item) {
|
||||||
showDialog<bool>(
|
showDialog<bool>(
|
||||||
context: context,
|
context: context,
|
||||||
|
@ -25,6 +25,7 @@ class FavIconButton extends StatelessWidget {
|
|||||||
builder: (BuildContext context, FavState favState) {
|
builder: (BuildContext context, FavState favState) {
|
||||||
final bool isFav = favState.favIds.contains(storyId);
|
final bool isFav = favState.favIds.contains(storyId);
|
||||||
return IconButton(
|
return IconButton(
|
||||||
|
tooltip: 'Add to favorites',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -21,6 +21,7 @@ class LinkIconButton extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return IconButton(
|
return IconButton(
|
||||||
|
tooltip: 'Open this story in browser',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -31,6 +31,7 @@ class PinIconButton extends StatelessWidget {
|
|||||||
child: Transform.translate(
|
child: Transform.translate(
|
||||||
offset: const Offset(2, 0),
|
offset: const Offset(2, 0),
|
||||||
child: IconButton(
|
child: IconButton(
|
||||||
|
tooltip: 'Pin to home screen',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -38,6 +38,7 @@ class CommentTile extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocProvider<CollapseCubit>(
|
return BlocProvider<CollapseCubit>(
|
||||||
|
key: ValueKey<String>('${comment.id}-BlocProvider'),
|
||||||
lazy: false,
|
lazy: false,
|
||||||
create: (_) => CollapseCubit(
|
create: (_) => CollapseCubit(
|
||||||
commentId: comment.id,
|
commentId: comment.id,
|
||||||
@ -209,30 +210,62 @@ class CommentTile extends StatelessWidget {
|
|||||||
top: 6,
|
top: 6,
|
||||||
bottom: 12,
|
bottom: 12,
|
||||||
),
|
),
|
||||||
child: SelectableLinkify(
|
child: comment is BuildableComment
|
||||||
key: ObjectKey(comment),
|
? SelectableText.rich(
|
||||||
text: comment.text,
|
key: ValueKey<int>(comment.id),
|
||||||
style: TextStyle(
|
buildTextSpan(
|
||||||
fontSize: MediaQuery.of(context)
|
(comment as BuildableComment)
|
||||||
.textScaleFactor *
|
.elements,
|
||||||
15,
|
style: TextStyle(
|
||||||
),
|
fontSize: MediaQuery.of(context)
|
||||||
linkStyle: TextStyle(
|
.textScaleFactor *
|
||||||
fontSize: MediaQuery.of(context)
|
15,
|
||||||
.textScaleFactor *
|
),
|
||||||
15,
|
linkStyle: TextStyle(
|
||||||
color: Colors.orange,
|
fontSize: MediaQuery.of(context)
|
||||||
),
|
.textScaleFactor *
|
||||||
onOpen: (LinkableElement link) {
|
15,
|
||||||
if (link.url.contains(
|
decoration:
|
||||||
'news.ycombinator.com/item',
|
TextDecoration.underline,
|
||||||
)) {
|
color: Colors.orange,
|
||||||
onStoryLinkTapped.call(link.url);
|
),
|
||||||
} else {
|
onOpen: (LinkableElement link) {
|
||||||
LinkUtil.launch(link.url);
|
if (link.url.contains(
|
||||||
}
|
'news.ycombinator.com/item',
|
||||||
},
|
)) {
|
||||||
),
|
onStoryLinkTapped
|
||||||
|
.call(link.url);
|
||||||
|
} else {
|
||||||
|
LinkUtil.launch(link.url);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: SelectableLinkify(
|
||||||
|
key: ValueKey<int>(comment.id),
|
||||||
|
text: comment.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
|
||||||
|
.call(link.url);
|
||||||
|
} else {
|
||||||
|
LinkUtil.launch(link.url);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
),
|
),
|
||||||
const Divider(
|
const Divider(
|
||||||
height: 0,
|
height: 0,
|
||||||
|
@ -87,7 +87,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
|
|||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
child: StoryTile(
|
child: StoryTile(
|
||||||
key: ObjectKey(e),
|
key: ValueKey<int>(e.id),
|
||||||
story: e,
|
story: e,
|
||||||
onTap: () => onTap(e),
|
onTap: () => onTap(e),
|
||||||
showWebPreview: showWebPreview,
|
showWebPreview: showWebPreview,
|
||||||
|
@ -141,7 +141,7 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
_info = await WebAnalyzer.getInfo(
|
_info = await WebAnalyzer.getInfo(
|
||||||
widget.story.id.toString(),
|
null,
|
||||||
story: widget.story,
|
story: widget.story,
|
||||||
cache: widget.cache,
|
cache: widget.cache,
|
||||||
);
|
);
|
||||||
@ -188,8 +188,8 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
key: widget.key ?? Key(widget.link),
|
key: widget.key ?? Key(widget.link),
|
||||||
metadata: widget.story.simpleMetadata,
|
metadata: widget.story.simpleMetadata,
|
||||||
url: widget.link,
|
url: widget.link,
|
||||||
title: title!,
|
title: widget.story.title,
|
||||||
description: desc!,
|
description: desc ?? title ?? 'no comments yet.',
|
||||||
imageUri: imageUri,
|
imageUri: imageUri,
|
||||||
imagePath: Constants.hackerNewsLogoPath,
|
imagePath: Constants.hackerNewsLogoPath,
|
||||||
onTap: _launchURL,
|
onTap: _launchURL,
|
||||||
@ -228,40 +228,29 @@ class _LinkPreviewState extends State<LinkPreview> {
|
|||||||
|
|
||||||
Widget loadedWidget;
|
Widget loadedWidget;
|
||||||
|
|
||||||
if (_info is WebImageInfo) {
|
final WebInfo? info = _info as WebInfo?;
|
||||||
final String img = (_info as WebImageInfo?)?.image ?? '';
|
loadedWidget = _info == null
|
||||||
loadedWidget = _buildLinkContainer(
|
? _buildLinkContainer(
|
||||||
_height,
|
_height,
|
||||||
title: _errorTitle,
|
title: _errorTitle,
|
||||||
desc: _errorBody,
|
desc: _errorBody,
|
||||||
imageUri:
|
imageUri: null,
|
||||||
widget.showMultimedia ? (img.trim() == '' ? null : img) : null,
|
)
|
||||||
);
|
: _buildLinkContainer(
|
||||||
} else {
|
_height,
|
||||||
final WebInfo? info = _info as WebInfo?;
|
title: _errorTitle,
|
||||||
loadedWidget = _info == null
|
desc: WebAnalyzer.isNotEmpty(info!.description)
|
||||||
? _buildLinkContainer(
|
? info.description
|
||||||
_height,
|
: _errorBody,
|
||||||
title: _errorTitle,
|
imageUri: widget.showMultimedia
|
||||||
desc: _errorBody,
|
? (WebAnalyzer.isNotEmpty(info.image)
|
||||||
imageUri: null,
|
? info.image
|
||||||
)
|
: WebAnalyzer.isNotEmpty(info.icon)
|
||||||
: _buildLinkContainer(
|
? info.icon
|
||||||
_height,
|
: null)
|
||||||
title: _errorTitle,
|
: null,
|
||||||
desc: WebAnalyzer.isNotEmpty(info!.description)
|
isIcon: !WebAnalyzer.isNotEmpty(info.image),
|
||||||
? 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(
|
return AnimatedCrossFade(
|
||||||
firstChild: loadingWidget,
|
firstChild: loadingWidget,
|
||||||
|
@ -5,7 +5,6 @@ import 'dart:io';
|
|||||||
import 'package:collection/collection.dart' show IterableExtension;
|
import 'package:collection/collection.dart' show IterableExtension;
|
||||||
import 'package:fast_gbk/fast_gbk.dart';
|
import 'package:fast_gbk/fast_gbk.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
|
||||||
import 'package:hacki/extensions/extensions.dart';
|
import 'package:hacki/extensions/extensions.dart';
|
||||||
import 'package:hacki/models/models.dart';
|
import 'package:hacki/models/models.dart';
|
||||||
import 'package:hacki/repositories/repositories.dart';
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
@ -16,6 +15,7 @@ import 'package:http/io_client.dart';
|
|||||||
|
|
||||||
abstract class InfoBase {
|
abstract class InfoBase {
|
||||||
late DateTime _timeout;
|
late DateTime _timeout;
|
||||||
|
late bool _shouldRetry;
|
||||||
|
|
||||||
Map<String, dynamic> toJson();
|
Map<String, dynamic> toJson();
|
||||||
}
|
}
|
||||||
@ -114,22 +114,29 @@ class WebAnalyzer {
|
|||||||
bool multimedia = true,
|
bool multimedia = true,
|
||||||
}) async {
|
}) async {
|
||||||
InfoBase? info = getInfoFromCache(url);
|
InfoBase? info = getInfoFromCache(url);
|
||||||
|
|
||||||
if (info != null) return info;
|
if (info != null) return info;
|
||||||
|
|
||||||
if (story.url.isEmpty && story.text.isNotEmpty) {
|
if (story.url.isEmpty && story.text.isNotEmpty) {
|
||||||
info = WebInfo(
|
info = WebInfo(
|
||||||
title: story.title,
|
title: story.title,
|
||||||
description: story.text,
|
description: story.text,
|
||||||
).._timeout = DateTime.now().add(cache);
|
)
|
||||||
|
.._timeout = DateTime.now().add(cache)
|
||||||
|
.._shouldRetry = false;
|
||||||
cacheMap[story.id.toString()] = info;
|
cacheMap[story.id.toString()] = info;
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
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);
|
info._timeout = DateTime.now().add(cache);
|
||||||
cacheMap[url] = info;
|
cacheMap[url] = info;
|
||||||
}
|
}
|
||||||
@ -137,42 +144,6 @@ class WebAnalyzer {
|
|||||||
//locator.get<Logger>().log(Level.error, e);
|
//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;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -195,60 +166,114 @@ class WebAnalyzer {
|
|||||||
return _getWebInfo(response, url, multimedia);
|
return _getWebInfo(response, url, multimedia);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<InfoBase?> _getInfoByIsolate(
|
static Future<InfoBase?> _getInfoByIsolate({
|
||||||
String? url,
|
String? url,
|
||||||
bool multimedia,
|
required bool multimedia,
|
||||||
) async {
|
required Story story,
|
||||||
final List<dynamic>? res = await compute(
|
}) async {
|
||||||
_isolate,
|
List<dynamic>? res;
|
||||||
<dynamic>[url, multimedia],
|
|
||||||
);
|
|
||||||
|
|
||||||
|
if (url != null) {
|
||||||
|
res = await compute(
|
||||||
|
_fetchInfoFromUrl,
|
||||||
|
<dynamic>[url, multimedia],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
late final bool shouldRetry;
|
||||||
InfoBase? info;
|
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 != null) {
|
||||||
if (res[0] == '0') {
|
if (res[0] == '0') {
|
||||||
info = WebInfo(
|
info = WebInfo(
|
||||||
title: res[1] as String?,
|
title: story.title,
|
||||||
description:
|
description: isEmpty(res[2] as String?)
|
||||||
res[2] == null ? null : (res[2] as String).removeAllEmojis(),
|
? (fallbackDescription ??
|
||||||
|
(story.text.isEmpty ? res[1] as String? : story.text))
|
||||||
|
: (res[2] as String).removeAllEmojis(),
|
||||||
icon: res[3] as String?,
|
icon: res[3] as String?,
|
||||||
image: res[4] as String?,
|
image: res[4] as String?,
|
||||||
);
|
).._shouldRetry = shouldRetry;
|
||||||
} else if (res[0] == '1') {
|
} else {
|
||||||
info = WebVideoInfo(image: res[1] as String);
|
info = WebInfo(
|
||||||
} else if (res[0] == '2') {
|
image: res[1] as String,
|
||||||
info = WebImageInfo(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;
|
return info;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Future<List<dynamic>?> _isolate(dynamic message) async {
|
static Future<List<dynamic>?> _fetchInfoFromUrl(dynamic message) async {
|
||||||
// ignore: avoid_dynamic_calls
|
try {
|
||||||
final String url = message[0] as String;
|
// ignore: avoid_dynamic_calls
|
||||||
// ignore: avoid_dynamic_calls
|
final String url = message[0] as String;
|
||||||
final bool multimedia = message[1] as bool;
|
// 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) {
|
if (info is WebInfo) {
|
||||||
return <dynamic>[
|
return <dynamic>[
|
||||||
'0',
|
'0',
|
||||||
info.title,
|
info.title,
|
||||||
info.description,
|
info.description,
|
||||||
info.icon,
|
info.icon,
|
||||||
info.image
|
info.image
|
||||||
];
|
];
|
||||||
} else if (info is WebVideoInfo) {
|
} else if (info is WebVideoInfo) {
|
||||||
return <dynamic>['1', info.image];
|
return <dynamic>['1', info.image];
|
||||||
} else if (info is WebImageInfo) {
|
} else if (info is WebImageInfo) {
|
||||||
return <dynamic>['2', info.image];
|
return <dynamic>['2', info.image];
|
||||||
} else {
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
return null;
|
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) =>
|
static bool _certificateCheck(X509Certificate cert, String host, int port) =>
|
||||||
true;
|
true;
|
||||||
|
|
||||||
@ -275,46 +300,45 @@ class WebAnalyzer {
|
|||||||
..headers['accept'] =
|
..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';
|
'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 =
|
try {
|
||||||
await client.send(request).catchError((dynamic err) {
|
final IOStreamedResponse stream =
|
||||||
// locator.get<Logger>().log(
|
await client.send(request).timeout(const Duration(seconds: 10));
|
||||||
// Level.error,
|
|
||||||
// 'Error in getting the link => ${request.url}\n$err',
|
|
||||||
// );
|
|
||||||
});
|
|
||||||
|
|
||||||
if (stream.statusCode == HttpStatus.movedTemporarily ||
|
if (stream.statusCode == HttpStatus.movedTemporarily ||
|
||||||
stream.statusCode == HttpStatus.movedPermanently) {
|
stream.statusCode == HttpStatus.movedPermanently) {
|
||||||
if (stream.isRedirect && count < 6) {
|
if (stream.isRedirect && count < 6) {
|
||||||
final String? location = stream.headers['location'];
|
final String? location = stream.headers['location'];
|
||||||
if (location != null) {
|
if (location != null) {
|
||||||
url = location;
|
url = location;
|
||||||
if (location.startsWith('/')) {
|
if (location.startsWith('/')) {
|
||||||
url = uri.origin + location;
|
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) {
|
} else if (stream.statusCode == HttpStatus.ok) {
|
||||||
cookie = stream.headers['set-cookie'];
|
res = await Response.fromStream(stream);
|
||||||
}
|
if (uri.host == 'm.tb.cn') {
|
||||||
count++;
|
final RegExpMatch? match =
|
||||||
client.close();
|
RegExp(r"var url = \'(.*)\'").firstMatch(res.body);
|
||||||
return _requestUrl(url, count: count, cookie: cookie);
|
if (match != null) {
|
||||||
}
|
final String? newUrl = match.group(1);
|
||||||
} else if (stream.statusCode == HttpStatus.ok) {
|
if (newUrl != null) {
|
||||||
res = await Response.fromStream(stream);
|
return _requestUrl(newUrl, count: count, cookie: cookie);
|
||||||
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(
|
static Future<InfoBase?> _getWebInfo(
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
@ -20,17 +22,21 @@ abstract class LinkUtil {
|
|||||||
canLaunchUrl(uri).then((bool val) {
|
canLaunchUrl(uri).then((bool val) {
|
||||||
if (val) {
|
if (val) {
|
||||||
if (link.contains('http')) {
|
if (link.contains('http')) {
|
||||||
_browser
|
if (Platform.isAndroid) {
|
||||||
.open(
|
launchUrl(uri, mode: LaunchMode.externalApplication);
|
||||||
url: uri,
|
} else {
|
||||||
options: ChromeSafariBrowserClassOptions(
|
_browser
|
||||||
ios: IOSSafariOptions(
|
.open(
|
||||||
entersReaderIfAvailable: useReader,
|
url: uri,
|
||||||
preferredControlTintColor: Colors.orange,
|
options: ChromeSafariBrowserClassOptions(
|
||||||
|
ios: IOSSafariOptions(
|
||||||
|
entersReaderIfAvailable: useReader,
|
||||||
|
preferredControlTintColor: Colors.orange,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
)
|
.onError((_, __) => launchUrl(uri));
|
||||||
.onError((_, __) => launchUrl(uri));
|
}
|
||||||
} else {
|
} else {
|
||||||
launchUrl(uri);
|
launchUrl(uri);
|
||||||
}
|
}
|
||||||
|
51
pubspec.lock
@ -414,6 +414,13 @@ packages:
|
|||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.2"
|
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:
|
flutter_slidable:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -804,6 +811,48 @@ packages:
|
|||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "3.2.0"
|
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:
|
shared_preferences:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@ -1032,7 +1081,7 @@ packages:
|
|||||||
name: url_launcher
|
name: url_launcher
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "6.1.2"
|
version: "6.1.3"
|
||||||
url_launcher_android:
|
url_launcher_android:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
name: hacki
|
name: hacki
|
||||||
description: A Hacker News reader.
|
description: A Hacker News reader.
|
||||||
version: 0.2.16+55
|
version: 0.2.18+57
|
||||||
publish_to: none
|
publish_to: none
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
@ -33,6 +33,7 @@ dependencies:
|
|||||||
flutter_linkify: ^5.0.2
|
flutter_linkify: ^5.0.2
|
||||||
flutter_local_notifications: ^9.5.0
|
flutter_local_notifications: ^9.5.0
|
||||||
flutter_secure_storage: ^5.0.2
|
flutter_secure_storage: ^5.0.2
|
||||||
|
flutter_siri_suggestions: ^2.1.0
|
||||||
flutter_slidable: ^1.2.1
|
flutter_slidable: ^1.2.1
|
||||||
font_awesome_flutter: ^9.2.0
|
font_awesome_flutter: ^9.2.0
|
||||||
gbk_codec: ^0.4.0
|
gbk_codec: ^0.4.0
|
||||||
@ -56,6 +57,7 @@ dependencies:
|
|||||||
responsive_builder: ^0.4.2
|
responsive_builder: ^0.4.2
|
||||||
rxdart: ^0.27.3
|
rxdart: ^0.27.3
|
||||||
sembast: ^3.1.1+1
|
sembast: ^3.1.1+1
|
||||||
|
share_plus: ^4.0.8
|
||||||
shared_preferences: ^2.0.11
|
shared_preferences: ^2.0.11
|
||||||
shared_preferences_android: ^2.0.11
|
shared_preferences_android: ^2.0.11
|
||||||
shared_preferences_ios: ^2.0.11
|
shared_preferences_ios: ^2.0.11
|
||||||
@ -64,7 +66,7 @@ dependencies:
|
|||||||
path: components/synced_shared_preferences
|
path: components/synced_shared_preferences
|
||||||
tuple: ^2.0.0
|
tuple: ^2.0.0
|
||||||
universal_platform: ^1.0.0+1
|
universal_platform: ^1.0.0+1
|
||||||
url_launcher: ^6.0.10
|
url_launcher: ^6.1.3
|
||||||
wakelock: ^0.6.1+2
|
wakelock: ^0.6.1+2
|
||||||
workmanager: ^0.5.0
|
workmanager: ^0.5.0
|
||||||
|
|
||||||
|