Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
a9590af3e9 | |||
18dadaa5ec | |||
d506297f4c | |||
4e8cf9837f | |||
f73269404a | |||
c4c109e4a3 | |||
b7720d0584 | |||
7d5788dec3 | |||
80a836c6b9 |
40
README.md
@ -3,15 +3,17 @@
|
||||
|
||||
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://f-droid.org/en/packages/com.jiaqifeng.hacki/)
|
||||
[](https://github.com/Livinglist/Hacki/releases/latest)
|
||||
[](https://badges.pufler.dev)
|
||||
[](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
|
||||
[](https://pub.dev/packages/effective_dart)
|
||||
|
||||
<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:
|
||||
@ -36,24 +38,22 @@ Features:
|
||||
|
||||
|
||||
<p align="center">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799288-6e98352a-fe89-4a2e-8a74-c5782463a1e1.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799297-75b52eac-2066-4df9-bdfc-7c82bf7b81c8.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799302-860c61b8-abba-486a-9592-bc84a6af3232.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159799305-308743d3-1c89-45de-9645-3b6ec789c282.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798176-5212e9bf-296d-4d9b-ab48-19b741684c8a.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798179-72edbe49-7444-4e54-a07c-fc1244447a74.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798182-28397805-a7cc-4124-b65b-c02c80afbbec.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798183-c2984270-ee99-4419-841e-65e98890464f.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798184-2fce5d97-710e-44a7-b99a-3296ebcf273b.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798185-d7c81348-956e-483c-a1bc-5cd872bdad62.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png">
|
||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798187-4404adea-b2bc-472e-8568-2379e6db01a4.png">
|
||||
<img width="200" alt="01" src="assets/screenshots/01.png">
|
||||
<img width="200" alt="02" src="assets/screenshots/02.png">
|
||||
<img width="200" alt="03" src="assets/screenshots/03.png">
|
||||
<img width="200" alt="04" src="assets/screenshots/04.png">
|
||||
<img width="200" alt="05" src="assets/screenshots/05.png">
|
||||
<img width="200" alt="06" src="assets/screenshots/06.png">
|
||||
<img width="200" alt="07" src="assets/screenshots/07.png">
|
||||
<img width="200" alt="08" src="assets/screenshots/08.png">
|
||||
<img width="200" alt="09" src="assets/screenshots/09.png">
|
||||
<img width="200" alt="10" src="assets/screenshots/10.png">
|
||||
<img width="200" alt="11" src="assets/screenshots/11.png">
|
||||
<img width="200" alt="12" src="assets/screenshots/12.png">
|
||||
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162711-a9146326-9645-4db6-a04e-1f82e6133e40.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162726-ef1d3f2a-5179-417c-8a5f-0cddb52249da.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162733-906c4afd-39a8-48ae-946a-8019b327eaa0.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162735-f2b25119-4702-4308-b2f5-281a2a2c5901.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163024-6dcd65b6-bada-4c1c-95af-387fd4f42fb2.png">
|
||||
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163033-7bcf7038-b9aa-4ce4-8b58-64578eae8531.png">
|
||||
<img width="400" alt="ipad-01" src="assets/screenshots/ipad-01.png">
|
||||
<img width="400" alt="ipad-02" src="assets/screenshots/ipad-02.png">
|
||||
<img width="400" alt="ipad-03" src="assets/screenshots/ipad-03.png">
|
||||
<img width="400" alt="ipad-04" src="assets/screenshots/ipad-04.png">
|
||||
</p>
|
||||
|
||||
|
@ -5,4 +5,5 @@ linter:
|
||||
public_member_api_docs: false
|
||||
library_private_types_in_public_api: false
|
||||
omit_local_variable_types: false
|
||||
one_member_abstracts: false
|
||||
always_specify_types: true
|
@ -9,6 +9,10 @@
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<data android:scheme="https" />
|
||||
</intent>
|
||||
<intent>
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
<data android:mimeType="*/*" />
|
||||
</intent>
|
||||
</queries>
|
||||
|
||||
<application
|
||||
|
BIN
assets/screenshots/01.png
Normal file
After Width: | Height: | Size: 522 KiB |
BIN
assets/screenshots/02.png
Normal file
After Width: | Height: | Size: 835 KiB |
BIN
assets/screenshots/03.png
Normal file
After Width: | Height: | Size: 282 KiB |
BIN
assets/screenshots/04.png
Normal file
After Width: | Height: | Size: 298 KiB |
BIN
assets/screenshots/05.png
Normal file
After Width: | Height: | Size: 698 KiB |
BIN
assets/screenshots/06.png
Normal file
After Width: | Height: | Size: 868 KiB |
BIN
assets/screenshots/07.png
Normal file
After Width: | Height: | Size: 102 KiB |
BIN
assets/screenshots/08.png
Normal file
After Width: | Height: | Size: 384 KiB |
BIN
assets/screenshots/09.png
Normal file
After Width: | Height: | Size: 282 KiB |
BIN
assets/screenshots/10.png
Normal file
After Width: | Height: | Size: 414 KiB |
BIN
assets/screenshots/11.png
Normal file
After Width: | Height: | Size: 530 KiB |
BIN
assets/screenshots/12.png
Normal file
After Width: | Height: | Size: 313 KiB |
BIN
assets/screenshots/ipad-01.png
Normal file
After Width: | Height: | Size: 763 KiB |
BIN
assets/screenshots/ipad-02.png
Normal file
After Width: | Height: | Size: 1.7 MiB |
BIN
assets/screenshots/ipad-03.png
Normal file
After Width: | Height: | Size: 1.1 MiB |
BIN
assets/screenshots/ipad-04.png
Normal file
After Width: | Height: | Size: 1005 KiB |
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.
|
5
fastlane/metadata/android/en-US/changelogs/52.txt
Normal file
@ -0,0 +1,5 @@
|
||||
- You can now participate in polls.
|
||||
- Pick up where you left off.
|
||||
- Swipe left on comment tile to view its parents without scrolling all the way up.
|
||||
- Huge performance boost.
|
||||
- Bugfixes.
|
6
fastlane/metadata/android/en-US/changelogs/53.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.
|
6
fastlane/metadata/android/en-US/changelogs/54.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.
|
6
fastlane/metadata/android/en-US/changelogs/55.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.
|
Before Width: | Height: | Size: 393 KiB After Width: | Height: | Size: 522 KiB |
Before Width: | Height: | Size: 696 KiB After Width: | Height: | Size: 835 KiB |
Before Width: | Height: | Size: 250 KiB After Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 231 KiB After Width: | Height: | Size: 298 KiB |
Before Width: | Height: | Size: 903 KiB After Width: | Height: | Size: 698 KiB |
Before Width: | Height: | Size: 931 KiB After Width: | Height: | Size: 868 KiB |
Before Width: | Height: | Size: 298 KiB After Width: | Height: | Size: 102 KiB |
Before Width: | Height: | Size: 247 KiB After Width: | Height: | Size: 384 KiB |
Before Width: | Height: | Size: 496 KiB After Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 420 KiB After Width: | Height: | Size: 414 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
Normal file
After Width: | Height: | Size: 530 KiB |
BIN
fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
Normal file
After Width: | Height: | Size: 313 KiB |
@ -577,7 +577,7 @@
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.2.11;
|
||||
MARKETING_VERSION = 0.2.16;
|
||||
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.11;
|
||||
MARKETING_VERSION = 0.2.16;
|
||||
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.11;
|
||||
MARKETING_VERSION = 0.2.16;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
|
@ -39,6 +39,12 @@
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>$(CURRENT_PROJECT_VERSION)</string>
|
||||
<key>LSApplicationQueriesSchemes</key>
|
||||
<array>
|
||||
<string>https</string>
|
||||
<string>http</string>
|
||||
<string>mailto</string>
|
||||
</array>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
<true/>
|
||||
<key>UIBackgroundModes</key>
|
||||
|
@ -48,6 +48,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
static const int _tabletSmallPageSize = 15;
|
||||
static const int _tabletLargePageSize = 25;
|
||||
|
||||
/// Types of story to be shown in the tab bar.
|
||||
static const Set<StoryType> types = <StoryType>{
|
||||
StoryType.top,
|
||||
StoryType.best,
|
||||
StoryType.latest,
|
||||
StoryType.ask,
|
||||
StoryType.show,
|
||||
};
|
||||
|
||||
Future<void> onInitialize(
|
||||
StoriesInitialize event,
|
||||
Emitter<StoriesState> emit,
|
||||
@ -70,11 +79,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
currentPageSize: pageSize,
|
||||
),
|
||||
);
|
||||
await loadStories(of: StoryType.top, emit: emit);
|
||||
await loadStories(of: StoryType.latest, emit: emit);
|
||||
await loadStories(of: StoryType.ask, emit: emit);
|
||||
await loadStories(of: StoryType.show, emit: emit);
|
||||
await loadStories(of: StoryType.jobs, emit: emit);
|
||||
for (final StoryType type in types) {
|
||||
await loadStories(of: type, emit: emit);
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> loadStories({
|
||||
@ -237,34 +244,17 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
||||
await _cacheRepository.deleteAllStories();
|
||||
await _cacheRepository.deleteAllComments();
|
||||
|
||||
final List<int> topIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.top);
|
||||
final List<int> newIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.latest);
|
||||
final List<int> askIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.ask);
|
||||
final List<int> showIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.show);
|
||||
final List<int> jobIds =
|
||||
await _storiesRepository.fetchStoryIds(of: StoryType.jobs);
|
||||
final Set<int> allIds = <int>{};
|
||||
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
|
||||
await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
|
||||
|
||||
final List<int> allIds = <int>[
|
||||
...topIds,
|
||||
...newIds,
|
||||
...askIds,
|
||||
...showIds,
|
||||
...jobIds
|
||||
];
|
||||
for (final StoryType type in types) {
|
||||
final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
|
||||
await _cacheRepository.cacheStoryIds(of: type, ids: ids);
|
||||
allIds.addAll(ids);
|
||||
}
|
||||
|
||||
try {
|
||||
_storiesRepository
|
||||
.fetchStoriesStream(ids: allIds)
|
||||
.fetchStoriesStream(ids: allIds.toList())
|
||||
.listen((Story story) async {
|
||||
if (story.kids.isNotEmpty) {
|
||||
await _cacheRepository.cacheStory(story: story);
|
||||
|
@ -28,6 +28,7 @@ class StoriesState extends Equatable {
|
||||
const StoriesState.init({
|
||||
this.storiesByType = const <StoryType, List<Story>>{
|
||||
StoryType.top: <Story>[],
|
||||
StoryType.best: <Story>[],
|
||||
StoryType.latest: <Story>[],
|
||||
StoryType.ask: <Story>[],
|
||||
StoryType.show: <Story>[],
|
||||
@ -35,6 +36,7 @@ class StoriesState extends Equatable {
|
||||
},
|
||||
this.storyIdsByType = const <StoryType, List<int>>{
|
||||
StoryType.top: <int>[],
|
||||
StoryType.best: <int>[],
|
||||
StoryType.latest: <int>[],
|
||||
StoryType.ask: <int>[],
|
||||
StoryType.show: <int>[],
|
||||
@ -42,6 +44,7 @@ class StoriesState extends Equatable {
|
||||
},
|
||||
this.statusByType = const <StoryType, StoriesStatus>{
|
||||
StoryType.top: StoriesStatus.initial,
|
||||
StoryType.best: StoriesStatus.initial,
|
||||
StoryType.latest: StoriesStatus.initial,
|
||||
StoryType.ask: StoriesStatus.initial,
|
||||
StoryType.show: StoriesStatus.initial,
|
||||
@ -49,6 +52,7 @@ class StoriesState extends Equatable {
|
||||
},
|
||||
this.currentPageByType = const <StoryType, int>{
|
||||
StoryType.top: 0,
|
||||
StoryType.best: 0,
|
||||
StoryType.latest: 0,
|
||||
StoryType.ask: 0,
|
||||
StoryType.show: 0,
|
||||
|
@ -55,21 +55,21 @@ class CollapseCubit extends Cubit<CollapseState> {
|
||||
}
|
||||
|
||||
void hiddenCommentsStreamListener(Map<int, Set<int>> event) {
|
||||
int collapsedCount = 0;
|
||||
for (final int key in event.keys) {
|
||||
if (key == _commentId && !isClosed) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
collapsedCount: event[key]?.length ?? 0,
|
||||
),
|
||||
);
|
||||
return;
|
||||
collapsedCount = event[key]?.length ?? 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (final Set<int> val in event.values) {
|
||||
if (val.contains(_commentId) && !isClosed) {
|
||||
emit(
|
||||
state.copyWith(hidden: true),
|
||||
state.copyWith(
|
||||
hidden: true,
|
||||
collapsedCount: collapsedCount,
|
||||
),
|
||||
);
|
||||
return;
|
||||
}
|
||||
@ -77,7 +77,10 @@ class CollapseCubit extends Cubit<CollapseState> {
|
||||
|
||||
if (!isClosed) {
|
||||
emit(
|
||||
state.copyWith(hidden: false),
|
||||
state.copyWith(
|
||||
hidden: false,
|
||||
collapsedCount: collapsedCount,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
];
|
||||
}
|
||||
|
@ -1,3 +1,5 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:bloc/bloc.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:hacki/config/locator.dart';
|
||||
@ -13,42 +15,94 @@ class SearchCubit extends Cubit<SearchState> {
|
||||
|
||||
final SearchRepository _searchRepository;
|
||||
|
||||
StreamSubscription<Story>? streamSubscription;
|
||||
|
||||
void search(String query) {
|
||||
streamSubscription?.cancel();
|
||||
emit(
|
||||
state.copyWith(
|
||||
results: <Story>[],
|
||||
currentPage: 0,
|
||||
status: SearchStatus.loading,
|
||||
query: query,
|
||||
searchFilters: state.searchFilters.copyWith(query: query, page: 0),
|
||||
),
|
||||
);
|
||||
_searchRepository.search(query).listen(_onStoryFetched).onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
streamSubscription = _searchRepository
|
||||
.search(filters: state.searchFilters)
|
||||
.listen(_onStoryFetched)
|
||||
..onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
}
|
||||
|
||||
void loadMore() {
|
||||
final int updatedPage = state.currentPage + 1;
|
||||
if (state.status != SearchStatus.loading) {
|
||||
final int updatedPage = state.searchFilters.page + 1;
|
||||
emit(
|
||||
state.copyWith(
|
||||
status: SearchStatus.loadingMore,
|
||||
searchFilters: state.searchFilters.copyWith(page: updatedPage),
|
||||
),
|
||||
);
|
||||
streamSubscription = _searchRepository
|
||||
.search(filters: state.searchFilters)
|
||||
.listen(_onStoryFetched)
|
||||
..onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void addFilter<T extends SearchFilter>(T filter) {
|
||||
if (state.searchFilters.contains<T>()) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
emit(
|
||||
state.copyWith(
|
||||
status: SearchStatus.loadingMore,
|
||||
currentPage: updatedPage,
|
||||
searchFilters: state.searchFilters.copyWithFilterAdded(filter),
|
||||
),
|
||||
);
|
||||
_searchRepository
|
||||
.search(state.query, page: updatedPage)
|
||||
.listen(_onStoryFetched)
|
||||
.onDone(() {
|
||||
emit(state.copyWith(status: SearchStatus.loaded));
|
||||
});
|
||||
|
||||
search(state.searchFilters.query);
|
||||
}
|
||||
|
||||
void removeFilter<T extends SearchFilter>() {
|
||||
emit(
|
||||
state.copyWith(
|
||||
searchFilters: state.searchFilters.copyWithFilterRemoved<T>(),
|
||||
),
|
||||
);
|
||||
|
||||
search(state.searchFilters.query);
|
||||
}
|
||||
|
||||
void onSortToggled() {
|
||||
emit(
|
||||
state.copyWith(
|
||||
searchFilters: state.searchFilters.copyWith(
|
||||
sorted: !state.searchFilters.sorted,
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
search(state.searchFilters.query);
|
||||
}
|
||||
|
||||
void _onStoryFetched(Story story) {
|
||||
emit(
|
||||
state.copyWith(
|
||||
results: List<Story>.from(state.results)..add(story),
|
||||
status: SearchStatus.loaded,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> close() async {
|
||||
await streamSubscription?.cancel();
|
||||
await super.close();
|
||||
}
|
||||
}
|
||||
|
@ -9,42 +9,36 @@ enum SearchStatus {
|
||||
|
||||
class SearchState extends Equatable {
|
||||
const SearchState({
|
||||
required this.query,
|
||||
required this.status,
|
||||
required this.results,
|
||||
required this.currentPage,
|
||||
required this.searchFilters,
|
||||
});
|
||||
|
||||
SearchState.init()
|
||||
: query = '',
|
||||
status = SearchStatus.initial,
|
||||
: status = SearchStatus.initial,
|
||||
results = <Story>[],
|
||||
currentPage = 0;
|
||||
searchFilters = SearchFilters.init();
|
||||
|
||||
final String query;
|
||||
final List<Story> results;
|
||||
final SearchStatus status;
|
||||
final int currentPage;
|
||||
final SearchFilters searchFilters;
|
||||
|
||||
SearchState copyWith({
|
||||
String? query,
|
||||
List<Story>? results,
|
||||
SearchStatus? status,
|
||||
int? currentPage,
|
||||
SearchFilters? searchFilters,
|
||||
}) {
|
||||
return SearchState(
|
||||
query: query ?? this.query,
|
||||
results: results ?? this.results,
|
||||
status: status ?? this.status,
|
||||
currentPage: currentPage ?? this.currentPage,
|
||||
searchFilters: searchFilters ?? this.searchFilters,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => <Object?>[
|
||||
query,
|
||||
status,
|
||||
results,
|
||||
currentPage,
|
||||
searchFilters,
|
||||
];
|
||||
}
|
||||
|
@ -21,4 +21,6 @@ class SplitViewCubit extends Cubit<SplitViewState> {
|
||||
void enableSplitView() => emit(state.copyWith(enabled: true));
|
||||
|
||||
void disableSplitView() => emit(state.copyWith(enabled: false));
|
||||
|
||||
void zoom() => emit(state.copyWith(expanded: !state.expanded));
|
||||
}
|
||||
|
@ -3,19 +3,27 @@ part of 'split_view_cubit.dart';
|
||||
class SplitViewState extends Equatable {
|
||||
const SplitViewState({
|
||||
required this.storyScreenArgs,
|
||||
required this.expanded,
|
||||
required this.enabled,
|
||||
});
|
||||
|
||||
const SplitViewState.init()
|
||||
: enabled = false,
|
||||
expanded = false,
|
||||
storyScreenArgs = null;
|
||||
|
||||
final bool enabled;
|
||||
final bool expanded;
|
||||
final StoryScreenArgs? storyScreenArgs;
|
||||
|
||||
SplitViewState copyWith({bool? enabled, StoryScreenArgs? storyScreenArgs}) {
|
||||
SplitViewState copyWith({
|
||||
bool? enabled,
|
||||
bool? expanded,
|
||||
StoryScreenArgs? storyScreenArgs,
|
||||
}) {
|
||||
return SplitViewState(
|
||||
enabled: enabled ?? this.enabled,
|
||||
expanded: expanded ?? this.expanded,
|
||||
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
|
||||
);
|
||||
}
|
||||
@ -23,6 +31,7 @@ class SplitViewState extends Equatable {
|
||||
@override
|
||||
List<Object?> get props => <Object?>[
|
||||
enabled,
|
||||
expanded,
|
||||
storyScreenArgs,
|
||||
];
|
||||
}
|
||||
|
@ -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, (_) => '');
|
||||
}
|
||||
}
|
||||
|
@ -2,5 +2,6 @@ export 'comment.dart';
|
||||
export 'item.dart';
|
||||
export 'poll_option.dart';
|
||||
export 'post_data.dart';
|
||||
export 'search_filters.dart';
|
||||
export 'story.dart';
|
||||
export 'user.dart';
|
||||
|
104
lib/models/search_filter.dart
Normal file
@ -0,0 +1,104 @@
|
||||
part of 'search_filters.dart';
|
||||
|
||||
abstract class SearchFilter {
|
||||
String get query;
|
||||
}
|
||||
|
||||
abstract class NumericFilter extends SearchFilter {}
|
||||
|
||||
abstract class TagFilter extends SearchFilter {}
|
||||
|
||||
class DateTimeRangeFilter implements NumericFilter {
|
||||
DateTimeRangeFilter({
|
||||
this.startTime,
|
||||
this.endTime,
|
||||
});
|
||||
|
||||
final DateTime? startTime;
|
||||
final DateTime? endTime;
|
||||
|
||||
@override
|
||||
String get query {
|
||||
final int? startTimestamp = startTime == null
|
||||
? null
|
||||
: startTime!.toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||
final int? endTimestamp = endTime == null
|
||||
? null
|
||||
: endTime!.toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||
final String query =
|
||||
'''${startTimestamp == null ? '' : 'created_at_i>$startTimestamp'},${endTimestamp == null ? '' : 'created_at_i<$endTimestamp'}''';
|
||||
|
||||
if (query.endsWith(',')) {
|
||||
return query.replaceFirst(',', '');
|
||||
}
|
||||
|
||||
return query;
|
||||
}
|
||||
}
|
||||
|
||||
class PostedByFilter implements TagFilter {
|
||||
PostedByFilter({required this.author});
|
||||
|
||||
final String author;
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return 'author_$author';
|
||||
}
|
||||
}
|
||||
|
||||
class FrontPageFilter implements TagFilter {
|
||||
FrontPageFilter();
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return 'front_page';
|
||||
}
|
||||
}
|
||||
|
||||
class ShowHnFilter implements TagFilter {
|
||||
ShowHnFilter();
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return 'show_hn';
|
||||
}
|
||||
}
|
||||
|
||||
class AskHnFilter implements TagFilter {
|
||||
AskHnFilter();
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return 'ask_hn';
|
||||
}
|
||||
}
|
||||
|
||||
class PollFilter implements TagFilter {
|
||||
PollFilter();
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return 'poll';
|
||||
}
|
||||
}
|
||||
|
||||
class StoryFilter implements TagFilter {
|
||||
StoryFilter();
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return 'story';
|
||||
}
|
||||
}
|
||||
|
||||
class CombinedFilter implements TagFilter {
|
||||
CombinedFilter({required this.filters});
|
||||
|
||||
final List<TagFilter> filters;
|
||||
|
||||
@override
|
||||
String get query {
|
||||
return '''(${filters.map((TagFilter e) => e.query).reduce((String value, String element) => '$value, $element')})''';
|
||||
}
|
||||
}
|
116
lib/models/search_filters.dart
Normal file
@ -0,0 +1,116 @@
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:equatable/equatable.dart';
|
||||
|
||||
part 'search_filter.dart';
|
||||
|
||||
class SearchFilters extends Equatable {
|
||||
const SearchFilters({
|
||||
required this.filters,
|
||||
required this.query,
|
||||
required this.page,
|
||||
this.sorted = false,
|
||||
});
|
||||
|
||||
SearchFilters.init()
|
||||
: filters = <SearchFilter>{},
|
||||
query = '',
|
||||
page = 0,
|
||||
sorted = false;
|
||||
|
||||
final Set<SearchFilter> filters;
|
||||
final String query;
|
||||
final int page;
|
||||
final bool sorted;
|
||||
|
||||
SearchFilters copyWith({
|
||||
Set<SearchFilter>? filters,
|
||||
String? query,
|
||||
int? page,
|
||||
bool? sorted,
|
||||
}) {
|
||||
return SearchFilters(
|
||||
filters: filters ?? this.filters,
|
||||
query: query ?? this.query,
|
||||
page: page ?? this.page,
|
||||
sorted: sorted ?? this.sorted,
|
||||
);
|
||||
}
|
||||
|
||||
SearchFilters copyWithFilterRemoved<T extends SearchFilter>() {
|
||||
return SearchFilters(
|
||||
filters: <SearchFilter>{...filters}
|
||||
..removeWhere((SearchFilter e) => e is T),
|
||||
query: query,
|
||||
page: page,
|
||||
sorted: sorted,
|
||||
);
|
||||
}
|
||||
|
||||
SearchFilters copyWithFilterAdded(
|
||||
SearchFilter filter,
|
||||
) {
|
||||
return SearchFilters(
|
||||
filters: <SearchFilter>{...filters, filter},
|
||||
query: query,
|
||||
page: page,
|
||||
sorted: sorted,
|
||||
);
|
||||
}
|
||||
|
||||
String get filteredQuery {
|
||||
final StringBuffer buffer = StringBuffer();
|
||||
|
||||
if (sorted) {
|
||||
buffer.write('search_by_date?query=${Uri.encodeComponent(query)}');
|
||||
} else {
|
||||
buffer.write('search?query=${Uri.encodeComponent(query)}');
|
||||
}
|
||||
|
||||
final Iterable<NumericFilter> numericFilters =
|
||||
filters.whereType<NumericFilter>();
|
||||
final List<TagFilter> tagFilters = <TagFilter>[
|
||||
...filters.whereType<TagFilter>(),
|
||||
CombinedFilter(filters: <TagFilter>[StoryFilter(), PollFilter()]),
|
||||
];
|
||||
|
||||
if (numericFilters.isNotEmpty) {
|
||||
buffer
|
||||
..write('&numericFilters=')
|
||||
..writeAll(
|
||||
numericFilters.map<String>((NumericFilter e) => e.query),
|
||||
',',
|
||||
);
|
||||
}
|
||||
|
||||
if (tagFilters.isNotEmpty) {
|
||||
buffer
|
||||
..write('&tags=')
|
||||
..writeAll(
|
||||
tagFilters.map<String>((TagFilter e) => e.query),
|
||||
',',
|
||||
);
|
||||
}
|
||||
|
||||
buffer.write('&page=$page');
|
||||
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
bool contains<T extends SearchFilter>() {
|
||||
return filters.whereType<T>().isNotEmpty;
|
||||
}
|
||||
|
||||
T? get<T extends SearchFilter>() {
|
||||
return filters.singleWhereOrNull(
|
||||
(SearchFilter e) => e is T,
|
||||
) as T?;
|
||||
}
|
||||
|
||||
@override
|
||||
List<Object?> get props => <Object?>[
|
||||
filters,
|
||||
query,
|
||||
page,
|
||||
sorted,
|
||||
];
|
||||
}
|
@ -5,6 +5,7 @@ import 'package:hacki/models/item.dart';
|
||||
|
||||
enum StoryType {
|
||||
top('topstories'),
|
||||
best('beststories'),
|
||||
latest('newstories'),
|
||||
ask('askstories'),
|
||||
show('showstories'),
|
||||
@ -13,6 +14,23 @@ enum StoryType {
|
||||
const StoryType(this.path);
|
||||
|
||||
final String path;
|
||||
|
||||
String get label {
|
||||
switch (this) {
|
||||
case StoryType.top:
|
||||
return 'TOP';
|
||||
case StoryType.best:
|
||||
return 'BEST';
|
||||
case StoryType.latest:
|
||||
return 'NEW';
|
||||
case StoryType.ask:
|
||||
return 'ASK';
|
||||
case StoryType.show:
|
||||
return 'SHOW';
|
||||
case StoryType.jobs:
|
||||
return 'JOBS';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Story extends Item {
|
||||
@ -70,6 +88,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';
|
||||
}
|
||||
|
@ -6,12 +6,14 @@ import 'package:hacki/utils/utils.dart';
|
||||
class SearchRepository {
|
||||
SearchRepository({Dio? dio}) : _dio = dio ?? Dio();
|
||||
|
||||
static const String _baseUrl = 'http://hn.algolia.com/api/v1/search?query=';
|
||||
static const String _baseUrl = 'http://hn.algolia.com/api/v1/';
|
||||
|
||||
final Dio _dio;
|
||||
|
||||
Stream<Story> search(String query, {int page = 0}) async* {
|
||||
final String url = '$_baseUrl${Uri.encodeComponent(query)}&page=$page';
|
||||
Stream<Story> search({
|
||||
required SearchFilters filters,
|
||||
}) async* {
|
||||
final String url = '$_baseUrl${filters.filteredQuery}';
|
||||
final Response<Map<String, dynamic>> response =
|
||||
await _dio.get<Map<String, dynamic>>(url);
|
||||
final Map<String, dynamic>? data = response.data;
|
||||
@ -28,6 +30,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 +50,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,
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -220,61 +222,21 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
HapticFeedback.selectionClick();
|
||||
},
|
||||
tabs: <Widget>[
|
||||
Tab(
|
||||
child: Text(
|
||||
'TOP',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 0 ? 14 : 10,
|
||||
color: currentIndex == 0
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
for (int i = 0; i < StoriesBloc.types.length; i++)
|
||||
Tab(
|
||||
key: ValueKey<StoryType>(
|
||||
StoriesBloc.types.elementAt(i),
|
||||
),
|
||||
child: Text(
|
||||
StoriesBloc.types.elementAt(i).label,
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == i ? 14 : 10,
|
||||
color: currentIndex == i
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'NEW',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 1 ? 14 : 10,
|
||||
color: currentIndex == 1
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'ASK',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 2 ? 14 : 10,
|
||||
color: currentIndex == 2
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'SHOW',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 3 ? 14 : 10,
|
||||
color: currentIndex == 3
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: Text(
|
||||
'JOBS',
|
||||
style: TextStyle(
|
||||
fontSize: currentIndex == 4 ? 14 : 10,
|
||||
color: currentIndex == 4
|
||||
? Colors.orange
|
||||
: Colors.grey,
|
||||
),
|
||||
),
|
||||
),
|
||||
Tab(
|
||||
child: DescribedFeatureOverlay(
|
||||
onBackgroundTap: onFeatureDiscoveryDismissed,
|
||||
@ -347,36 +309,13 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
controller: tabController,
|
||||
children: <Widget>[
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.top),
|
||||
storyType: StoryType.top,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.latest),
|
||||
storyType: StoryType.latest,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.ask),
|
||||
storyType: StoryType.ask,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.show),
|
||||
storyType: StoryType.show,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
StoriesListView(
|
||||
key: const ValueKey<StoryType>(StoryType.jobs),
|
||||
storyType: StoryType.jobs,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
for (final StoryType type in StoriesBloc.types)
|
||||
StoriesListView(
|
||||
key: ValueKey<StoryType>(type),
|
||||
storyType: type,
|
||||
header: pinnedStories,
|
||||
onStoryTapped: onStoryTapped,
|
||||
),
|
||||
const ProfileScreen(),
|
||||
],
|
||||
),
|
||||
@ -388,11 +327,11 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
return ScreenTypeLayout.builder(
|
||||
mobile: (BuildContext context) {
|
||||
context.read<SplitViewCubit>().disableSplitView();
|
||||
return _MobileHomeScreenBuilder(
|
||||
return _MobileHomeScreen(
|
||||
homeScreen: homeScreen,
|
||||
);
|
||||
},
|
||||
tablet: (BuildContext context) => _TabletHomeScreenBuilder(
|
||||
tablet: (BuildContext context) => _TabletHomeScreen(
|
||||
homeScreen: homeScreen,
|
||||
),
|
||||
);
|
||||
@ -443,7 +382,7 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
|
||||
if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
|
||||
LinkUtil.launchUrl(story.url, useReader: useReader);
|
||||
LinkUtil.launch(story.url, useReader: useReader);
|
||||
}
|
||||
|
||||
context.read<StoriesBloc>().add(
|
||||
@ -509,8 +448,8 @@ class _HomeScreenState extends State<HomeScreen>
|
||||
}
|
||||
}
|
||||
|
||||
class _MobileHomeScreenBuilder extends StatelessWidget {
|
||||
const _MobileHomeScreenBuilder({
|
||||
class _MobileHomeScreen extends StatelessWidget {
|
||||
const _MobileHomeScreen({
|
||||
Key? key,
|
||||
required this.homeScreen,
|
||||
}) : super(key: key);
|
||||
@ -535,8 +474,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _TabletHomeScreenBuilder extends StatelessWidget {
|
||||
const _TabletHomeScreenBuilder({
|
||||
class _TabletHomeScreen extends StatelessWidget {
|
||||
const _TabletHomeScreen({
|
||||
Key? key,
|
||||
required this.homeScreen,
|
||||
}) : super(key: key);
|
||||
@ -554,30 +493,40 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
||||
homeScreenWidth = 345.0;
|
||||
}
|
||||
|
||||
return Stack(
|
||||
children: <Widget>[
|
||||
Positioned(
|
||||
left: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
width: homeScreenWidth,
|
||||
child: homeScreen,
|
||||
),
|
||||
Positioned(
|
||||
left: 24,
|
||||
bottom: 36,
|
||||
height: 40,
|
||||
width: homeScreenWidth - 24,
|
||||
child: const CountdownReminder(),
|
||||
),
|
||||
Positioned(
|
||||
right: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
left: homeScreenWidth,
|
||||
child: const _TabletStoryView(),
|
||||
),
|
||||
],
|
||||
return BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||
buildWhen: (SplitViewState previous, SplitViewState current) =>
|
||||
previous.expanded != current.expanded,
|
||||
builder: (BuildContext context, SplitViewState state) {
|
||||
return Stack(
|
||||
children: <Widget>[
|
||||
AnimatedPositioned(
|
||||
left: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
width: state.expanded ? 0 : homeScreenWidth,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.elasticOut,
|
||||
child: homeScreen,
|
||||
),
|
||||
Positioned(
|
||||
left: 24,
|
||||
bottom: 36,
|
||||
height: 40,
|
||||
width: homeScreenWidth - 24,
|
||||
child: const CountdownReminder(),
|
||||
),
|
||||
AnimatedPositioned(
|
||||
right: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
left: state.expanded ? 0 : homeScreenWidth,
|
||||
duration: const Duration(milliseconds: 300),
|
||||
curve: Curves.elasticOut,
|
||||
child: const _TabletStoryView(),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
|
@ -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.16',
|
||||
applicationIcon: ClipRRect(
|
||||
borderRadius: const BorderRadius.all(
|
||||
Radius.circular(12),
|
||||
@ -403,7 +420,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
),
|
||||
children: <Widget>[
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launchUrl(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Constants.portfolioLink,
|
||||
),
|
||||
child: Row(
|
||||
@ -419,7 +436,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launchUrl(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Constants.githubLink,
|
||||
),
|
||||
child: Row(
|
||||
@ -435,7 +452,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
),
|
||||
),
|
||||
ElevatedButton(
|
||||
onPressed: () => LinkUtil.launchUrl(
|
||||
onPressed: () => LinkUtil.launch(
|
||||
Platform.isIOS
|
||||
? Constants.appStoreLink
|
||||
: Constants.googlePlayLink,
|
||||
@ -806,7 +823,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
||||
child: Transform.translate(
|
||||
offset: const Offset(0, 1),
|
||||
child: TapDownWrapper(
|
||||
onTap: () => LinkUtil.launchUrl(
|
||||
onTap: () => LinkUtil.launch(
|
||||
Constants.endUserAgreementLink,
|
||||
),
|
||||
child: const Text(
|
||||
|
@ -107,7 +107,7 @@ class InboxView extends StatelessWidget {
|
||||
),
|
||||
maxLines: 4,
|
||||
onOpen: (LinkableElement link) =>
|
||||
LinkUtil.launchUrl(link.url),
|
||||
LinkUtil.launch(link.url),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -1,4 +1,3 @@
|
||||
export 'centered_message_view.dart';
|
||||
export 'custom_chip.dart';
|
||||
export 'inbox_view.dart';
|
||||
export 'offline_list_tile.dart';
|
||||
|
@ -3,8 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_fadein/flutter_fadein.dart';
|
||||
import 'package:hacki/cubits/cubits.dart';
|
||||
import 'package:hacki/extensions/extensions.dart';
|
||||
import 'package:hacki/models/story.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/screens/screens.dart';
|
||||
import 'package:hacki/screens/search/widgets/widgets.dart';
|
||||
import 'package:hacki/screens/widgets/widgets.dart';
|
||||
import 'package:hacki/utils/utils.dart';
|
||||
import 'package:pull_to_refresh/pull_to_refresh.dart';
|
||||
@ -56,7 +57,64 @@ class _SearchScreenState extends State<SearchScreen> {
|
||||
},
|
||||
),
|
||||
),
|
||||
if (state.status == SearchStatus.loading) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 6,
|
||||
),
|
||||
SingleChildScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
DateTimeRangeFilterChip(
|
||||
filter:
|
||||
state.searchFilters.get<DateTimeRangeFilter>(),
|
||||
onDateTimeRangeUpdated:
|
||||
(DateTime start, DateTime end) =>
|
||||
context.read<SearchCubit>().addFilter(
|
||||
DateTimeRangeFilter(
|
||||
startTime: start,
|
||||
endTime: end,
|
||||
),
|
||||
),
|
||||
onDateTimeRangeRemoved: context
|
||||
.read<SearchCubit>()
|
||||
.removeFilter<DateTimeRangeFilter>,
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
CustomChip(
|
||||
onSelected: (_) =>
|
||||
context.read<SearchCubit>().onSortToggled(),
|
||||
selected: state.searchFilters.sorted,
|
||||
label: '''newest first''',
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
for (final CustomDateTimeRange range
|
||||
in CustomDateTimeRange.values) ...<Widget>[
|
||||
CustomRangeFilterChip(
|
||||
range: range,
|
||||
onTap: (DateTime start, DateTime end) =>
|
||||
context.read<SearchCubit>().addFilter(
|
||||
DateTimeRangeFilter(
|
||||
startTime: start,
|
||||
endTime: end,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(
|
||||
width: 8,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
if (state.status == SearchStatus.loading &&
|
||||
state.results.isEmpty) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 100,
|
||||
),
|
||||
@ -102,6 +160,7 @@ class _SearchScreenState extends State<SearchScreen> {
|
||||
child: StoryTile(
|
||||
showWebPreview:
|
||||
prefState.showComplexStoryTile,
|
||||
showMetadata: prefState.showMetadata,
|
||||
story: e,
|
||||
onTap: () => goToStoryScreen(
|
||||
args: StoryScreenArgs(story: e),
|
||||
|
75
lib/screens/search/widgets/custom_range_filter_chip.dart
Normal file
@ -0,0 +1,75 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hacki/screens/widgets/widgets.dart';
|
||||
|
||||
typedef DateRangeCallback = Function(DateTime, DateTime);
|
||||
|
||||
enum CustomDateTimeRange {
|
||||
pastDay(Duration(days: 1), label: 'past day'),
|
||||
pastWeek(Duration(days: 7), label: 'past week'),
|
||||
pastMonth(Duration(days: 31), label: 'past month'),
|
||||
pastYear(Duration(days: 365), label: 'past year');
|
||||
|
||||
const CustomDateTimeRange(this.duration, {required this.label});
|
||||
|
||||
final Duration duration;
|
||||
final String label;
|
||||
}
|
||||
|
||||
class CustomRangeFilterChip extends StatelessWidget {
|
||||
const CustomRangeFilterChip({
|
||||
Key? key,
|
||||
required this.range,
|
||||
required this.onTap,
|
||||
}) : super(key: key);
|
||||
|
||||
final CustomDateTimeRange range;
|
||||
final DateRangeCallback onTap;
|
||||
|
||||
static Widget pastDay({
|
||||
required DateRangeCallback onTap,
|
||||
}) {
|
||||
return CustomRangeFilterChip(
|
||||
range: CustomDateTimeRange.pastDay,
|
||||
onTap: onTap,
|
||||
);
|
||||
}
|
||||
|
||||
static Widget pastWeek({
|
||||
required DateRangeCallback onTap,
|
||||
}) {
|
||||
return CustomRangeFilterChip(
|
||||
range: CustomDateTimeRange.pastWeek,
|
||||
onTap: onTap,
|
||||
);
|
||||
}
|
||||
|
||||
static Widget pastMonth({
|
||||
required DateRangeCallback onTap,
|
||||
}) {
|
||||
return CustomRangeFilterChip(
|
||||
range: CustomDateTimeRange.pastMonth,
|
||||
onTap: onTap,
|
||||
);
|
||||
}
|
||||
|
||||
static Widget pastYear({
|
||||
required DateRangeCallback onTap,
|
||||
}) {
|
||||
return CustomRangeFilterChip(
|
||||
range: CustomDateTimeRange.pastYear,
|
||||
onTap: onTap,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomChip(
|
||||
onSelected: (bool value) {
|
||||
final DateTime now = DateTime.now();
|
||||
onTap(now.subtract(range.duration), now);
|
||||
},
|
||||
selected: false,
|
||||
label: range.label,
|
||||
);
|
||||
}
|
||||
}
|
47
lib/screens/search/widgets/date_time_range_filter_chip.dart
Normal file
@ -0,0 +1,47 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hacki/models/search_filters.dart';
|
||||
import 'package:hacki/screens/widgets/widgets.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
class DateTimeRangeFilterChip extends StatelessWidget {
|
||||
const DateTimeRangeFilterChip({
|
||||
Key? key,
|
||||
required this.filter,
|
||||
required this.onDateTimeRangeUpdated,
|
||||
required this.onDateTimeRangeRemoved,
|
||||
}) : super(key: key);
|
||||
|
||||
final DateTimeRangeFilter? filter;
|
||||
final Function(DateTime, DateTime) onDateTimeRangeUpdated;
|
||||
final VoidCallback onDateTimeRangeRemoved;
|
||||
|
||||
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomChip(
|
||||
onSelected: (bool value) {
|
||||
showDateRangePicker(
|
||||
context: context,
|
||||
firstDate: DateTime.now().subtract(const Duration(days: 20 * 365)),
|
||||
lastDate: DateTime.now(),
|
||||
).then((DateTimeRange? range) {
|
||||
if (range != null) {
|
||||
onDateTimeRangeUpdated(range.start, range.end);
|
||||
} else {
|
||||
onDateTimeRangeRemoved();
|
||||
}
|
||||
});
|
||||
},
|
||||
selected: filter != null,
|
||||
label:
|
||||
'''from ${_formatDateTime(filter?.startTime) ?? 'START DATE'} to ${_formatDateTime(filter?.endTime) ?? 'END DATE'}''',
|
||||
);
|
||||
}
|
||||
|
||||
static String? _formatDateTime(DateTime? dateTime) {
|
||||
if (dateTime == null) return null;
|
||||
|
||||
return _dateTimeFormatter.format(dateTime);
|
||||
}
|
||||
}
|
21
lib/screens/search/widgets/posted_by_filter_chip.dart
Normal file
@ -0,0 +1,21 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hacki/models/search_filters.dart';
|
||||
import 'package:hacki/screens/widgets/widgets.dart';
|
||||
|
||||
class PostedByFilterChip extends StatelessWidget {
|
||||
const PostedByFilterChip({
|
||||
Key? key,
|
||||
required this.filter,
|
||||
}) : super(key: key);
|
||||
|
||||
final PostedByFilter? filter;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return CustomChip(
|
||||
onSelected: (bool value) {},
|
||||
selected: filter != null,
|
||||
label: '''posted by ${filter?.author ?? ''}''',
|
||||
);
|
||||
}
|
||||
}
|
3
lib/screens/search/widgets/widgets.dart
Normal file
@ -0,0 +1,3 @@
|
||||
export 'custom_range_filter_chip.dart';
|
||||
export 'date_time_range_filter_chip.dart';
|
||||
export 'posted_by_filter_chip.dart';
|
@ -140,6 +140,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
delay: _featureDiscoveryDismissThrottleDelay,
|
||||
);
|
||||
|
||||
static const int _extraItemsCount = 2;
|
||||
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
||||
static const Duration _featureDiscoveryDismissThrottleDelay =
|
||||
Duration(seconds: 1);
|
||||
@ -269,209 +270,229 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
onLoading: () {
|
||||
context.read<CommentsCubit>().loadMore();
|
||||
},
|
||||
child: ListView(
|
||||
child: ListView.builder(
|
||||
primary: false,
|
||||
children: <Widget>[
|
||||
SizedBox(
|
||||
height: topPadding,
|
||||
),
|
||||
if (!widget.splitViewEnabled)
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(bottom: 6),
|
||||
child: OfflineBanner(),
|
||||
),
|
||||
Slidable(
|
||||
startActionPane: ActionPane(
|
||||
motion: const BehindMotion(),
|
||||
itemCount: state.comments.length + _extraItemsCount,
|
||||
itemBuilder: (BuildContext context, int index) {
|
||||
if (index == 0) {
|
||||
return Column(
|
||||
children: <Widget>[
|
||||
SlidableAction(
|
||||
onPressed: (_) {
|
||||
HapticFeedback.lightImpact();
|
||||
|
||||
if (widget.story !=
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.onReplyTapped(widget.story);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.message,
|
||||
SizedBox(
|
||||
height: topPadding,
|
||||
),
|
||||
SlidableAction(
|
||||
onPressed: (_) => onMorePressed(widget.story),
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.more_horiz,
|
||||
),
|
||||
],
|
||||
),
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
if (!widget.splitViewEnabled)
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(bottom: 6),
|
||||
child: OfflineBanner(),
|
||||
),
|
||||
child: Row(
|
||||
Slidable(
|
||||
startActionPane: ActionPane(
|
||||
motion: const BehindMotion(),
|
||||
children: <Widget>[
|
||||
Text(
|
||||
widget.story.by,
|
||||
style: const TextStyle(
|
||||
color: Colors.orange,
|
||||
),
|
||||
SlidableAction(
|
||||
onPressed: (_) {
|
||||
HapticFeedback.lightImpact();
|
||||
|
||||
if (widget.story !=
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.state
|
||||
.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
context
|
||||
.read<EditCubit>()
|
||||
.onReplyTapped(widget.story);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.message,
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
widget.story.postedDate,
|
||||
style: const TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
SlidableAction(
|
||||
onPressed: (_) => onMorePressed(widget.story),
|
||||
backgroundColor: Colors.orange,
|
||||
foregroundColor: Colors.white,
|
||||
icon: Icons.more_horiz,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
InkWell(
|
||||
onTap: () => LinkUtil.launchUrl(
|
||||
widget.story.url,
|
||||
useReader: context
|
||||
.read<PreferenceCubit>()
|
||||
.state
|
||||
.useReader,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
bottom: 12,
|
||||
top: 12,
|
||||
),
|
||||
child: Text(
|
||||
widget.story.title,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: widget.story.url.isNotEmpty
|
||||
? Colors.orange
|
||||
: null,
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
),
|
||||
child: Row(
|
||||
children: <Widget>[
|
||||
Text(
|
||||
widget.story.by,
|
||||
style: const TextStyle(
|
||||
color: Colors.orange,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
Text(
|
||||
widget.story.postedDate,
|
||||
style: const TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
InkWell(
|
||||
onTap: () => LinkUtil.launch(
|
||||
widget.story.url,
|
||||
useReader: context
|
||||
.read<PreferenceCubit>()
|
||||
.state
|
||||
.useReader,
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 6,
|
||||
right: 6,
|
||||
bottom: 12,
|
||||
top: 12,
|
||||
),
|
||||
child: Text(
|
||||
widget.story.title,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: widget.story.url.isNotEmpty
|
||||
? Colors.orange
|
||||
: null,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
if (widget.story.text.isNotEmpty)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10,
|
||||
),
|
||||
child: SelectableLinkify(
|
||||
text: widget.story.text,
|
||||
style: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
15,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
fontSize: MediaQuery.of(context)
|
||||
.textScaleFactor *
|
||||
15,
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped(link.url);
|
||||
} else {
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
if (widget.story.isPoll)
|
||||
PollView(
|
||||
onLoginTapped: onLoginTapped,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
if (widget.story.text.isNotEmpty)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10,
|
||||
),
|
||||
child: SelectableLinkify(
|
||||
text: widget.story.text,
|
||||
style: TextStyle(
|
||||
fontSize:
|
||||
MediaQuery.of(context).textScaleFactor *
|
||||
15,
|
||||
),
|
||||
linkStyle: TextStyle(
|
||||
fontSize:
|
||||
MediaQuery.of(context).textScaleFactor *
|
||||
15,
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) {
|
||||
if (link.url.contains(
|
||||
'news.ycombinator.com/item',
|
||||
)) {
|
||||
onStoryLinkTapped(link.url);
|
||||
} else {
|
||||
LinkUtil.launchUrl(link.url);
|
||||
}
|
||||
},
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
if (state.onlyShowTargetComment) ...<Widget>[
|
||||
TextButton(
|
||||
onPressed: () => context
|
||||
.read<CommentsCubit>()
|
||||
.loadAll(widget.story),
|
||||
child: const Text('View all comments'),
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
],
|
||||
if (state.comments.isEmpty &&
|
||||
state.status ==
|
||||
CommentsStatus.allLoaded) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 240,
|
||||
),
|
||||
const Center(
|
||||
child: Text(
|
||||
'Nothing yet',
|
||||
style: TextStyle(color: Colors.grey),
|
||||
),
|
||||
),
|
||||
if (widget.story.isPoll)
|
||||
PollView(
|
||||
onLoginTapped: onLoginTapped,
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
if (widget.story.text.isNotEmpty)
|
||||
const SizedBox(
|
||||
height: 8,
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
if (state.onlyShowTargetComment) ...<Widget>[
|
||||
TextButton(
|
||||
onPressed: () =>
|
||||
context.read<CommentsCubit>().loadAll(widget.story),
|
||||
child: const Text('View all comments'),
|
||||
),
|
||||
const Divider(
|
||||
height: 0,
|
||||
),
|
||||
],
|
||||
if (state.comments.isEmpty &&
|
||||
state.status == CommentsStatus.allLoaded) ...<Widget>[
|
||||
const SizedBox(
|
||||
height: 240,
|
||||
),
|
||||
const Center(
|
||||
child: Text(
|
||||
'Nothing yet',
|
||||
style: TextStyle(color: Colors.grey),
|
||||
),
|
||||
),
|
||||
],
|
||||
for (final Comment e in state.comments)
|
||||
FadeIn(
|
||||
child: CommentTile(
|
||||
comment: e,
|
||||
level: e.level,
|
||||
myUsername:
|
||||
authState.isLoggedIn ? authState.username : null,
|
||||
opUsername: widget.story.by,
|
||||
onReplyTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
);
|
||||
} else if (index ==
|
||||
state.comments.length + _extraItemsCount - 1) {
|
||||
if ((state.status == CommentsStatus.allLoaded &&
|
||||
state.comments.isNotEmpty) ||
|
||||
state.onlyShowTargetComment) {
|
||||
return SizedBox(
|
||||
height: 240,
|
||||
child: Center(
|
||||
child: Text(happyFace),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
if (cmt !=
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
}
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
context.read<EditCubit>().onReplyTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onEditTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
final Comment comment = state.comments.elementAt(index - 1);
|
||||
|
||||
return FadeIn(
|
||||
key: ValueKey<int>(comment.id),
|
||||
child: CommentTile(
|
||||
comment: comment,
|
||||
level: comment.level,
|
||||
myUsername:
|
||||
authState.isLoggedIn ? authState.username : null,
|
||||
opUsername: widget.story.by,
|
||||
onReplyTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cmt !=
|
||||
context.read<EditCubit>().state.replyingTo) {
|
||||
commentEditingController.clear();
|
||||
context.read<EditCubit>().onEditTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onMoreTapped: onMorePressed,
|
||||
onStoryLinkTapped: onStoryLinkTapped,
|
||||
onTimeMachineActivated: onTimeMachineActivated,
|
||||
),
|
||||
}
|
||||
|
||||
context.read<EditCubit>().onReplyTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onEditTapped: (Comment cmt) {
|
||||
HapticFeedback.lightImpact();
|
||||
if (cmt.deleted || cmt.dead) {
|
||||
return;
|
||||
}
|
||||
commentEditingController.clear();
|
||||
context.read<EditCubit>().onEditTapped(cmt);
|
||||
focusNode.requestFocus();
|
||||
},
|
||||
onMoreTapped: onMorePressed,
|
||||
onStoryLinkTapped: onStoryLinkTapped,
|
||||
onTimeMachineActivated: onTimeMachineActivated,
|
||||
),
|
||||
if ((state.status == CommentsStatus.allLoaded &&
|
||||
state.comments.isNotEmpty) ||
|
||||
state.onlyShowTargetComment)
|
||||
SizedBox(
|
||||
height: 240,
|
||||
child: Center(
|
||||
child: Text(happyFace),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
@ -504,19 +525,34 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
Positioned.fill(
|
||||
child: mainView,
|
||||
),
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: CustomAppBar(
|
||||
backgroundColor: Theme.of(context)
|
||||
.canvasColor
|
||||
.withOpacity(0.6),
|
||||
story: widget.story,
|
||||
scrollController: scrollController,
|
||||
onBackgroundTap: onFeatureDiscoveryDismissed,
|
||||
onDismiss: onFeatureDiscoveryDismissed,
|
||||
),
|
||||
BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||
buildWhen: (
|
||||
SplitViewState previous,
|
||||
SplitViewState current,
|
||||
) =>
|
||||
previous.expanded != current.expanded,
|
||||
builder:
|
||||
(BuildContext context, SplitViewState state) {
|
||||
return Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: CustomAppBar(
|
||||
backgroundColor: Theme.of(context)
|
||||
.canvasColor
|
||||
.withOpacity(0.6),
|
||||
story: widget.story,
|
||||
scrollController: scrollController,
|
||||
onBackgroundTap:
|
||||
onFeatureDiscoveryDismissed,
|
||||
onDismiss: onFeatureDiscoveryDismissed,
|
||||
splitViewEnabled: state.enabled,
|
||||
expanded: state.expanded,
|
||||
onZoomTap:
|
||||
context.read<SplitViewCubit>().zoom,
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
@ -674,7 +710,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
});
|
||||
});
|
||||
} else {
|
||||
LinkUtil.launchUrl(link);
|
||||
LinkUtil.launch(link);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1093,7 +1129,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
||||
child: Transform.translate(
|
||||
offset: const Offset(0, 1),
|
||||
child: TapDownWrapper(
|
||||
onTap: () => LinkUtil.launchUrl(
|
||||
onTap: () => LinkUtil.launch(
|
||||
Constants.endUserAgreementLink,
|
||||
),
|
||||
child: const Text(
|
||||
|
@ -1,4 +1,6 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
|
||||
import 'package:hacki/models/models.dart';
|
||||
import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
|
||||
import 'package:hacki/screens/story/widgets/link_icon_button.dart';
|
||||
@ -13,11 +15,29 @@ class CustomAppBar extends AppBar {
|
||||
required Color backgroundColor,
|
||||
required Future<bool> Function() onBackgroundTap,
|
||||
required Future<bool> Function() onDismiss,
|
||||
bool splitViewEnabled = false,
|
||||
VoidCallback? onZoomTap,
|
||||
bool? expanded,
|
||||
}) : super(
|
||||
key: key,
|
||||
backgroundColor: backgroundColor,
|
||||
elevation: 0,
|
||||
actions: <Widget>[
|
||||
if (splitViewEnabled) ...<Widget>[
|
||||
IconButton(
|
||||
icon: Icon(
|
||||
expanded ?? false
|
||||
? FeatherIcons.minimize2
|
||||
: FeatherIcons.maximize2,
|
||||
size: 20,
|
||||
),
|
||||
onPressed: () {
|
||||
HapticFeedback.lightImpact();
|
||||
onZoomTap?.call();
|
||||
},
|
||||
),
|
||||
const Spacer(),
|
||||
],
|
||||
ScrollUpIconButton(
|
||||
scrollController: scrollController,
|
||||
),
|
||||
|
@ -47,7 +47,7 @@ class LinkIconButton extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
onPressed: () =>
|
||||
LinkUtil.launchUrl('https://news.ycombinator.com/item?id=$storyId'),
|
||||
LinkUtil.launch('https://news.ycombinator.com/item?id=$storyId'),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -189,6 +189,7 @@ class _ReplyBoxState extends State<ReplyBox> {
|
||||
border: InputBorder.none,
|
||||
),
|
||||
keyboardType: TextInputType.multiline,
|
||||
textCapitalization: TextCapitalization.sentences,
|
||||
textInputAction: TextInputAction.newline,
|
||||
onChanged: widget.onChanged,
|
||||
),
|
||||
@ -273,7 +274,7 @@ class _ReplyBoxState extends State<ReplyBox> {
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) =>
|
||||
LinkUtil.launchUrl(link.url),
|
||||
LinkUtil.launch(link.url),
|
||||
text: replyingTo?.text ?? '',
|
||||
),
|
||||
),
|
||||
|
@ -187,6 +187,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
|
||||
),
|
||||
),
|
||||
onChanged: context.read<SubmitCubit>().onTextChanged,
|
||||
textCapitalization: TextCapitalization.sentences,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -229,7 +229,7 @@ class CommentTile extends StatelessWidget {
|
||||
)) {
|
||||
onStoryLinkTapped.call(link.url);
|
||||
} else {
|
||||
LinkUtil.launchUrl(link.url);
|
||||
LinkUtil.launch(link.url);
|
||||
}
|
||||
},
|
||||
),
|
||||
|
@ -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,
|
||||
),
|
||||
@ -138,7 +141,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
|
||||
color: Colors.orange,
|
||||
),
|
||||
onOpen: (LinkableElement link) =>
|
||||
LinkUtil.launchUrl(link.url),
|
||||
LinkUtil.launch(link.url),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
@ -1,5 +1,4 @@
|
||||
import 'dart:async';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
@ -13,6 +12,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 +99,8 @@ class LinkPreview extends StatefulWidget {
|
||||
/// `[BoxShadow(blurRadius: 3, color: Colors.grey)]`
|
||||
final List<BoxShadow>? boxShadow;
|
||||
|
||||
final bool showMetadata;
|
||||
|
||||
@override
|
||||
_LinkPreviewState createState() => _LinkPreviewState();
|
||||
}
|
||||
@ -184,6 +186,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 +201,7 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
isIcon: isIcon,
|
||||
bgColor: widget.backgroundColor,
|
||||
radius: widget.borderRadius ?? 12,
|
||||
showMetadata: widget.showMetadata,
|
||||
),
|
||||
);
|
||||
}
|
||||
@ -205,11 +209,11 @@ class _LinkPreviewState extends State<LinkPreview> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final double screenWidth = MediaQuery.of(context).size.width;
|
||||
final bool showSmallerPreviewPic =
|
||||
Platform.isIOS && screenWidth > 428.0 && screenWidth < 850;
|
||||
final bool showSmallerPreviewPic = screenWidth > 428.0 && screenWidth < 850;
|
||||
final double _height = showSmallerPreviewPic
|
||||
? 100.0
|
||||
: (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
|
||||
|
||||
final Widget loadingWidget = widget.placeholderWidget ??
|
||||
Container(
|
||||
height: _height,
|
||||
|
@ -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
|
||||
|
@ -1,5 +1,3 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_fadein/flutter_fadein.dart';
|
||||
import 'package:hacki/config/constants.dart';
|
||||
@ -12,12 +10,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;
|
||||
@ -28,7 +28,7 @@ class StoryTile extends StatelessWidget {
|
||||
if (showWebPreview) {
|
||||
final double screenWidth = MediaQuery.of(context).size.width;
|
||||
final bool showSmallerPreviewPic =
|
||||
Platform.isIOS && screenWidth > 428.0 && screenWidth < 850;
|
||||
screenWidth > 428.0 && screenWidth < 850;
|
||||
final double height = showSmallerPreviewPic
|
||||
? 100.0
|
||||
: (MediaQuery.of(context).size.height * 0.14).clamp(118.0, 140.0);
|
||||
@ -129,6 +129,7 @@ class StoryTile extends StatelessWidget {
|
||||
: Theme.of(context).textTheme.subtitle1!.color,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
showMetadata: showMetadata,
|
||||
),
|
||||
),
|
||||
),
|
||||
@ -157,6 +158,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,7 @@
|
||||
export 'circle_tab_indicator.dart';
|
||||
export 'comment_tile.dart';
|
||||
export 'countdown_reminder.dart';
|
||||
export 'custom_chip.dart';
|
||||
export 'custom_circular_progress_indicator.dart';
|
||||
export 'items_list_view.dart';
|
||||
export 'link_preview/link_preview.dart';
|
||||
|
@ -5,10 +5,10 @@ import 'package:url_launcher/url_launcher.dart';
|
||||
abstract class LinkUtil {
|
||||
static final ChromeSafariBrowser _browser = ChromeSafariBrowser();
|
||||
|
||||
static void launchUrl(String link, {bool useReader = false}) {
|
||||
static void launch(String link, {bool useReader = false}) {
|
||||
Uri rinseLink(String link) {
|
||||
if (link.contains(')')) {
|
||||
final RegExp regex = RegExp(r'\).*$');
|
||||
final RegExp regex = RegExp(r'\)|].*$');
|
||||
if (!link.contains('en.wikipedia.org') && link.contains(regex)) {
|
||||
final String match = regex.stringMatch(link) ?? '';
|
||||
return Uri.parse(link.replaceAll(match, ''));
|
||||
}
|
||||
@ -19,15 +19,21 @@ abstract class LinkUtil {
|
||||
final Uri uri = rinseLink(link);
|
||||
canLaunchUrl(uri).then((bool val) {
|
||||
if (val) {
|
||||
_browser.open(
|
||||
url: uri,
|
||||
options: ChromeSafariBrowserClassOptions(
|
||||
ios: IOSSafariOptions(
|
||||
entersReaderIfAvailable: useReader,
|
||||
preferredControlTintColor: Colors.orange,
|
||||
),
|
||||
),
|
||||
);
|
||||
if (link.contains('http')) {
|
||||
_browser
|
||||
.open(
|
||||
url: uri,
|
||||
options: ChromeSafariBrowserClassOptions(
|
||||
ios: IOSSafariOptions(
|
||||
entersReaderIfAvailable: useReader,
|
||||
preferredControlTintColor: Colors.orange,
|
||||
),
|
||||
),
|
||||
)
|
||||
.onError((_, __) => launchUrl(uri));
|
||||
} else {
|
||||
launchUrl(uri);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
name: hacki
|
||||
description: A Hacker News reader.
|
||||
version: 0.2.11+49
|
||||
version: 0.2.16+55
|
||||
publish_to: none
|
||||
|
||||
environment:
|
||||
@ -12,7 +12,7 @@ dependencies:
|
||||
bloc: ^8.0.3
|
||||
cached_network_image: ^3.2.1
|
||||
clipboard: ^0.1.3
|
||||
collection:
|
||||
collection: ^1.16.0
|
||||
connectivity_plus: ^2.2.1
|
||||
dio: ^4.0.4
|
||||
equatable: 2.0.3
|
||||
|