Compare commits

...

5 Commits

Author SHA1 Message Date
9312c56dd0 v0.2.17 (#47)
* improved story screen scrolling.

* bumped version.

* shrink instead of return on tapping back button. #42

* allowed users to view other user's profile. #45

* bumped version.

* added back underline to links.

* fixed overlow of popup menu,
2022-06-10 02:10:23 -07:00
6e71de5913 updated README.md 2022-06-05 22:39:54 -07:00
a9590af3e9 v0.2.16 (#41)
* bumped version.

* add badges for fdroid, GitHub release versions (#40)

* updated README.md

* replaced jobs with best.

* updated README.md

Co-authored-by: Efreak <Efreak@users.noreply.github.com>
2022-06-05 22:34:48 -07:00
18dadaa5ec v0.2.15 (#39)
* Add capitlzation to text fields (#37)

* added ability for split view to be expanded to full screen. (#38)

Co-authored-by: Efreak <Efreak@users.noreply.github.com>
2022-06-05 00:58:49 -07:00
d506297f4c v0.2.14 (#35)
* added custom search feature.

* removed equatable.

* added custom range.

* updated README.md
2022-06-04 02:11:26 -07:00
72 changed files with 1222 additions and 477 deletions

View File

@ -4,7 +4,8 @@
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
[![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
[![Play Store](https://img.shields.io/badge/Play%20Store--yellow)](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
[![Fdroid version](https://img.shields.io/f-droid/v/com.jiaqifeng.hacki)](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
[![GH version](https://img.shields.io/github/release/livinglist/hacki.svg?logo=github)](https://github.com/Livinglist/Hacki/releases/latest)
[![Visits Badge](https://badges.pufler.dev/visits/livinglist/Hacki)](https://badges.pufler.dev)
[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
[![style: effective dart](https://img.shields.io/badge/style-effective_dart-40c4ff.svg)](https://pub.dev/packages/effective_dart)
@ -34,25 +35,24 @@ Features:
- Launch from system share sheet.
- And more...
<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="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="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="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="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="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/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.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>

View File

@ -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

BIN
assets/screenshots/01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 KiB

BIN
assets/screenshots/02.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 835 KiB

BIN
assets/screenshots/03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 KiB

BIN
assets/screenshots/04.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 KiB

BIN
assets/screenshots/05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 KiB

BIN
assets/screenshots/06.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 868 KiB

BIN
assets/screenshots/07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

BIN
assets/screenshots/08.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 KiB

BIN
assets/screenshots/09.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 KiB

BIN
assets/screenshots/10.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 KiB

BIN
assets/screenshots/11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 KiB

BIN
assets/screenshots/12.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1005 KiB

View 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.

View 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.

View 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.

View 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.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 422 KiB

After

Width:  |  Height:  |  Size: 522 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 KiB

After

Width:  |  Height:  |  Size: 835 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 KiB

After

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 298 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 672 KiB

After

Width:  |  Height:  |  Size: 698 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 931 KiB

After

Width:  |  Height:  |  Size: 868 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 KiB

After

Width:  |  Height:  |  Size: 384 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 496 KiB

After

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 420 KiB

After

Width:  |  Height:  |  Size: 414 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 KiB

View File

@ -568,7 +568,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = QMWX3X2NF7;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -577,7 +577,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.13;
MARKETING_VERSION = 0.2.17;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -705,7 +705,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = QMWX3X2NF7;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -714,7 +714,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.13;
MARKETING_VERSION = 0.2.17;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -736,7 +736,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = QMWX3X2NF7;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@ -745,7 +745,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.2.13;
MARKETING_VERSION = 0.2.17;
PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

View File

@ -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);

View File

@ -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,

View File

@ -2,6 +2,7 @@ import 'dart:async';
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart';
@ -159,10 +160,19 @@ class CommentsCubit extends Cubit<CommentsState> {
..addKid(comment.id, to: comment.parent)
..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>[
...state.comments,
comment
buildableComment
];
emit(state.copyWith(comments: updatedComments));
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
Future<void> close() async {
await _streamSubscription?.cancel();

View File

@ -14,4 +14,5 @@ export 'search/search_cubit.dart';
export 'split_view/split_view_cubit.dart';
export 'submit/submit_cubit.dart';
export 'time_machine/time_machine_cubit.dart';
export 'user/user_cubit.dart';
export 'vote/vote_cubit.dart';

View File

@ -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();
}
}

View File

@ -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,
];
}

View File

@ -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));
}

View File

@ -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,
];
}

View 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;
});
}
}

View 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,
];
}

View 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;
}

View File

@ -1,6 +1,8 @@
export 'buildable_comment.dart';
export 'comment.dart';
export 'item.dart';
export 'poll_option.dart';
export 'post_data.dart';
export 'search_filters.dart';
export 'story.dart';
export 'user.dart';

View 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')})''';
}
}

View 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,
];
}

View File

@ -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 {

View File

@ -1,5 +1,7 @@
import 'dart:convert';
import 'package:intl/intl.dart';
class User {
User({
required this.about,
@ -29,6 +31,12 @@ class User {
final String id;
final int karma;
static final DateFormat _dateTimeFormatter = DateFormat.yMMMd();
String get description {
return '''$karma karma, created on ${_dateTimeFormatter.format(DateTime.fromMillisecondsSinceEpoch(created * 1000))}''';
}
@override
String toString() {
final String prettyString =

View File

@ -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;

View File

@ -171,7 +171,7 @@ class _HomeScreenState extends State<HomeScreen>
child: Container(
color: Colors.orangeAccent.withOpacity(0.2),
child: StoryTile(
key: ObjectKey(story),
key: ValueKey<String>('${story.id}-PinnedStoryTile'),
story: story,
onTap: () => onStoryTapped(story, isPin: true),
showWebPreview: preferenceState.showComplexStoryTile,
@ -222,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,
@ -349,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(),
],
),
@ -390,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,
),
);
@ -511,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);
@ -537,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);
@ -556,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(),
),
],
);
},
);
},
);
@ -596,7 +543,7 @@ class _TabletStoryView extends StatelessWidget {
previous.storyScreenArgs != current.storyScreenArgs,
builder: (BuildContext context, SplitViewState state) {
if (state.storyScreenArgs != null) {
return StoryScreen.build(state.storyScreenArgs!);
return StoryScreen.build(context, state.storyScreenArgs!);
}
return Material(

View File

@ -407,7 +407,7 @@ class _ProfileScreenState extends State<ProfileScreen>
showAboutDialog(
context: context,
applicationName: 'Hacki',
applicationVersion: 'v0.2.13',
applicationVersion: 'v0.2.17',
applicationIcon: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(12),

View File

@ -1,4 +1,3 @@
export 'centered_message_view.dart';
export 'custom_chip.dart';
export 'inbox_view.dart';
export 'offline_list_tile.dart';

View File

@ -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,
),

View 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,
);
}
}

