Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
9312c56dd0 | |||
6e71de5913 | |||
a9590af3e9 | |||
18dadaa5ec |
37
README.md
@ -4,7 +4,8 @@
|
|||||||
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
|
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
|
||||||
|
|
||||||
[](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
|
[](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
|
||||||
[](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
|
[](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
|
||||||
|
[](https://github.com/Livinglist/Hacki/releases/latest)
|
||||||
[](https://badges.pufler.dev)
|
[](https://badges.pufler.dev)
|
||||||
[](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
|
[](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
|
||||||
[](https://pub.dev/packages/effective_dart)
|
[](https://pub.dev/packages/effective_dart)
|
||||||
@ -36,24 +37,22 @@ Features:
|
|||||||
|
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450528-02c561ed-0ebb-4c1b-9ee0-a935211db0f2.png">
|
<img width="200" alt="01" src="assets/screenshots/01.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450536-ea61c176-37d7-4744-8674-4668e0e7e774.png">
|
<img width="200" alt="02" src="assets/screenshots/02.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450541-a9af3417-526f-4dbd-96d7-781c95c886d3.png">
|
<img width="200" alt="03" src="assets/screenshots/03.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450543-fb631b02-5f46-4455-b8ff-9ef119a486f1.png">
|
<img width="200" alt="04" src="assets/screenshots/04.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450548-38e98b02-6201-48c9-9674-87bdfc61f456.png">
|
<img width="200" alt="05" src="assets/screenshots/05.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="06" src="assets/screenshots/06.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="07" src="assets/screenshots/07.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="08" src="assets/screenshots/08.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="09" src="assets/screenshots/09.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171992215-5b43443b-f2b0-4b6e-9a30-a583fda1b189.png">
|
<img width="200" alt="10" src="assets/screenshots/10.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="11" src="assets/screenshots/11.png">
|
||||||
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.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="ipad-01" src="assets/screenshots/ipad-01.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="ipad-02" src="assets/screenshots/ipad-02.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="ipad-03" src="assets/screenshots/ipad-03.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="ipad-04" src="assets/screenshots/ipad-04.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">
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
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 |
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.
|
6
fastlane/metadata/android/en-US/changelogs/56.txt
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
- You can now add filters for searching.
|
||||||
|
- You can now participate in polls.
|
||||||
|
- Pick up where you left off.
|
||||||
|
- Swipe left on comment tile to view its parents without scrolling all the way up.
|
||||||
|
- Huge performance boost.
|
||||||
|
- Bugfixes.
|
Before Width: | Height: | Size: 422 KiB After Width: | Height: | Size: 522 KiB |
Before Width: | Height: | Size: 712 KiB After Width: | Height: | Size: 835 KiB |
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 282 KiB |
Before Width: | Height: | Size: 262 KiB After Width: | Height: | Size: 298 KiB |
Before Width: | Height: | Size: 672 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: 617 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 |
@ -568,7 +568,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 2;
|
||||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@ -577,7 +577,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.14;
|
MARKETING_VERSION = 0.2.17;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@ -705,7 +705,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 2;
|
||||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@ -714,7 +714,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.14;
|
MARKETING_VERSION = 0.2.17;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
@ -736,7 +736,7 @@
|
|||||||
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Apple Development";
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 2;
|
||||||
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
DEVELOPMENT_TEAM = QMWX3X2NF7;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
@ -745,7 +745,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 0.2.14;
|
MARKETING_VERSION = 0.2.17;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
@ -48,6 +48,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
|||||||
static const int _tabletSmallPageSize = 15;
|
static const int _tabletSmallPageSize = 15;
|
||||||
static const int _tabletLargePageSize = 25;
|
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(
|
Future<void> onInitialize(
|
||||||
StoriesInitialize event,
|
StoriesInitialize event,
|
||||||
Emitter<StoriesState> emit,
|
Emitter<StoriesState> emit,
|
||||||
@ -70,11 +79,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
|||||||
currentPageSize: pageSize,
|
currentPageSize: pageSize,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
await loadStories(of: StoryType.top, emit: emit);
|
for (final StoryType type in types) {
|
||||||
await loadStories(of: StoryType.latest, emit: emit);
|
await loadStories(of: type, emit: emit);
|
||||||
await loadStories(of: StoryType.ask, emit: emit);
|
}
|
||||||
await loadStories(of: StoryType.show, emit: emit);
|
|
||||||
await loadStories(of: StoryType.jobs, emit: emit);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> loadStories({
|
Future<void> loadStories({
|
||||||
@ -237,34 +244,17 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
|
|||||||
await _cacheRepository.deleteAllStories();
|
await _cacheRepository.deleteAllStories();
|
||||||
await _cacheRepository.deleteAllComments();
|
await _cacheRepository.deleteAllComments();
|
||||||
|
|
||||||
final List<int> topIds =
|
final Set<int> allIds = <int>{};
|
||||||
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);
|
|
||||||
|
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds);
|
for (final StoryType type in types) {
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds);
|
final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds);
|
await _cacheRepository.cacheStoryIds(of: type, ids: ids);
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds);
|
allIds.addAll(ids);
|
||||||
await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds);
|
}
|
||||||
|
|
||||||
final List<int> allIds = <int>[
|
|
||||||
...topIds,
|
|
||||||
...newIds,
|
|
||||||
...askIds,
|
|
||||||
...showIds,
|
|
||||||
...jobIds
|
|
||||||
];
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
_storiesRepository
|
_storiesRepository
|
||||||
.fetchStoriesStream(ids: allIds)
|
.fetchStoriesStream(ids: allIds.toList())
|
||||||
.listen((Story story) async {
|
.listen((Story story) async {
|
||||||
if (story.kids.isNotEmpty) {
|
if (story.kids.isNotEmpty) {
|
||||||
await _cacheRepository.cacheStory(story: story);
|
await _cacheRepository.cacheStory(story: story);
|
||||||
|
@ -28,6 +28,7 @@ class StoriesState extends Equatable {
|
|||||||
const StoriesState.init({
|
const StoriesState.init({
|
||||||
this.storiesByType = const <StoryType, List<Story>>{
|
this.storiesByType = const <StoryType, List<Story>>{
|
||||||
StoryType.top: <Story>[],
|
StoryType.top: <Story>[],
|
||||||
|
StoryType.best: <Story>[],
|
||||||
StoryType.latest: <Story>[],
|
StoryType.latest: <Story>[],
|
||||||
StoryType.ask: <Story>[],
|
StoryType.ask: <Story>[],
|
||||||
StoryType.show: <Story>[],
|
StoryType.show: <Story>[],
|
||||||
@ -35,6 +36,7 @@ class StoriesState extends Equatable {
|
|||||||
},
|
},
|
||||||
this.storyIdsByType = const <StoryType, List<int>>{
|
this.storyIdsByType = const <StoryType, List<int>>{
|
||||||
StoryType.top: <int>[],
|
StoryType.top: <int>[],
|
||||||
|
StoryType.best: <int>[],
|
||||||
StoryType.latest: <int>[],
|
StoryType.latest: <int>[],
|
||||||
StoryType.ask: <int>[],
|
StoryType.ask: <int>[],
|
||||||
StoryType.show: <int>[],
|
StoryType.show: <int>[],
|
||||||
@ -42,6 +44,7 @@ class StoriesState extends Equatable {
|
|||||||
},
|
},
|
||||||
this.statusByType = const <StoryType, StoriesStatus>{
|
this.statusByType = const <StoryType, StoriesStatus>{
|
||||||
StoryType.top: StoriesStatus.initial,
|
StoryType.top: StoriesStatus.initial,
|
||||||
|
StoryType.best: StoriesStatus.initial,
|
||||||
StoryType.latest: StoriesStatus.initial,
|
StoryType.latest: StoriesStatus.initial,
|
||||||
StoryType.ask: StoriesStatus.initial,
|
StoryType.ask: StoriesStatus.initial,
|
||||||
StoryType.show: StoriesStatus.initial,
|
StoryType.show: StoriesStatus.initial,
|
||||||
@ -49,6 +52,7 @@ class StoriesState extends Equatable {
|
|||||||
},
|
},
|
||||||
this.currentPageByType = const <StoryType, int>{
|
this.currentPageByType = const <StoryType, int>{
|
||||||
StoryType.top: 0,
|
StoryType.top: 0,
|
||||||
|
StoryType.best: 0,
|
||||||
StoryType.latest: 0,
|
StoryType.latest: 0,
|
||||||
StoryType.ask: 0,
|
StoryType.ask: 0,
|
||||||
StoryType.show: 0,
|
StoryType.show: 0,
|
||||||
|
@ -2,6 +2,7 @@ import 'dart:async';
|
|||||||
|
|
||||||
import 'package:bloc/bloc.dart';
|
import 'package:bloc/bloc.dart';
|
||||||
import 'package:equatable/equatable.dart';
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||||
import 'package:hacki/config/locator.dart';
|
import 'package:hacki/config/locator.dart';
|
||||||
import 'package:hacki/models/models.dart';
|
import 'package:hacki/models/models.dart';
|
||||||
import 'package:hacki/repositories/repositories.dart';
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
@ -159,10 +160,19 @@ class CommentsCubit extends Cubit<CommentsState> {
|
|||||||
..addKid(comment.id, to: comment.parent)
|
..addKid(comment.id, to: comment.parent)
|
||||||
..cacheComment(comment);
|
..cacheComment(comment);
|
||||||
_sembastRepository.cacheComment(comment);
|
_sembastRepository.cacheComment(comment);
|
||||||
|
|
||||||
|
final List<LinkifyElement> elements = linkify(
|
||||||
|
comment.text,
|
||||||
|
);
|
||||||
|
|
||||||
|
final BuildableComment buildableComment =
|
||||||
|
BuildableComment.fromComment(comment, elements: elements);
|
||||||
|
|
||||||
final List<Comment> updatedComments = <Comment>[
|
final List<Comment> updatedComments = <Comment>[
|
||||||
...state.comments,
|
...state.comments,
|
||||||
comment
|
buildableComment
|
||||||
];
|
];
|
||||||
|
|
||||||
emit(state.copyWith(comments: updatedComments));
|
emit(state.copyWith(comments: updatedComments));
|
||||||
|
|
||||||
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
|
||||||
@ -180,6 +190,31 @@ class CommentsCubit extends Cubit<CommentsState> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<LinkifyElement> linkify(
|
||||||
|
String text, {
|
||||||
|
LinkifyOptions options = const LinkifyOptions(),
|
||||||
|
List<Linkifier> linkifiers = const <Linkifier>[
|
||||||
|
UrlLinkifier(),
|
||||||
|
EmailLinkifier(),
|
||||||
|
],
|
||||||
|
}) {
|
||||||
|
List<LinkifyElement> list = <LinkifyElement>[TextElement(text)];
|
||||||
|
|
||||||
|
if (text.isEmpty) {
|
||||||
|
return <LinkifyElement>[];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (linkifiers.isEmpty) {
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (final Linkifier linkifier in linkifiers) {
|
||||||
|
list = linkifier.parse(list, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<void> close() async {
|
Future<void> close() async {
|
||||||
await _streamSubscription?.cancel();
|
await _streamSubscription?.cancel();
|
||||||
|
@ -14,4 +14,5 @@ export 'search/search_cubit.dart';
|
|||||||
export 'split_view/split_view_cubit.dart';
|
export 'split_view/split_view_cubit.dart';
|
||||||
export 'submit/submit_cubit.dart';
|
export 'submit/submit_cubit.dart';
|
||||||
export 'time_machine/time_machine_cubit.dart';
|
export 'time_machine/time_machine_cubit.dart';
|
||||||
|
export 'user/user_cubit.dart';
|
||||||
export 'vote/vote_cubit.dart';
|
export 'vote/vote_cubit.dart';
|
||||||
|
@ -21,4 +21,6 @@ class SplitViewCubit extends Cubit<SplitViewState> {
|
|||||||
void enableSplitView() => emit(state.copyWith(enabled: true));
|
void enableSplitView() => emit(state.copyWith(enabled: true));
|
||||||
|
|
||||||
void disableSplitView() => emit(state.copyWith(enabled: false));
|
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 {
|
class SplitViewState extends Equatable {
|
||||||
const SplitViewState({
|
const SplitViewState({
|
||||||
required this.storyScreenArgs,
|
required this.storyScreenArgs,
|
||||||
|
required this.expanded,
|
||||||
required this.enabled,
|
required this.enabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
const SplitViewState.init()
|
const SplitViewState.init()
|
||||||
: enabled = false,
|
: enabled = false,
|
||||||
|
expanded = false,
|
||||||
storyScreenArgs = null;
|
storyScreenArgs = null;
|
||||||
|
|
||||||
final bool enabled;
|
final bool enabled;
|
||||||
|
final bool expanded;
|
||||||
final StoryScreenArgs? storyScreenArgs;
|
final StoryScreenArgs? storyScreenArgs;
|
||||||
|
|
||||||
SplitViewState copyWith({bool? enabled, StoryScreenArgs? storyScreenArgs}) {
|
SplitViewState copyWith({
|
||||||
|
bool? enabled,
|
||||||
|
bool? expanded,
|
||||||
|
StoryScreenArgs? storyScreenArgs,
|
||||||
|
}) {
|
||||||
return SplitViewState(
|
return SplitViewState(
|
||||||
enabled: enabled ?? this.enabled,
|
enabled: enabled ?? this.enabled,
|
||||||
|
expanded: expanded ?? this.expanded,
|
||||||
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
|
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -23,6 +31,7 @@ class SplitViewState extends Equatable {
|
|||||||
@override
|
@override
|
||||||
List<Object?> get props => <Object?>[
|
List<Object?> get props => <Object?>[
|
||||||
enabled,
|
enabled,
|
||||||
|
expanded,
|
||||||
storyScreenArgs,
|
storyScreenArgs,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
26
lib/cubits/user/user_cubit.dart
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:hacki/config/locator.dart';
|
||||||
|
import 'package:hacki/models/models.dart';
|
||||||
|
import 'package:hacki/repositories/repositories.dart';
|
||||||
|
|
||||||
|
part 'user_state.dart';
|
||||||
|
|
||||||
|
class UserCubit extends Cubit<UserState> {
|
||||||
|
UserCubit({StoriesRepository? storiesRepository})
|
||||||
|
: _storiesRepository =
|
||||||
|
storiesRepository ?? locator.get<StoriesRepository>(),
|
||||||
|
super(UserState.init());
|
||||||
|
|
||||||
|
final StoriesRepository _storiesRepository;
|
||||||
|
|
||||||
|
void init({required String userId}) {
|
||||||
|
emit(state.copyWith(status: UserStatus.loading));
|
||||||
|
_storiesRepository.fetchUserBy(userId: userId).then((User user) {
|
||||||
|
emit(state.copyWith(user: user, status: UserStatus.loaded));
|
||||||
|
}).onError((_, __) {
|
||||||
|
emit(state.copyWith(status: UserStatus.failure));
|
||||||
|
return;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
38
lib/cubits/user/user_state.dart
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
part of 'user_cubit.dart';
|
||||||
|
|
||||||
|
enum UserStatus {
|
||||||
|
initial,
|
||||||
|
loading,
|
||||||
|
loaded,
|
||||||
|
failure,
|
||||||
|
}
|
||||||
|
|
||||||
|
class UserState extends Equatable {
|
||||||
|
const UserState({
|
||||||
|
required this.user,
|
||||||
|
required this.status,
|
||||||
|
});
|
||||||
|
|
||||||
|
UserState.init()
|
||||||
|
: user = User.empty(),
|
||||||
|
status = UserStatus.initial;
|
||||||
|
|
||||||
|
final User user;
|
||||||
|
final UserStatus status;
|
||||||
|
|
||||||
|
UserState copyWith({
|
||||||
|
User? user,
|
||||||
|
UserStatus? status,
|
||||||
|
}) {
|
||||||
|
return UserState(
|
||||||
|
user: user ?? this.user,
|
||||||
|
status: status ?? this.status,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => <Object?>[
|
||||||
|
user,
|
||||||
|
status,
|
||||||
|
];
|
||||||
|
}
|
33
lib/models/buildable_comment.dart
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||||
|
import 'package:hacki/models/comment.dart';
|
||||||
|
import 'package:hacki/models/models.dart';
|
||||||
|
|
||||||
|
class BuildableComment extends Comment {
|
||||||
|
BuildableComment({
|
||||||
|
required super.id,
|
||||||
|
required super.time,
|
||||||
|
required super.parent,
|
||||||
|
required super.score,
|
||||||
|
required super.by,
|
||||||
|
required super.text,
|
||||||
|
required super.kids,
|
||||||
|
required super.deleted,
|
||||||
|
required super.level,
|
||||||
|
required this.elements,
|
||||||
|
});
|
||||||
|
|
||||||
|
BuildableComment.fromComment(Comment comment, {required this.elements})
|
||||||
|
: super(
|
||||||
|
id: comment.id,
|
||||||
|
time: comment.time,
|
||||||
|
parent: comment.parent,
|
||||||
|
score: comment.score,
|
||||||
|
by: comment.by,
|
||||||
|
text: comment.text,
|
||||||
|
kids: comment.kids,
|
||||||
|
deleted: comment.deleted,
|
||||||
|
level: comment.level,
|
||||||
|
);
|
||||||
|
|
||||||
|
final List<LinkifyElement> elements;
|
||||||
|
}
|
@ -1,3 +1,4 @@
|
|||||||
|
export 'buildable_comment.dart';
|
||||||
export 'comment.dart';
|
export 'comment.dart';
|
||||||
export 'item.dart';
|
export 'item.dart';
|
||||||
export 'poll_option.dart';
|
export 'poll_option.dart';
|
||||||
|
@ -5,6 +5,7 @@ import 'package:hacki/models/item.dart';
|
|||||||
|
|
||||||
enum StoryType {
|
enum StoryType {
|
||||||
top('topstories'),
|
top('topstories'),
|
||||||
|
best('beststories'),
|
||||||
latest('newstories'),
|
latest('newstories'),
|
||||||
ask('askstories'),
|
ask('askstories'),
|
||||||
show('showstories'),
|
show('showstories'),
|
||||||
@ -13,6 +14,23 @@ enum StoryType {
|
|||||||
const StoryType(this.path);
|
const StoryType(this.path);
|
||||||
|
|
||||||
final String 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 {
|
class Story extends Item {
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
class User {
|
class User {
|
||||||
User({
|
User({
|
||||||
required this.about,
|
required this.about,
|
||||||
@ -29,6 +31,12 @@ class User {
|
|||||||
final String id;
|
final String id;
|
||||||
final int karma;
|
final int karma;
|
||||||
|
|
||||||
|
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
|
||||||
|
|
||||||
|
String get description {
|
||||||
|
return '''$karma karma, created on ${_dateTimeFormatter.format(DateTime.fromMillisecondsSinceEpoch(created * 1000))}''';
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String toString() {
|
String toString() {
|
||||||
final String prettyString =
|
final String prettyString =
|
||||||
|
@ -171,7 +171,7 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
child: Container(
|
child: Container(
|
||||||
color: Colors.orangeAccent.withOpacity(0.2),
|
color: Colors.orangeAccent.withOpacity(0.2),
|
||||||
child: StoryTile(
|
child: StoryTile(
|
||||||
key: ObjectKey(story),
|
key: ValueKey<String>('${story.id}-PinnedStoryTile'),
|
||||||
story: story,
|
story: story,
|
||||||
onTap: () => onStoryTapped(story, isPin: true),
|
onTap: () => onStoryTapped(story, isPin: true),
|
||||||
showWebPreview: preferenceState.showComplexStoryTile,
|
showWebPreview: preferenceState.showComplexStoryTile,
|
||||||
@ -222,56 +222,16 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
HapticFeedback.selectionClick();
|
HapticFeedback.selectionClick();
|
||||||
},
|
},
|
||||||
tabs: <Widget>[
|
tabs: <Widget>[
|
||||||
|
for (int i = 0; i < StoriesBloc.types.length; i++)
|
||||||
Tab(
|
Tab(
|
||||||
|
key: ValueKey<StoryType>(
|
||||||
|
StoriesBloc.types.elementAt(i),
|
||||||
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
'TOP',
|
StoriesBloc.types.elementAt(i).label,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: currentIndex == 0 ? 14 : 10,
|
fontSize: currentIndex == i ? 14 : 10,
|
||||||
color: currentIndex == 0
|
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.orange
|
||||||
: Colors.grey,
|
: Colors.grey,
|
||||||
),
|
),
|
||||||
@ -349,33 +309,10 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
physics: const NeverScrollableScrollPhysics(),
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
controller: tabController,
|
controller: tabController,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
|
for (final StoryType type in StoriesBloc.types)
|
||||||
StoriesListView(
|
StoriesListView(
|
||||||
key: const ValueKey<StoryType>(StoryType.top),
|
key: ValueKey<StoryType>(type),
|
||||||
storyType: StoryType.top,
|
storyType: type,
|
||||||
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,
|
header: pinnedStories,
|
||||||
onStoryTapped: onStoryTapped,
|
onStoryTapped: onStoryTapped,
|
||||||
),
|
),
|
||||||
@ -390,11 +327,11 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
return ScreenTypeLayout.builder(
|
return ScreenTypeLayout.builder(
|
||||||
mobile: (BuildContext context) {
|
mobile: (BuildContext context) {
|
||||||
context.read<SplitViewCubit>().disableSplitView();
|
context.read<SplitViewCubit>().disableSplitView();
|
||||||
return _MobileHomeScreenBuilder(
|
return _MobileHomeScreen(
|
||||||
homeScreen: homeScreen,
|
homeScreen: homeScreen,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
tablet: (BuildContext context) => _TabletHomeScreenBuilder(
|
tablet: (BuildContext context) => _TabletHomeScreen(
|
||||||
homeScreen: homeScreen,
|
homeScreen: homeScreen,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -511,8 +448,8 @@ class _HomeScreenState extends State<HomeScreen>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _MobileHomeScreenBuilder extends StatelessWidget {
|
class _MobileHomeScreen extends StatelessWidget {
|
||||||
const _MobileHomeScreenBuilder({
|
const _MobileHomeScreen({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.homeScreen,
|
required this.homeScreen,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
@ -537,8 +474,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _TabletHomeScreenBuilder extends StatelessWidget {
|
class _TabletHomeScreen extends StatelessWidget {
|
||||||
const _TabletHomeScreenBuilder({
|
const _TabletHomeScreen({
|
||||||
Key? key,
|
Key? key,
|
||||||
required this.homeScreen,
|
required this.homeScreen,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
@ -556,13 +493,19 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
|||||||
homeScreenWidth = 345.0;
|
homeScreenWidth = 345.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||||
|
buildWhen: (SplitViewState previous, SplitViewState current) =>
|
||||||
|
previous.expanded != current.expanded,
|
||||||
|
builder: (BuildContext context, SplitViewState state) {
|
||||||
return Stack(
|
return Stack(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Positioned(
|
AnimatedPositioned(
|
||||||
left: 0,
|
left: 0,
|
||||||
top: 0,
|
top: 0,
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
width: homeScreenWidth,
|
width: state.expanded ? 0 : homeScreenWidth,
|
||||||
|
duration: const Duration(milliseconds: 300),
|
||||||
|
curve: Curves.elasticOut,
|
||||||
child: homeScreen,
|
child: homeScreen,
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
@ -572,17 +515,21 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
|
|||||||
width: homeScreenWidth - 24,
|
width: homeScreenWidth - 24,
|
||||||
child: const CountdownReminder(),
|
child: const CountdownReminder(),
|
||||||
),
|
),
|
||||||
Positioned(
|
AnimatedPositioned(
|
||||||
right: 0,
|
right: 0,
|
||||||
top: 0,
|
top: 0,
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
left: homeScreenWidth,
|
left: state.expanded ? 0 : homeScreenWidth,
|
||||||
|
duration: const Duration(milliseconds: 300),
|
||||||
|
curve: Curves.elasticOut,
|
||||||
child: const _TabletStoryView(),
|
child: const _TabletStoryView(),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -596,7 +543,7 @@ class _TabletStoryView extends StatelessWidget {
|
|||||||
previous.storyScreenArgs != current.storyScreenArgs,
|
previous.storyScreenArgs != current.storyScreenArgs,
|
||||||
builder: (BuildContext context, SplitViewState state) {
|
builder: (BuildContext context, SplitViewState state) {
|
||||||
if (state.storyScreenArgs != null) {
|
if (state.storyScreenArgs != null) {
|
||||||
return StoryScreen.build(state.storyScreenArgs!);
|
return StoryScreen.build(context, state.storyScreenArgs!);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Material(
|
return Material(
|
||||||
|
@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
|
|||||||
showAboutDialog(
|
showAboutDialog(
|
||||||
context: context,
|
context: context,
|
||||||
applicationName: 'Hacki',
|
applicationName: 'Hacki',
|
||||||
applicationVersion: 'v0.2.14',
|
applicationVersion: 'v0.2.17',
|
||||||
applicationIcon: ClipRRect(
|
applicationIcon: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(
|
borderRadius: const BorderRadius.all(
|
||||||
Radius.circular(12),
|
Radius.circular(12),
|
||||||
|
@ -88,8 +88,17 @@ class StoryScreen extends StatefulWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Widget build(StoryScreenArgs args) {
|
static Widget build(BuildContext context, StoryScreenArgs args) {
|
||||||
return MultiBlocProvider(
|
return WillPopScope(
|
||||||
|
onWillPop: () async {
|
||||||
|
if (context.read<SplitViewCubit>().state.expanded) {
|
||||||
|
context.read<SplitViewCubit>().zoom();
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: MultiBlocProvider(
|
||||||
key: ValueKey<StoryScreenArgs>(args),
|
key: ValueKey<StoryScreenArgs>(args),
|
||||||
providers: <BlocProvider<dynamic>>[
|
providers: <BlocProvider<dynamic>>[
|
||||||
BlocProvider<CommentsCubit>(
|
BlocProvider<CommentsCubit>(
|
||||||
@ -112,6 +121,7 @@ class StoryScreen extends StatefulWidget {
|
|||||||
parentComments: args.targetComments ?? <Comment>[],
|
parentComments: args.targetComments ?? <Comment>[],
|
||||||
splitViewEnabled: true,
|
splitViewEnabled: true,
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -140,7 +150,6 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
delay: _featureDiscoveryDismissThrottleDelay,
|
delay: _featureDiscoveryDismissThrottleDelay,
|
||||||
);
|
);
|
||||||
|
|
||||||
static const int _extraItemsCount = 2;
|
|
||||||
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
static const Duration _storyLinkTapThrottleDelay = Duration(seconds: 2);
|
||||||
static const Duration _featureDiscoveryDismissThrottleDelay =
|
static const Duration _featureDiscoveryDismissThrottleDelay =
|
||||||
Duration(seconds: 1);
|
Duration(seconds: 1);
|
||||||
@ -270,12 +279,8 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
onLoading: () {
|
onLoading: () {
|
||||||
context.read<CommentsCubit>().loadMore();
|
context.read<CommentsCubit>().loadMore();
|
||||||
},
|
},
|
||||||
child: ListView.builder(
|
child: ListView(
|
||||||
primary: false,
|
primary: false,
|
||||||
itemCount: state.comments.length + _extraItemsCount,
|
|
||||||
itemBuilder: (BuildContext context, int index) {
|
|
||||||
if (index == 0) {
|
|
||||||
return Column(
|
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: topPadding,
|
height: topPadding,
|
||||||
@ -294,10 +299,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
HapticFeedback.lightImpact();
|
HapticFeedback.lightImpact();
|
||||||
|
|
||||||
if (widget.story !=
|
if (widget.story !=
|
||||||
context
|
context.read<EditCubit>().state.replyingTo) {
|
||||||
.read<EditCubit>()
|
|
||||||
.state
|
|
||||||
.replyingTo) {
|
|
||||||
commentEditingController.clear();
|
commentEditingController.clear();
|
||||||
}
|
}
|
||||||
context
|
context
|
||||||
@ -377,13 +379,13 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
child: SelectableLinkify(
|
child: SelectableLinkify(
|
||||||
text: widget.story.text,
|
text: widget.story.text,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: MediaQuery.of(context)
|
fontSize:
|
||||||
.textScaleFactor *
|
MediaQuery.of(context).textScaleFactor *
|
||||||
15,
|
15,
|
||||||
),
|
),
|
||||||
linkStyle: TextStyle(
|
linkStyle: TextStyle(
|
||||||
fontSize: MediaQuery.of(context)
|
fontSize:
|
||||||
.textScaleFactor *
|
MediaQuery.of(context).textScaleFactor *
|
||||||
15,
|
15,
|
||||||
color: Colors.orange,
|
color: Colors.orange,
|
||||||
),
|
),
|
||||||
@ -414,9 +416,8 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
if (state.onlyShowTargetComment) ...<Widget>[
|
if (state.onlyShowTargetComment) ...<Widget>[
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: () => context
|
onPressed: () =>
|
||||||
.read<CommentsCubit>()
|
context.read<CommentsCubit>().loadAll(widget.story),
|
||||||
.loadAll(widget.story),
|
|
||||||
child: const Text('View all comments'),
|
child: const Text('View all comments'),
|
||||||
),
|
),
|
||||||
const Divider(
|
const Divider(
|
||||||
@ -424,8 +425,7 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
if (state.comments.isEmpty &&
|
if (state.comments.isEmpty &&
|
||||||
state.status ==
|
state.status == CommentsStatus.allLoaded) ...<Widget>[
|
||||||
CommentsStatus.allLoaded) ...<Widget>[
|
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
height: 240,
|
height: 240,
|
||||||
),
|
),
|
||||||
@ -436,28 +436,9 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
],
|
for (final Comment comment in state.comments)
|
||||||
);
|
FadeIn(
|
||||||
} else if (index ==
|
key: ValueKey<String>('${comment.id}-FadeIn'),
|
||||||
state.comments.length + _extraItemsCount - 1) {
|
|
||||||
if ((state.status == CommentsStatus.allLoaded &&
|
|
||||||
state.comments.isNotEmpty) ||
|
|
||||||
state.onlyShowTargetComment) {
|
|
||||||
return SizedBox(
|
|
||||||
height: 240,
|
|
||||||
child: Center(
|
|
||||||
child: Text(happyFace),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return const SizedBox.shrink();
|
|
||||||
}
|
|
||||||
|
|
||||||
final Comment comment = state.comments.elementAt(index - 1);
|
|
||||||
|
|
||||||
return FadeIn(
|
|
||||||
key: ValueKey<int>(comment.id),
|
|
||||||
child: CommentTile(
|
child: CommentTile(
|
||||||
comment: comment,
|
comment: comment,
|
||||||
level: comment.level,
|
level: comment.level,
|
||||||
@ -491,8 +472,17 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
onStoryLinkTapped: onStoryLinkTapped,
|
onStoryLinkTapped: onStoryLinkTapped,
|
||||||
onTimeMachineActivated: onTimeMachineActivated,
|
onTimeMachineActivated: onTimeMachineActivated,
|
||||||
),
|
),
|
||||||
);
|
),
|
||||||
},
|
if ((state.status == CommentsStatus.allLoaded &&
|
||||||
|
state.comments.isNotEmpty) ||
|
||||||
|
state.onlyShowTargetComment)
|
||||||
|
SizedBox(
|
||||||
|
height: 240,
|
||||||
|
child: Center(
|
||||||
|
child: Text(happyFace),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -525,7 +515,15 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
Positioned.fill(
|
Positioned.fill(
|
||||||
child: mainView,
|
child: mainView,
|
||||||
),
|
),
|
||||||
Positioned(
|
BlocBuilder<SplitViewCubit, SplitViewState>(
|
||||||
|
buildWhen: (
|
||||||
|
SplitViewState previous,
|
||||||
|
SplitViewState current,
|
||||||
|
) =>
|
||||||
|
previous.expanded != current.expanded,
|
||||||
|
builder:
|
||||||
|
(BuildContext context, SplitViewState state) {
|
||||||
|
return Positioned(
|
||||||
top: 0,
|
top: 0,
|
||||||
left: 0,
|
left: 0,
|
||||||
right: 0,
|
right: 0,
|
||||||
@ -535,9 +533,16 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
.withOpacity(0.6),
|
.withOpacity(0.6),
|
||||||
story: widget.story,
|
story: widget.story,
|
||||||
scrollController: scrollController,
|
scrollController: scrollController,
|
||||||
onBackgroundTap: onFeatureDiscoveryDismissed,
|
onBackgroundTap:
|
||||||
|
onFeatureDiscoveryDismissed,
|
||||||
onDismiss: onFeatureDiscoveryDismissed,
|
onDismiss: onFeatureDiscoveryDismissed,
|
||||||
|
splitViewEnabled: state.enabled,
|
||||||
|
expanded: state.expanded,
|
||||||
|
onZoomTap:
|
||||||
|
context.read<SplitViewCubit>().zoom,
|
||||||
),
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
bottom: 0,
|
bottom: 0,
|
||||||
@ -751,12 +756,82 @@ class _StoryScreenState extends State<StoryScreen> {
|
|||||||
final bool upvoted = voteState.vote == Vote.up;
|
final bool upvoted = voteState.vote == Vote.up;
|
||||||
final bool downvoted = voteState.vote == Vote.down;
|
final bool downvoted = voteState.vote == Vote.down;
|
||||||
return Container(
|
return Container(
|
||||||
height: 300,
|
height: item is Comment ? 370 : 390,
|
||||||
color: Theme.of(context).canvasColor,
|
color: Theme.of(context).canvasColor,
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Colors.transparent,
|
color: Colors.transparent,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
|
BlocProvider<UserCubit>(
|
||||||
|
create: (BuildContext context) =>
|
||||||
|
UserCubit()..init(userId: item.by),
|
||||||
|
child: BlocBuilder<UserCubit, UserState>(
|
||||||
|
builder: (BuildContext context, UserState state) {
|
||||||
|
return ListTile(
|
||||||
|
leading: const Icon(
|
||||||
|
Icons.account_circle,
|
||||||
|
),
|
||||||
|
title: Text(item.by),
|
||||||
|
subtitle: Text(
|
||||||
|
state.user.description,
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
showDialog<void>(
|
||||||
|
context: context,
|
||||||
|
builder: (BuildContext context) =>
|
||||||
|
SimpleDialog(
|
||||||
|
title: Text('About ${state.user.id}'),
|
||||||
|
contentPadding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 24,
|
||||||
|
vertical: 12,
|
||||||
|
),
|
||||||
|
children: <Widget>[
|
||||||
|
SelectableLinkify(
|
||||||
|
text: HtmlUtil.parseHtml(
|
||||||
|
state.user.about,
|
||||||
|
),
|
||||||
|
linkStyle: const TextStyle(
|
||||||
|
color: Colors.orange,
|
||||||
|
),
|
||||||
|
onOpen: (LinkableElement link) {
|
||||||
|
if (link.url.contains(
|
||||||
|
'news.ycombinator.com/item',
|
||||||
|
)) {
|
||||||
|
onStoryLinkTapped.call(link.url);
|
||||||
|
} else {
|
||||||
|
LinkUtil.launch(link.url);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
ButtonBar(
|
||||||
|
children: <Widget>[
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: () =>
|
||||||
|
Navigator.pop(context),
|
||||||
|
style: ButtonStyle(
|
||||||
|
backgroundColor:
|
||||||
|
MaterialStateProperty.all(
|
||||||
|
Colors.deepOrange,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: const Text(
|
||||||
|
'Okay',
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: Icon(
|
leading: Icon(
|
||||||
FeatherIcons.chevronUp,
|
FeatherIcons.chevronUp,
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
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/models/models.dart';
|
||||||
import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
|
import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
|
||||||
import 'package:hacki/screens/story/widgets/link_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 Color backgroundColor,
|
||||||
required Future<bool> Function() onBackgroundTap,
|
required Future<bool> Function() onBackgroundTap,
|
||||||
required Future<bool> Function() onDismiss,
|
required Future<bool> Function() onDismiss,
|
||||||
|
bool splitViewEnabled = false,
|
||||||
|
VoidCallback? onZoomTap,
|
||||||
|
bool? expanded,
|
||||||
}) : super(
|
}) : super(
|
||||||
key: key,
|
key: key,
|
||||||
backgroundColor: backgroundColor,
|
backgroundColor: backgroundColor,
|
||||||
elevation: 0,
|
elevation: 0,
|
||||||
actions: <Widget>[
|
actions: <Widget>[
|
||||||
|
if (splitViewEnabled) ...<Widget>[
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(
|
||||||
|
expanded ?? false
|
||||||
|
? FeatherIcons.minimize2
|
||||||
|
: FeatherIcons.maximize2,
|
||||||
|
size: 20,
|
||||||
|
),
|
||||||
|
onPressed: () {
|
||||||
|
HapticFeedback.lightImpact();
|
||||||
|
onZoomTap?.call();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
],
|
||||||
ScrollUpIconButton(
|
ScrollUpIconButton(
|
||||||
scrollController: scrollController,
|
scrollController: scrollController,
|
||||||
),
|
),
|
||||||
|
@ -25,6 +25,7 @@ class FavIconButton extends StatelessWidget {
|
|||||||
builder: (BuildContext context, FavState favState) {
|
builder: (BuildContext context, FavState favState) {
|
||||||
final bool isFav = favState.favIds.contains(storyId);
|
final bool isFav = favState.favIds.contains(storyId);
|
||||||
return IconButton(
|
return IconButton(
|
||||||
|
tooltip: 'Add to favorites',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -21,6 +21,7 @@ class LinkIconButton extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return IconButton(
|
return IconButton(
|
||||||
|
tooltip: 'Open this story in browser',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -31,6 +31,7 @@ class PinIconButton extends StatelessWidget {
|
|||||||
child: Transform.translate(
|
child: Transform.translate(
|
||||||
offset: const Offset(2, 0),
|
offset: const Offset(2, 0),
|
||||||
child: IconButton(
|
child: IconButton(
|
||||||
|
tooltip: 'Pin to home screen',
|
||||||
icon: DescribedFeatureOverlay(
|
icon: DescribedFeatureOverlay(
|
||||||
onBackgroundTap: onBackgroundTap,
|
onBackgroundTap: onBackgroundTap,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
|
@ -189,6 +189,7 @@ class _ReplyBoxState extends State<ReplyBox> {
|
|||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
),
|
),
|
||||||
keyboardType: TextInputType.multiline,
|
keyboardType: TextInputType.multiline,
|
||||||
|
textCapitalization: TextCapitalization.sentences,
|
||||||
textInputAction: TextInputAction.newline,
|
textInputAction: TextInputAction.newline,
|
||||||
onChanged: widget.onChanged,
|
onChanged: widget.onChanged,
|
||||||
),
|
),
|
||||||
|
@ -187,6 +187,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
onChanged: context.read<SubmitCubit>().onTextChanged,
|
onChanged: context.read<SubmitCubit>().onTextChanged,
|
||||||
|
textCapitalization: TextCapitalization.sentences,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
@ -38,6 +38,7 @@ class CommentTile extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocProvider<CollapseCubit>(
|
return BlocProvider<CollapseCubit>(
|
||||||
|
key: ValueKey<String>('${comment.id}-BlocProvider'),
|
||||||
lazy: false,
|
lazy: false,
|
||||||
create: (_) => CollapseCubit(
|
create: (_) => CollapseCubit(
|
||||||
commentId: comment.id,
|
commentId: comment.id,
|
||||||
@ -209,8 +210,39 @@ class CommentTile extends StatelessWidget {
|
|||||||
top: 6,
|
top: 6,
|
||||||
bottom: 12,
|
bottom: 12,
|
||||||
),
|
),
|
||||||
child: SelectableLinkify(
|
child: comment is BuildableComment
|
||||||
key: ObjectKey(comment),
|
? SelectableText.rich(
|
||||||
|
key: ValueKey<int>(comment.id),
|
||||||
|
buildTextSpan(
|
||||||
|
(comment as BuildableComment)
|
||||||
|
.elements,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: MediaQuery.of(context)
|
||||||
|
.textScaleFactor *
|
||||||
|
15,
|
||||||
|
),
|
||||||
|
linkStyle: TextStyle(
|
||||||
|
fontSize: MediaQuery.of(context)
|
||||||
|
.textScaleFactor *
|
||||||
|
15,
|
||||||
|
decoration:
|
||||||
|
TextDecoration.underline,
|
||||||
|
color: Colors.orange,
|
||||||
|
),
|
||||||
|
onOpen: (LinkableElement link) {
|
||||||
|
if (link.url.contains(
|
||||||
|
'news.ycombinator.com/item',
|
||||||
|
)) {
|
||||||
|
onStoryLinkTapped
|
||||||
|
.call(link.url);
|
||||||
|
} else {
|
||||||
|
LinkUtil.launch(link.url);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: SelectableLinkify(
|
||||||
|
key: ValueKey<int>(comment.id),
|
||||||
text: comment.text,
|
text: comment.text,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: MediaQuery.of(context)
|
fontSize: MediaQuery.of(context)
|
||||||
@ -227,7 +259,8 @@ class CommentTile extends StatelessWidget {
|
|||||||
if (link.url.contains(
|
if (link.url.contains(
|
||||||
'news.ycombinator.com/item',
|
'news.ycombinator.com/item',
|
||||||
)) {
|
)) {
|
||||||
onStoryLinkTapped.call(link.url);
|
onStoryLinkTapped
|
||||||
|
.call(link.url);
|
||||||
} else {
|
} else {
|
||||||
LinkUtil.launch(link.url);
|
LinkUtil.launch(link.url);
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
|
|||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
child: StoryTile(
|
child: StoryTile(
|
||||||
key: ObjectKey(e),
|
key: ValueKey<int>(e.id),
|
||||||
story: e,
|
story: e,
|
||||||
onTap: () => onTap(e),
|
onTap: () => onTap(e),
|
||||||
showWebPreview: showWebPreview,
|
showWebPreview: showWebPreview,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
name: hacki
|
name: hacki
|
||||||
description: A Hacker News reader.
|
description: A Hacker News reader.
|
||||||
version: 0.2.14+53
|
version: 0.2.17+56
|
||||||
publish_to: none
|
publish_to: none
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
|