Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
c4c109e4a3 | |||
b7720d0584 | |||
7d5788dec3 | |||
80a836c6b9 |
@ -3,7 +3,7 @@
|
||||
|
||||
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)
|
||||
[](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://badges.pufler.dev)
|
||||
[](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:
|
||||
|
4
fastlane/metadata/android/en-US/changelogs/50.txt
Normal 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.
|
4
fastlane/metadata/android/en-US/changelogs/51.txt
Normal 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.
|
Before Width: | Height: | Size: 393 KiB After Width: | Height: | Size: 422 KiB |
Before Width: | Height: | Size: 696 KiB After Width: | Height: | Size: 712 KiB |
Before Width: | Height: | Size: 250 KiB After Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 231 KiB After Width: | Height: | Size: 262 KiB |
Before Width: | Height: | Size: 903 KiB After Width: | Height: | Size: 672 KiB |
@ -568,7 +568,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -577,7 +577,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.11;
|
||||
MARKETING_VERSION = 0.2.12;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@ -705,7 +705,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -714,7 +714,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.11;
|
||||
MARKETING_VERSION = 0.2.12;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
@ -736,7 +736,7 @@
|
||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||
CODE_SIGN_IDENTITY = "Apple Development";
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 1;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||
ENABLE_BITCODE = NO;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
@ -745,7 +745,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.11;
|
||||
MARKETING_VERSION = 0.2.12;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
|
@ -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]));
|
||||
}
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
];
|
||||
}
|
||||
|
@ -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, (_) => '');
|
||||
}
|
||||
}
|
||||
|
@ -70,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();
|
||||
|
||||
|
@ -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';
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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>(
|
||||
@ -174,6 +175,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
story: story,
|
||||
onTap: () => onStoryTapped(story, isPin: true),
|
||||
showWebPreview: preferenceState.showComplexStoryTile,
|
||||
showMetadata: preferenceState.showMetadata,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -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.11',
|
||||
applicationVersion: 'v0.2.12',
|
||||
applicationIcon: ClipRRect(
|
||||
borderRadius: const BorderRadius.all(
|
||||
Radius.circular(12),
|
||||
|
@ -102,6 +102,7 @@ class _SearchScreenState extends State<SearchScreen> {
|
||||
child: StoryTile(
|
||||
showWebPreview:
|
||||
prefState.showComplexStoryTile,
|
||||
showMetadata: prefState.showMetadata,
|
||||
story: e,
|
||||
onTap: () => goToStoryScreen(
|
||||
args: StoryScreenArgs(story: e),
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
@ -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,
|
||||
),
|
||||
|
@ -13,6 +13,7 @@ class LinkPreview extends StatefulWidget {
|
||||
super.key,
|
||||
required this.link,
|
||||
required this.story,
|
||||
required this.showMetadata,
|
||||
this.cache = const Duration(days: 30),
|
||||
this.titleStyle,
|
||||
this.bodyStyle,
|
||||
@ -99,6 +100,8 @@ class LinkPreview extends StatefulWidget {
|
||||
/// `[BoxShadow(blurRadius: 3, color: Colors.grey)]`
|
||||
final List<BoxShadow>? boxShadow;
|
||||
|
||||
final bool showMetadata;
|
||||
|
||||
@override
|
||||
_LinkPreviewState createState() => _LinkPreviewState();
|
||||
}
|
||||
@ -184,6 +187,7 @@ 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!,
|
||||
@ -198,6 +202,7 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
isIcon: isIcon,
|
||||
bgColor: widget.backgroundColor,
|
||||
radius: widget.borderRadius ?? 12,
|
||||
showMetadata: widget.showMetadata,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
@ -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;
|
||||
@ -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),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -6,6 +6,7 @@ import 'package:collection/collection.dart' show IterableExtension;
|
||||
import 'package:fast_gbk/fast_gbk.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
import 'package:hacki/extensions/extensions.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/repositories/repositories.dart';
|
||||
import 'package:html/dom.dart' hide Text, Comment;
|
||||
@ -208,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?,
|
||||
);
|
||||
|
@ -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
|
||||
|
@ -12,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;
|
||||
@ -129,6 +131,7 @@ class StoryTile extends StatelessWidget {
|
||||
: Theme.of(context).textTheme.subtitle1!.color,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
showMetadata: showMetadata,
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -157,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,
|
||||
),
|
||||
|
@ -1,6 +1,6 @@
|
||||
name: hacki
|
||||
description: A Hacker News reader.
|
||||
version: 0.2.11+49
|
||||
version: 0.2.12+51
|
||||
publish_to: none
|
||||
|
||||
environment:
|
||||
|