View 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);
}
}

View 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 ?? ''}''',
);
}
}

View File

@ -0,0 +1,3 @@
export 'custom_range_filter_chip.dart';
export 'date_time_range_filter_chip.dart';
export 'posted_by_filter_chip.dart';

View File

@ -88,29 +88,39 @@ class StoryScreen extends StatefulWidget {
);
}
static Widget build(StoryScreenArgs args) {
return MultiBlocProvider(
key: ValueKey<StoryScreenArgs>(args),
providers: <BlocProvider<dynamic>>[
BlocProvider<CommentsCubit>(
create: (BuildContext context) => CommentsCubit(
offlineReading: context.read<StoriesBloc>().state.offlineReading,
story: args.story,
)..init(
onlyShowTargetComment: args.onlyShowTargetComment,
targetParents: args.targetComments,
),
),
if (args.story.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: args.story)..init(),
static Widget build(BuildContext context, StoryScreenArgs args) {
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),
providers: <BlocProvider<dynamic>>[
BlocProvider<CommentsCubit>(
create: (BuildContext context) => CommentsCubit(
offlineReading: context.read<StoriesBloc>().state.offlineReading,
story: args.story,
)..init(
onlyShowTargetComment: args.onlyShowTargetComment,
targetParents: args.targetComments,
),
),
],
child: StoryScreen(
story: args.story,
parentComments: args.targetComments ?? <Comment>[],
splitViewEnabled: true,
if (args.story.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: args.story)..init(),
),
],
child: StoryScreen(
story: args.story,
parentComments: args.targetComments ?? <Comment>[],
splitViewEnabled: true,
),
),
);
}
@ -140,7 +150,6 @@ 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);
@ -270,229 +279,210 @@ class _StoryScreenState extends State<StoryScreen> {
onLoading: () {
context.read<CommentsCubit>().loadMore();
},
child: ListView.builder(
child: ListView(
primary: false,
itemCount: state.comments.length + _extraItemsCount,
itemBuilder: (BuildContext context, int index) {
if (index == 0) {
return Column(
children: <Widget>[
SizedBox(
height: topPadding,
),
if (!widget.splitViewEnabled)
const Padding(
padding: EdgeInsets.only(bottom: 6),
child: OfflineBanner(),
),
Slidable(
startActionPane: ActionPane(
motion: const BehindMotion(),
children: <Widget>[
SizedBox(
height: topPadding,
),
if (!widget.splitViewEnabled)
const Padding(
padding: EdgeInsets.only(bottom: 6),
child: OfflineBanner(),
),
Slidable(
startActionPane: ActionPane(
motion: const BehindMotion(),
children: <Widget>[
SlidableAction(
onPressed: (_) {
HapticFeedback.lightImpact();
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,
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,
),
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,
),
child: Row(
children: <Widget>[
Text(
widget.story.by,
style: const TextStyle(
color: Colors.orange,
),
),
SlidableAction(
onPressed: (_) => onMorePressed(widget.story),
backgroundColor: Colors.orange,
foregroundColor: Colors.white,
icon: Icons.more_horiz,
const Spacer(),
Text(
widget.story.postedDate,
style: const TextStyle(
color: Colors.grey,
),
),
],
),
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,
),
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)
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),
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,
),
],
);
} else if (index ==
state.comments.length + _extraItemsCount - 1) {
if ((state.status == CommentsStatus.allLoaded &&
state.comments.isNotEmpty) ||
state.onlyShowTargetComment) {
return SizedBox(
height: 240,
child: Center(
child: Text(happyFace),
),
);
}
return const SizedBox.shrink();
}
final Comment comment = state.comments.elementAt(index - 1);
return FadeIn(
key: ValueKey<int>(comment.id),
child: CommentTile(
comment: comment,
level: comment.level,
myUsername:
authState.isLoggedIn ? authState.username : null,
opUsername: widget.story.by,
onReplyTapped: (Comment cmt) {
HapticFeedback.lightImpact();
if (cmt.deleted || cmt.dead) {
return;
}
if (cmt !=
context.read<EditCubit>().state.replyingTo) {
commentEditingController.clear();
}
context.read<EditCubit>().onReplyTapped(cmt);
focusNode.requestFocus();
},
onEditTapped: (Comment cmt) {
HapticFeedback.lightImpact();
if (cmt.deleted || cmt.dead) {
return;
}
commentEditingController.clear();
context.read<EditCubit>().onEditTapped(cmt);
focusNode.requestFocus();
},
onMoreTapped: onMorePressed,
onStoryLinkTapped: onStoryLinkTapped,
onTimeMachineActivated: onTimeMachineActivated,
),
);
},
),
if (widget.story.text.isNotEmpty)
const SizedBox(
height: 8,
),
const Divider(
height: 0,
),
if (state.onlyShowTargetComment) ...<Widget>[
TextButton(
onPressed: () =>
context.read<CommentsCubit>().loadAll(widget.story),
child: const Text('View all comments'),
),
const Divider(
height: 0,
),
],
if (state.comments.isEmpty &&
state.status == CommentsStatus.allLoaded) ...<Widget>[
const SizedBox(
height: 240,
),
const Center(
child: Text(
'Nothing yet',
style: TextStyle(color: Colors.grey),
),
),
],
for (final Comment comment in state.comments)
FadeIn(
key: ValueKey<String>('${comment.id}-FadeIn'),
child: CommentTile(
comment: comment,
level: comment.level,
myUsername:
authState.isLoggedIn ? authState.username : null,
opUsername: widget.story.by,
onReplyTapped: (Comment cmt) {
HapticFeedback.lightImpact();
if (cmt.deleted || cmt.dead) {
return;
}
if (cmt !=
context.read<EditCubit>().state.replyingTo) {
commentEditingController.clear();
}
context.read<EditCubit>().onReplyTapped(cmt);
focusNode.requestFocus();
},
onEditTapped: (Comment cmt) {
HapticFeedback.lightImpact();
if (cmt.deleted || cmt.dead) {
return;
}
commentEditingController.clear();
context.read<EditCubit>().onEditTapped(cmt);
focusNode.requestFocus();
},
onMoreTapped: onMorePressed,
onStoryLinkTapped: onStoryLinkTapped,
onTimeMachineActivated: onTimeMachineActivated,
),
),
if ((state.status == CommentsStatus.allLoaded &&
state.comments.isNotEmpty) ||
state.onlyShowTargetComment)
SizedBox(
height: 240,
child: Center(
child: Text(happyFace),
),
)
],
),
);
@ -525,19 +515,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,
@ -751,12 +756,82 @@ class _StoryScreenState extends State<StoryScreen> {
final bool upvoted = voteState.vote == Vote.up;
final bool downvoted = voteState.vote == Vote.down;
return Container(
height: 300,
height: item is Comment ? 370 : 390,
color: Theme.of(context).canvasColor,
child: Material(
color: Colors.transparent,
child: Column(
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(
leading: Icon(
FeatherIcons.chevronUp,

View File

@ -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,
),

View File

@ -25,6 +25,7 @@ class FavIconButton extends StatelessWidget {
builder: (BuildContext context, FavState favState) {
final bool isFav = favState.favIds.contains(storyId);
return IconButton(
tooltip: 'Add to favorites',
icon: DescribedFeatureOverlay(
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,

View File

@ -21,6 +21,7 @@ class LinkIconButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return IconButton(
tooltip: 'Open this story in browser',
icon: DescribedFeatureOverlay(
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,

View File

@ -31,6 +31,7 @@ class PinIconButton extends StatelessWidget {
child: Transform.translate(
offset: const Offset(2, 0),
child: IconButton(
tooltip: 'Pin to home screen',
icon: DescribedFeatureOverlay(
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,

View File

@ -189,6 +189,7 @@ class _ReplyBoxState extends State<ReplyBox> {
border: InputBorder.none,
),
keyboardType: TextInputType.multiline,
textCapitalization: TextCapitalization.sentences,
textInputAction: TextInputAction.newline,
onChanged: widget.onChanged,
),

View File

@ -187,6 +187,7 @@ class _SubmitScreenState extends State<SubmitScreen> {
),
),
onChanged: context.read<SubmitCubit>().onTextChanged,
textCapitalization: TextCapitalization.sentences,
),
),
),

View File

@ -38,6 +38,7 @@ class CommentTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BlocProvider<CollapseCubit>(
key: ValueKey<String>('${comment.id}-BlocProvider'),
lazy: false,
create: (_) => CollapseCubit(
commentId: comment.id,
@ -209,30 +210,62 @@ class CommentTile extends StatelessWidget {
top: 6,
bottom: 12,
),
child: SelectableLinkify(
key: ObjectKey(comment),
text: comment.text,
style: TextStyle(
fontSize: MediaQuery.of(context)
.textScaleFactor *
15,
),
linkStyle: TextStyle(
fontSize: MediaQuery.of(context)
.textScaleFactor *
15,
color: Colors.orange,
),
onOpen: (LinkableElement link) {
if (link.url.contains(
'news.ycombinator.com/item',
)) {
onStoryLinkTapped.call(link.url);
} else {
LinkUtil.launch(link.url);
}
},
),
child: comment is BuildableComment
? 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,
style: TextStyle(
fontSize: MediaQuery.of(context)
.textScaleFactor *
15,
),
linkStyle: TextStyle(
fontSize: MediaQuery.of(context)
.textScaleFactor *
15,
color: Colors.orange,
),
onOpen: (LinkableElement link) {
if (link.url.contains(
'news.ycombinator.com/item',
)) {
onStoryLinkTapped
.call(link.url);
} else {
LinkUtil.launch(link.url);
}
},
),
),
const Divider(
height: 0,

View File

@ -87,7 +87,7 @@ class ItemsListView<T extends Item> extends StatelessWidget {
)
: null,
child: StoryTile(
key: ObjectKey(e),
key: ValueKey<int>(e.id),
story: e,
onTap: () => onTap(e),
showWebPreview: showWebPreview,

View File

@ -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';

View File

@ -1,6 +1,6 @@
name: hacki
description: A Hacker News reader.
version: 0.2.13+52
version: 0.2.17+56
publish_to: none
environment: