Compare commits

..

1 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
33 changed files with 418 additions and 245 deletions

View File

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

View File

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

View File

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

View File

@ -3,10 +3,13 @@ import 'dart:async';
import 'package:bloc/bloc.dart'; import 'package:bloc/bloc.dart';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flutter/services.dart';
import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:flutter_linkify/flutter_linkify.dart';
import 'package:hacki/config/locator.dart'; import 'package:hacki/config/locator.dart';
import 'package:hacki/main.dart';
import 'package:hacki/models/models.dart'; import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart'; import 'package:hacki/repositories/repositories.dart';
import 'package:hacki/screens/screens.dart';
import 'package:hacki/services/services.dart'; import 'package:hacki/services/services.dart';
part 'comments_state.dart'; part 'comments_state.dart';
@ -18,14 +21,14 @@ class CommentsCubit extends Cubit<CommentsState> {
StoriesRepository? storiesRepository, StoriesRepository? storiesRepository,
SembastRepository? sembastRepository, SembastRepository? sembastRepository,
required bool offlineReading, required bool offlineReading,
required Story story, required Item item,
}) : _cacheService = cacheService ?? locator.get<CacheService>(), }) : _cacheService = cacheService ?? locator.get<CacheService>(),
_cacheRepository = cacheRepository ?? locator.get<CacheRepository>(), _cacheRepository = cacheRepository ?? locator.get<CacheRepository>(),
_storiesRepository = _storiesRepository =
storiesRepository ?? locator.get<StoriesRepository>(), storiesRepository ?? locator.get<StoriesRepository>(),
_sembastRepository = _sembastRepository =
sembastRepository ?? locator.get<SembastRepository>(), sembastRepository ?? locator.get<SembastRepository>(),
super(CommentsState.init(offlineReading: offlineReading, story: story)); super(CommentsState.init(offlineReading: offlineReading, item: item));
final CacheService _cacheService; final CacheService _cacheService;
final CacheRepository _cacheRepository; final CacheRepository _cacheRepository;
@ -68,22 +71,22 @@ class CommentsCubit extends Cubit<CommentsState> {
emit(state.copyWith(status: CommentsStatus.loading)); emit(state.copyWith(status: CommentsStatus.loading));
final Story story = state.story; final Item item = state.item;
final Story updatedStory = state.offlineReading final Item updatedItem = state.offlineReading
? story ? item
: await _storiesRepository.fetchStoryBy(story.id) ?? story; : await _storiesRepository.fetchItemBy(id: item.id) ?? item;
final List<int> kids = () { final List<int> kids = () {
switch (state.order) { switch (state.order) {
case CommentsOrder.natural: case CommentsOrder.natural:
return updatedStory.kids; return updatedItem.kids;
case CommentsOrder.newestFirst: case CommentsOrder.newestFirst:
return updatedStory.kids.sorted((int a, int b) => b.compareTo(a)); return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
case CommentsOrder.oldestFirst: case CommentsOrder.oldestFirst:
return updatedStory.kids.sorted((int a, int b) => a.compareTo(b)); return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
} }
}(); }();
emit(state.copyWith(story: updatedStory)); emit(state.copyWith(item: updatedItem));
if (state.offlineReading) { if (state.offlineReading) {
_streamSubscription = _cacheRepository _streamSubscription = _cacheRepository
@ -121,17 +124,17 @@ class CommentsCubit extends Cubit<CommentsState> {
await _streamSubscription?.cancel(); await _streamSubscription?.cancel();
final Story story = state.story; final Item item = state.item;
final Story updatedStory = final Item updatedItem =
await _storiesRepository.fetchStoryBy(story.id) ?? story; await _storiesRepository.fetchItemBy(id: item.id) ?? item;
final List<int> kids = () { final List<int> kids = () {
switch (state.order) { switch (state.order) {
case CommentsOrder.natural: case CommentsOrder.natural:
return updatedStory.kids; return updatedItem.kids;
case CommentsOrder.newestFirst: case CommentsOrder.newestFirst:
return updatedStory.kids.sorted((int a, int b) => b.compareTo(a)); return updatedItem.kids.sorted((int a, int b) => b.compareTo(a));
case CommentsOrder.oldestFirst: case CommentsOrder.oldestFirst:
return updatedStory.kids.sorted((int a, int b) => a.compareTo(b)); return updatedItem.kids.sorted((int a, int b) => a.compareTo(b));
} }
}(); }();
@ -142,18 +145,19 @@ class CommentsCubit extends Cubit<CommentsState> {
emit( emit(
state.copyWith( state.copyWith(
story: updatedStory, item: updatedItem,
status: CommentsStatus.loaded, status: CommentsStatus.loaded,
), ),
); );
} }
void loadAll(Story story) { void loadAll(Story story) {
HapticFeedback.lightImpact();
emit( emit(
state.copyWith( state.copyWith(
onlyShowTargetComment: false, onlyShowTargetComment: false,
comments: <Comment>[], comments: <Comment>[],
story: story, item: story,
), ),
); );
init(); init();
@ -166,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() { void _onDone() {
_streamSubscription?.cancel(); _streamSubscription?.cancel();
_streamSubscription = null; _streamSubscription = null;
@ -216,13 +250,6 @@ class CommentsCubit extends Cubit<CommentsState> {
} }
} }
void onOrderChanged(CommentsOrder? order) {
if (order == null) return;
_streamSubscription?.cancel();
emit(state.copyWith(order: order, comments: <Comment>[]));
init();
}
static List<LinkifyElement> _linkify( static List<LinkifyElement> _linkify(
String text, { String text, {
LinkifyOptions options = const LinkifyOptions(), LinkifyOptions options = const LinkifyOptions(),

View File

@ -16,9 +16,10 @@ enum CommentsOrder {
class CommentsState extends Equatable { class CommentsState extends Equatable {
const CommentsState({ const CommentsState({
required this.story, required this.item,
required this.comments, required this.comments,
required this.status, required this.status,
required this.fetchParentStatus,
required this.order, required this.order,
required this.onlyShowTargetComment, required this.onlyShowTargetComment,
required this.offlineReading, required this.offlineReading,
@ -27,33 +28,37 @@ class CommentsState extends Equatable {
CommentsState.init({ CommentsState.init({
required this.offlineReading, required this.offlineReading,
required this.story, required this.item,
}) : comments = <Comment>[], }) : comments = <Comment>[],
status = CommentsStatus.init, status = CommentsStatus.init,
fetchParentStatus = CommentsStatus.init,
order = CommentsOrder.natural, order = CommentsOrder.natural,
onlyShowTargetComment = false, onlyShowTargetComment = false,
currentPage = 0; currentPage = 0;
final Story story; final Item item;
final List<Comment> comments; final List<Comment> comments;
final CommentsStatus status; final CommentsStatus status;
final CommentsStatus fetchParentStatus;
final CommentsOrder order; final CommentsOrder order;
final bool onlyShowTargetComment; final bool onlyShowTargetComment;
final bool offlineReading; final bool offlineReading;
final int currentPage; final int currentPage;
CommentsState copyWith({ CommentsState copyWith({
Story? story, Item? item,
List<Comment>? comments, List<Comment>? comments,
CommentsStatus? status, CommentsStatus? status,
CommentsStatus? fetchParentStatus,
CommentsOrder? order, CommentsOrder? order,
bool? onlyShowTargetComment, bool? onlyShowTargetComment,
bool? offlineReading, bool? offlineReading,
int? currentPage, int? currentPage,
}) { }) {
return CommentsState( return CommentsState(
story: story ?? this.story, item: item ?? this.item,
comments: comments ?? this.comments, comments: comments ?? this.comments,
fetchParentStatus: fetchParentStatus ?? this.fetchParentStatus,
status: status ?? this.status, status: status ?? this.status,
order: order ?? this.order, order: order ?? this.order,
onlyShowTargetComment: onlyShowTargetComment:
@ -65,9 +70,10 @@ class CommentsState extends Equatable {
@override @override
List<Object?> get props => <Object?>[ List<Object?> get props => <Object?>[
story, item,
comments, comments,
status, status,
fetchParentStatus,
order, order,
onlyShowTargetComment, onlyShowTargetComment,
offlineReading, offlineReading,

View File

@ -39,15 +39,15 @@ class FavCubit extends Cubit<FavState> {
emit( emit(
state.copyWith( state.copyWith(
favIds: favIds, favIds: favIds,
favStories: <Story>[], favItems: <Item>[],
currentPage: 0, currentPage: 0,
), ),
); );
_storiesRepository _storiesRepository
.fetchStoriesStream( .fetchItemsStream(
ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)), ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
) )
.listen(_onStoryLoaded) .listen(_onItemLoaded)
.onDone(() { .onDone(() {
emit( emit(
state.copyWith( 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( emit(
state.copyWith( 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( emit(
state.copyWith( state.copyWith(
favIds: List<int>.from(state.favIds)..remove(id), favIds: List<int>.from(state.favIds)..remove(id),
favStories: List<Story>.from(state.favStories) favItems: List<Item>.from(state.favItems)
..removeWhere((Story e) => e.id == id), ..removeWhere((Item e) => e.id == id),
), ),
); );
@ -120,13 +120,13 @@ class FavCubit extends Cubit<FavState> {
} }
_storiesRepository _storiesRepository
.fetchStoriesStream( .fetchItemsStream(
ids: state.favIds.sublist( ids: state.favIds.sublist(
lower, lower,
upper, upper,
), ),
) )
.listen(_onStoryLoaded) .listen(_onItemLoaded)
.onDone(() { .onDone(() {
emit(state.copyWith(status: FavStatus.loaded)); emit(state.copyWith(status: FavStatus.loaded));
}); });
@ -142,7 +142,7 @@ class FavCubit extends Cubit<FavState> {
state.copyWith( state.copyWith(
status: FavStatus.loading, status: FavStatus.loading,
currentPage: 0, currentPage: 0,
favStories: <Story>[], favItems: <Item>[],
favIds: <int>[], favIds: <int>[],
), ),
); );
@ -150,20 +150,20 @@ class FavCubit extends Cubit<FavState> {
_preferenceRepository.favList(of: username).then((List<int> favIds) { _preferenceRepository.favList(of: username).then((List<int> favIds) {
emit(state.copyWith(favIds: favIds)); emit(state.copyWith(favIds: favIds));
_storiesRepository _storiesRepository
.fetchStoriesStream( .fetchItemsStream(
ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)), ids: favIds.sublist(0, _pageSize.clamp(0, favIds.length)),
) )
.listen(_onStoryLoaded) .listen(_onItemLoaded)
.onDone(() { .onDone(() {
emit(state.copyWith(status: FavStatus.loaded)); emit(state.copyWith(status: FavStatus.loaded));
}); });
}); });
} }
void _onStoryLoaded(Story story) { void _onItemLoaded(Item item) {
emit( emit(
state.copyWith( 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 { class FavState extends Equatable {
const FavState({ const FavState({
required this.favIds, required this.favIds,
required this.favStories, required this.favItems,
required this.status, required this.status,
required this.currentPage, required this.currentPage,
}); });
FavState.init() FavState.init()
: favIds = <int>[], : favIds = <int>[],
favStories = <Story>[], favItems = <Item>[],
status = FavStatus.init, status = FavStatus.init,
currentPage = 0; currentPage = 0;
final List<int> favIds; final List<int> favIds;
final List<Story> favStories; final List<Item> favItems;
final FavStatus status; final FavStatus status;
final int currentPage; final int currentPage;
FavState copyWith({ FavState copyWith({
List<int>? favIds, List<int>? favIds,
List<Story>? favStories, List<Item>? favItems,
FavStatus? status, FavStatus? status,
int? currentPage, int? currentPage,
}) { }) {
return FavState( return FavState(
favIds: favIds ?? this.favIds, favIds: favIds ?? this.favIds,
favStories: favStories ?? this.favStories, favItems: favItems ?? this.favItems,
status: status ?? this.status, status: status ?? this.status,
currentPage: currentPage ?? this.currentPage, currentPage: currentPage ?? this.currentPage,
); );
@ -43,7 +43,7 @@ class FavState extends Equatable {
@override @override
List<Object?> get props => <Object?>[ List<Object?> get props => <Object?>[
favIds, favIds,
favStories, favItems,
status, status,
currentPage, currentPage,
]; ];

View File

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

View File

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

View File

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:hacki/cubits/cubits.dart'; import 'package:hacki/cubits/cubits.dart';
import 'package:hacki/main.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 { extension StateExtension on State {
void showSnackBar({ 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; final bool splitViewEnabled = context.read<SplitViewCubit>().state.enabled;
if (splitViewEnabled) { if (splitViewEnabled && !forceNewScreen) {
context.read<SplitViewCubit>().updateStoryScreenArgs(args); context.read<SplitViewCubit>().updateItemScreenArgs(args);
} else { } else {
return HackiApp.navigatorKey.currentState?.pushNamed( return HackiApp.navigatorKey.currentState?.pushNamed(
StoryScreen.routeName, ItemScreen.routeName,
arguments: args, arguments: args,
); );
} }

View File

@ -1,7 +1,8 @@
extension StringExtension on String { extension StringExtension on String {
int? getItemId() { int? getItemId() {
final RegExp regex = RegExp(r'\d+$'); 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); return int.tryParse(match);
} }

View File

@ -1,6 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/item.dart'; import 'package:hacki/models/item.dart';
class Comment extends Item { class Comment extends Item {
@ -43,8 +42,7 @@ class Comment extends Item {
final int level; final int level;
String get postedDate => String get metadata => '''by $by $postedDate''';
DateTime.fromMillisecondsSinceEpoch(time * 1000).toReadableString();
Comment copyWith({int? level}) { Comment copyWith({int? level}) {
return Comment( return Comment(

View File

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

View File

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

View File

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

View File

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

View File

@ -375,16 +375,16 @@ class _HomeScreenState extends State<HomeScreen>
if (isJobWithLink) { if (isJobWithLink) {
context.read<ReminderCubit>().removeLastReadStoryId(); context.read<ReminderCubit>().removeLastReadStoryId();
} else { } else {
final StoryScreenArgs args = StoryScreenArgs(story: story); final ItemScreenArgs args = ItemScreenArgs(item: story);
context.read<ReminderCubit>().updateLastReadStoryId(story.id); context.read<ReminderCubit>().updateLastReadStoryId(story.id);
if (splitViewEnabled) { if (splitViewEnabled) {
context.read<SplitViewCubit>().updateStoryScreenArgs(args); context.read<SplitViewCubit>().updateItemScreenArgs(args);
} else { } else {
HackiApp.navigatorKey.currentState HackiApp.navigatorKey.currentState
?.pushNamed( ?.pushNamed(
StoryScreen.routeName, ItemScreen.routeName,
arguments: args, arguments: args,
) )
.whenComplete(() { .whenComplete(() {
@ -436,13 +436,10 @@ class _HomeScreenState extends State<HomeScreen>
final int? id = event.getItemId(); final int? id = event.getItemId();
if (id != null) { if (id != null) {
locator locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
.get<StoriesRepository>()
.fetchParentStory(id: id)
.then((Story? story) {
if (mounted) { if (mounted) {
if (story != null) { if (item != null) {
goToStoryScreen(args: StoryScreenArgs(story: story)); goToItemScreen(args: ItemScreenArgs(item: item));
} }
} }
}); });
@ -462,8 +459,8 @@ class _HomeScreenState extends State<HomeScreen>
showSnackBar(content: 'Something went wrong...'); showSnackBar(content: 'Something went wrong...');
return; return;
} }
final StoryScreenArgs args = StoryScreenArgs(story: story); final ItemScreenArgs args = ItemScreenArgs(item: story);
goToStoryScreen(args: args); goToItemScreen(args: args);
}); });
} }
@ -487,8 +484,8 @@ class _HomeScreenState extends State<HomeScreen>
showSnackBar(content: 'Something went wrong...'); showSnackBar(content: 'Something went wrong...');
return; return;
} }
final StoryScreenArgs args = StoryScreenArgs(story: story); final ItemScreenArgs args = ItemScreenArgs(item: story);
goToStoryScreen(args: args); goToItemScreen(args: args);
}); });
} }
} }
@ -586,10 +583,10 @@ class _TabletStoryView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocBuilder<SplitViewCubit, SplitViewState>( return BlocBuilder<SplitViewCubit, SplitViewState>(
buildWhen: (SplitViewState previous, SplitViewState current) => buildWhen: (SplitViewState previous, SplitViewState current) =>
previous.storyScreenArgs != current.storyScreenArgs, previous.itemScreenArgs != current.itemScreenArgs,
builder: (BuildContext context, SplitViewState state) { builder: (BuildContext context, SplitViewState state) {
if (state.storyScreenArgs != null) { if (state.itemScreenArgs != null) {
return StoryScreen.build(context, state.storyScreenArgs!); return ItemScreen.build(context, state.itemScreenArgs!);
} }
return Material( return Material(

View File

@ -16,7 +16,7 @@ import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/main.dart'; import 'package:hacki/main.dart';
import 'package:hacki/models/models.dart'; import 'package:hacki/models/models.dart';
import 'package:hacki/repositories/repositories.dart'; import 'package:hacki/repositories/repositories.dart';
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/screens/widgets/widgets.dart';
import 'package:hacki/services/services.dart'; import 'package:hacki/services/services.dart';
import 'package:hacki/utils/utils.dart'; import 'package:hacki/utils/utils.dart';
@ -33,44 +33,44 @@ enum _MenuAction {
cancel, cancel,
} }
class StoryScreenArgs extends Equatable { class ItemScreenArgs extends Equatable {
const StoryScreenArgs({ const ItemScreenArgs({
required this.story, required this.item,
this.onlyShowTargetComment = false, this.onlyShowTargetComment = false,
this.targetComments, this.targetComments,
}); });
final Story story; final Item item;
final bool onlyShowTargetComment; final bool onlyShowTargetComment;
final List<Comment>? targetComments; final List<Comment>? targetComments;
@override @override
List<Object?> get props => <Object?>[ List<Object?> get props => <Object?>[
story, item,
onlyShowTargetComment, onlyShowTargetComment,
targetComments, targetComments,
]; ];
} }
class StoryScreen extends StatefulWidget { class ItemScreen extends StatefulWidget {
const StoryScreen({ const ItemScreen({
super.key, super.key,
this.splitViewEnabled = false, this.splitViewEnabled = false,
required this.story, required this.item,
required this.parentComments, required this.parentComments,
}); });
static const String routeName = '/story'; static const String routeName = '/item';
static Route<dynamic> route(StoryScreenArgs args) { static Route<dynamic> route(ItemScreenArgs args) {
return MaterialPageRoute<StoryScreen>( return MaterialPageRoute<ItemScreen>(
settings: const RouteSettings(name: routeName), settings: const RouteSettings(name: routeName),
builder: (BuildContext context) => MultiBlocProvider( builder: (BuildContext context) => MultiBlocProvider(
providers: <BlocProvider<dynamic>>[ providers: <BlocProvider<dynamic>>[
BlocProvider<CommentsCubit>( BlocProvider<CommentsCubit>(
create: (_) => CommentsCubit( create: (_) => CommentsCubit(
offlineReading: context.read<StoriesBloc>().state.offlineReading, offlineReading: context.read<StoriesBloc>().state.offlineReading,
story: args.story, item: args.item,
)..init( )..init(
onlyShowTargetComment: args.onlyShowTargetComment, onlyShowTargetComment: args.onlyShowTargetComment,
targetParents: args.targetComments, targetParents: args.targetComments,
@ -80,21 +80,16 @@ class StoryScreen extends StatefulWidget {
lazy: false, lazy: false,
create: (BuildContext context) => EditCubit(), create: (BuildContext context) => EditCubit(),
), ),
if (args.story.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: args.story)..init(),
),
], ],
child: StoryScreen( child: ItemScreen(
story: args.story, item: args.item,
parentComments: args.targetComments ?? <Comment>[], parentComments: args.targetComments ?? <Comment>[],
), ),
), ),
); );
} }
static Widget build(BuildContext context, StoryScreenArgs args) { static Widget build(BuildContext context, ItemScreenArgs args) {
return WillPopScope( return WillPopScope(
onWillPop: () async { onWillPop: () async {
if (context.read<SplitViewCubit>().state.expanded) { if (context.read<SplitViewCubit>().state.expanded) {
@ -105,12 +100,12 @@ class StoryScreen extends StatefulWidget {
} }
}, },
child: MultiBlocProvider( child: MultiBlocProvider(
key: ValueKey<StoryScreenArgs>(args), key: ValueKey<ItemScreenArgs>(args),
providers: <BlocProvider<dynamic>>[ providers: <BlocProvider<dynamic>>[
BlocProvider<CommentsCubit>( BlocProvider<CommentsCubit>(
create: (BuildContext context) => CommentsCubit( create: (BuildContext context) => CommentsCubit(
offlineReading: context.read<StoriesBloc>().state.offlineReading, offlineReading: context.read<StoriesBloc>().state.offlineReading,
story: args.story, item: args.item,
)..init( )..init(
onlyShowTargetComment: args.onlyShowTargetComment, onlyShowTargetComment: args.onlyShowTargetComment,
targetParents: args.targetComments, targetParents: args.targetComments,
@ -120,14 +115,9 @@ class StoryScreen extends StatefulWidget {
lazy: false, lazy: false,
create: (BuildContext context) => EditCubit(), create: (BuildContext context) => EditCubit(),
), ),
if (args.story.isPoll)
BlocProvider<PollCubit>(
create: (BuildContext context) =>
PollCubit(story: args.story)..init(),
),
], ],
child: StoryScreen( child: ItemScreen(
story: args.story, item: args.item,
parentComments: args.targetComments ?? <Comment>[], parentComments: args.targetComments ?? <Comment>[],
splitViewEnabled: true, splitViewEnabled: true,
), ),
@ -136,14 +126,14 @@ class StoryScreen extends StatefulWidget {
} }
final bool splitViewEnabled; final bool splitViewEnabled;
final Story story; final Item item;
final List<Comment> parentComments; final List<Comment> parentComments;
@override @override
_StoryScreenState createState() => _StoryScreenState(); _ItemScreenState createState() => _ItemScreenState();
} }
class _StoryScreenState extends State<StoryScreen> { class _ItemScreenState extends State<ItemScreen> {
final TextEditingController commentEditingController = final TextEditingController commentEditingController =
TextEditingController(); TextEditingController();
final ScrollController scrollController = ScrollController(); final ScrollController scrollController = ScrollController();
@ -286,7 +276,7 @@ class _StoryScreenState extends State<StoryScreen> {
} else { } else {
context.read<CommentsCubit>().refresh(); context.read<CommentsCubit>().refresh();
if (widget.story.isPoll) { if (widget.item.isPoll) {
context.read<PollCubit>().refresh(); context.read<PollCubit>().refresh();
} }
} }
@ -311,13 +301,13 @@ class _StoryScreenState extends State<StoryScreen> {
onPressed: (_) { onPressed: (_) {
HapticFeedback.lightImpact(); HapticFeedback.lightImpact();
if (widget.story != if (widget.item !=
context.read<EditCubit>().state.replyingTo) { context.read<EditCubit>().state.replyingTo) {
commentEditingController.clear(); commentEditingController.clear();
} }
context context
.read<EditCubit>() .read<EditCubit>()
.onReplyTapped(widget.story); .onReplyTapped(widget.item);
focusNode.requestFocus(); focusNode.requestFocus();
}, },
backgroundColor: Colors.orange, backgroundColor: Colors.orange,
@ -325,7 +315,7 @@ class _StoryScreenState extends State<StoryScreen> {
icon: Icons.message, icon: Icons.message,
), ),
SlidableAction( SlidableAction(
onPressed: (_) => onMorePressed(widget.story), onPressed: (_) => onMoreTapped(widget.item),
backgroundColor: Colors.orange, backgroundColor: Colors.orange,
foregroundColor: Colors.white, foregroundColor: Colors.white,
icon: Icons.more_horiz, icon: Icons.more_horiz,
@ -342,14 +332,14 @@ class _StoryScreenState extends State<StoryScreen> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Text( Text(
widget.story.by, state.item.by,
style: const TextStyle( style: const TextStyle(
color: Colors.orange, color: Colors.orange,
), ),
), ),
const Spacer(), const Spacer(),
Text( Text(
widget.story.postedDate, state.item.postedDate,
style: const TextStyle( style: const TextStyle(
color: Colors.grey, color: Colors.grey,
), ),
@ -357,44 +347,49 @@ class _StoryScreenState extends State<StoryScreen> {
], ],
), ),
), ),
InkWell( if (state.item is Story)
onTap: () => LinkUtil.launch( InkWell(
widget.story.url, onTap: () => LinkUtil.launch(
useReader: context state.item.url,
.read<PreferenceCubit>() useReader: context
.state .read<PreferenceCubit>()
.useReader, .state
offlineReading: context .useReader,
.read<StoriesBloc>() offlineReading: context
.state .read<StoriesBloc>()
.offlineReading, .state
), .offlineReading,
child: Padding(
padding: const EdgeInsets.only(
left: 6,
right: 6,
bottom: 12,
top: 12,
), ),
child: Text( child: Padding(
widget.story.title, padding: const EdgeInsets.only(
textAlign: TextAlign.center, left: 6,
style: TextStyle( right: 6,
fontWeight: FontWeight.bold, bottom: 12,
color: widget.story.url.isNotEmpty top: 12,
? Colors.orange ),
: null, 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 (state.item.text.isNotEmpty)
if (widget.story.text.isNotEmpty)
Padding( Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 10, horizontal: 10,
), ),
child: SelectableLinkify( child: SelectableLinkify(
text: widget.story.text, text: widget.item.text,
style: TextStyle( style: TextStyle(
fontSize: fontSize:
MediaQuery.of(context).textScaleFactor * MediaQuery.of(context).textScaleFactor *
@ -417,14 +412,18 @@ class _StoryScreenState extends State<StoryScreen> {
}, },
), ),
), ),
if (widget.story.isPoll) if (state.item.isPoll)
PollView( BlocProvider<PollCubit>(
onLoginTapped: onLoginTapped, 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( const SizedBox(
height: 8, height: 8,
), ),
@ -436,7 +435,7 @@ class _StoryScreenState extends State<StoryScreen> {
child: TextButton( child: TextButton(
onPressed: () => context onPressed: () => context
.read<CommentsCubit>() .read<CommentsCubit>()
.loadAll(widget.story), .loadAll(state.item as Story),
child: const Text('View all comments'), child: const Text('View all comments'),
), ),
), ),
@ -446,12 +445,33 @@ class _StoryScreenState extends State<StoryScreen> {
] else ...<Widget>[ ] else ...<Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
const SizedBox( if (state.item is Story) ...<Widget>[
width: 12, const SizedBox(
), width: 12,
Text( ),
'''${state.story.score} karma, ${state.story.descendants} comment${state.story.descendants > 1 ? 's' : ''}''', 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(), const Spacer(),
DropdownButton<CommentsOrder>( DropdownButton<CommentsOrder>(
value: state.order, value: state.order,
@ -517,7 +537,7 @@ class _StoryScreenState extends State<StoryScreen> {
level: comment.level, level: comment.level,
myUsername: myUsername:
authState.isLoggedIn ? authState.username : null, authState.isLoggedIn ? authState.username : null,
opUsername: widget.story.by, opUsername: widget.item.by,
onReplyTapped: (Comment cmt) { onReplyTapped: (Comment cmt) {
HapticFeedback.lightImpact(); HapticFeedback.lightImpact();
if (cmt.deleted || cmt.dead) { if (cmt.deleted || cmt.dead) {
@ -541,9 +561,9 @@ class _StoryScreenState extends State<StoryScreen> {
context.read<EditCubit>().onEditTapped(cmt); context.read<EditCubit>().onEditTapped(cmt);
focusNode.requestFocus(); focusNode.requestFocus();
}, },
onMoreTapped: onMorePressed, onMoreTapped: onMoreTapped,
onStoryLinkTapped: onStoryLinkTapped, onStoryLinkTapped: onStoryLinkTapped,
onTimeMachineActivated: onTimeMachineActivated, onRightMoreTapped: onRightMoreTapped,
), ),
), ),
if ((state.status == CommentsStatus.allLoaded && if ((state.status == CommentsStatus.allLoaded &&
@ -606,7 +626,7 @@ class _StoryScreenState extends State<StoryScreen> {
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.canvasColor .canvasColor
.withOpacity(0.6), .withOpacity(0.6),
story: widget.story, item: widget.item,
scrollController: scrollController, scrollController: scrollController,
onBackgroundTap: onBackgroundTap:
onFeatureDiscoveryDismissed, onFeatureDiscoveryDismissed,
@ -646,7 +666,7 @@ class _StoryScreenState extends State<StoryScreen> {
appBar: CustomAppBar( appBar: CustomAppBar(
backgroundColor: backgroundColor:
Theme.of(context).canvasColor.withOpacity(0.6), Theme.of(context).canvasColor.withOpacity(0.6),
story: widget.story, item: widget.item,
scrollController: scrollController, scrollController: scrollController,
onBackgroundTap: onFeatureDiscoveryDismissed, onBackgroundTap: onFeatureDiscoveryDismissed,
onDismiss: onFeatureDiscoveryDismissed, onDismiss: onFeatureDiscoveryDismissed,
@ -681,12 +701,53 @@ class _StoryScreenState extends State<StoryScreen> {
return Future<bool>.value(false); 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) { void onTimeMachineActivated(Comment comment) {
final Size size = MediaQuery.of(context).size; final Size size = MediaQuery.of(context).size;
final DeviceScreenType deviceType = getDeviceType(size); final DeviceScreenType deviceType = getDeviceType(size);
final double widthFactor = final double widthFactor =
deviceType != DeviceScreenType.mobile ? 0.6 : 0.9; deviceType != DeviceScreenType.mobile ? 0.6 : 0.9;
HapticFeedback.lightImpact();
showDialog<void>( showDialog<void>(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
@ -761,15 +822,12 @@ class _StoryScreenState extends State<StoryScreen> {
final int? id = link.getItemId(); final int? id = link.getItemId();
if (id != null) { if (id != null) {
storyLinkTapThrottle.run(() { storyLinkTapThrottle.run(() {
locator locator.get<StoriesRepository>().fetchItemBy(id: id).then((Item? item) {
.get<StoriesRepository>()
.fetchParentStory(id: id)
.then((Story? story) {
if (mounted) { if (mounted) {
if (story != null) { if (item != null) {
HackiApp.navigatorKey.currentState!.pushNamed( HackiApp.navigatorKey.currentState!.pushNamed(
StoryScreen.routeName, ItemScreen.routeName,
arguments: StoryScreenArgs(story: story), arguments: ItemScreenArgs(item: item),
); );
} }
} }
@ -780,7 +838,7 @@ class _StoryScreenState extends State<StoryScreen> {
} }
} }
void onMorePressed(Item item) { void onMoreTapped(Item item) {
HapticFeedback.lightImpact(); HapticFeedback.lightImpact();
if (item.dead || item.deleted) { if (item.dead || item.deleted) {

View File

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

View File

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

View File

@ -135,8 +135,8 @@ class _ProfileScreenState extends State<ProfileScreen>
}, },
onTap: (Item item) { onTap: (Item item) {
if (item is Story) { if (item is Story) {
goToStoryScreen( goToItemScreen(
args: StoryScreenArgs(story: item), args: ItemScreenArgs(item: item),
); );
} else if (item is Comment) { } else if (item is Comment) {
onCommentTapped(item); onCommentTapped(item);
@ -160,7 +160,7 @@ class _ProfileScreenState extends State<ProfileScreen>
} }
}, },
builder: (BuildContext context, FavState favState) { builder: (BuildContext context, FavState favState) {
if (favState.favStories.isEmpty && if (favState.favItems.isEmpty &&
favState.status != FavStatus.loading) { favState.status != FavStatus.loading) {
return const CenteredMessageView( return const CenteredMessageView(
content: content:
@ -169,12 +169,13 @@ class _ProfileScreenState extends State<ProfileScreen>
'News account if you are logged in.', 'News account if you are logged in.',
); );
} }
return ItemsListView<Story>( return ItemsListView<Item>(
showWebPreview: showWebPreview:
preferenceState.showComplexStoryTile, preferenceState.showComplexStoryTile,
showMetadata: preferenceState.showMetadata, showMetadata: preferenceState.showMetadata,
useCommentTile: true,
refreshController: refreshControllerFav, refreshController: refreshControllerFav,
items: favState.favStories, items: favState.favItems,
onRefresh: () { onRefresh: () {
HapticFeedback.lightImpact(); HapticFeedback.lightImpact();
context.read<FavCubit>().refresh(); context.read<FavCubit>().refresh();
@ -182,8 +183,8 @@ class _ProfileScreenState extends State<ProfileScreen>
onLoadMore: () { onLoadMore: () {
context.read<FavCubit>().loadMore(); context.read<FavCubit>().loadMore();
}, },
onTap: (Story story) => goToStoryScreen( onTap: (Item item) => goToItemScreen(
args: StoryScreenArgs(story: story), args: ItemScreenArgs(item: item),
), ),
); );
}, },
@ -408,7 +409,7 @@ class _ProfileScreenState extends State<ProfileScreen>
showAboutDialog( showAboutDialog(
context: context, context: context,
applicationName: 'Hacki', applicationName: 'Hacki',
applicationVersion: 'v0.2.20', applicationVersion: 'v0.2.21',
applicationIcon: ClipRRect( applicationIcon: ClipRRect(
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
Radius.circular(12), Radius.circular(12),
@ -705,9 +706,9 @@ class _ProfileScreenState extends State<ProfileScreen>
.fetchParentStoryWithComments(id: comment.parent) .fetchParentStoryWithComments(id: comment.parent)
.then((Tuple2<Story, List<Comment>>? tuple) { .then((Tuple2<Story, List<Comment>>? tuple) {
if (tuple != null && mounted) { if (tuple != null && mounted) {
goToStoryScreen( goToItemScreen(
args: StoryScreenArgs( args: ItemScreenArgs(
story: tuple.item1, item: tuple.item1,
targetComments: tuple.item2.isEmpty targetComments: tuple.item2.isEmpty
? <Comment>[comment] ? <Comment>[comment]
: <Comment>[ : <Comment>[

View File

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

View File

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

View File

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

View File

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

View File

@ -18,6 +18,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
required this.items, required this.items,
required this.onTap, required this.onTap,
required this.refreshController, required this.refreshController,
this.useCommentTile = false,
this.showCommentBy = false,
this.enablePullDown = true, this.enablePullDown = true,
this.pinnable = false, this.pinnable = false,
this.markReadStories = false, this.markReadStories = false,
@ -32,6 +34,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
'onPinned cannot be null when pinnable is true', 'onPinned cannot be null when pinnable is true',
); );
final bool useCommentTile;
final bool showCommentBy;
final bool showWebPreview; final bool showWebPreview;
final bool showMetadata; final bool showMetadata;
final bool enablePullDown; final bool enablePullDown;
@ -103,6 +107,22 @@ class ItemsListView<T extends Item> extends StatelessWidget {
), ),
]; ];
} else if (e is Comment) { } 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>[ return <Widget>[
FadeIn( FadeIn(
child: Padding( child: Padding(
@ -135,7 +155,8 @@ class ItemsListView<T extends Item> extends StatelessWidget {
horizontal: 6, horizontal: 6,
), ),
child: Linkify( child: Linkify(
text: e.text, text:
'''${showCommentBy ? '${e.by}: ' : ''}${e.text}''',
maxLines: 4, maxLines: 4,
linkStyle: const TextStyle( linkStyle: const TextStyle(
color: Colors.orange, 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

@ -1,6 +1,6 @@
name: hacki name: hacki
description: A Hacker News reader. description: A Hacker News reader.
version: 0.2.20+62 version: 0.2.21+63
publish_to: none publish_to: none
environment: environment: