Compare commits

...

8 Commits

Author SHA1 Message Date
c4c109e4a3 v0.2.12 (#30)
* added metadata to story tile.

* bumped version

* fixed metadata tile

* bumped version.

* fixed pinned stories not being refreshed.
2022-06-01 01:34:21 -07:00
b7720d0584 v0.2.12 (#29)
* added metadata to story tile.

* bumped version

* fixed metadata tile

* bumped version.
2022-06-01 01:13:21 -07:00
7d5788dec3 updated README.md 2022-05-28 00:03:46 -07:00
80a836c6b9 updated README.md 2022-05-28 00:02:03 -07:00
913be9fc5d v0.2.11 (#27)
* fixed pinned story tile.

* bumped version.
2022-05-27 16:18:36 -07:00
7fceebfd56 fixed poll. (#26) 2022-05-27 10:56:19 -07:00
b9909b6a44 v0.2.9 (#25)
* improved link preview.

* fixed offline mode.

* make refresh controller required.

* remove shouldRetry.

* fixed link preview.
2022-05-25 02:25:58 -07:00
9346542328 improved link preview. (#24) 2022-05-24 22:50:04 -07:00
42 changed files with 598 additions and 460 deletions

View File

@ -3,7 +3,7 @@
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
[![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763)
[![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
[![Play Store](https://img.shields.io/badge/Play%20Store--yellow)](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
[![Visits Badge](https://badges.pufler.dev/visits/livinglist/Hacki)](https://badges.pufler.dev)
[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
@ -11,7 +11,7 @@ A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with
<noscript><a href="https://liberapay.com/jfeng_for_open_source/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
[<img src="assets/images/app_store_badge.png" height="50">](https://apps.apple.com/us/app/hacki/id1602043763) [<img src="assets/images/google_play_badge.png" height="50">](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [<img src="assets/images/f_droid_badge.png" height="50">](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
[<img src="assets/images/app_store_badge.png" height="50">](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone) [<img src="assets/images/google_play_badge.png" height="50">](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [<img src="assets/images/f_droid_badge.png" height="50">](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
Features:

View File

@ -0,0 +1,4 @@
- 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.

View File

@ -0,0 +1,4 @@
- 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.

View File

@ -0,0 +1,4 @@
- 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.

View File

@ -0,0 +1,4 @@
- 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.

View File

@ -0,0 +1,4 @@
- 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.

View File

@ -0,0 +1,4 @@
- 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.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 KiB

After

Width:  |  Height:  |  Size: 422 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 KiB

After

Width:  |  Height:  |  Size: 712 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

After

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 KiB

After

Width:  |  Height:  |  Size: 262 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 903 KiB

After

Width:  |  Height:  |  Size: 672 KiB

View File

@ -577,7 +577,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.8;
MARKETING_VERSION = 0.2.12;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -714,7 +714,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.8;
MARKETING_VERSION = 0.2.12;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -745,7 +745,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.8;
MARKETING_VERSION = 0.2.12;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

View File

@ -52,6 +52,8 @@ class PinCubit extends Cubit<PinState> {
_preferenceRepository.updatePinnedStoriesIds(state.pinnedStoriesIds);
}
void refresh() => init();
void _onStoryFetched(Story story) {
emit(state.copyWith(pinnedStories: <Story>[...state.pinnedStories, story]));
}

View File

@ -23,6 +23,10 @@ class PollCubit extends Cubit<PollState> {
Future<void> init({
bool refresh = false,
}) async {
if (refresh) {
emit(PollState.init());
}
emit(state.copyWith(status: PollStatus.loading));
List<int> pollOptionsIds = _story.parts;

View File

@ -31,6 +31,8 @@ class PreferenceCubit extends Cubit<PreferenceState> {
.then((bool value) => emit(state.copyWith(useReader: value)));
_preferenceRepository.markReadStories
.then((bool value) => emit(state.copyWith(markReadStories: value)));
_preferenceRepository.shouldShowMetadata
.then((bool value) => emit(state.copyWith(showMetadata: value)));
}
void toggleNotificationMode() {
@ -67,4 +69,9 @@ class PreferenceCubit extends Cubit<PreferenceState> {
emit(state.copyWith(markReadStories: !state.markReadStories));
_preferenceRepository.toggleMarkReadStoriesMode();
}
void toggleMetadataMode() {
emit(state.copyWith(showMetadata: !state.showMetadata));
_preferenceRepository.toggleMetadataMode();
}
}

View File

@ -9,6 +9,7 @@ class PreferenceState extends Equatable {
required this.useTrueDark,
required this.useReader,
required this.markReadStories,
required this.showMetadata,
});
const PreferenceState.init()
@ -18,7 +19,8 @@ class PreferenceState extends Equatable {
showEyeCandy = false,
useTrueDark = false,
useReader = false,
markReadStories = false;
markReadStories = false,
showMetadata = false;
final bool showNotification;
final bool showComplexStoryTile;
@ -27,6 +29,7 @@ class PreferenceState extends Equatable {
final bool useTrueDark;
final bool useReader;
final bool markReadStories;
final bool showMetadata;
PreferenceState copyWith({
bool? showNotification,
@ -36,6 +39,7 @@ class PreferenceState extends Equatable {
bool? useTrueDark,
bool? useReader,
bool? markReadStories,
bool? showMetadata,
}) {
return PreferenceState(
showNotification: showNotification ?? this.showNotification,
@ -45,6 +49,7 @@ class PreferenceState extends Equatable {
useTrueDark: useTrueDark ?? this.useTrueDark,
useReader: useReader ?? this.useReader,
markReadStories: markReadStories ?? this.markReadStories,
showMetadata: showMetadata ?? this.showMetadata,
);
}
@ -57,5 +62,6 @@ class PreferenceState extends Equatable {
useTrueDark,
useReader,
markReadStories,
showMetadata,
];
}

View File

@ -4,4 +4,11 @@ extension StringExtension on String {
final String match = regex.stringMatch(this) ?? '';
return int.tryParse(match);
}
String removeAllEmojis() {
final RegExp regex = RegExp(
r'(\u00a9|\u00ae|[\u2000-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])',
);
return replaceAllMapped(regex, (_) => '');
}
}

View File

@ -76,6 +76,7 @@ Future<void> main() async {
// runApp(
// HackiApp(
// savedThemeMode: savedThemeMode,
// trueDarkMode: trueDarkMode,
// ),
// );
// },

View File

@ -4,11 +4,15 @@ import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/item.dart';
enum StoryType {
top,
latest,
ask,
show,
jobs,
top('topstories'),
latest('newstories'),
ask('askstories'),
show('showstories'),
jobs('jobstories');
const StoryType(this.path);
final String path;
}
class Story extends Item {
@ -66,6 +70,12 @@ class Story extends Item {
parent: 0,
);
String get metadata =>
'''$score point${score > 1 ? 's' : ''} by $by $postedDate | $descendants comment${descendants > 1 ? 's' : ''}''';
String get simpleMetadata =>
'''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $postedDate''';
String get postedDate =>
DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();

View File

@ -1,25 +1,23 @@
import 'dart:async';
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/postable_repository.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:hacki/utils/service_exception.dart';
class AuthRepository {
class AuthRepository extends PostableRepository {
AuthRepository({
Dio? dio,
PreferenceRepository? preferenceRepository,
}) : _dio = dio ?? Dio(),
_preferenceRepository =
preferenceRepository ?? locator.get<PreferenceRepository>();
}) : _preferenceRepository =
preferenceRepository ?? locator.get<PreferenceRepository>(),
super(dio: dio);
final PreferenceRepository _preferenceRepository;
static const String _authority = 'news.ycombinator.com';
final Dio _dio;
final PreferenceRepository _preferenceRepository;
Future<bool> get loggedIn async => _preferenceRepository.loggedIn;
Future<String?> get username async => _preferenceRepository.username;
@ -37,7 +35,7 @@ class AuthRepository {
goto: 'news',
);
final bool success = await _performDefaultPost(uri, data);
final bool success = await performDefaultPost(uri, data);
if (success) {
await _preferenceRepository.setAuth(
@ -69,7 +67,7 @@ class AuthRepository {
un: flag ? null : 't',
);
return _performDefaultPost(uri, data);
return performDefaultPost(uri, data);
}
Future<bool> favorite({
@ -86,7 +84,7 @@ class AuthRepository {
un: favorite ? null : 't',
);
return _performDefaultPost(uri, data);
return performDefaultPost(uri, data);
}
Future<bool> upvote({
@ -103,7 +101,7 @@ class AuthRepository {
how: upvote ? 'up' : 'un',
);
return _performDefaultPost(uri, data);
return performDefaultPost(uri, data);
}
Future<bool> downvote({
@ -120,53 +118,6 @@ class AuthRepository {
how: downvote ? 'down' : 'un',
);
return _performDefaultPost(uri, data);
}
Future<bool> _performDefaultPost(
Uri uri,
PostDataMixin data, {
String? cookie,
bool Function(String?)? validateLocation,
}) async {
try {
final Response<void> response = await _performPost<void>(
uri,
data,
cookie: cookie,
validateStatus: (int? status) => status == HttpStatus.found,
);
if (validateLocation != null) {
return validateLocation(response.headers.value('location'));
}
return true;
} on ServiceException {
return false;
}
}
Future<Response<T>> _performPost<T>(
Uri uri,
PostDataMixin data, {
String? cookie,
ResponseType? responseType,
bool Function(int?)? validateStatus,
}) async {
try {
return await _dio.postUri<T>(
uri,
data: data.toJson(),
options: Options(
headers: <String, dynamic>{if (cookie != null) 'cookie': cookie},
responseType: responseType,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
),
);
} on DioError catch (e) {
throw ServiceException(e.message);
}
return performDefaultPost(uri, data);
}
}

View File

@ -3,20 +3,20 @@ import 'dart:io';
import 'package:dio/dio.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/models/post_data.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:hacki/repositories/postable_repository.dart';
import 'package:hacki/repositories/preference_repository.dart';
import 'package:hacki/utils/utils.dart';
class PostRepository {
class PostRepository extends PostableRepository {
PostRepository({Dio? dio, PreferenceRepository? storageRepository})
: _dio = dio ?? Dio(),
_preferenceRepository =
storageRepository ?? locator.get<PreferenceRepository>();
: _preferenceRepository =
storageRepository ?? locator.get<PreferenceRepository>(),
super(dio: dio);
final PreferenceRepository _preferenceRepository;
static const String _authority = 'news.ycombinator.com';
final Dio _dio;
final PreferenceRepository _preferenceRepository;
Future<bool> comment({
required int parentId,
required String text,
@ -36,7 +36,7 @@ class PostRepository {
text: text,
);
return _performDefaultPost(
return performDefaultPost(
uri,
data,
validateLocation: (String? location) => location == '/',
@ -79,7 +79,7 @@ class PostRepository {
text: text,
);
return _performDefaultPost(
return performDefaultPost(
uri,
data,
cookie: cookie,
@ -121,7 +121,7 @@ class PostRepository {
text: text,
);
return _performDefaultPost(
return performDefaultPost(
uri,
data,
cookie: cookie,
@ -144,58 +144,11 @@ class PostRepository {
pw: password,
id: id,
);
return _performPost(
return performPost(
uri,
data,
responseType: ResponseType.bytes,
validateStatus: (int? status) => status == HttpStatus.ok,
);
}
Future<bool> _performDefaultPost(
Uri uri,
PostDataMixin data, {
String? cookie,
bool Function(String?)? validateLocation,
}) async {
try {
final Response<void> response = await _performPost<void>(
uri,
data,
cookie: cookie,
validateStatus: (int? status) => status == HttpStatus.found,
);
if (validateLocation != null) {
return validateLocation(response.headers.value('location'));
}
return true;
} on ServiceException {
return false;
}
}
Future<Response<T>> _performPost<T>(
Uri uri,
PostDataMixin data, {
String? cookie,
ResponseType? responseType,
bool Function(int?)? validateStatus,
}) async {
try {
return await _dio.postUri<T>(
uri,
data: data.toJson(),
options: Options(
headers: <String, dynamic>{if (cookie != null) 'cookie': cookie},
responseType: responseType,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
),
);
} on DioError catch (e) {
throw ServiceException(e.message);
}
}
}

View File

@ -0,0 +1,63 @@
import 'dart:io';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/utils/service_exception.dart';
class PostableRepository {
PostableRepository({
Dio? dio,
}) : _dio = dio ?? Dio();
final Dio _dio;
@protected
Future<bool> performDefaultPost(
Uri uri,
PostDataMixin data, {
String? cookie,
bool Function(String?)? validateLocation,
}) async {
try {
final Response<void> response = await performPost<void>(
uri,
data,
cookie: cookie,
validateStatus: (int? status) => status == HttpStatus.found,
);
if (validateLocation != null) {
return validateLocation(response.headers.value('location'));
}
return true;
} on ServiceException {
return false;
}
}
@protected
Future<Response<T>> performPost<T>(
Uri uri,
PostDataMixin data, {
String? cookie,
ResponseType? responseType,
bool Function(int?)? validateStatus,
}) async {
try {
return await _dio.postUri<T>(
uri,
data: data.toJson(),
options: Options(
headers: <String, dynamic>{if (cookie != null) 'cookie': cookie},
responseType: responseType,
contentType: 'application/x-www-form-urlencoded',
validateStatus: validateStatus,
),
);
} on DioError catch (e) {
throw ServiceException(e.message);
}
}
}

View File

@ -21,6 +21,7 @@ class PreferenceRepository {
static const String _unreadCommentsIdsKey = 'unreadCommentsIds';
static const String _lastReadStoryIdKey = 'lastReadStoryId';
static const String _isFirstLaunchKey = 'isFirstLaunch';
static const String _metadataModeKey = 'metadataMode';
static const String _notificationModeKey = 'notificationMode';
static const String _readerModeKey = 'readerMode';
@ -46,6 +47,7 @@ class PreferenceRepository {
static const bool _readerModeDefaultValue = true;
static const bool _markReadStoriesModeDefaultValue = true;
static const bool _isFirstLaunchKeyDefaultValue = true;
static const bool _metadataModeDefaultValue = true;
final SyncedSharedPreferences _syncedPrefs;
final Future<SharedPreferences> _prefs;
@ -67,29 +69,6 @@ class PreferenceRepository {
return val;
}
Future<List<String>> get blocklist async => _prefs.then(
(SharedPreferences prefs) =>
prefs.getStringList(_blocklistKey) ?? <String>[],
);
Future<List<int>> get pinnedStoriesIds async {
if (Platform.isIOS) {
final List<String>? favList = await _syncedPrefs.getStringList(
key: _pinnedStoriesIdsKey,
);
return favList?.map(int.parse).toList() ?? <int>[];
} else {
return _prefs.then(
(SharedPreferences prefs) =>
prefs
.getStringList(_pinnedStoriesIdsKey)
?.map(int.parse)
.toList() ??
<int>[],
);
}
}
Future<bool> get shouldShowNotification async => _prefs.then(
(SharedPreferences prefs) =>
prefs.getBool(_notificationModeKey) ??
@ -111,6 +90,11 @@ class PreferenceRepository {
prefs.getBool(_eyeCandyModeKey) ?? _eyeCandyModeDefaultValue,
);
Future<bool> get shouldShowMetadata async => _prefs.then(
(SharedPreferences prefs) =>
prefs.getBool(_metadataModeKey) ?? _metadataModeDefaultValue,
);
Future<bool> get trueDarkMode async => _prefs.then(
(SharedPreferences prefs) =>
prefs.getBool(trueDarkModeKey) ?? _trueDarkModeDefaultValue,
@ -127,24 +111,6 @@ class PreferenceRepository {
_markReadStoriesModeDefaultValue,
);
Future<List<int>> get unreadCommentsIds async => _prefs.then(
(SharedPreferences prefs) =>
prefs
.getStringList(_unreadCommentsIdsKey)
?.map(int.parse)
.toList() ??
<int>[],
);
Future<int?> get lastReadStoryId async =>
_prefs.then((SharedPreferences prefs) {
final String? val = prefs.getString(_lastReadStoryIdKey);
if (val == null) return null;
return int.tryParse(val);
});
Future<bool> hasPushed(int commentId) async =>
_prefs.then((SharedPreferences prefs) {
final bool? val = prefs.getBool(_getPushNotificationKey(commentId));
@ -170,53 +136,6 @@ class PreferenceRepository {
}
}
Future<List<int>> favList({required String of}) async {
final SharedPreferences prefs = await _prefs;
if (Platform.isIOS) {
final List<String> previousList =
((prefs.getStringList(_getFavKey('')) ?? <String>[])
..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
.toList();
/// Since v0.2.5, fav list will be stored in [NSUbiquitousKeyValueStore]
/// instead of [UserDefaults] on iOS.
if (previousList.isNotEmpty) {
for (final String fav in previousList) {
await addFav(username: of, id: int.parse(fav));
}
await prefs.remove(_getFavKey(''));
await prefs.remove(_getFavKey(of));
}
final List<String>? initialList =
await _syncedPrefs.getStringList(key: _getFavKey(''));
final List<String>? userList =
await _syncedPrefs.getStringList(key: _getFavKey(of));
return <String>{
...?initialList,
...?userList,
}.map(int.parse).toList();
} else {
final List<int> favList =
((prefs.getStringList(_getFavKey('')) ?? <String>[])
..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
.map(int.parse)
.toSet()
.toList();
return favList;
}
}
Future<bool?> vote({required int submittedTo, required String from}) async {
final SharedPreferences prefs = await _prefs;
final String key = _getVoteKey(from, submittedTo);
final bool? vote = prefs.getBool(key);
return vote;
}
Future<void> setAuth({
required String username,
required String password,
@ -279,6 +198,55 @@ class PreferenceRepository {
await prefs.setBool(_markReadStoriesModeKey, !currentMode);
}
Future<void> toggleMetadataMode() async {
final SharedPreferences prefs = await _prefs;
final bool currentMode =
prefs.getBool(_metadataModeKey) ?? _metadataModeDefaultValue;
await prefs.setBool(_metadataModeKey, !currentMode);
}
//#region fav
Future<List<int>> favList({required String of}) async {
final SharedPreferences prefs = await _prefs;
if (Platform.isIOS) {
final List<String> previousList =
((prefs.getStringList(_getFavKey('')) ?? <String>[])
..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
.toList();
/// Since v0.2.5, fav list will be stored in [NSUbiquitousKeyValueStore]
/// instead of [UserDefaults] on iOS.
if (previousList.isNotEmpty) {
for (final String fav in previousList) {
await addFav(username: of, id: int.parse(fav));
}
await prefs.remove(_getFavKey(''));
await prefs.remove(_getFavKey(of));
}
final List<String>? initialList =
await _syncedPrefs.getStringList(key: _getFavKey(''));
final List<String>? userList =
await _syncedPrefs.getStringList(key: _getFavKey(of));
return <String>{
...?initialList,
...?userList,
}.map(int.parse).toList();
} else {
final List<int> favList =
((prefs.getStringList(_getFavKey('')) ?? <String>[])
..addAll(prefs.getStringList(_getFavKey(of)) ?? <String>[]))
.map(int.parse)
.toSet()
.toList();
return favList;
}
}
Future<void> addFav({required String username, required int id}) async {
final String key = _getFavKey(username);
@ -331,6 +299,19 @@ class PreferenceRepository {
}
}
static String _getFavKey(String username) => 'fav_$username';
//#endregion
//#region vote
Future<bool?> vote({required int submittedTo, required String from}) async {
final SharedPreferences prefs = await _prefs;
final String key = _getVoteKey(from, submittedTo);
final bool? vote = prefs.getBool(key);
return vote;
}
Future<void> addVote({
required String username,
required int id,
@ -350,11 +331,44 @@ class PreferenceRepository {
await prefs.remove(key);
}
String _getVoteKey(String username, int id) => 'vote_$username-$id';
//#endregion
//#region blocklist
Future<List<String>> get blocklist async => _prefs.then(
(SharedPreferences prefs) =>
prefs.getStringList(_blocklistKey) ?? <String>[],
);
Future<void> updateBlocklist(List<String> usernames) async {
final SharedPreferences prefs = await _prefs;
await prefs.setStringList(_blocklistKey, usernames);
}
//#endregion
//#region pins
Future<List<int>> get pinnedStoriesIds async {
if (Platform.isIOS) {
final List<String>? favList = await _syncedPrefs.getStringList(
key: _pinnedStoriesIdsKey,
);
return favList?.map(int.parse).toList() ?? <int>[];
} else {
return _prefs.then(
(SharedPreferences prefs) =>
prefs
.getStringList(_pinnedStoriesIdsKey)
?.map(int.parse)
.toList() ??
<int>[],
);
}
}
Future<void> updatePinnedStoriesIds(List<int> ids) async {
if (Platform.isIOS) {
await _syncedPrefs.setStringList(
@ -370,6 +384,19 @@ class PreferenceRepository {
}
}
//#endregion
//#region unread comment ids
Future<List<int>> get unreadCommentsIds async => _prefs.then(
(SharedPreferences prefs) =>
prefs
.getStringList(_unreadCommentsIdsKey)
?.map(int.parse)
.toList() ??
<int>[],
);
Future<void> updateUnreadCommentsIds(List<int> ids) async {
final SharedPreferences prefs = await _prefs;
await prefs.setStringList(
@ -378,6 +405,19 @@ class PreferenceRepository {
);
}
//#endregion
//#region reminder
Future<int?> get lastReadStoryId async =>
_prefs.then((SharedPreferences prefs) {
final String? val = prefs.getString(_lastReadStoryIdKey);
if (val == null) return null;
return int.tryParse(val);
});
Future<void> updateLastReadStoryId(int? id) async {
final SharedPreferences prefs = await _prefs;
await prefs.setString(
@ -386,6 +426,8 @@ class PreferenceRepository {
);
}
//#endregion
Future<void> updateHasPushed(int commentId) async {
final SharedPreferences prefs = await _prefs;
await prefs.setBool(
@ -422,11 +464,7 @@ class PreferenceRepository {
}
}
String _getPushNotificationKey(int commentId) => 'pushed_$commentId';
static String _getPushNotificationKey(int commentId) => 'pushed_$commentId';
String _getFavKey(String username) => 'fav_$username';
String _getVoteKey(String username, int id) => 'vote_$username-$id';
String _getHasReadKey(int storyId) => 'hasRead_$storyId';
static String _getHasReadKey(int storyId) => 'hasRead_$storyId';
}

View File

@ -28,6 +28,8 @@ class SearchRepository {
final String by = hit['author'] as String? ?? '';
final String title = hit['title'] as String? ?? '';
final int createdAt = hit['created_at_i'] as int? ?? 0;
final int score = hit['points'] as int? ?? 0;
final int descendants = hit['num_comments'] as int? ?? 0;
// Getting rid of comments, only keeping stories for convenience.
// Don't judge me.
@ -46,9 +48,9 @@ class SearchRepository {
final int id = int.parse(hit['objectID'] as String? ?? '0');
final Story story = Story(
descendants: 0,
descendants: descendants,
id: id,
score: 0,
score: score,
time: createdAt,
by: by,
title: title,

View File

@ -25,22 +25,9 @@ class StoriesRepository {
}
Future<List<int>> fetchStoryIds({required StoryType of}) async {
final String suffix = () {
switch (of) {
case StoryType.top:
return 'topstories.json';
case StoryType.latest:
return 'newstories.json';
case StoryType.ask:
return 'askstories.json';
case StoryType.show:
return 'showstories.json';
case StoryType.jobs:
return 'jobstories.json';
}
}();
final List<int> ids =
await _firebaseClient.get('$_baseUrl$suffix').then((dynamic val) {
final List<int> ids = await _firebaseClient
.get('$_baseUrl${of.path}.json')
.then((dynamic val) {
final List<int> ids = (val as List<dynamic>).cast<int>();
return ids;
});

View File

@ -140,7 +140,8 @@ class _HomeScreenState extends State<HomeScreen>
final BlocBuilder<PreferenceCubit, PreferenceState> homeScreen =
BlocBuilder<PreferenceCubit, PreferenceState>(
buildWhen: (PreferenceState previous, PreferenceState current) =>
previous.showComplexStoryTile != current.showComplexStoryTile,
previous.showComplexStoryTile != current.showComplexStoryTile ||
previous.showMetadata != current.showMetadata,
builder: (BuildContext context, PreferenceState preferenceState) {
final BlocBuilder<PinCubit, PinState> pinnedStories =
BlocBuilder<PinCubit, PinState>(
@ -172,8 +173,9 @@ class _HomeScreenState extends State<HomeScreen>
child: StoryTile(
key: ObjectKey(story),
story: story,
onTap: () => onStoryTapped(story),
onTap: () => onStoryTapped(story, isPin: true),
showWebPreview: preferenceState.showComplexStoryTile,
showMetadata: preferenceState.showMetadata,
),
),
),
@ -408,13 +410,13 @@ class _HomeScreenState extends State<HomeScreen>
return Future<bool>.value(false);
}
void onStoryTapped(Story story) {
void onStoryTapped(Story story, {bool isPin = false}) {
final bool showWebFirst =
context.read<PreferenceCubit>().state.showWebFirst;
final bool useReader = context.read<PreferenceCubit>().state.useReader;
final bool offlineReading =
context.read<StoriesBloc>().state.offlineReading;
final bool hasRead = context.read<StoriesBloc>().hasRead(story);
final bool hasRead = isPin || context.read<StoriesBloc>().hasRead(story);
final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
// If a story is a job story and it has a link to the job posting,

View File

@ -119,6 +119,7 @@ class _ProfileScreenState extends State<ProfileScreen>
return ItemsListView<Item>(
showWebPreview: false,
showMetadata: false,
useConsistentFontSize: true,
refreshController: refreshControllerHistory,
items: historyState.submittedItems
@ -170,6 +171,7 @@ class _ProfileScreenState extends State<ProfileScreen>
return ItemsListView<Story>(
showWebPreview:
preferenceState.showComplexStoryTile,
showMetadata: preferenceState.showMetadata,
refreshController: refreshControllerFav,
items: favState.favStories,
onRefresh: () {
@ -292,6 +294,21 @@ class _ProfileScreenState extends State<ProfileScreen>
},
activeColor: Colors.orange,
),
SwitchListTile(
title: const Text('Show Metadata'),
subtitle: const Text(
'show number of comments and post date'
' in story tile.',
),
value: preferenceState.showMetadata,
onChanged: (bool val) {
HapticFeedback.lightImpact();
context
.read<PreferenceCubit>()
.toggleMetadataMode();
},
activeColor: Colors.orange,
),
SwitchListTile(
title: const Text('Show Web Page First'),
subtitle: const Text(
@ -390,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
showAboutDialog(
context: context,
applicationName: 'Hacki',
applicationVersion: 'v0.2.8',
applicationVersion: 'v0.2.12',
applicationIcon: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(12),

View File

@ -48,20 +48,14 @@ class InboxView extends StatelessWidget {
loadStyle: LoadStyle.ShowWhenLoading,
builder: (BuildContext context, LoadStatus? mode) {
Widget body;
if (mode == LoadStatus.idle) {
body = const Text('');
} else if (mode == LoadStatus.loading) {
if (mode == LoadStatus.loading) {
body = const CustomCircularProgressIndicator();
} else if (mode == LoadStatus.failed) {
body = const Text(
'loading failed.',
);
} else if (mode == LoadStatus.canLoading) {
body = const Text(
'loading more.',
);
} else {
body = const Text('');
body = const SizedBox.shrink();
}
return SizedBox(
height: 55,

View File

@ -73,20 +73,14 @@ class _SearchScreenState extends State<SearchScreen> {
loadStyle: LoadStyle.ShowWhenLoading,
builder: (BuildContext context, LoadStatus? mode) {
Widget body;
if (mode == LoadStatus.idle) {
body = const Text('');
} else if (mode == LoadStatus.loading) {
if (mode == LoadStatus.loading) {
body = const CustomCircularProgressIndicator();
} else if (mode == LoadStatus.failed) {
body = const Text(
'loading failed.',
);
} else if (mode == LoadStatus.canLoading) {
body = const Text(
'loading more.',
);
} else {
body = const Text('');
body = const SizedBox.shrink();
}
return SizedBox(
height: 55,
@ -108,6 +102,7 @@ class _SearchScreenState extends State<SearchScreen> {
child: StoryTile(
showWebPreview:
prefState.showComplexStoryTile,
showMetadata: prefState.showMetadata,
story: e,
onTap: () => goToStoryScreen(
args: StoryScreenArgs(story: e),

View File

@ -261,7 +261,10 @@ class _StoryScreenState extends State<StoryScreen> {
HapticFeedback.lightImpact();
locator.get<CacheService>().resetComments();
context.read<CommentsCubit>().refresh();
context.read<PollCubit>().refresh();
if (widget.story.isPoll) {
context.read<PollCubit>().refresh();
}
},
onLoading: () {
context.read<CommentsCubit>().loadMore();

View File

@ -124,7 +124,7 @@ class PollView extends StatelessWidget {
option.text,
),
Text(
'${option.score} votes',
'''${option.score} vote${option.score > 1 ? 's' : ''}''',
style: const TextStyle(
color: Colors.grey,
fontSize: 12,

View File

@ -14,6 +14,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
const ItemsListView({
super.key,
required this.showWebPreview,
required this.showMetadata,
required this.items,
required this.onTap,
required this.refreshController,
@ -32,6 +33,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
);
final bool showWebPreview;
final bool showMetadata;
final bool enablePullDown;
final bool markReadStories;
final bool showOfflineBanner;
@ -44,7 +46,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
final List<T> items;
final Widget? header;
final RefreshController? refreshController;
final RefreshController refreshController;
final VoidCallback? onRefresh;
final VoidCallback? onLoadMore;
final ValueChanged<Story>? onPinned;
@ -89,6 +91,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
story: e,
onTap: () => onTap(e),
showWebPreview: showWebPreview,
showMetadata: showMetadata,
hasRead: markReadStories && hasRead,
simpleTileFontSize: useConsistentFontSize ? 14 : 16,
),
@ -180,10 +183,6 @@ class ItemsListView<T extends Item> extends StatelessWidget {
],
);
if (refreshController == null) {
return child;
}
return SmartRefresher(
enablePullUp: true,
enablePullDown: enablePullDown,
@ -194,20 +193,14 @@ class ItemsListView<T extends Item> extends StatelessWidget {
loadStyle: LoadStyle.ShowWhenLoading,
builder: (BuildContext context, LoadStatus? mode) {
Widget body;
if (mode == LoadStatus.idle) {
body = const Text('');
} else if (mode == LoadStatus.loading) {
if (mode == LoadStatus.loading) {
body = const CustomCircularProgressIndicator();
} else if (mode == LoadStatus.failed) {
body = const Text(
'loading failed.',
);
} else if (mode == LoadStatus.canLoading) {
body = const Text(
'loading more.',
);
} else {
body = const Text('');
body = const SizedBox.shrink();
}
return SizedBox(
height: 55,
@ -215,7 +208,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
);
},
),
controller: refreshController!,
controller: refreshController,
onRefresh: onRefresh,
onLoading: onLoadMore,
child: child,

View File

@ -3,6 +3,7 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:hacki/config/constants.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/screens/widgets/link_preview/link_view.dart';
import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart';
import 'package:url_launcher/url_launcher.dart';
@ -11,6 +12,8 @@ class LinkPreview extends StatefulWidget {
const LinkPreview({
super.key,
required this.link,
required this.story,
required this.showMetadata,
this.cache = const Duration(days: 30),
this.titleStyle,
this.bodyStyle,
@ -28,6 +31,8 @@ class LinkPreview extends StatefulWidget {
this.removeElevation = false,
});
final Story story;
/// Web address (Url that need to be parsed)
/// For IOS & Web, only HTTP and HTTPS are support
/// For Android, all urls are supported
@ -95,18 +100,19 @@ class LinkPreview extends StatefulWidget {
/// `[BoxShadow(blurRadius: 3, color: Colors.grey)]`
final List<BoxShadow>? boxShadow;
final bool showMetadata;
@override
_LinkPreviewState createState() => _LinkPreviewState();
}
class _LinkPreviewState extends State<LinkPreview> {
InfoBase? _info;
String? _errorImage, _errorTitle, _errorBody, _url;
String? _errorTitle, _errorBody, _url;
bool _loading = false;
@override
void initState() {
_errorImage = widget.errorImage ?? Constants.hackerNewsLogoLink;
_errorTitle = widget.errorTitle ?? 'Something went wrong!';
_errorBody = widget.errorBody ??
'Oops! Unable to parse the url. We have '
@ -114,7 +120,12 @@ class _LinkPreviewState extends State<LinkPreview> {
'we will try to fix this in our next release. Thanks!';
_url = widget.link.trim();
_info = WebAnalyzer.getInfoFromCache(_url);
if (_url?.isNotEmpty ?? false) {
_info = WebAnalyzer.getInfoFromCache(_url);
} else {
_info = WebAnalyzer.getInfoFromCache(widget.story.id.toString());
}
if (_info == null) {
_loading = true;
_getInfo();
@ -124,14 +135,23 @@ class _LinkPreviewState extends State<LinkPreview> {
Future<void> _getInfo() async {
if (_url!.startsWith('http') || _url!.startsWith('https')) {
_info = await WebAnalyzer.getInfo(_url, cache: widget.cache);
if (mounted) {
setState(() {
_loading = false;
});
}
_info = await WebAnalyzer.getInfo(
_url,
story: widget.story,
cache: widget.cache,
);
} else {
//print('$_url is not starting with either http or https');
_info = await WebAnalyzer.getInfo(
widget.story.id.toString(),
story: widget.story,
cache: widget.cache,
);
}
if (mounted) {
setState(() {
_loading = false;
});
}
}
@ -167,10 +187,12 @@ class _LinkPreviewState extends State<LinkPreview> {
height: _height,
child: LinkView(
key: widget.key ?? Key(widget.link),
metadata: widget.story.simpleMetadata,
url: widget.link,
title: title!,
description: desc!,
imageUri: imageUri,
imagePath: Constants.hackerNewsLogoPath,
onTap: _launchURL,
titleTextStyle: widget.titleStyle,
bodyTextStyle: widget.bodyStyle,
@ -180,6 +202,7 @@ class _LinkPreviewState extends State<LinkPreview> {
isIcon: isIcon,
bgColor: widget.backgroundColor,
radius: widget.borderRadius ?? 12,
showMetadata: widget.showMetadata,
),
);
}
@ -212,9 +235,8 @@ class _LinkPreviewState extends State<LinkPreview> {
_height,
title: _errorTitle,
desc: _errorBody,
imageUri: widget.showMultimedia
? (img.trim() == '' ? _errorImage : img)
: null,
imageUri:
widget.showMultimedia ? (img.trim() == '' ? null : img) : null,
);
} else {
final WebInfo? info = _info as WebInfo?;
@ -222,7 +244,8 @@ class _LinkPreviewState extends State<LinkPreview> {
? _buildLinkContainer(
_height,
title: _errorTitle,
imageUri: widget.showMultimedia ? _errorImage : null,
desc: _errorBody,
imageUri: null,
)
: _buildLinkContainer(
_height,
@ -235,7 +258,7 @@ class _LinkPreviewState extends State<LinkPreview> {
? info.image
: WebAnalyzer.isNotEmpty(info.icon)
? info.icon
: _errorImage)
: null)
: null,
isIcon: !WebAnalyzer.isNotEmpty(info.image),
);

View File

@ -5,10 +5,12 @@ import 'package:hacki/config/constants.dart';
class LinkView extends StatelessWidget {
const LinkView({
super.key,
required this.metadata,
required this.url,
required this.title,
required this.description,
required this.onTap,
required this.showMetadata,
this.imageUri,
this.imagePath,
this.titleTextStyle,
@ -25,6 +27,7 @@ class LinkView extends StatelessWidget {
'imageUri or imagePath cannot be null when showMultiMedia is true',
);
final String metadata;
final String url;
final String title;
final String description;
@ -39,6 +42,7 @@ class LinkView extends StatelessWidget {
final bool isIcon;
final double radius;
final Color? bgColor;
final bool showMetadata;
double computeTitleFontSize(double width) {
double size = width * 0.13;
@ -97,7 +101,7 @@ class LinkView extends StatelessWidget {
child: (imageUri?.isEmpty ?? true) && imagePath != null
? Image.asset(
imagePath!,
fit: isIcon ? BoxFit.scaleDown : BoxFit.fitWidth,
fit: BoxFit.cover,
)
: CachedNetworkImage(
imageUrl: imageUri!,
@ -166,6 +170,20 @@ class LinkView extends StatelessWidget {
padding: const EdgeInsets.fromLTRB(5, 3, 5, 0),
child: Column(
children: <Widget>[
if (showMetadata)
Container(
alignment: Alignment.topLeft,
child: Text(
metadata,
textAlign: TextAlign.left,
style: _bodyTS.copyWith(
fontSize:
_bodyTS.fontSize == null ? 12 : _bodyTS.fontSize! - 2,
),
overflow: bodyTextOverflow ?? TextOverflow.ellipsis,
maxLines: 1,
),
),
Expanded(
child: Container(
alignment: Alignment.topLeft,
@ -174,7 +192,8 @@ class LinkView extends StatelessWidget {
textAlign: TextAlign.left,
style: _bodyTS,
overflow: bodyTextOverflow ?? TextOverflow.ellipsis,
maxLines: bodyMaxLines ?? _maxLines,
maxLines:
(bodyMaxLines ?? _maxLines) - (showMetadata ? 1 : 0),
),
),
),

View File

@ -5,7 +5,11 @@ import 'dart:io';
import 'package:collection/collection.dart' show IterableExtension;
import 'package:fast_gbk/fast_gbk.dart';
import 'package:flutter/foundation.dart';
import 'package:html/dom.dart' hide Text;
import 'package:hacki/config/locator.dart';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:html/dom.dart' hide Text, Comment;
import 'package:html/parser.dart' as parser;
import 'package:http/http.dart';
import 'package:http/io_client.dart';
@ -63,7 +67,7 @@ class WebVideoInfo extends WebImageInfo {
/// Web analyzer
class WebAnalyzer {
static final Map<String?, InfoBase> _map = <String?, InfoBase>{};
static final Map<String?, InfoBase> cacheMap = <String?, InfoBase>{};
static final RegExp _bodyReg =
RegExp(r'<body[^>]*>([\s\S]*?)<\/body>', caseSensitive: false);
static final RegExp _htmlReg = RegExp(
@ -80,7 +84,10 @@ class WebAnalyzer {
static final RegExp _lineReg = RegExp(r'[\n\r]|&nbsp;|&gt;');
static final RegExp _spaceReg = RegExp(r'\s+');
/// Is it an empty string
static bool isEmpty(String? str) {
return !isNotEmpty(str);
}
static bool isNotEmpty(String? str) {
return str != null && str.isNotEmpty && str.trim().isNotEmpty;
}
@ -88,10 +95,11 @@ class WebAnalyzer {
/// Get web information
/// return [InfoBase]
static InfoBase? getInfoFromCache(String? url) {
final InfoBase? info = _map[url];
final InfoBase? info = cacheMap[url];
if (info != null) {
if (!info._timeout.isAfter(DateTime.now())) {
_map.remove(url);
cacheMap.remove(url);
}
}
return info;
@ -101,25 +109,69 @@ class WebAnalyzer {
/// return [InfoBase]
static Future<InfoBase?> getInfo(
String? url, {
required Story story,
Duration cache = const Duration(hours: 24),
bool multimedia = true,
}) async {
// final start = DateTime.now();
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);
cacheMap[story.id.toString()] = info;
return info;
}
try {
info = await _getInfoByIsolate(url, multimedia);
if (info != null) {
info._timeout = DateTime.now().add(cache);
_map[url] = info;
cacheMap[url] = info;
}
} catch (e) {
//print('Get web error:$url, Error:$e');
//locator.get<Logger>().log(Level.error, e);
}
// print("$url cost ${DateTime.now().difference(start).inMilliseconds}");
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;
}
@ -128,6 +180,7 @@ class WebAnalyzer {
final Response? response = await _requestUrl(url);
if (response == null) return null;
if (multimedia!) {
final String? contentType = response.headers['content-type'];
if (contentType != null) {
@ -156,7 +209,8 @@ class WebAnalyzer {
if (res[0] == '0') {
info = WebInfo(
title: res[1] as String?,
description: res[2] as String?,
description:
res[2] == null ? null : (res[2] as String).removeAllEmojis(),
icon: res[3] as String?,
image: res[4] as String?,
);
@ -214,17 +268,21 @@ class WebAnalyzer {
..maxRedirects = 3
..persistentConnection = true
..headers['accept-encoding'] = 'gzip, deflate'
..headers['User-Agent'] =
'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Mobile Safari/537.36'
..headers['User-Agent'] = url.contains('twitter.com')
? 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
: 'Mozilla/5.0'
..headers['cache-control'] = 'no-cache'
..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';
// print(request.headers);
final IOStreamedResponse stream =
await client.send(request).catchError((dynamic err) {
//print('Error in getting the link => ${request.url}');
//print('Error => $err');
// locator.get<Logger>().log(
// Level.error,
// 'Error in getting the link => ${request.url}\n$err',
// );
});
if (stream.statusCode == HttpStatus.movedTemporarily ||
stream.statusCode == HttpStatus.movedPermanently) {
if (stream.isRedirect && count < 6) {
@ -240,7 +298,6 @@ class WebAnalyzer {
}
count++;
client.close();
// print("Redirect ====> $url");
return _requestUrl(url, count: count, cookie: cookie);
}
} else if (stream.statusCode == HttpStatus.ok) {
@ -257,7 +314,6 @@ class WebAnalyzer {
}
}
client.close();
//if (res == null) print('Get web info empty($url)');
return res;
}
@ -274,28 +330,22 @@ class WebAnalyzer {
String temp = html.replaceAll(r'\', '');
temp = temp.replaceAll('u003C', '<');
temp = temp.replaceAll('u003E', '>');
// print(temp);
} else {
// print(html);
}
} catch (e) {
try {
html = gbk.decode(response.bodyBytes);
} catch (e) {
//print('Web page resolution failure from:$url Error:$e');
// locator.get<Logger>().log(
// Level.error,
// 'Web page resolution failure from:$url Error:$e',
// );
}
}
if (html == null) {
//print('Web page resolution failure from:$url');
return null;
}
if (html == null) return null;
// Improved performance
// final start = DateTime.now();
final String headHtml = _getHeadHtml(html);
final Document document = parser.parse(headHtml);
// print("dom cost ${DateTime.now().difference(start).inMilliseconds}");
final Uri uri = Uri.parse(url);
// get image or video
@ -360,6 +410,7 @@ class WebAnalyzer {
static String _analyzeTitle(Document document, {bool isTwitter = false}) {
if (isTwitter) return '';
final String? title = _getMetaContent(document, 'property', 'og:title');
if (title != null) return title;
final List<Element> list = document.head!.getElementsByTagName('title');
if (list.isNotEmpty) {
@ -379,14 +430,12 @@ class WebAnalyzer {
_getMetaContent(document, 'name', 'description') ??
_getMetaContent(document, 'name', 'Description');
if (!isNotEmpty(description)) {
// final DateTime start = DateTime.now();
if (isEmpty(description)) {
String body = html.replaceAll(_htmlReg, '');
body = body.trim().replaceAll(_lineReg, ' ').replaceAll(_spaceReg, ' ');
if (body.length > 300) {
body = body.substring(0, 300);
}
// print("html cost ${DateTime.now().difference(start).inMilliseconds}");
if (body.contains('JavaScript is disabled in your browser')) return '';
return body;
}

View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hacki/blocs/blocs.dart';
import 'package:hacki/cubits/cubits.dart';
import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart';
class OfflineBanner extends StatelessWidget {
const OfflineBanner({
@ -57,6 +58,7 @@ class OfflineBanner extends StatelessWidget {
context.read<StoriesBloc>().add(StoriesExitOffline());
context.read<AuthBloc>().add(AuthInitialize());
context.read<PinCubit>().init();
WebAnalyzer.cacheMap.clear();
}
});
},

View File

@ -40,7 +40,8 @@ class _StoriesListViewState extends State<StoriesListView> {
return BlocBuilder<PreferenceCubit, PreferenceState>(
buildWhen: (PreferenceState previous, PreferenceState current) =>
previous.showComplexStoryTile != current.showComplexStoryTile,
previous.showComplexStoryTile != current.showComplexStoryTile ||
previous.showMetadata != current.showMetadata,
builder: (BuildContext context, PreferenceState preferenceState) {
return BlocConsumer<StoriesBloc, StoriesState>(
listenWhen: (StoriesState previous, StoriesState current) =>
@ -66,6 +67,7 @@ class _StoriesListViewState extends State<StoriesListView> {
markReadStories:
context.read<PreferenceCubit>().state.markReadStories,
showWebPreview: preferenceState.showComplexStoryTile,
showMetadata: preferenceState.showMetadata,
refreshController: refreshController,
items: state.storiesByType[storyType]!,
onRefresh: () {
@ -73,6 +75,7 @@ class _StoriesListViewState extends State<StoriesListView> {
context
.read<StoriesBloc>()
.add(StoriesRefresh(type: storyType));
context.read<PinCubit>().refresh();
},
onLoadMore: () {
context

View File

@ -4,9 +4,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_fadein/flutter_fadein.dart';
import 'package:hacki/config/constants.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/screens/widgets/link_preview/link_view.dart';
import 'package:hacki/screens/widgets/widgets.dart';
import 'package:html/parser.dart';
import 'package:shimmer/shimmer.dart';
class StoryTile extends StatelessWidget {
@ -14,12 +12,14 @@ class StoryTile extends StatelessWidget {
super.key,
this.hasRead = false,
required this.showWebPreview,
required this.showMetadata,
required this.story,
required this.onTap,
this.simpleTileFontSize = 16,
});
final bool showWebPreview;
final bool showMetadata;
final bool hasRead;
final Story story;
final VoidCallback onTap;
@ -35,137 +35,107 @@ class StoryTile extends StatelessWidget {
? 100.0
: (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
if (story.url.isNotEmpty) {
return TapDownWrapper(
onTap: onTap,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 12,
),
child: AbsorbPointer(
child: LinkPreview(
link: story.url.isNotEmpty ? story.url : 's',
placeholderWidget: FadeIn(
child: SizedBox(
height: height,
child: Shimmer.fromColors(
baseColor: Colors.orange,
highlightColor: Colors.orangeAccent,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
right: 5,
bottom: 5,
top: 5,
),
child: Container(
height: height,
width: height,
color: Colors.white,
return TapDownWrapper(
onTap: onTap,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 12,
),
child: AbsorbPointer(
child: LinkPreview(
story: story,
link: story.url,
placeholderWidget: FadeIn(
child: SizedBox(
height: height,
child: Shimmer.fromColors(
baseColor: Colors.orange,
highlightColor: Colors.orangeAccent,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
right: 5,
bottom: 5,
top: 5,
),
child: Container(
height: height,
width: height,
color: Colors.white,
),
),
Expanded(
flex: 4,
child: Padding(
padding: const EdgeInsets.only(left: 4, top: 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
width: double.infinity,
height: 14,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 4),
),
Container(
width: double.infinity,
height: 10,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 3),
),
Container(
width: double.infinity,
height: 10,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 3),
),
Container(
width: double.infinity,
height: 10,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 3),
),
Container(
width: 40,
height: 10,
color: Colors.white,
),
],
),
),
Expanded(
flex: 4,
child: Padding(
padding: const EdgeInsets.only(left: 4, top: 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
width: double.infinity,
height: 14,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 4),
),
Container(
width: double.infinity,
height: 10,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 3),
),
Container(
width: double.infinity,
height: 10,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 3),
),
Container(
width: double.infinity,
height: 10,
color: Colors.white,
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 3),
),
Container(
width: 40,
height: 10,
color: Colors.white,
),
],
),
),
)
],
),
)
],
),
),
),
errorImage: Constants.hackerNewsLogoLink,
backgroundColor: Colors.transparent,
borderRadius: 0,
removeElevation: true,
bodyMaxLines: height == 100 ? 3 : 4,
errorTitle: story.title,
titleStyle: TextStyle(
color: hasRead
? Colors.grey[500]
: Theme.of(context).textTheme.subtitle1!.color,
fontWeight: FontWeight.bold,
),
),
errorImage: Constants.hackerNewsLogoLink,
backgroundColor: Colors.transparent,
borderRadius: 0,
removeElevation: true,
bodyMaxLines: height == 100 ? 3 : 4,
errorTitle: story.title,
titleStyle: TextStyle(
color: hasRead
? Colors.grey[500]
: Theme.of(context).textTheme.subtitle1!.color,
fontWeight: FontWeight.bold,
),
showMetadata: showMetadata,
),
),
);
} else {
final String text = parse(story.text).body?.text ?? '';
return TapDownWrapper(
onTap: onTap,
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 12,
),
child: AbsorbPointer(
child: SizedBox(
height: height,
child: LinkView(
title: story.title,
description: text,
onTap: (_) {},
url: '',
imagePath: Constants.hackerNewsLogoPath,
bodyMaxLines: height == 100 ? 3 : 4,
titleTextStyle: TextStyle(
color: hasRead
? Colors.grey[500]
: Theme.of(context).textTheme.subtitle1!.color,
fontWeight: FontWeight.bold,
),
),
),
),
),
);
}
),
);
} else {
return InkWell(
onTap: onTap,
@ -190,6 +160,21 @@ class StoryTile extends StatelessWidget {
),
],
),
if (showMetadata)
Row(
children: <Widget>[
Expanded(
child: Text(
story.metadata,
style: TextStyle(
color: Colors.grey,
fontSize: simpleTileFontSize - 2,
),
maxLines: 1,
),
),
],
),
const SizedBox(
height: 8,
),

View File

@ -2,9 +2,7 @@ import 'package:html/dom.dart' as dom;
import 'package:html/parser.dart' as parser;
import 'package:html_unescape/html_unescape.dart';
class HtmlUtil {
const HtmlUtil._();
abstract class HtmlUtil {
static String? getTitle(dynamic input) =>
parser.parse(input).head?.querySelector('title')?.text;

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:url_launcher/url_launcher.dart';
class LinkUtil {
abstract class LinkUtil {
static final ChromeSafariBrowser _browser = ChromeSafariBrowser();
static void launchUrl(String link, {bool useReader = false}) {

View File

@ -1,6 +1,6 @@
name: hacki
description: A Hacker News reader.
version: 0.2.8+45
version: 0.2.12+51
publish_to: none
environment: