Compare commits

...

4 Commits

Author SHA1 Message Date
764ff09345 v0.2.29-hotfix (#67)
* fixed datetime extension.

* updated README.md
2022-07-06 20:37:18 -07:00
ab449adce2 v0.2.29 (#66)
* fixed stuff.

* fixed UI.

* bumped version.
2022-07-06 17:04:14 -07:00
2ec41b26f2 updated README.md 2022-07-06 16:23:05 -07:00
19f2107d95 v0.2.28 (#65)
* bumped version.

* fixed comments cubit and story tile.

* cancel subscription on error.
2022-07-02 01:14:40 -07:00
21 changed files with 179 additions and 101 deletions

View File

@ -1,14 +1,13 @@
# <img width="64" src="https://user-images.githubusercontent.com/7277662/167775086-0b234f28-dee4-44f6-aae4-14a28ed4bbb6.png"> Hacki for Hacker News # <img width="64" src="https://user-images.githubusercontent.com/7277662/167775086-0b234f28-dee4-44f6-aae4-14a28ed4bbb6.png"> Hacki for Hacker News
A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough. A [Hacker News](https://news.ycombinator.com/) client made with Flutter that is just enough.
[![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone) [![App Store](https://img.shields.io/itunes/v/1602043763?label=App%20Store)](https://apps.apple.com/us/app/hacki/id1602043763?platform=iphone)
[![Fdroid version](https://img.shields.io/f-droid/v/com.jiaqifeng.hacki)](https://f-droid.org/en/packages/com.jiaqifeng.hacki/) [![Fdroid version](https://img.shields.io/f-droid/v/com.jiaqifeng.hacki)](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
[![GH version](https://img.shields.io/github/release/livinglist/hacki.svg?logo=github)](https://github.com/Livinglist/Hacki/releases/latest) [![GH version](https://img.shields.io/github/release/livinglist/hacki.svg?logo=github)](https://github.com/Livinglist/Hacki/releases/latest)
[![Visits Badge](https://badges.pufler.dev/visits/livinglist/Hacki)](https://badges.pufler.dev)
[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
[![style: effective dart](https://img.shields.io/badge/style-effective_dart-40c4ff.svg)](https://pub.dev/packages/effective_dart) [![style: effective dart](https://img.shields.io/badge/style-effective_dart-40c4ff.svg)](https://pub.dev/packages/effective_dart)
[![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
[<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/) [<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/)

View File

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

View File

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

View File

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

View File

@ -577,7 +577,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.27; MARKETING_VERSION = 0.2.29;
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 = "";
@ -714,7 +714,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.27; MARKETING_VERSION = 0.2.29;
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 = "";
@ -745,7 +745,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.27; MARKETING_VERSION = 0.2.29;
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

@ -11,6 +11,7 @@ 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/screens/screens.dart';
import 'package:hacki/services/services.dart'; import 'package:hacki/services/services.dart';
import 'package:logger/logger.dart';
part 'comments_state.dart'; part 'comments_state.dart';
@ -21,6 +22,7 @@ class CommentsCubit extends Cubit<CommentsState> {
OfflineRepository? offlineRepository, OfflineRepository? offlineRepository,
StoriesRepository? storiesRepository, StoriesRepository? storiesRepository,
SembastRepository? sembastRepository, SembastRepository? sembastRepository,
Logger? logger,
required bool offlineReading, required bool offlineReading,
required Item item, required Item item,
required FetchMode defaultFetchMode, required FetchMode defaultFetchMode,
@ -33,6 +35,7 @@ class CommentsCubit extends Cubit<CommentsState> {
storiesRepository ?? locator.get<StoriesRepository>(), storiesRepository ?? locator.get<StoriesRepository>(),
_sembastRepository = _sembastRepository =
sembastRepository ?? locator.get<SembastRepository>(), sembastRepository ?? locator.get<SembastRepository>(),
_logger = logger ?? locator.get<Logger>(),
super( super(
CommentsState.init( CommentsState.init(
offlineReading: offlineReading, offlineReading: offlineReading,
@ -47,8 +50,17 @@ class CommentsCubit extends Cubit<CommentsState> {
final OfflineRepository _offlineRepository; final OfflineRepository _offlineRepository;
final StoriesRepository _storiesRepository; final StoriesRepository _storiesRepository;
final SembastRepository _sembastRepository; final SembastRepository _sembastRepository;
final Logger _logger;
/// The [StreamSubscription] for stream (both lazy or eager)
/// fetching comments posted directly to the story.
StreamSubscription<Comment>? _streamSubscription; StreamSubscription<Comment>? _streamSubscription;
/// The map of [StreamSubscription] for streams
/// fetching comments lazily. [int] is the id of parent comment.
final Map<int, StreamSubscription<Comment>> _streamSubscriptions =
<int, StreamSubscription<Comment>>{};
static const int _pageSize = 20; static const int _pageSize = 20;
@override @override
@ -73,7 +85,7 @@ class CommentsCubit extends Cubit<CommentsState> {
); );
_streamSubscription = _storiesRepository _streamSubscription = _storiesRepository
.fetchAllCommentsStream( .fetchAllCommentsRecursivelyStream(
ids: targetParents!.last.kids, ids: targetParents!.last.kids,
level: targetParents.last.level + 1, level: targetParents.last.level + 1,
) )
@ -105,7 +117,8 @@ class CommentsCubit extends Cubit<CommentsState> {
.listen(_onCommentFetched) .listen(_onCommentFetched)
..onDone(_onDone); ..onDone(_onDone);
} else { } else {
if (state.fetchMode == FetchMode.lazy) { switch (state.fetchMode) {
case FetchMode.lazy:
_streamSubscription = _storiesRepository _streamSubscription = _storiesRepository
.fetchCommentsStream( .fetchCommentsStream(
ids: kids, ids: kids,
@ -113,14 +126,16 @@ class CommentsCubit extends Cubit<CommentsState> {
) )
.listen(_onCommentFetched) .listen(_onCommentFetched)
..onDone(_onDone); ..onDone(_onDone);
} else { break;
case FetchMode.eager:
_streamSubscription = _storiesRepository _streamSubscription = _storiesRepository
.fetchAllCommentsStream( .fetchAllCommentsRecursivelyStream(
ids: kids, ids: kids,
getFromCache: useCommentCache ? _commentCache.getComment : null, getFromCache: useCommentCache ? _commentCache.getComment : null,
) )
.listen(_onCommentFetched) .listen(_onCommentFetched)
..onDone(_onDone); ..onDone(_onDone);
break;
} }
} }
} }
@ -135,18 +150,27 @@ class CommentsCubit extends Cubit<CommentsState> {
return; return;
} }
_collapseCache.resetCollapsedComments();
emit( emit(
state.copyWith( state.copyWith(
status: CommentsStatus.loading, status: CommentsStatus.loading,
),
);
_collapseCache.resetCollapsedComments();
await _streamSubscription?.cancel();
for (final int id in _streamSubscriptions.keys) {
await _streamSubscriptions[id]?.cancel();
}
_streamSubscriptions.clear();
emit(
state.copyWith(
comments: <Comment>[], comments: <Comment>[],
currentPage: 0, currentPage: 0,
), ),
); );
await _streamSubscription?.cancel();
final Item item = state.item; final Item item = state.item;
final Item updatedItem = final Item updatedItem =
await _storiesRepository.fetchItemBy(id: item.id) ?? item; await _storiesRepository.fetchItemBy(id: item.id) ?? item;
@ -161,7 +185,7 @@ class CommentsCubit extends Cubit<CommentsState> {
..onDone(_onDone); ..onDone(_onDone);
} else { } else {
_streamSubscription = _storiesRepository _streamSubscription = _storiesRepository
.fetchAllCommentsStream( .fetchAllCommentsRecursivelyStream(
ids: kids, ids: kids,
) )
.listen(_onCommentFetched) .listen(_onCommentFetched)
@ -189,20 +213,20 @@ class CommentsCubit extends Cubit<CommentsState> {
/// [comment] is only used for lazy fetching. /// [comment] is only used for lazy fetching.
void loadMore({Comment? comment}) { void loadMore({Comment? comment}) {
if (state.fetchMode == FetchMode.eager) { switch (state.fetchMode) {
if (_streamSubscription != null) { case FetchMode.lazy:
emit(state.copyWith(status: CommentsStatus.loading));
_streamSubscription?.resume();
}
} else {
if (comment == null) return; if (comment == null) return;
if (_streamSubscriptions.containsKey(comment.id)) return;
final int level = comment.level + 1; final int level = comment.level + 1;
int offset = 0; int offset = 0;
_streamSubscription = _streamSubscription = /// Ignoring because the subscription will be cancelled in close()
_storiesRepository.fetchCommentsStream(ids: comment.kids).listen( // ignore: cancel_subscriptions
(Comment cmt) { final StreamSubscription<Comment> streamSubscription =
_storiesRepository
.fetchCommentsStream(ids: comment.kids)
.listen((Comment cmt) {
_collapseCache.addKid(cmt.id, to: cmt.parent); _collapseCache.addKid(cmt.id, to: cmt.parent);
_commentCache.cacheComment(cmt); _commentCache.cacheComment(cmt);
_sembastRepository.cacheComment(cmt); _sembastRepository.cacheComment(cmt);
@ -223,8 +247,25 @@ class CommentsCubit extends Cubit<CommentsState> {
), ),
); );
offset++; offset++;
}, })
); ..onDone(() {
_streamSubscriptions[comment.id]?.cancel();
_streamSubscriptions.remove(comment.id);
})
..onError((dynamic error) {
_logger.e(error);
_streamSubscriptions[comment.id]?.cancel();
_streamSubscriptions.remove(comment.id);
});
_streamSubscriptions[comment.id] = streamSubscription;
break;
case FetchMode.eager:
if (_streamSubscription != null) {
emit(state.copyWith(status: CommentsStatus.loading));
_streamSubscription?.resume();
}
break;
} }
} }
@ -255,6 +296,10 @@ class CommentsCubit extends Cubit<CommentsState> {
if (state.order == order) return; if (state.order == order) return;
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
_streamSubscription?.cancel(); _streamSubscription?.cancel();
for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
s.cancel();
}
_streamSubscriptions.clear();
emit(state.copyWith(order: order)); emit(state.copyWith(order: order));
init(useCommentCache: true); init(useCommentCache: true);
} }
@ -265,6 +310,10 @@ class CommentsCubit extends Cubit<CommentsState> {
_collapseCache.resetCollapsedComments(); _collapseCache.resetCollapsedComments();
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
_streamSubscription?.cancel(); _streamSubscription?.cancel();
for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
s.cancel();
}
_streamSubscriptions.clear();
emit(state.copyWith(fetchMode: fetchMode)); emit(state.copyWith(fetchMode: fetchMode));
init(useCommentCache: true); init(useCommentCache: true);
} }
@ -360,6 +409,9 @@ class CommentsCubit extends Cubit<CommentsState> {
@override @override
Future<void> close() async { Future<void> close() async {
await _streamSubscription?.cancel(); await _streamSubscription?.cancel();
for (final StreamSubscription<Comment> s in _streamSubscriptions.values) {
await s.cancel();
}
await super.close(); await super.close();
} }
} }

View File

@ -78,6 +78,8 @@ class CommentsState extends Equatable {
); );
} }
Set<int> get commentIds => comments.map((Comment e) => e.id).toSet();
@override @override
List<Object?> get props => <Object?>[ List<Object?> get props => <Object?>[
item, item,

View File

@ -33,7 +33,8 @@ class NotificationCubit extends Cubit<NotificationState> {
_preferenceRepository.shouldShowNotification _preferenceRepository.shouldShowNotification
.then((bool showNotification) { .then((bool showNotification) {
if (showNotification) { if (showNotification) {
init(); // Delaying the initialization to prevent janks in home screen.
Future<void>.delayed(const Duration(seconds: 2), init);
} }
}); });

View File

@ -1,5 +1,6 @@
import 'package:bloc/bloc.dart'; import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flutter/services.dart';
import 'package:hacki/config/locator.dart'; import 'package:hacki/config/locator.dart';
import 'package:hacki/cubits/comments/comments_cubit.dart'; import 'package:hacki/cubits/comments/comments_cubit.dart';
import 'package:hacki/repositories/repositories.dart'; import 'package:hacki/repositories/repositories.dart';
@ -82,12 +83,14 @@ class PreferenceCubit extends Cubit<PreferenceState> {
void selectFetchMode(FetchMode? fetchMode) { void selectFetchMode(FetchMode? fetchMode) {
if (fetchMode == null || state.fetchMode == fetchMode) return; if (fetchMode == null || state.fetchMode == fetchMode) return;
HapticFeedback.lightImpact();
emit(state.copyWith(fetchMode: fetchMode)); emit(state.copyWith(fetchMode: fetchMode));
_preferenceRepository.selectFetchMode(fetchMode); _preferenceRepository.selectFetchMode(fetchMode);
} }
void selectCommentsOrder(CommentsOrder? order) { void selectCommentsOrder(CommentsOrder? order) {
if (order == null || state.order == order) return; if (order == null || state.order == order) return;
HapticFeedback.lightImpact();
emit(state.copyWith(order: order)); emit(state.copyWith(order: order));
_preferenceRepository.selectCommentsOrder(order); _preferenceRepository.selectCommentsOrder(order);
} }

View File

@ -1,7 +1,9 @@
import 'dart:math';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
extension TryReadContext on BuildContext { extension ContextExtension on BuildContext {
T? tryRead<T>() { T? tryRead<T>() {
try { try {
return read<T>(); return read<T>();
@ -16,4 +18,41 @@ extension TryReadContext on BuildContext {
box == null ? null : box.localToGlobal(Offset.zero) & box.size; box == null ? null : box.localToGlobal(Offset.zero) & box.size;
return rect; return rect;
} }
static double _screenWidth = 0;
static double _storyTileHeight = 0;
static int _storyTileMaxLines = 4;
static const double _screenWidthLowerBound = 428,
_screenWidthUpperBound = 850,
_picHeightLowerBound = 110,
_picHeightUpperBound = 128,
_smallPicHeight = 100,
_picHeightFactor = 0.3;
double get storyTileHeight {
final double screenWidth =
min(MediaQuery.of(this).size.height, MediaQuery.of(this).size.width);
if (screenWidth == _screenWidth) {
return _storyTileHeight;
} else {
_screenWidth = screenWidth;
}
final bool showSmallerPreviewPic = screenWidth > _screenWidthLowerBound &&
screenWidth < _screenWidthUpperBound;
final double height = showSmallerPreviewPic
? _smallPicHeight
: (screenWidth * _picHeightFactor)
.clamp(_picHeightLowerBound, _picHeightUpperBound);
final int maxLines = height == _smallPicHeight ? 3 : 4;
_storyTileMaxLines = maxLines;
_storyTileHeight = height;
return height;
}
int get storyTileMaxLines {
return _storyTileMaxLines;
}
} }

View File

@ -7,10 +7,8 @@ extension DateTimeExtension on DateTime {
return '$gap year${gap == 1 ? '' : 's'} ago'; return '$gap year${gap == 1 ? '' : 's'} ago';
} else if (diff.inDays > 30) { } else if (diff.inDays > 30) {
int gap = now.month - month; int gap = now.month - month;
if (gap == 0) { if (gap <= 0) {
gap = 1; gap = now.month + 12 - month;
} else if (gap < 0) {
gap = now.month + (12 - month);
} }
return '$gap month${gap == 1 ? '' : 's'} ago'; return '$gap month${gap == 1 ? '' : 's'} ago';
} else if (diff.inDays >= 1) { } else if (diff.inDays >= 1) {

View File

@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
class User { class User {
@ -39,8 +37,6 @@ class User {
@override @override
String toString() { String toString() {
final String prettyString = return 'User $about, $created, $delay, $id, $karma';
const JsonEncoder.withIndent(' ').convert(this);
return 'User $prettyString';
} }
} }

View File

@ -73,7 +73,7 @@ class StoriesRepository {
return; return;
} }
Stream<Comment> fetchAllCommentsStream({ Stream<Comment> fetchAllCommentsRecursivelyStream({
required List<int> ids, required List<int> ids,
int level = 0, int level = 0,
Comment? Function(int)? getFromCache, Comment? Function(int)? getFromCache,
@ -94,7 +94,7 @@ class StoriesRepository {
if (comment != null) { if (comment != null) {
yield comment; yield comment;
yield* fetchAllCommentsStream( yield* fetchAllCommentsRecursivelyStream(
ids: comment.kids, ids: comment.kids,
level: level + 1, level: level + 1,
getFromCache: getFromCache, getFromCache: getFromCache,

View File

@ -502,7 +502,7 @@ class _ItemScreenState extends State<ItemScreen> {
Text( Text(
'''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''', '''${state.item.score} karma, ${state.item.descendants} comment${state.item.descendants > 1 ? 's' : ''}''',
style: const TextStyle( style: const TextStyle(
fontSize: TextDimens.pt12, fontSize: TextDimens.pt13,
), ),
), ),
] else ...<Widget>[ ] else ...<Widget>[
@ -523,7 +523,12 @@ class _ItemScreenState extends State<ItemScreen> {
strokeWidth: Dimens.pt2, strokeWidth: Dimens.pt2,
), ),
) )
: const Text('View parent thread'), : const Text(
'View parent thread',
style: TextStyle(
fontSize: TextDimens.pt13,
),
),
), ),
], ],
const Spacer(), const Spacer(),
@ -537,7 +542,7 @@ class _ItemScreenState extends State<ItemScreen> {
child: Text( child: Text(
'Lazy', 'Lazy',
style: TextStyle( style: TextStyle(
fontSize: TextDimens.pt12, fontSize: TextDimens.pt13,
), ),
), ),
), ),
@ -546,7 +551,7 @@ class _ItemScreenState extends State<ItemScreen> {
child: Text( child: Text(
'Eager', 'Eager',
style: TextStyle( style: TextStyle(
fontSize: TextDimens.pt12, fontSize: TextDimens.pt13,
), ),
), ),
), ),
@ -568,7 +573,7 @@ class _ItemScreenState extends State<ItemScreen> {
child: Text( child: Text(
'Natural', 'Natural',
style: TextStyle( style: TextStyle(
fontSize: TextDimens.pt12, fontSize: TextDimens.pt13,
), ),
), ),
), ),
@ -577,7 +582,7 @@ class _ItemScreenState extends State<ItemScreen> {
child: Text( child: Text(
'Newest first', 'Newest first',
style: TextStyle( style: TextStyle(
fontSize: TextDimens.pt12, fontSize: TextDimens.pt13,
), ),
), ),
), ),
@ -586,7 +591,7 @@ class _ItemScreenState extends State<ItemScreen> {
child: Text( child: Text(
'Oldest first', 'Oldest first',
style: TextStyle( style: TextStyle(
fontSize: TextDimens.pt12, fontSize: TextDimens.pt13,
), ),
), ),
), ),

View File

@ -526,7 +526,7 @@ class _ProfileScreenState extends State<ProfileScreen>
showAboutDialog( showAboutDialog(
context: context, context: context,
applicationName: 'Hacki', applicationName: 'Hacki',
applicationVersion: 'v0.2.27', applicationVersion: 'v0.2.29',
applicationIcon: ClipRRect( applicationIcon: ClipRRect(
borderRadius: const BorderRadius.all( borderRadius: const BorderRadius.all(
Radius.circular( Radius.circular(

View File

@ -288,9 +288,7 @@ class CommentTile extends StatelessWidget {
!context !context
.read<CommentsCubit>() .read<CommentsCubit>()
.state .state
.comments .commentIds
.map((Comment e) => e.id)
.toSet()
.contains(comment.kids.first)) .contains(comment.kids.first))
Center( Center(
child: TextButton( child: TextButton(

View File

@ -2,6 +2,7 @@ import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hacki/config/constants.dart'; import 'package:hacki/config/constants.dart';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/models.dart'; import 'package:hacki/models/models.dart';
import 'package:hacki/screens/widgets/link_preview/link_view.dart'; import 'package:hacki/screens/widgets/link_preview/link_view.dart';
import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart'; import 'package:hacki/screens/widgets/link_preview/web_analyzer.dart';
@ -199,23 +200,9 @@ class _LinkPreviewState extends State<LinkPreview> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
const double screenWidthLowerBound = 428,
screenWidthUpperBound = 850,
picHeightLowerBound = 118,
picHeightUpperBound = 140,
smallPicHeight = 100,
picHeightFactor = 0.14;
final double screenWidth = MediaQuery.of(context).size.width;
final bool showSmallerPreviewPic = screenWidth > screenWidthLowerBound &&
screenWidth < screenWidthUpperBound;
final double height = showSmallerPreviewPic
? smallPicHeight
: (MediaQuery.of(context).size.height * picHeightFactor)
.clamp(picHeightLowerBound, picHeightUpperBound);
final Widget loadingWidget = widget.placeholderWidget ?? final Widget loadingWidget = widget.placeholderWidget ??
Container( Container(
height: height, height: context.storyTileHeight,
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
@ -232,13 +219,13 @@ class _LinkPreviewState extends State<LinkPreview> {
final WebInfo? info = _info as WebInfo?; final WebInfo? info = _info as WebInfo?;
loadedWidget = _info == null loadedWidget = _info == null
? _buildLinkContainer( ? _buildLinkContainer(
height, context.storyTileHeight,
title: _errorTitle, title: _errorTitle,
desc: _errorBody, desc: _errorBody,
imageUri: null, imageUri: null,
) )
: _buildLinkContainer( : _buildLinkContainer(
height, context.storyTileHeight,
title: _errorTitle, title: _errorTitle,
desc: WebAnalyzer.isNotEmpty(info!.description) desc: WebAnalyzer.isNotEmpty(info!.description)
? info.description ? info.description

View File

@ -147,7 +147,7 @@ class LinkView extends StatelessWidget {
Widget _buildTitleContainer(TextStyle _titleTS, int _maxLines) { Widget _buildTitleContainer(TextStyle _titleTS, int _maxLines) {
return Padding( return Padding(
padding: const EdgeInsets.fromLTRB(4, 2, 3, 1), padding: const EdgeInsets.fromLTRB(4, 2, 3, 0),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
@ -168,7 +168,7 @@ class LinkView extends StatelessWidget {
return Expanded( return Expanded(
flex: 2, flex: 2,
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB(5, 3, 5, 0), padding: const EdgeInsets.fromLTRB(5, 2, 5, 0),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
if (showMetadata) if (showMetadata)

View File

@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_fadein/flutter_fadein.dart'; import 'package:flutter_fadein/flutter_fadein.dart';
import 'package:hacki/blocs/blocs.dart'; import 'package:hacki/blocs/blocs.dart';
import 'package:hacki/config/constants.dart'; import 'package:hacki/config/constants.dart';
import 'package:hacki/extensions/extensions.dart';
import 'package:hacki/models/models.dart'; import 'package:hacki/models/models.dart';
import 'package:hacki/screens/widgets/widgets.dart'; import 'package:hacki/screens/widgets/widgets.dart';
import 'package:hacki/styles/styles.dart'; import 'package:hacki/styles/styles.dart';
@ -29,20 +30,7 @@ class StoryTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (showWebPreview) { if (showWebPreview) {
const double screenWidthLowerBound = 428, final double height = context.storyTileHeight;
screenWidthUpperBound = 850,
picHeightLowerBound = 118,
picHeightUpperBound = 140,
smallPicHeight = 100,
picHeightFactor = 0.14;
final double screenWidth = MediaQuery.of(context).size.width;
final bool showSmallerPreviewPic = screenWidth > screenWidthLowerBound &&
screenWidth < screenWidthUpperBound;
final double height = showSmallerPreviewPic
? smallPicHeight
: (MediaQuery.of(context).size.height * picHeightFactor)
.clamp(picHeightLowerBound, picHeightUpperBound);
return TapDownWrapper( return TapDownWrapper(
onTap: onTap, onTap: onTap,
child: Padding( child: Padding(
@ -143,7 +131,7 @@ class StoryTile extends StatelessWidget {
backgroundColor: Palette.transparent, backgroundColor: Palette.transparent,
borderRadius: Dimens.zero, borderRadius: Dimens.zero,
removeElevation: true, removeElevation: true,
bodyMaxLines: height == smallPicHeight ? 3 : 4, bodyMaxLines: context.storyTileMaxLines,
errorTitle: story.title, errorTitle: story.title,
titleStyle: TextStyle( titleStyle: TextStyle(
color: hasRead color: hasRead

View File

@ -27,6 +27,7 @@ abstract class TextDimens {
static const double pt8 = 8; static const double pt8 = 8;
static const double pt10 = 10; static const double pt10 = 10;
static const double pt12 = 12; static const double pt12 = 12;
static const double pt13 = 13;
static const double pt14 = 14; static const double pt14 = 14;
static const double pt15 = 15; static const double pt15 = 15;
static const double pt16 = 16; static const double pt16 = 16;

View File

@ -1,6 +1,6 @@
name: hacki name: hacki
description: A Hacker News reader. description: A Hacker News reader.
version: 0.2.27+69 version: 0.2.29+72
publish_to: none publish_to: none
environment: environment: