Compare commits

..

8 Commits

Author SHA1 Message Date
b952f349fc v0.2.21 (#57)
* replaced StoryScreen with ItemScreen.

* use ItemScreen for share extension.

* fixed getItemId()

* bumped version.

* force new screen on viewing comments in separate thread.

* disable comment thread if comment is deleted or dead.

* navigate to new screen on viewing parent thread.

* bumped version.

* fixed inconsistent fontsize.

* bumped version.
2022-06-21 20:20:09 -07:00
9cefffa518 v0.2.20 (#56)
* bumped version.

* fixed web analyzer.

* improved comments loading mechanism.

* fixed delete all button.

* improved reply box logic.

* improved web analyzer.

* allow users to sort comments.

* fixed styles.

* fixed bugs.

* bumped version.

* fixed comments cubit.

* fixed dead comments.
2022-06-21 02:38:24 -07:00
fe630ea7a9 v0.2.20 (#55)
* bumped version.

* fixed web analyzer.

* improved comments loading mechanism.

* fixed delete all button.

* improved reply box logic.

* improved web analyzer.

* allow users to sort comments.

* fixed styles.

* fixed bugs.

* bumped version.

* fixed comments cubit.
2022-06-21 02:15:42 -07:00
459ab961d1 v0.2.19 hotfix (#52)
* improved offline mode.

* bumped version.

* reset stories count on download event.

* fixed overflow.
2022-06-18 23:40:56 -07:00
362d7005df fixed jank while exiting story screen. 2022-06-18 11:44:34 -07:00
6b7c1d42de fixed offline mode. 2022-06-18 02:38:31 -07:00
2a889bca56 v0.2.19 (#51)
* improved comments loading.

* added web page caching to offline mode.

* improved offline webview.

* fixed web analyzer.

* updated description.
2022-06-18 02:18:03 -07:00
e25026f129 created FUNDING.yml 2022-06-17 21:25:24 -07:00
59 changed files with 1068 additions and 700 deletions

13
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1,13 @@
# These are supported funding model platforms
github: livinglist
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: jfeng_for_open_source
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

View File

@ -10,8 +10,6 @@ A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with
[![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)
<noscript><a href="https://liberapay.com/jfeng_for_open_source/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
[<img src="assets/images/app_store_badge.png" height="50">](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone) [<img src="assets/images/google_play_badge.png" height="50">](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [<img src="assets/images/f_droid_badge.png" height="50">](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 935 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 KiB

After

Width:  |  Height:  |  Size: 390 KiB

View File

@ -0,0 +1 @@
- Offline mode now includes web pages.

View File

@ -0,0 +1 @@
- Offline mode now includes web pages.

View File

@ -0,0 +1 @@
- Offline mode now includes web pages.

View File

@ -0,0 +1 @@
- Offline mode now includes web pages.

View File

@ -0,0 +1,2 @@
- Offline mode now includes web pages.
- You can now sort comments in story screen.

View File

@ -0,0 +1,2 @@
- Offline mode now includes web pages.
- You can now sort comments in story screen.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 935 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 KiB

After

Width:  |  Height:  |  Size: 390 KiB

View File

@ -36,8 +36,6 @@ PODS:
- Flutter
- url_launcher_ios (0.0.1):
- Flutter
- video_player_avfoundation (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
- webview_flutter_wkwebview (0.0.1):
@ -59,7 +57,6 @@ DEPENDENCIES:
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- synced_shared_preferences (from `.symlinks/plugins/synced_shared_preferences/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
- workmanager (from `.symlinks/plugins/workmanager/ios`)
@ -97,8 +94,6 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/synced_shared_preferences/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"
video_player_avfoundation:
:path: ".symlinks/plugins/video_player_avfoundation/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter_wkwebview:
@ -123,7 +118,6 @@ SPEC CHECKSUMS:
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
synced_shared_preferences: f722742b06d65c7315b8e9f56b794c9fbd5597f7
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6

View File

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

View File

@ -32,6 +32,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
on<StoryRead>(onStoryRead);
on<StoriesLoaded>(onStoriesLoaded);
on<StoriesDownload>(onDownload);
on<StoryDownloaded>(onStoryDownloaded);
on<StoriesExitOffline>(onExitOffline);
on<StoriesPageSizeChanged>(onPageSizeChanged);
on<ClearAllReadStories>(onClearAllReadStories);
@ -244,35 +245,48 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
await _cacheRepository.deleteAllStories();
await _cacheRepository.deleteAllComments();
final Set<int> allIds = <int>{};
final Set<int> prioritizedIds = <int>{};
final List<StoryType> prioritizedTypes = <StoryType>[...types]
..remove(StoryType.latest);
for (final StoryType type in types) {
for (final StoryType type in prioritizedTypes) {
final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
await _cacheRepository.cacheStoryIds(of: type, ids: ids);
allIds.addAll(ids);
prioritizedIds.addAll(ids);
}
emit(
state.copyWith(
storiesDownloaded: 0,
storiesToBeDownloaded: prioritizedIds.length,
),
);
try {
_storiesRepository
.fetchStoriesStream(ids: allIds.toList())
.listen((Story story) async {
if (story.kids.isNotEmpty) {
await _cacheRepository.cacheStory(story: story);
_storiesRepository
.fetchAllChildrenComments(ids: story.kids)
.listen((Comment? comment) async {
if (comment != null) {
await _cacheRepository.cacheComment(comment: comment);
}
});
}
}).onDone(() {
emit(
state.copyWith(
downloadStatus: StoriesDownloadStatus.finished,
),
);
});
await fetchAndCacheStories(
prioritizedIds,
includingWebPage: event.includingWebPage,
isPrioritized: true,
);
final Set<int> latestIds = <int>{};
final List<int> ids = await _storiesRepository.fetchStoryIds(
of: StoryType.latest,
);
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: ids);
latestIds.addAll(ids);
await fetchAndCacheStories(
latestIds,
includingWebPage: event.includingWebPage,
isPrioritized: false,
);
emit(
state.copyWith(
downloadStatus: StoriesDownloadStatus.finished,
),
);
} catch (_) {
emit(
state.copyWith(
@ -282,6 +296,71 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
}
}
Future<void> fetchAndCacheStories(
Iterable<int> ids, {
required bool includingWebPage,
required bool isPrioritized,
}) async {
for (final int id in ids) {
final Story? story = await _storiesRepository.fetchStoryBy(id);
if (story == null) {
if (isPrioritized) {
add(StoryDownloaded(skipped: true));
}
continue;
}
if (story.kids.isEmpty) {
if (isPrioritized) {
add(StoryDownloaded(skipped: true));
}
continue;
}
await _cacheRepository.cacheStory(story: story);
if (story.url.isNotEmpty && includingWebPage) {
await _cacheRepository.cacheUrl(url: story.url);
}
final Completer<void> completer = Completer<void>();
_storiesRepository
.fetchAllChildrenComments(ids: story.kids)
.listen((Comment? comment) async {
if (comment != null) {
await _cacheRepository.cacheComment(comment: comment);
}
}).onDone(() {
completer.complete();
add(StoryDownloaded(skipped: false));
});
await completer.future;
}
}
void onStoryDownloaded(StoryDownloaded event, Emitter<StoriesState> emit) {
if (event.skipped) {
emit(
state.copyWith(
storiesToBeDownloaded: state.storiesToBeDownloaded - 1,
),
);
} else {
final int updatedStoriesDownloaded = state.storiesDownloaded + 1;
emit(
state.copyWith(
storiesDownloaded: updatedStoriesDownloaded,
storiesToBeDownloaded:
updatedStoriesDownloaded > state.storiesToBeDownloaded
? state.storiesToBeDownloaded + 1
: state.storiesToBeDownloaded,
),
);
}
}
Future<void> onPageSizeChanged(
StoriesPageSizeChanged event,
Emitter<StoriesState> emit,
@ -297,6 +376,7 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
await _cacheRepository.deleteAllStoryIds();
await _cacheRepository.deleteAllStories();
await _cacheRepository.deleteAllComments();
await _cacheRepository.deleteAllWebPages();
emit(state.copyWith(offlineReading: false));
add(StoriesInitialize());
}

View File

@ -38,8 +38,21 @@ class StoriesLoadMore extends StoriesEvent {
}
class StoriesDownload extends StoriesEvent {
StoriesDownload({required this.includingWebPage});
final bool includingWebPage;
@override
List<Object?> get props => <Object?>[];
List<Object?> get props => <Object?>[includingWebPage];
}
class StoryDownloaded extends StoriesEvent {
StoryDownloaded({required this.skipped});
final bool skipped;
@override
List<Object?> get props => <Object?>[skipped];
}
class StoriesExitOffline extends StoriesEvent {

View File

@ -23,6 +23,8 @@ class StoriesState extends Equatable {
required this.offlineReading,
required this.downloadStatus,
required this.currentPageSize,
required this.storiesDownloaded,
required this.storiesToBeDownloaded,
});
const StoriesState.init({
@ -61,7 +63,9 @@ class StoriesState extends Equatable {
}) : offlineReading = false,
downloadStatus = StoriesDownloadStatus.initial,
currentPageSize = 0,
readStoriesIds = const <int>{};
readStoriesIds = const <int>{},
storiesDownloaded = 0,
storiesToBeDownloaded = 0;
final Map<StoryType, List<Story>> storiesByType;
final Map<StoryType, List<int>> storyIdsByType;
@ -71,6 +75,8 @@ class StoriesState extends Equatable {
final StoriesDownloadStatus downloadStatus;
final bool offlineReading;
final int currentPageSize;
final int storiesDownloaded;
final int storiesToBeDownloaded;
StoriesState copyWith({
Map<StoryType, List<Story>>? storiesByType,
@ -81,6 +87,8 @@ class StoriesState extends Equatable {
StoriesDownloadStatus? downloadStatus,
bool? offlineReading,
int? currentPageSize,
int? storiesDownloaded,
int? storiesToBeDownloaded,
}) {
return StoriesState(
storiesByType: storiesByType ?? this.storiesByType,
@ -91,6 +99,9 @@ class StoriesState extends Equatable {
offlineReading: offlineReading ?? this.offlineReading,
downloadStatus: downloadStatus ?? this.downloadStatus,
currentPageSize: currentPageSize ?? this.currentPageSize,
storiesDownloaded: storiesDownloaded ?? this.storiesDownloaded,
storiesToBeDownloaded:
storiesToBeDownloaded ?? this.storiesToBeDownloaded,
);
}
@ -102,18 +113,12 @@ class StoriesState extends Equatable {
final Map<StoryType, List<Story>> newMap =
Map<StoryType, List<Story>>.from(storiesByType);
newMap[of] = List<Story>.from(newMap[of]!)..add(story);
return StoriesState(
return copyWith(
storiesByType: newMap,
storyIdsByType: storyIdsByType,
statusByType: statusByType,
currentPageByType: currentPageByType,
readStoriesIds: <int>{
...readStoriesIds,
if (hasRead) story.id,
},
offlineReading: offlineReading,
downloadStatus: downloadStatus,
currentPageSize: currentPageSize,
);
}
@ -124,15 +129,8 @@ class StoriesState extends Equatable {
final Map<StoryType, List<int>> newMap =
Map<StoryType, List<int>>.from(storyIdsByType);
newMap[of] = to;
return StoriesState(
storiesByType: storiesByType,
return copyWith(
storyIdsByType: newMap,
statusByType: statusByType,
currentPageByType: currentPageByType,
readStoriesIds: readStoriesIds,
offlineReading: offlineReading,
downloadStatus: downloadStatus,
currentPageSize: currentPageSize,
);
}
@ -143,15 +141,8 @@ class StoriesState extends Equatable {
final Map<StoryType, StoriesStatus> newMap =
Map<StoryType, StoriesStatus>.from(statusByType);
newMap[of] = to;
return StoriesState(
storiesByType: storiesByType,
storyIdsByType: storyIdsByType,
return copyWith(
statusByType: newMap,
currentPageByType: currentPageByType,
readStoriesIds: readStoriesIds,
offlineReading: offlineReading,
downloadStatus: downloadStatus,
currentPageSize: currentPageSize,
);
}
@ -162,15 +153,8 @@ class StoriesState extends Equatable {
final Map<StoryType, int> newMap =
Map<StoryType, int>.from(currentPageByType);
newMap[of] = to;
return StoriesState(
storiesByType: storiesByType,
storyIdsByType: storyIdsByType,
statusByType: statusByType,
return copyWith(
currentPageByType: newMap,
readStoriesIds: readStoriesIds,
offlineReading: offlineReading,
downloadStatus: downloadStatus,
currentPageSize: currentPageSize,
);
}
@ -187,15 +171,11 @@ class StoriesState extends Equatable {
final Map<StoryType, int> newCurrentPageMap =
Map<StoryType, int>.from(currentPageByType);
newCurrentPageMap[of] = 0;
return StoriesState(
return copyWith(
storiesByType: newStoriesMap,
storyIdsByType: newStoryIdsMap,
statusByType: newStatusMap,
currentPageByType: newCurrentPageMap,
readStoriesIds: readStoriesIds,
offlineReading: offlineReading,
downloadStatus: downloadStatus,
currentPageSize: currentPageSize,
);
}
@ -209,5 +189,7 @@ class StoriesState extends Equatable {
offlineReading,
downloadStatus,
currentPageSize,
storiesDownloaded,
storiesToBeDownloaded,
];
}

View File

@ -9,6 +9,7 @@ abstract class Constants {
'https://apps.apple.com/us/app/hacki/id1602043763?action=write-review';
static const String googlePlayLink =
'https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US';
static const String sponsorLink = 'https://github.com/sponsors/Livinglist';
static const String _imagePath = 'assets/images';
static const String hackerNewsLogoPath = '$_imagePath/hacker_news_logo.png';

View File

@ -10,8 +10,8 @@ class CustomRouter {
switch (settings.name) {
case HomeScreen.routeName:
return HomeScreen.route();
case StoryScreen.routeName:
return StoryScreen.route(settings.arguments! as StoryScreenArgs);
case ItemScreen.routeName:
return ItemScreen.route(settings.arguments! as ItemScreenArgs);
case SubmitScreen.routeName:
return SubmitScreen.route();
default:
@ -22,8 +22,8 @@ class CustomRouter {
/// Nested routing for bottom navigation bar.
static Route<dynamic> onGenerateNestedRoute(RouteSettings settings) {
switch (settings.name) {
case StoryScreen.routeName:
return StoryScreen.route(settings.arguments! as StoryScreenArgs);
case ItemScreen.routeName:
return ItemScreen.route(settings.arguments! as ItemScreenArgs);
case SubmitScreen.routeName:
return SubmitScreen.route();
default:

View File

@ -1,11 +1,15 @@
import 'dart:async';
import 'package:bloc/bloc.dart';
import 'package:collection/collection.dart';
import 'package:equatable/equatable.dart';
import 'package:flutter/services.dart';
import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/main.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:hacki/screens/screens.dart';
import 'package:hacki/services/services.dart';
part 'comments_state.dart';
@ -17,14 +21,14 @@ class CommentsCubit extends Cubit<CommentsState> {
StoriesRepository? storiesRepository,
SembastRepository? sembastRepository,
required bool offlineReading,
required Story story,
required Item item,
}) : _cacheService = cacheService ?? locator.get<CacheService>(),
_cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
_storiesRepository =
storiesRepository ?? locator.get<StoriesRepository>(),
_sembastRepository =
sembastRepository ?? locator.get<SembastRepository>(),
super(CommentsState.init(offlineReading: offlineReading, story: story));
super(CommentsState.init(offlineReading: offlineReading, item: item));
final CacheService _cacheService;
final CacheRepository _cacheRepository;
@ -67,32 +71,38 @@ class CommentsCubit extends Cubit<CommentsState> {
emit(state.copyWith(status: CommentsStatus.loading));
final Story story = state.story;
final Story updatedStory = state.offlineReading
? story
: await _storiesRepository.fetchStoryBy(story.id) ?? story;
final Item item = state.item;
final Item updatedItem = state.offlineReading
? item
: await _storiesRepository.fetchItemBy(id: item.id) ?? item;
final List<int> kids = () {
switch (state.order) {
case CommentsOrder.natural:
return updatedItem.kids;
case CommentsOrder.newestFirst:
return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
case CommentsOrder.oldestFirst:
return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
}
}();
emit(state.copyWith(story: updatedStory));
emit(state.copyWith(item: updatedItem));
if (state.offlineReading) {
_streamSubscription = _cacheRepository
.getCachedCommentsStream(ids: updatedStory.kids)
.getCachedCommentsStream(ids: kids)
.listen(_onCommentFetched)
..onDone(_onDone);
} else {
_streamSubscription = _storiesRepository
.fetchCommentsStream(ids: updatedStory.kids)
.fetchCommentsStream(ids: kids)
.listen(_onCommentFetched)
..onDone(_onDone);
}
}
Future<void> refresh() async {
final bool offlineReading = await _cacheRepository.hasCachedStories;
_cacheService.resetCollapsedComments();
if (offlineReading) {
if (state.offlineReading) {
emit(
state.copyWith(
status: CommentsStatus.loaded,
@ -101,6 +111,10 @@ class CommentsCubit extends Cubit<CommentsState> {
return;
}
_cacheService
..resetComments()
..resetCollapsedComments();
emit(
state.copyWith(
status: CommentsStatus.loading,
@ -110,28 +124,40 @@ class CommentsCubit extends Cubit<CommentsState> {
await _streamSubscription?.cancel();
final Story story = state.story;
final Story updatedStory =
await _storiesRepository.fetchStoryBy(story.id) ?? story;
final Item item = state.item;
final Item updatedItem =
await _storiesRepository.fetchItemBy(id: item.id) ?? item;
final List<int> kids = () {
switch (state.order) {
case CommentsOrder.natural:
return updatedItem.kids;
case CommentsOrder.newestFirst:
return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
case CommentsOrder.oldestFirst:
return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
}
}();
_streamSubscription = _storiesRepository
.fetchCommentsStream(ids: updatedStory.kids)
.fetchCommentsStream(ids: kids)
.listen(_onCommentFetched)
..onDone(_onDone);
emit(
state.copyWith(
story: updatedStory,
item: updatedItem,
status: CommentsStatus.loaded,
),
);
}
void loadAll(Story story) {
HapticFeedback.lightImpact();
emit(
state.copyWith(
onlyShowTargetComment: false,
comments: <Comment>[],
story: story,
item: story,
),
);
init();
@ -144,6 +170,36 @@ class CommentsCubit extends Cubit<CommentsState> {
}
}
Future<void> loadParentThread() async {
unawaited(HapticFeedback.lightImpact());
emit(state.copyWith(fetchParentStatus: CommentsStatus.loading));
final Story? parent =
await _storiesRepository.fetchParentStory(id: state.item.id);
if (parent == null) {
return;
} else {
await HackiApp.navigatorKey.currentState?.pushNamed(
ItemScreen.routeName,
arguments: ItemScreenArgs(item: parent),
);
emit(
state.copyWith(
fetchParentStatus: CommentsStatus.loaded,
),
);
}
}
void onOrderChanged(CommentsOrder? order) {
HapticFeedback.selectionClick();
if (order == null) return;
_streamSubscription?.cancel();
emit(state.copyWith(order: order, comments: <Comment>[]));
init();
}
void _onDone() {
_streamSubscription?.cancel();
_streamSubscription = null;
@ -161,7 +217,7 @@ class CommentsCubit extends Cubit<CommentsState> {
..cacheComment(comment);
_sembastRepository.cacheComment(comment);
final List<LinkifyElement> elements = linkify(
final List<LinkifyElement> elements = _linkify(
comment.text,
);
@ -178,7 +234,11 @@ class CommentsCubit extends Cubit<CommentsState> {
if (updatedComments.length >= _pageSize + _pageSize * state.currentPage &&
updatedComments.length <=
_pageSize * 2 + _pageSize * state.currentPage) {
_streamSubscription?.pause();
final bool isHidden = _cacheService.isHidden(comment.id);
if (!isHidden) {
_streamSubscription?.pause();
}
emit(
state.copyWith(
@ -190,7 +250,7 @@ class CommentsCubit extends Cubit<CommentsState> {
}
}
List<LinkifyElement> linkify(
static List<LinkifyElement> _linkify(
String text, {
LinkifyOptions options = const LinkifyOptions(),
List<Linkifier> linkifiers = const <Linkifier>[

View File

@ -8,12 +8,19 @@ enum CommentsStatus {
failure,
}
enum CommentsOrder {
natural,
newestFirst,
oldestFirst,
}
class CommentsState extends Equatable {
const CommentsState({
required this.story,
required this.item,
required this.comments,
required this.status,
required this.collapsed,
required this.fetchParentStatus,
required this.order,
required this.onlyShowTargetComment,
required this.offlineReading,
required this.currentPage,
@ -21,35 +28,39 @@ class CommentsState extends Equatable {
CommentsState.init({
required this.offlineReading,
required this.story,
required this.item,
}) : comments = <Comment>[],
status = CommentsStatus.init,
collapsed = false,
fetchParentStatus = CommentsStatus.init,
order = CommentsOrder.natural,
onlyShowTargetComment = false,
currentPage = 0;
final Story story;
final Item item;
final List<Comment> comments;
final CommentsStatus status;
final bool collapsed;
final CommentsStatus fetchParentStatus;
final CommentsOrder order;
final bool onlyShowTargetComment;
final bool offlineReading;
final int currentPage;
CommentsState copyWith({
Story? story,
Item? item,
List<Comment>? comments,
CommentsStatus? status,
bool? collapsed,
CommentsStatus? fetchParentStatus,
CommentsOrder? order,
bool? onlyShowTargetComment,
bool? offlineReading,
int? currentPage,
}) {
return CommentsState(
story: story ?? this.story,
item: item ?? this.item,
comments: comments ?? this.comments,
fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
status: status ?? this.status,
collapsed: collapsed ?? this.collapsed,
order: order ?? this.order,
onlyShowTargetComment:
onlyShowTargetComment ?? this.onlyShowTargetComment,
offlineReading: offlineReading ?? this.offlineReading,
@ -59,10 +70,11 @@ class CommentsState extends Equatable {
@override
List<Object?> get props => <Object?>[
story,
item,
comments,
status,
collapsed,
fetchParentStatus,
order,
onlyShowTargetComment,
offlineReading,
currentPage,

View File

@ -39,15 +39,15 @@ class FavCubit extends Cubit<FavState> {
emit(
state.copyWith(
favIds: favIds,
favStories: <Story>[],
favItems: <Item>[],
currentPage: 0,
),
);
_storiesRepository
.fetchStoriesStream(
.fetchItemsStream(
ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
)
.listen(_onStoryLoaded)
.listen(_onItemLoaded)
.onDone(() {
emit(
state.copyWith(
@ -73,13 +73,13 @@ class FavCubit extends Cubit<FavState> {
),
);
final Story? story = await _storiesRepository.fetchStoryBy(id);
final Item? item = await _storiesRepository.fetchItemBy(id: id);
if (story == null) return;
if (item == null) return;
emit(
state.copyWith(
favStories: List<Story>.from(state.favStories)..insert(0, story),
favItems: List<Item>.from(state.favItems)..insert(0, item),
),
);
@ -96,8 +96,8 @@ class FavCubit extends Cubit<FavState> {
emit(
state.copyWith(
favIds: List<int>.from(state.favIds)..remove(id),
favStories: List<Story>.from(state.favStories)
..removeWhere((Story e) => e.id == id),
favItems: List<Item>.from(state.favItems)
..removeWhere((Item e) => e.id == id),
),
);
@ -120,13 +120,13 @@ class FavCubit extends Cubit<FavState> {
}
_storiesRepository
.fetchStoriesStream(
.fetchItemsStream(
ids: state.favIds.sublist(
lower,
upper,
),
)
.listen(_onStoryLoaded)
.listen(_onItemLoaded)
.onDone(() {
emit(state.copyWith(status: FavStatus.loaded));
});
@ -142,7 +142,7 @@ class FavCubit extends Cubit<FavState> {
state.copyWith(
status: FavStatus.loading,
currentPage: 0,
favStories: <Story>[],
favItems: <Item>[],
favIds: <int>[],
),
);
@ -150,20 +150,20 @@ class FavCubit extends Cubit<FavState> {
_preferenceRepository.favList(of: username).then((List<int> favIds) {
emit(state.copyWith(favIds: favIds));
_storiesRepository
.fetchStoriesStream(
.fetchItemsStream(
ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
)
.listen(_onStoryLoaded)
.listen(_onItemLoaded)
.onDone(() {
emit(state.copyWith(status: FavStatus.loaded));
});
});
}
void _onStoryLoaded(Story story) {
void _onItemLoaded(Item item) {
emit(
state.copyWith(
favStories: List<Story>.from(state.favStories)..add(story),
favItems: List<Item>.from(state.favItems)..add(item),
),
);
}

View File

@ -10,31 +10,31 @@ enum FavStatus {
class FavState extends Equatable {
const FavState({
required this.favIds,
required this.favStories,
required this.favItems,
required this.status,
required this.currentPage,
});
FavState.init()
: favIds = <int>[],
favStories = <Story>[],
favItems = <Item>[],
status = FavStatus.init,
currentPage = 0;
final List<int> favIds;
final List<Story> favStories;
final List<Item> favItems;
final FavStatus status;
final int currentPage;
FavState copyWith({
List<int>? favIds,
List<Story>? favStories,
List<Item>? favItems,
FavStatus? status,
int? currentPage,
}) {
return FavState(
favIds: favIds ?? this.favIds,
favStories: favStories ?? this.favStories,
favItems: favItems ?? this.favItems,
status: status ?? this.status,
currentPage: currentPage ?? this.currentPage,
);
@ -43,7 +43,7 @@ class FavState extends Equatable {
@override
List<Object?> get props => <Object?>[
favIds,
favStories,
favItems,
status,
currentPage,
];

View File

@ -13,9 +13,9 @@ class SplitViewCubit extends Cubit<SplitViewState> {
final CacheService _cacheService;
void updateStoryScreenArgs(StoryScreenArgs args) {
void updateItemScreenArgs(ItemScreenArgs args) {
_cacheService.resetCollapsedComments();
emit(state.copyWith(storyScreenArgs: args));
emit(state.copyWith(itemScreenArgs: args));
}
void enableSplitView() => emit(state.copyWith(enabled: true));

View File

@ -2,7 +2,7 @@ part of 'split_view_cubit.dart';
class SplitViewState extends Equatable {
const SplitViewState({
required this.storyScreenArgs,
required this.itemScreenArgs,
required this.expanded,
required this.enabled,
});
@ -10,21 +10,21 @@ class SplitViewState extends Equatable {
const SplitViewState.init()
: enabled = false,
expanded = false,
storyScreenArgs = null;
itemScreenArgs = null;
final bool enabled;
final bool expanded;
final StoryScreenArgs? storyScreenArgs;
final ItemScreenArgs? itemScreenArgs;
SplitViewState copyWith({
bool? enabled,
bool? expanded,
StoryScreenArgs? storyScreenArgs,
ItemScreenArgs? itemScreenArgs,
}) {
return SplitViewState(
enabled: enabled ?? this.enabled,
expanded: expanded ?? this.expanded,
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
itemScreenArgs: itemScreenArgs ?? this.itemScreenArgs,
);
}
@ -32,6 +32,6 @@ class SplitViewState extends Equatable {
List<Object?> get props => <Object?>[
enabled,
expanded,
storyScreenArgs,
itemScreenArgs,
];
}

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hacki/cubits/cubits.dart';
import 'package:hacki/main.dart';
import 'package:hacki/screens/screens.dart' show StoryScreen, StoryScreenArgs;
import 'package:hacki/screens/screens.dart' show ItemScreen, ItemScreenArgs;
extension StateExtension on State {
void showSnackBar({
@ -26,14 +26,17 @@ extension StateExtension on State {
);
}
Future<void>? goToStoryScreen({required StoryScreenArgs args}) {
Future<void>? goToItemScreen({
required ItemScreenArgs args,
bool forceNewScreen = false,
}) {
final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
if (splitViewEnabled) {
context.read<SplitViewCubit>().updateStoryScreenArgs(args);
if (splitViewEnabled && !forceNewScreen) {
context.read<SplitViewCubit>().updateItemScreenArgs(args);
} else {
return HackiApp.navigatorKey.currentState?.pushNamed(
StoryScreen.routeName,
ItemScreen.routeName,
arguments: args,
);
}

View File

@ -1,7 +1,8 @@
extension StringExtension on String {
int? getItemId() {
final RegExp regex = RegExp(r'\d+$');
final String match = regex.stringMatch(this) ?? '';
final RegExp exception = RegExp(r'\)|].*$');
final String match = regex.stringMatch(replaceAll(exception, '')) ?? '';
return int.tryParse(match);
}

View File

@ -179,10 +179,6 @@ class HackiApp extends StatelessWidget {
lazy: false,
create: (BuildContext context) => PostCubit(),
),
BlocProvider<EditCubit>(
lazy: false,
create: (BuildContext context) => EditCubit(),
),
],
child: AdaptiveTheme(
light: ThemeData(

View File

@ -11,6 +11,7 @@ class BuildableComment extends Comment {
required super.by,
required super.text,
required super.kids,
required super.dead,
required super.deleted,
required super.level,
required this.elements,
@ -25,6 +26,7 @@ class BuildableComment extends Comment {
by: comment.by,
text: comment.text,
kids: comment.kids,
dead: comment.dead,
deleted: comment.deleted,
level: comment.level,
);

View File

@ -1,6 +1,5 @@
import 'dart:convert';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/item.dart';
class Comment extends Item {
@ -12,11 +11,11 @@ class Comment extends Item {
required super.by,
required super.text,
required super.kids,
required super.dead,
required super.deleted,
required this.level,
}) : super(
descendants: 0,
dead: false,
parts: <int>[],
title: '',
url: '',
@ -43,8 +42,7 @@ class Comment extends Item {
final int level;
String get postedDate =>
DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
String get metadata => '''by $by $postedDate''';
Comment copyWith({int? level}) {
return Comment(
@ -55,6 +53,7 @@ class Comment extends Item {
by: by,
text: text,
kids: kids,
dead: dead,
deleted: deleted,
level: level ?? this.level,
);

View File

@ -1,4 +1,5 @@
import 'package:equatable/equatable.dart';
import 'package:hacki/extensions/date_time_extension.dart';
abstract class Item extends Equatable {
const Item({
@ -54,6 +55,9 @@ abstract class Item extends Equatable {
final List<int> kids;
final List<int> parts;
String get postedDate =>
DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
bool get isPoll => type == 'poll';
bool get isStory => type == 'story';

View File

@ -1,6 +1,5 @@
import 'dart:convert';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/item.dart';
class PollOption extends Item {
@ -63,9 +62,6 @@ class PollOption extends Item {
final double ratio;
String get postedDate =>
DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
PollOption copyWith({double? ratio}) {
return PollOption(
id: id,

View File

@ -1,6 +1,5 @@
import 'dart:convert';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/item.dart';
enum StoryType {
@ -94,9 +93,6 @@ class Story extends Item {
String get simpleMetadata =>
'''$score point${score > 1 ? 's' : ''} $descendants comment${descendants > 1 ? 's' : ''} $postedDate''';
String get postedDate =>
DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
Map<String, dynamic> toJson() {
return <String, dynamic>{
'descendants': descendants,

View File

@ -1,5 +1,7 @@
import 'package:flutter/foundation.dart';
import 'package:hacki/models/models.dart';
import 'package:hive/hive.dart';
import 'package:http/http.dart';
/// [CacheRepository] is for storing stories and comments for offline reading.
/// It's using [Hive] as its database which is being stored in temp directory.
@ -7,19 +9,23 @@ class CacheRepository {
CacheRepository({
Future<Box<List<int>>>? storyIdBox,
Future<Box<Map<dynamic, dynamic>>>? storyBox,
Future<Box<String>>? webPageBox,
Future<LazyBox<Map<dynamic, dynamic>>>? commentBox,
}) : _storyIdBox = storyIdBox ?? Hive.openBox<List<int>>(_storyIdBoxName),
_storyBox =
storyBox ?? Hive.openBox<Map<dynamic, dynamic>>(_storyBoxName),
_webPageBox = webPageBox ?? Hive.openBox<String>(_webPageBoxName),
_commentBox = commentBox ??
Hive.openLazyBox<Map<dynamic, dynamic>>(_commentBoxName);
static const String _storyIdBoxName = 'storyIdBox';
static const String _storyBoxName = 'storyBox';
static const String _commentBoxName = 'commentBox';
static const String _webPageBoxName = 'webPageBox';
final Future<Box<List<int>>> _storyIdBox;
final Future<Box<Map<dynamic, dynamic>>> _storyBox;
final Future<LazyBox<Map<dynamic, dynamic>>> _commentBox;
final Future<Box<String>> _webPageBox;
Future<bool> get hasCachedStories =>
_storyBox.then((Box<Map<dynamic, dynamic>> box) => box.isNotEmpty);
@ -37,6 +43,22 @@ class CacheRepository {
return box.put(story.id.toString(), story.toJson());
}
Future<void> cacheUrl({required String url}) async {
final Box<String> box = await _webPageBox;
final String html = await compute(downloadWebPage, url);
return box.put(url, html);
}
Future<String?> getHtml({required String url}) async {
final Box<String> box = await _webPageBox;
return box.get(url);
}
Future<bool> hasCachedWebPage({required String url}) async {
final Box<String> box = await _webPageBox;
return box.containsKey(url);
}
Future<List<int>> getCachedStoryIds({required StoryType of}) async {
final Box<List<int>> box = await _storyIdBox;
final List<int>? ids = box.get(of.name);
@ -119,9 +141,27 @@ class CacheRepository {
return box.clear();
}
Future<int> deleteAllWebPages() async {
final Box<String> box = await _webPageBox;
return box.clear();
}
Future<int> deleteAll() async {
return deleteAllStoryIds()
.whenComplete(deleteAllStories)
.whenComplete(deleteAllComments);
.whenComplete(deleteAllComments)
.whenComplete(deleteAllWebPages);
}
static Future<String> downloadWebPage(String link) async {
try {
final Client client = Client();
final Uri url = Uri.parse(link);
final Response response = await client.get(url);
final String body = response.body;
return body;
} catch (_) {
return '''Web page not available.''';
}
}
}

View File

@ -170,7 +170,7 @@ class StoriesRepository {
if (json == null) return null;
final String type = json['type'] as String;
if (type == 'story' || type == 'job') {
if (type == 'story' || type == 'job' || type == 'poll') {
final Story story = Story.fromJson(json);
return story;
} else if (json['type'] == 'comment') {
@ -192,7 +192,7 @@ class StoriesRepository {
final Map<String, dynamic> json = val as Map<String, dynamic>;
final String type = json['type'] as String;
if (type == 'story' || type == 'job') {
if (type == 'story' || type == 'job' || type == 'poll') {
final Story story = Story.fromJson(json);
return story;
} else if (json['type'] == 'comment') {

View File

@ -62,11 +62,14 @@ class _HomeScreenState extends State<HomeScreen>
@override
void didPopNext() {
super.didPopNext();
if (context.read<StoriesBloc>().deviceScreenType ==
DeviceScreenType.mobile) {
cacheService.resetCollapsedComments();
Future<void>.delayed(
const Duration(milliseconds: 500),
cacheService.resetCollapsedComments,
);
}
super.didPopNext();
}
@override
@ -372,16 +375,16 @@ class _HomeScreenState extends State<HomeScreen>
if (isJobWithLink) {
context.read<ReminderCubit>().removeLastReadStoryId();
} else {
final StoryScreenArgs args = StoryScreenArgs(story: story);
final ItemScreenArgs args = ItemScreenArgs(item: story);
context.read<ReminderCubit>().updateLastReadStoryId(story.id);
if (splitViewEnabled) {
context.read<SplitViewCubit>().updateStoryScreenArgs(args);
context.read<SplitViewCubit>().updateItemScreenArgs(args);
} else {
HackiApp.navigatorKey.currentState
?.pushNamed(
StoryScreen.routeName,
ItemScreen.routeName,
arguments: args,
)
.whenComplete(() {
@ -390,8 +393,12 @@ class _HomeScreenState extends State<HomeScreen>
}
}
if (!offlineReading && (isJobWithLink || (showWebFirst && !hasRead))) {
LinkUtil.launch(story.url, useReader: useReader);
if (story.url.isNotEmpty && (isJobWithLink || (showWebFirst && !hasRead))) {
LinkUtil.launch(
story.url,
useReader: useReader,
offlineReading: offlineReading,
);
}
context.read<StoriesBloc>().add(
@ -429,13 +436,10 @@ class _HomeScreenState extends State<HomeScreen>
final int? id = event.getItemId();
if (id != null) {
locator
.get<StoriesRepository>()
.fetchParentStory(id: id)
.then((Story? story) {
locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
if (mounted) {
if (story != null) {
goToStoryScreen(args: StoryScreenArgs(story: story));
if (item != null) {
goToItemScreen(args: ItemScreenArgs(item: item));
}
}
});
@ -455,8 +459,8 @@ class _HomeScreenState extends State<HomeScreen>
showSnackBar(content: 'Something went wrong...');
return;
}
final StoryScreenArgs args = StoryScreenArgs(story: story);
goToStoryScreen(args: args);
final ItemScreenArgs args = ItemScreenArgs(item: story);
goToItemScreen(args: args);
});
}
@ -480,8 +484,8 @@ class _HomeScreenState extends State<HomeScreen>
showSnackBar(content: 'Something went wrong...');
return;
}
final StoryScreenArgs args = StoryScreenArgs(story: story);
goToStoryScreen(args: args);
final ItemScreenArgs args = ItemScreenArgs(item: story);
goToItemScreen(args: args);
});
}
}
@ -579,10 +583,10 @@ class _TabletStoryView extends StatelessWidget {
Widget build(BuildContext context) {
return BlocBuilder<SplitViewCubit, SplitViewState>(
buildWhen: (SplitViewState previous, SplitViewState current) =>
previous.storyScreenArgs != current.storyScreenArgs,
previous.itemScreenArgs != current.itemScreenArgs,
builder: (BuildContext context, SplitViewState state) {
if (state.storyScreenArgs != null) {
return StoryScreen.build(context, state.storyScreenArgs!);
if (state.itemScreenArgs != null) {
return ItemScreen.build(context, state.itemScreenArgs!);
}
return Material(

View File

@ -16,7 +16,7 @@ import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/main.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:hacki/screens/story/widgets/widgets.dart';
import 'package:hacki/screens/item/widgets/widgets.dart';
import 'package:hacki/screens/widgets/widgets.dart';
import 'package:hacki/services/services.dart';
import 'package:hacki/utils/utils.dart';
@ -33,64 +33,63 @@ enum _MenuAction {
cancel,
}
class StoryScreenArgs extends Equatable {
const StoryScreenArgs({
required this.story,
class ItemScreenArgs extends Equatable {
const ItemScreenArgs({
required this.item,
this.onlyShowTargetComment = false,
this.targetComments,
});
final Story story;
final Item item;
final bool onlyShowTargetComment;
final List<Comment>? targetComments;
@override
List<Object?> get props => <Object?>[
story,
item,
onlyShowTargetComment,
targetComments,
];
}
class StoryScreen extends StatefulWidget {
const StoryScreen({
class ItemScreen extends StatefulWidget {
const ItemScreen({
super.key,
this.splitViewEnabled = false,
required this.story,
required this.item,
required this.parentComments,
});
static const String routeName = '/story';
static const String routeName = '/item';
static Route<dynamic> route(StoryScreenArgs args) {
return MaterialPageRoute<StoryScreen>(
static Route<dynamic> route(ItemScreenArgs args) {
return MaterialPageRoute<ItemScreen>(
settings: const RouteSettings(name: routeName),
builder: (BuildContext context) => MultiBlocProvider(
providers: <BlocProvider<dynamic>>[
BlocProvider<CommentsCubit>(
create: (_) => CommentsCubit(
offlineReading: context.read<StoriesBloc>().state.offlineReading,
story: args.story,
item: args.item,
)..init(
onlyShowTargetComment: args.onlyShowTargetComment,
targetParents: args.targetComments,
),
),
if (args.story.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: args.story)..init(),
),
BlocProvider<EditCubit>(
lazy: false,
create: (BuildContext context) => EditCubit(),
),
],
child: StoryScreen(
story: args.story,
child: ItemScreen(
item: args.item,
parentComments: args.targetComments ?? <Comment>[],
),
),
);
}
static Widget build(BuildContext context, StoryScreenArgs args) {
static Widget build(BuildContext context, ItemScreenArgs args) {
return WillPopScope(
onWillPop: () async {
if (context.read<SplitViewCubit>().state.expanded) {
@ -101,25 +100,24 @@ class StoryScreen extends StatefulWidget {
}
},
child: MultiBlocProvider(
key: ValueKey<StoryScreenArgs>(args),
key: ValueKey<ItemScreenArgs>(args),
providers: <BlocProvider<dynamic>>[
BlocProvider<CommentsCubit>(
create: (BuildContext context) => CommentsCubit(
offlineReading: context.read<StoriesBloc>().state.offlineReading,
story: args.story,
item: args.item,
)..init(
onlyShowTargetComment: args.onlyShowTargetComment,
targetParents: args.targetComments,
),
),
if (args.story.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: args.story)..init(),
),
BlocProvider<EditCubit>(
lazy: false,
create: (BuildContext context) => EditCubit(),
),
],
child: StoryScreen(
story: args.story,
child: ItemScreen(
item: args.item,
parentComments: args.targetComments ?? <Comment>[],
splitViewEnabled: true,
),
@ -128,14 +126,14 @@ class StoryScreen extends StatefulWidget {
}
final bool splitViewEnabled;
final Story story;
final Item item;
final List<Comment> parentComments;
@override
_StoryScreenState createState() => _StoryScreenState();
_ItemScreenState createState() => _ItemScreenState();
}
class _StoryScreenState extends State<StoryScreen> {
class _ItemScreenState extends State<ItemScreen> {
final TextEditingController commentEditingController =
TextEditingController();
final ScrollController scrollController = ScrollController();
@ -187,6 +185,7 @@ class _StoryScreenState extends State<StoryScreen> {
scrollController.dispose();
storyLinkTapThrottle.dispose();
featureDiscoveryDismissThrottle.dispose();
focusNode.dispose();
super.dispose();
}
@ -271,16 +270,18 @@ class _StoryScreenState extends State<StoryScreen> {
controller: refreshController,
onRefresh: () {
HapticFeedback.lightImpact();
locator.get<CacheService>().resetComments();
context.read<CommentsCubit>().refresh();
if (widget.story.isPoll) {
context.read<PollCubit>().refresh();
if (context.read<StoriesBloc>().state.offlineReading) {
refreshController.refreshCompleted();
} else {
context.read<CommentsCubit>().refresh();
if (widget.item.isPoll) {
context.read<PollCubit>().refresh();
}
}
},
onLoading: () {
context.read<CommentsCubit>().loadMore();
},
onLoading: context.read<CommentsCubit>().loadMore,
child: ListView(
primary: false,
children: <Widget>[
@ -300,13 +301,13 @@ class _StoryScreenState extends State<StoryScreen> {
onPressed: (_) {
HapticFeedback.lightImpact();
if (widget.story !=
if (widget.item !=
context.read<EditCubit>().state.replyingTo) {
commentEditingController.clear();
}
context
.read<EditCubit>()
.onReplyTapped(widget.story);
.onReplyTapped(widget.item);
focusNode.requestFocus();
},
backgroundColor: Colors.orange,
@ -314,7 +315,7 @@ class _StoryScreenState extends State<StoryScreen> {
icon: Icons.message,
),
SlidableAction(
onPressed: (_) => onMorePressed(widget.story),
onPressed: (_) => onMoreTapped(widget.item),
backgroundColor: Colors.orange,
foregroundColor: Colors.white,
icon: Icons.more_horiz,
@ -331,14 +332,14 @@ class _StoryScreenState extends State<StoryScreen> {
child: Row(
children: <Widget>[
Text(
widget.story.by,
state.item.by,
style: const TextStyle(
color: Colors.orange,
),
),
const Spacer(),
Text(
widget.story.postedDate,
state.item.postedDate,
style: const TextStyle(
color: Colors.grey,
),
@ -346,40 +347,49 @@ class _StoryScreenState extends State<StoryScreen> {
],
),
),
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,
if (state.item is Story)
InkWell(
onTap: () => LinkUtil.launch(
state.item.url,
useReader: context
.read<PreferenceCubit>()
.state
.useReader,
offlineReading: context
.read<StoriesBloc>()
.state
.offlineReading,
),
child: Text(
widget.story.title,
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.bold,
color: widget.story.url.isNotEmpty
? Colors.orange
: null,
child: Padding(
padding: const EdgeInsets.only(
left: 6,
right: 6,
bottom: 12,
top: 12,
),
child: Text(
state.item.title,
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.bold,
color: state.item.url.isNotEmpty
? Colors.orange
: null,
),
),
),
)
else
const SizedBox(
height: 6,
),
),
if (widget.story.text.isNotEmpty)
if (state.item.text.isNotEmpty)
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 10,
),
child: SelectableLinkify(
text: widget.story.text,
text: widget.item.text,
style: TextStyle(
fontSize:
MediaQuery.of(context).textScaleFactor *
@ -402,14 +412,18 @@ class _StoryScreenState extends State<StoryScreen> {
},
),
),
if (widget.story.isPoll)
PollView(
onLoginTapped: onLoginTapped,
if (state.item.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: state.item as Story)..init(),
child: PollView(
onLoginTapped: onLoginTapped,
),
),
],
),
),
if (widget.story.text.isNotEmpty)
if (state.item.text.isNotEmpty)
const SizedBox(
height: 8,
),
@ -417,10 +431,87 @@ class _StoryScreenState extends State<StoryScreen> {
height: 0,
),
if (state.onlyShowTargetComment) ...<Widget>[
TextButton(
onPressed: () =>
context.read<CommentsCubit>().loadAll(widget.story),
child: const Text('View all comments'),
Center(
child: TextButton(
onPressed: () => context
.read<CommentsCubit>()
.loadAll(state.item as Story),
child: const Text('View all comments'),
),
),
const Divider(
height: 0,
),
] else ...<Widget>[
Row(
children: <Widget>[
if (state.item is Story) ...<Widget>[
const SizedBox(
width: 12,
),
Text(
'''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''',
),
] else ...<Widget>[
const SizedBox(
width: 4,
),
TextButton(
onPressed: context
.read<CommentsCubit>()
.loadParentThread,
child: state.fetchParentStatus ==
CommentsStatus.loading
? const SizedBox(
height: 12,
width: 12,
child: CustomCircularProgressIndicator(
strokeWidth: 2,
),
)
: const Text('View parent thread'),
),
],
const Spacer(),
DropdownButton<CommentsOrder>(
value: state.order,
underline: const SizedBox.shrink(),
items: const <DropdownMenuItem<CommentsOrder>>[
DropdownMenuItem<CommentsOrder>(
value: CommentsOrder.natural,
child: Text(
'Natural',
style: TextStyle(
fontSize: 14,
),
),
),
DropdownMenuItem<CommentsOrder>(
value: CommentsOrder.newestFirst,
child: Text(
'Newest first',
style: TextStyle(
fontSize: 14,
),
),
),
DropdownMenuItem<CommentsOrder>(
value: CommentsOrder.oldestFirst,
child: Text(
'Oldest first',
style: TextStyle(
fontSize: 14,
),
),
),
],
onChanged:
context.read<CommentsCubit>().onOrderChanged,
),
const SizedBox(
width: 4,
),
],
),
const Divider(
height: 0,
@ -446,7 +537,7 @@ class _StoryScreenState extends State<StoryScreen> {
level: comment.level,
myUsername:
authState.isLoggedIn ? authState.username : null,
opUsername: widget.story.by,
opUsername: widget.item.by,
onReplyTapped: (Comment cmt) {
HapticFeedback.lightImpact();
if (cmt.deleted || cmt.dead) {
@ -470,9 +561,9 @@ class _StoryScreenState extends State<StoryScreen> {
context.read<EditCubit>().onEditTapped(cmt);
focusNode.requestFocus();
},
onMoreTapped: onMorePressed,
onMoreTapped: onMoreTapped,
onStoryLinkTapped: onStoryLinkTapped,
onTimeMachineActivated: onTimeMachineActivated,
onRightMoreTapped: onRightMoreTapped,
),
),
if ((state.status == CommentsStatus.allLoaded &&
@ -523,8 +614,10 @@ class _StoryScreenState extends State<StoryScreen> {
SplitViewState current,
) =>
previous.expanded != current.expanded,
builder:
(BuildContext context, SplitViewState state) {
builder: (
BuildContext context,
SplitViewState state,
) {
return Positioned(
top: 0,
left: 0,
@ -533,7 +626,7 @@ class _StoryScreenState extends State<StoryScreen> {
backgroundColor: Theme.of(context)
.canvasColor
.withOpacity(0.6),
story: widget.story,
item: widget.item,
scrollController: scrollController,
onBackgroundTap:
onFeatureDiscoveryDismissed,
@ -573,7 +666,7 @@ class _StoryScreenState extends State<StoryScreen> {
appBar: CustomAppBar(
backgroundColor:
Theme.of(context).canvasColor.withOpacity(0.6),
story: widget.story,
item: widget.item,
scrollController: scrollController,
onBackgroundTap: onFeatureDiscoveryDismissed,
onDismiss: onFeatureDiscoveryDismissed,
@ -608,12 +701,53 @@ class _StoryScreenState extends State<StoryScreen> {
return Future<bool>.value(false);
}
void onRightMoreTapped(Comment comment) {
HapticFeedback.lightImpact();
showModalBottomSheet<void>(
context: context,
builder: (BuildContext context) {
return Container(
height: 140,
color: Theme.of(context).canvasColor,
child: Material(
color: Colors.transparent,
child: Column(
children: <Widget>[
ListTile(
leading: const Icon(Icons.av_timer),
title: const Text('View parents'),
onTap: () {
Navigator.pop(context);
onTimeMachineActivated(comment);
},
enabled:
comment.level > 0 && !(comment.dead || comment.deleted),
),
ListTile(
leading: const Icon(Icons.list),
title: const Text('View in separate thread'),
onTap: () {
Navigator.pop(context);
goToItemScreen(
args: ItemScreenArgs(item: comment),
forceNewScreen: true,
);
},
enabled: !(comment.dead || comment.deleted),
),
],
),
),
);
},
);
}
void onTimeMachineActivated(Comment comment) {
final Size size = MediaQuery.of(context).size;
final DeviceScreenType deviceType = getDeviceType(size);
final double widthFactor =
deviceType != DeviceScreenType.mobile ? 0.6 : 0.9;
HapticFeedback.lightImpact();
showDialog<void>(
context: context,
builder: (BuildContext context) {
@ -623,6 +757,7 @@ class _StoryScreenState extends State<StoryScreen> {
builder: (BuildContext context, TimeMachineState state) {
return Center(
child: Material(
color: Theme.of(context).canvasColor,
borderRadius: const BorderRadius.all(Radius.circular(4)),
child: SizedBox(
height: size.height * 0.8,
@ -687,15 +822,12 @@ class _StoryScreenState extends State<StoryScreen> {
final int? id = link.getItemId();
if (id != null) {
storyLinkTapThrottle.run(() {
locator
.get<StoriesRepository>()
.fetchParentStory(id: id)
.then((Story? story) {
locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
if (mounted) {
if (story != null) {
if (item != null) {
HackiApp.navigatorKey.currentState!.pushNamed(
StoryScreen.routeName,
arguments: StoryScreenArgs(story: story),
ItemScreen.routeName,
arguments: ItemScreenArgs(item: item),
);
}
}
@ -706,7 +838,7 @@ class _StoryScreenState extends State<StoryScreen> {
}
}
void onMorePressed(Item item) {
void onMoreTapped(Item item) {
HapticFeedback.lightImpact();
if (item.dead || item.deleted) {
@ -781,50 +913,45 @@ class _StoryScreenState extends State<StoryScreen> {
showDialog<void>(
context: context,
builder: (BuildContext context) =>
SimpleDialog(
AlertDialog(
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,
content: state.user.about.isEmpty
? Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: const <Widget>[
Text(
'empty',
style: TextStyle(
color: Colors.grey,
),
),
],
)
: SelectableLinkify(
text: HtmlUtil.parseHtml(
state.user.about,
),
child: const Text(
'Okay',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.white,
),
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);
}
},
),
],
actions: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text(
'Okay',
),
),
],
),
@ -942,53 +1069,25 @@ class _StoryScreenState extends State<StoryScreen> {
showDialog<bool>(
context: context,
builder: (BuildContext context) {
return SimpleDialog(
return AlertDialog(
title: const Text('Flag this comment?'),
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
left: 24,
right: 12,
),
child: Text(
'Flag this comment posted by ${item.by}?',
style: const TextStyle(
color: Colors.grey,
),
content: Text(
'Flag this comment posted by ${item.by}?',
style: const TextStyle(
color: Colors.grey,
),
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text(
'Cancel',
),
),
Padding(
padding: const EdgeInsets.only(
right: 12,
),
child: ButtonBar(
children: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text(
'Cancel',
style: TextStyle(
color: Colors.red,
),
),
),
ElevatedButton(
onPressed: () {
Navigator.pop(context, true);
},
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.all(Colors.deepOrange),
),
child: const Text(
'Yes',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
),
],
TextButton(
onPressed: () => Navigator.pop(context, true),
child: const Text(
'Yes',
),
),
],
@ -1006,55 +1105,27 @@ class _StoryScreenState extends State<StoryScreen> {
showDialog<bool>(
context: context,
builder: (BuildContext context) {
return SimpleDialog(
return AlertDialog(
title: Text('${isBlocked ? 'Unblock' : 'Block'} this user?'),
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
left: 24,
right: 12,
),
child: Text(
'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
' and ${isBlocked ? 'display' : 'hide'} '
'comments posted by this user?',
style: const TextStyle(
color: Colors.grey,
),
content: Text(
'Do you want to ${isBlocked ? 'unblock' : 'block'} ${item.by}'
' and ${isBlocked ? 'display' : 'hide'} '
'comments posted by this user?',
style: const TextStyle(
color: Colors.grey,
),
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text(
'Cancel',
),
),
Padding(
padding: const EdgeInsets.only(
right: 12,
),
child: ButtonBar(
children: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text(
'Cancel',
style: TextStyle(
color: Colors.red,
),
),
),
ElevatedButton(
onPressed: () {
Navigator.pop(context, true);
},
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.all(Colors.deepOrange),
),
child: const Text(
'Yes',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
),
],
TextButton(
onPressed: () => Navigator.pop(context, true),
child: const Text(
'Yes',
),
),
],
@ -1239,9 +1310,6 @@ class _StoryScreenState extends State<StoryScreen> {
},
child: const Text(
'Cancel',
style: TextStyle(
color: Colors.red,
),
),
),
ElevatedButton(

View File

@ -2,16 +2,13 @@ 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';
import 'package:hacki/screens/story/widgets/pin_icon_button.dart';
import 'package:hacki/screens/story/widgets/scroll_up_icon_button.dart';
import 'package:hacki/screens/item/widgets/widgets.dart';
class CustomAppBar extends AppBar {
CustomAppBar({
Key? key,
required ScrollController scrollController,
required Story story,
required Item item,
required Color backgroundColor,
required Future<bool> Function() onBackgroundTap,
required Future<bool> Function() onDismiss,
@ -41,18 +38,19 @@ class CustomAppBar extends AppBar {
ScrollUpIconButton(
scrollController: scrollController,
),
PinIconButton(
story: story,
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,
),
if (item is Story)
PinIconButton(
story: item,
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,
),
FavIconButton(
storyId: story.id,
storyId: item.id,
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,
),
LinkIconButton(
storyId: story.id,
storyId: item.id,
onBackgroundTap: onBackgroundTap,
onDismiss: onDismiss,
),

View File

@ -83,20 +83,24 @@ class _ReplyBoxState extends State<ReplyBox> {
),
Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 12,
vertical: 8,
),
child: Text(
replyingTo == null
? 'Editing'
: 'Replying '
'${replyingTo.by}',
style: const TextStyle(color: Colors.grey),
Expanded(
child: Padding(
padding: const EdgeInsets.only(
left: 12,
top: 8,
bottom: 8,
),
child: Text(
replyingTo == null
? 'Editing'
: 'Replying '
'${replyingTo.by}',
style: const TextStyle(color: Colors.grey),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
),
const Spacer(),
if (!isLoading) ...<Widget>[
...<Widget>[
if (replyingTo != null)

View File

@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:hacki/blocs/blocs.dart';
import 'package:hacki/config/constants.dart';
@ -134,8 +135,8 @@ class _ProfileScreenState extends State<ProfileScreen>
},
onTap: (Item item) {
if (item is Story) {
goToStoryScreen(
args: StoryScreenArgs(story: item),
goToItemScreen(
args: ItemScreenArgs(item: item),
);
} else if (item is Comment) {
onCommentTapped(item);
@ -159,7 +160,7 @@ class _ProfileScreenState extends State<ProfileScreen>
}
},
builder: (BuildContext context, FavState favState) {
if (favState.favStories.isEmpty &&
if (favState.favItems.isEmpty &&
favState.status != FavStatus.loading) {
return const CenteredMessageView(
content:
@ -168,12 +169,13 @@ class _ProfileScreenState extends State<ProfileScreen>
'News account if you are logged in.',
);
}
return ItemsListView<Story>(
return ItemsListView<Item>(
showWebPreview:
preferenceState.showComplexStoryTile,
showMetadata: preferenceState.showMetadata,
useCommentTile: true,
refreshController: refreshControllerFav,
items: favState.favStories,
items: favState.favItems,
onRefresh: () {
HapticFeedback.lightImpact();
context.read<FavCubit>().refresh();
@ -181,8 +183,8 @@ class _ProfileScreenState extends State<ProfileScreen>
onLoadMore: () {
context.read<FavCubit>().loadMore();
},
onTap: (Story story) => goToStoryScreen(
args: StoryScreenArgs(story: story),
onTap: (Item item) => goToItemScreen(
args: ItemScreenArgs(item: item),
),
);
},
@ -407,7 +409,7 @@ class _ProfileScreenState extends State<ProfileScreen>
showAboutDialog(
context: context,
applicationName: 'Hacki',
applicationVersion: 'v0.2.18',
applicationVersion: 'v0.2.21',
applicationIcon: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(12),
@ -447,7 +449,7 @@ class _ProfileScreenState extends State<ProfileScreen>
SizedBox(
width: 12,
),
Text('Source Code'),
Text('Source code'),
],
),
),
@ -465,7 +467,23 @@ class _ProfileScreenState extends State<ProfileScreen>
SizedBox(
width: 12,
),
Text('Like the App?'),
Text('Like the app?'),
],
),
),
ElevatedButton(
onPressed: () => LinkUtil.launch(
Constants.sponsorLink,
),
child: Row(
children: const <Widget>[
Icon(
FeatherIcons.coffee,
),
SizedBox(
width: 12,
),
Text('Buy me a coffee'),
],
),
),
@ -648,18 +666,18 @@ class _ProfileScreenState extends State<ProfileScreen>
child: const Text(
'Cancel',
style: TextStyle(
color: Colors.red,
color: Colors.orange,
),
),
),
ElevatedButton(
TextButton(
onPressed: () {
Navigator.pop(context);
locator
.get<SembastRepository>()
.deleteAllCachedComments()
.whenComplete(
locator.get<SembastRepository>().deleteAllCachedComments,
locator.get<CacheRepository>().deleteAll,
)
.whenComplete(
locator.get<PreferenceRepository>().clearAllReadStories,
@ -671,15 +689,8 @@ class _ProfileScreenState extends State<ProfileScreen>
showSnackBar(content: 'Data cleared!');
});
},
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.deepOrange),
),
child: const Text(
'Yes',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
),
],
@ -695,9 +706,9 @@ class _ProfileScreenState extends State<ProfileScreen>
.fetchParentStoryWithComments(id: comment.parent)
.then((Tuple2<Story, List<Comment>>? tuple) {
if (tuple != null && mounted) {
goToStoryScreen(
args: StoryScreenArgs(
story: tuple.item1,
goToItemScreen(
args: ItemScreenArgs(
item: tuple.item1,
targetComments: tuple.item2.isEmpty
? <Comment>[comment]
: <Comment>[
@ -855,9 +866,6 @@ class _ProfileScreenState extends State<ProfileScreen>
},
child: const Text(
'Cancel',
style: TextStyle(
color: Colors.red,
),
),
),
ElevatedButton(
@ -909,63 +917,30 @@ class _ProfileScreenState extends State<ProfileScreen>
context: context,
barrierDismissible: false,
builder: (BuildContext context) {
return SimpleDialog(
children: <Widget>[
...<Widget>[
const SizedBox(
height: 16,
return AlertDialog(
content: Text(
'Log out as ${authBloc.state.username}?',
style: const TextStyle(
fontSize: 16,
),
),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text(
'Cancel',
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 18,
),
child: Text(
'Log out as ${authBloc.state.username}?',
style: const TextStyle(
fontSize: 16,
),
),
),
TextButton(
onPressed: () {
Navigator.pop(context);
context.read<AuthBloc>().add(AuthLogout());
context.read<HistoryCubit>().reset();
},
child: const Text(
'Log out',
),
const SizedBox(
height: 16,
),
Padding(
padding: const EdgeInsets.only(
right: 12,
),
child: ButtonBar(
children: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text(
'Cancel',
style: TextStyle(
color: Colors.red,
),
),
),
ElevatedButton(
onPressed: () {
Navigator.pop(context);
context.read<AuthBloc>().add(AuthLogout());
context.read<HistoryCubit>().reset();
},
style: ButtonStyle(
backgroundColor:
MaterialStateProperty.all(Colors.deepOrange),
),
child: const Text(
'Log out',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
),
],
),
),
],
),
],
);
},

View File

@ -14,12 +14,15 @@ class OfflineListTile extends StatelessWidget {
listenWhen: (StoriesState previous, StoriesState current) =>
previous.downloadStatus != current.downloadStatus,
listener: (BuildContext context, StoriesState state) {
if (state.downloadStatus == StoriesDownloadStatus.failure) {
if (state.downloadStatus == StoriesDownloadStatus.failure ||
state.downloadStatus == StoriesDownloadStatus.finished) {
Wakelock.disable();
}
},
buildWhen: (StoriesState previous, StoriesState current) =>
previous.downloadStatus != current.downloadStatus,
previous.downloadStatus != current.downloadStatus ||
previous.storiesDownloaded != current.storiesDownloaded ||
previous.storiesToBeDownloaded != current.storiesToBeDownloaded,
builder: (BuildContext context, StoriesState state) {
final bool downloading =
state.downloadStatus == StoriesDownloadStatus.downloading;
@ -41,19 +44,53 @@ class OfflineListTile extends StatelessWidget {
return ListTile(
title: Text(
downloading ? 'Downloading All Stories...' : 'Download All Stories',
downloading
? '''Downloading All Stories (${state.storiesDownloaded}/${state.storiesToBeDownloaded})'''
: 'Download All Stories',
),
subtitle: const Text(
'download all latest stories that have at least one comment '
"for offline reading. (web page won't be downloaded)",
'for offline reading. (Please keep Hacki in foreground while '
'downloading.)',
),
trailing: trailingWidget,
isThreeLine: true,
onTap: () {
if (state.downloadStatus == StoriesDownloadStatus.downloading) {
return;
}
Connectivity().checkConnectivity().then((ConnectivityResult res) {
if (res != ConnectivityResult.none) {
Wakelock.enable();
context.read<StoriesBloc>().add(StoriesDownload());
showDialog<bool>(
context: context,
builder: (BuildContext context) => AlertDialog(
title: const Text('Download web pages as well?'),
content: const Text('It will take longer time.'),
actions: <Widget>[
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('Cancel'),
),
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('No'),
),
TextButton(
onPressed: () => Navigator.pop(context, true),
child: const Text('Yes'),
),
],
),
).then((bool? includeWebPage) {
if (includeWebPage != null) {
Wakelock.enable();
context.read<StoriesBloc>().add(
StoriesDownload(
includingWebPage: includeWebPage,
),
);
}
});
}
});
},

View File

@ -1,5 +1,6 @@
export 'home_screen.dart';
export 'item/item_screen.dart';
export 'profile/profile_screen.dart';
export 'search/search_screen.dart';
export 'story/story_screen.dart';
export 'submit/submit_screen.dart';
export 'web_view/web_view_screen.dart';

View File

@ -162,8 +162,8 @@ class _SearchScreenState extends State<SearchScreen> {
prefState.showComplexStoryTile,
showMetadata: prefState.showMetadata,
story: e,
onTap: () => goToStoryScreen(
args: StoryScreenArgs(story: e),
onTap: () => goToItemScreen(
args: ItemScreenArgs(item: e),
),
),
),

View File

@ -0,0 +1,54 @@
import 'package:flutter/material.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:webview_flutter/webview_flutter.dart';
class WebViewScreen extends StatefulWidget {
const WebViewScreen({
super.key,
required this.url,
});
final String url;
@override
State<WebViewScreen> createState() => _WebViewScreenState();
}
class _WebViewScreenState extends State<WebViewScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Theme.of(context).canvasColor,
title: Text(
humanize(widget.url),
style: const TextStyle(
fontSize: 12,
),
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
centerTitle: true,
),
body: WebView(
onWebViewCreated: (WebViewController controller) async {
final String? html = await locator.get<CacheRepository>().getHtml(
url: widget.url,
);
if (html != null) {
await controller.loadHtmlString(html);
}
},
),
);
}
static String humanize(String link) {
final String humanized = link
.replaceFirst(RegExp('https?://'), '')
.replaceFirst(RegExp(r'www\.'), '');
return humanized;
}
}

View File

@ -18,7 +18,7 @@ class CommentTile extends StatelessWidget {
this.onReplyTapped,
this.onMoreTapped,
this.onEditTapped,
this.onTimeMachineActivated,
this.onRightMoreTapped,
this.opUsername,
this.actionable = true,
this.level = 0,
@ -32,7 +32,7 @@ class CommentTile extends StatelessWidget {
final Function(Comment)? onReplyTapped;
final Function(Comment)? onMoreTapped;
final Function(Comment)? onEditTapped;
final Function(Comment)? onTimeMachineActivated;
final Function(Comment)? onRightMoreTapped;
final Function(String) onStoryLinkTapped;
@override
@ -94,13 +94,13 @@ class CommentTile extends StatelessWidget {
],
)
: null,
endActionPane: actionable && level != 0
endActionPane: actionable
? ActionPane(
motion: const StretchMotion(),
children: <Widget>[
SlidableAction(
onPressed: (_) =>
onTimeMachineActivated?.call(comment),
onRightMoreTapped?.call(comment),
backgroundColor: Colors.orange,
foregroundColor: Colors.white,
icon: Icons.av_timer,

View File

@ -109,9 +109,8 @@ class _CountDownReminderState extends State<CountdownReminder>
showSnackBar(content: 'Something went wrong...');
return;
}
final StoryScreenArgs args =
StoryScreenArgs(story: story);
goToStoryScreen(args: args);
final ItemScreenArgs args = ItemScreenArgs(item: story);
goToItemScreen(args: args);
context.read<ReminderCubit>().removeLastReadStoryId();
});

View File

@ -18,6 +18,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
required this.items,
required this.onTap,
required this.refreshController,
this.useCommentTile = false,
this.showCommentBy = false,
this.enablePullDown = true,
this.pinnable = false,
this.markReadStories = false,
@ -32,6 +34,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
'onPinned cannot be null when pinnable is true',
);
final bool useCommentTile;
final bool showCommentBy;
final bool showWebPreview;
final bool showMetadata;
final bool enablePullDown;
@ -103,6 +107,22 @@ class ItemsListView<T extends Item> extends StatelessWidget {
),
];
} else if (e is Comment) {
if (useCommentTile) {
return <Widget>[
if (showWebPreview)
const Divider(
height: 0,
),
_CommentTile(
comment: e,
onTap: () => onTap(e),
fontSize: showWebPreview ? 14 : 16,
),
const Divider(
height: 0,
),
];
}
return <Widget>[
FadeIn(
child: Padding(
@ -135,7 +155,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
horizontal: 6,
),
child: Linkify(
text: e.text,
text:
'''${showCommentBy ? '${e.by}: ' : ''}${e.text}''',
maxLines: 4,
linkStyle: const TextStyle(
color: Colors.orange,
@ -215,3 +236,65 @@ class ItemsListView<T extends Item> extends StatelessWidget {
);
}
}
class _CommentTile extends StatelessWidget {
const _CommentTile({
Key? key,
required this.comment,
required this.onTap,
this.fontSize = 16,
}) : super(key: key);
final Comment comment;
final VoidCallback onTap;
final double fontSize;
@override
Widget build(BuildContext context) {
return InkWell(
onTap: onTap,
child: Padding(
padding: const EdgeInsets.only(left: 12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const SizedBox(
height: 8,
),
Row(
children: <Widget>[
Expanded(
child: Text(
comment.text,
style: TextStyle(
fontSize: fontSize,
),
overflow: TextOverflow.ellipsis,
maxLines: 2,
),
),
],
),
Row(
children: <Widget>[
Expanded(
child: Text(
comment.metadata,
style: TextStyle(
color: Colors.grey,
fontSize: fontSize - 2,
),
maxLines: 1,
),
),
],
),
const SizedBox(
height: 8,
),
],
),
),
);
}
}

View File

@ -13,6 +13,7 @@ class LinkPreview extends StatefulWidget {
required this.link,
required this.story,
required this.showMetadata,
required this.offlineReading,
this.cache = const Duration(days: 30),
this.titleStyle,
this.bodyStyle,
@ -100,6 +101,7 @@ class LinkPreview extends StatefulWidget {
final List<BoxShadow>? boxShadow;
final bool showMetadata;
final bool offlineReading;
@override
_LinkPreviewState createState() => _LinkPreviewState();
@ -107,7 +109,7 @@ class LinkPreview extends StatefulWidget {
class _LinkPreviewState extends State<LinkPreview> {
InfoBase? _info;
String? _errorTitle, _errorBody, _url;
String? _errorTitle, _errorBody;
bool _loading = false;
@override
@ -117,35 +119,19 @@ class _LinkPreviewState extends State<LinkPreview> {
'Oops! Unable to parse the url. We have '
'sent feedback to our developers & '
'we will try to fix this in our next release. Thanks!';
_url = widget.link.trim();
if (_url?.isNotEmpty ?? false) {
_info = WebAnalyzer.getInfoFromCache(_url);
} else {
_info = WebAnalyzer.getInfoFromCache(widget.story.id.toString());
}
_loading = true;
_getInfo();
if (_info == null) {
_loading = true;
_getInfo();
}
super.initState();
}
Future<void> _getInfo() async {
if (_url!.startsWith('http') || _url!.startsWith('https')) {
_info = await WebAnalyzer.getInfo(
_url,
story: widget.story,
cache: widget.cache,
);
} else {
_info = await WebAnalyzer.getInfo(
null,
story: widget.story,
cache: widget.cache,
);
}
_info = await WebAnalyzer.getInfo(
story: widget.story,
cache: widget.cache,
offlineReading: widget.offlineReading,
);
if (mounted) {
setState(() {
@ -189,7 +175,7 @@ class _LinkPreviewState extends State<LinkPreview> {
metadata: widget.story.simpleMetadata,
url: widget.link,
title: widget.story.title,
description: desc ?? title ?? 'no comments yet.',
description: desc ?? title ?? 'no comment yet.',
imageUri: imageUri,
imagePath: Constants.hackerNewsLogoPath,
onTap: _launchURL,

View File

@ -5,6 +5,7 @@ import 'dart:io';
import 'package:collection/collection.dart' show IterableExtension;
import 'package:fast_gbk/fast_gbk.dart';
import 'package:flutter/foundation.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart';
@ -94,12 +95,12 @@ class WebAnalyzer {
/// Get web information
/// return [InfoBase]
static InfoBase? getInfoFromCache(String? url) {
final InfoBase? info = cacheMap[url];
static InfoBase? getInfoFromCache(String? cacheKey) {
final InfoBase? info = cacheMap[cacheKey];
if (info != null) {
if (!info._timeout.isAfter(DateTime.now())) {
cacheMap.remove(url);
cacheMap.remove(cacheKey);
}
}
return info;
@ -107,13 +108,16 @@ class WebAnalyzer {
/// Get web information
/// return [InfoBase]
static Future<InfoBase?> getInfo(
String? url, {
static Future<InfoBase?> getInfo({
required Story story,
Duration cache = const Duration(hours: 24),
bool multimedia = true,
required bool offlineReading,
}) async {
InfoBase? info = getInfoFromCache(url);
final String key = getKey(story);
final String url = story.url;
InfoBase? info = getInfoFromCache(key);
if (info != null) return info;
@ -124,7 +128,31 @@ class WebAnalyzer {
)
.._timeout = DateTime.now().add(cache)
.._shouldRetry = false;
cacheMap[story.id.toString()] = info;
cacheMap[key] = info;
return info;
}
if (offlineReading) {
int index = 0;
Comment? comment;
while (comment == null && index < story.kids.length) {
comment = await locator
.get<CacheRepository>()
.getCachedComment(id: story.kids.elementAt(index));
index++;
}
info = WebInfo(
title: story.title,
description: comment != null ? '${comment.by}: ${comment.text}' : null,
)
.._shouldRetry = false
.._timeout = DateTime.now();
cacheMap[key] = info;
return info;
}
@ -138,13 +166,18 @@ class WebAnalyzer {
if (info != null && !info._shouldRetry) {
info._timeout = DateTime.now().add(cache);
cacheMap[url] = info;
cacheMap[key] = info;
}
} catch (e) {
//locator.get<Logger>().log(Level.error, e);
}
return info;
return info;
} catch (e) {
return WebInfo(
title: story.title,
description: story.text,
)
.._shouldRetry = true
.._timeout = DateTime.now();
}
}
static Future<InfoBase?> _getInfo(String url, bool? multimedia) async {
@ -186,12 +219,12 @@ class WebAnalyzer {
if (res == null || isEmpty(res[2] as String?)) {
final String? commentText = await compute(
_fetchInfoFromStoryId,
story.kids,
_fetchInfoFromStory,
<int>[story.id, ...story.kids],
);
shouldRetry = commentText == null;
fallbackDescription = commentText ?? 'no comments yet';
fallbackDescription = commentText ?? 'no comment yet';
} else {
shouldRetry = false;
}
@ -253,23 +286,25 @@ class WebAnalyzer {
}
}
static Future<String?> _fetchInfoFromStoryId(List<int> kids) async {
if (kids.isEmpty) return null;
static Future<String?> _fetchInfoFromStory(List<int> meta) async {
final StoriesRepository storiesRepository = StoriesRepository();
final int storyId = meta.first;
List<int> kids = meta.sublist(1, meta.length);
final Comment? comment = await StoriesRepository()
.fetchCommentBy(id: kids.first)
.catchError((Object err) async {
int index = 0;
Comment? comment;
// Kids of stories from search results are always empty, so here we try
// to fetch the story itself first and see if the kids are still empty.
if (kids.isEmpty) {
final Story? story = await storiesRepository.fetchStoryBy(storyId);
while (comment == null && index < kids.length) {
comment =
await CacheRepository().getCachedComment(id: kids.elementAt(index));
index++;
}
if (story == null) return null;
return comment;
});
kids = story.kids;
if (kids.isEmpty) return null;
}
final Comment? comment =
await storiesRepository.fetchCommentBy(id: kids.first);
return comment != null ? '${comment.by}: ${comment.text}' : null;
}
@ -524,4 +559,7 @@ class WebAnalyzer {
}
return source;
}
static String getKey(Story story) =>
story.url.isNotEmpty ? story.url : story.id.toString();
}

View File

@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_fadein/flutter_fadein.dart';
import 'package:hacki/blocs/blocs.dart';
import 'package:hacki/config/constants.dart';
import 'package:hacki/models/models.dart';
import 'package:hacki/screens/widgets/widgets.dart';
@ -43,6 +45,7 @@ class StoryTile extends StatelessWidget {
child: LinkPreview(
story: story,
link: story.url,
offlineReading: context.read<StoriesBloc>().state.offlineReading,
placeholderWidget: FadeIn(
child: SizedBox(
height: height,

View File

@ -2,12 +2,37 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:hacki/config/locator.dart';
import 'package:hacki/main.dart';
import 'package:hacki/repositories/repositories.dart';
import 'package:hacki/screens/screens.dart' show WebViewScreen;
import 'package:url_launcher/url_launcher.dart';
abstract class LinkUtil {
static final ChromeSafariBrowser _browser = ChromeSafariBrowser();
static void launch(String link, {bool useReader = false}) {
static void launch(
String link, {
bool useReader = false,
bool offlineReading = false,
}) {
if (offlineReading) {
locator
.get<CacheRepository>()
.hasCachedWebPage(url: link)
.then((bool cached) {
if (cached) {
HackiApp.navigatorKey.currentState?.push<void>(
MaterialPageRoute<void>(
builder: (BuildContext context) => WebViewScreen(url: link),
),
);
}
});
return;
}
Uri rinseLink(String link) {
final RegExp regex = RegExp(r'\)|].*$');
if (!link.contains('en.wikipedia.org') && link.contains(regex)) {

View File

@ -99,20 +99,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
chewie:
dependency: transitive
description:
name: chewie
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.3"
chewie_audio:
dependency: transitive
description:
name: chewie_audio
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
clipboard:
dependency: "direct main"
description:
@ -204,13 +190,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.17.1"
cupertino_icons:
dependency: transitive
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.4"
dbus:
dependency: transitive
description:
@ -316,13 +295,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0+1"
flutter_html:
dependency: "direct main"
description:
name: flutter_html
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
flutter_inappwebview:
dependency: "direct main"
description:
@ -330,13 +302,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "5.4.3+7"
flutter_layout_grid:
dependency: transitive
description:
name: flutter_layout_grid
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.6"
flutter_linkify:
dependency: "direct main"
description:
@ -365,13 +330,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.0"
flutter_math_fork:
dependency: transitive
description:
name: flutter_math_fork
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0"
flutter_secure_storage:
dependency: "direct main"
description:
@ -428,13 +386,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.1"
flutter_svg:
dependency: transitive
description:
name: flutter_svg
url: "https://pub.dartlang.org"
source: hosted
version: "0.23.0+1"
flutter_test:
dependency: "direct dev"
description: flutter
@ -620,13 +571,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.1"
numerus:
dependency: transitive
description:
name: numerus
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.1"
octo_image:
dependency: transitive
description:
@ -648,20 +592,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.1"
path_drawing:
dependency: transitive
description:
name: path_drawing
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.1+1"
path_parsing:
dependency: transitive
description:
name: path_parsing
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.1"
path_provider:
dependency: "direct main"
description:
@ -1152,41 +1082,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.0"
video_player:
dependency: transitive
description:
name: video_player
url: "https://pub.dartlang.org"
source: hosted
version: "2.4.2"
video_player_android:
dependency: transitive
description:
name: video_player_android
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.3"
video_player_avfoundation:
dependency: transitive
description:
name: video_player_avfoundation
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.4"
video_player_platform_interface:
dependency: transitive
description:
name: video_player_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "5.1.2"
video_player_web:
dependency: transitive
description:
name: video_player_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.10"
vm_service:
dependency: transitive
description:
@ -1251,12 +1146,12 @@ packages:
source: hosted
version: "1.0.1"
webview_flutter:
dependency: transitive
dependency: "direct main"
description:
name: webview_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.0"
version: "3.0.4"
webview_flutter_android:
dependency: transitive
description:

View File

@ -1,6 +1,6 @@
name: hacki
description: A Hacker News reader.
version: 0.2.18+57
version: 0.2.21+63
publish_to: none
environment:
@ -28,7 +28,6 @@ dependencies:
flutter_cache_manager: ^3.3.0
flutter_fadein: ^2.0.0
flutter_feather_icons: 2.0.0+1
flutter_html: ^2.2.1
flutter_inappwebview: ^5.4.3+4
flutter_linkify: ^5.0.2
flutter_local_notifications: ^9.5.0
@ -68,6 +67,7 @@ dependencies:
universal_platform: ^1.0.0+1
url_launcher: ^6.1.3
wakelock: ^0.6.1+2
webview_flutter: ^3.0.4
workmanager: ^0.5.0
dev_dependencies: