Compare commits

...

2 Commits

Author SHA1 Message Date
a9590af3e9 v0.2.16 (#41)
* bumped version.

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

* updated README.md

* replaced jobs with best.

* updated README.md

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

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

Co-authored-by: Efreak <Efreak@users.noreply.github.com>
2022-06-05 00:58:49 -07:00
44 changed files with 198 additions and 179 deletions

View File

@ -5,6 +5,8 @@ A simple noiseless [Hacker News](https://news.ycombinator.com/) client made with
[![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)
[![Play Store](https://img.shields.io/badge/Play%20Store--yellow)](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US) [![Play Store](https://img.shields.io/badge/Play%20Store--yellow)](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
[![Fdroid version](https://img.shields.io/f-droid/v/com.jiaqifeng.hacki)](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
[![GH version](https://img.shields.io/github/release/livinglist/hacki.svg?logo=github)](https://github.com/Livinglist/Hacki/releases/latest)
[![Visits Badge](https://badges.pufler.dev/visits/livinglist/Hacki)](https://badges.pufler.dev) [![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) [![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)
@ -36,24 +38,22 @@ Features:
<p align="center"> <p align="center">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450528-02c561ed-0ebb-4c1b-9ee0-a935211db0f2.png"> <img width="200" alt="01" src="assets/screenshots/01.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450536-ea61c176-37d7-4744-8674-4668e0e7e774.png"> <img width="200" alt="02" src="assets/screenshots/02.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450541-a9af3417-526f-4dbd-96d7-781c95c886d3.png"> <img width="200" alt="03" src="assets/screenshots/03.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450543-fb631b02-5f46-4455-b8ff-9ef119a486f1.png"> <img width="200" alt="04" src="assets/screenshots/04.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450548-38e98b02-6201-48c9-9674-87bdfc61f456.png"> <img width="200" alt="05" src="assets/screenshots/05.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798179-72edbe49-7444-4e54-a07c-fc1244447a74.png"> <img width="200" alt="06" src="assets/screenshots/06.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798182-28397805-a7cc-4124-b65b-c02c80afbbec.png"> <img width="200" alt="07" src="assets/screenshots/07.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798183-c2984270-ee99-4419-841e-65e98890464f.png"> <img width="200" alt="08" src="assets/screenshots/08.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798184-2fce5d97-710e-44a7-b99a-3296ebcf273b.png"> <img width="200" alt="09" src="assets/screenshots/09.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171992215-5b43443b-f2b0-4b6e-9a30-a583fda1b189.png"> <img width="200" alt="10" src="assets/screenshots/10.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/159798186-1457ae21-f1aa-40a4-9206-0f3a1e24653e.png"> <img width="200" alt="11" src="assets/screenshots/11.png">
<img width="200" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/171450557-ab038e72-78c4-4daf-9b77-3873be1700db.png"> <img width="200" alt="12" src="assets/screenshots/12.png">
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162711-a9146326-9645-4db6-a04e-1f82e6133e40.png"> <img width="400" alt="ipad-01" src="assets/screenshots/ipad-01.png">
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162726-ef1d3f2a-5179-417c-8a5f-0cddb52249da.png"> <img width="400" alt="ipad-02" src="assets/screenshots/ipad-02.png">
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162733-906c4afd-39a8-48ae-946a-8019b327eaa0.png"> <img width="400" alt="ipad-03" src="assets/screenshots/ipad-03.png">
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160162735-f2b25119-4702-4308-b2f5-281a2a2c5901.png"> <img width="400" alt="ipad-04" src="assets/screenshots/ipad-04.png">
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163024-6dcd65b6-bada-4c1c-95af-387fd4f42fb2.png">
<img width="400" alt="Screen Shot 2020-03-03 at 1 22 57 PM" src="https://user-images.githubusercontent.com/7277662/160163033-7bcf7038-b9aa-4ce4-8b58-64578eae8531.png">
</p> </p>

BIN
assets/screenshots/01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 KiB

BIN
assets/screenshots/02.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 835 KiB

BIN
assets/screenshots/03.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 KiB

BIN
assets/screenshots/04.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 KiB

BIN
assets/screenshots/05.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 698 KiB

BIN
assets/screenshots/06.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 868 KiB

BIN
assets/screenshots/07.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

BIN
assets/screenshots/08.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 KiB

BIN
assets/screenshots/09.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 KiB

BIN
assets/screenshots/10.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 KiB

BIN
assets/screenshots/11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 KiB

BIN
assets/screenshots/12.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 763 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1005 KiB

View File

@ -0,0 +1,6 @@
- You can now add filters for searching.
- You can now participate in polls.
- Pick up where you left off.
- Swipe left on comment tile to view its parents without scrolling all the way up.
- Huge performance boost.
- Bugfixes.

View File

@ -0,0 +1,6 @@
- You can now add filters for searching.
- You can now participate in polls.
- Pick up where you left off.
- Swipe left on comment tile to view its parents without scrolling all the way up.
- Huge performance boost.
- Bugfixes.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 422 KiB

After

Width:  |  Height:  |  Size: 522 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 712 KiB

After

Width:  |  Height:  |  Size: 835 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 KiB

After

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 298 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 672 KiB

After

Width:  |  Height:  |  Size: 698 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 931 KiB

After

Width:  |  Height:  |  Size: 868 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 KiB

After

Width:  |  Height:  |  Size: 384 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 496 KiB

After

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 617 KiB

After

Width:  |  Height:  |  Size: 414 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 530 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 313 KiB

View File

@ -577,7 +577,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.14; MARKETING_VERSION = 0.2.16;
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.14; MARKETING_VERSION = 0.2.16;
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.14; MARKETING_VERSION = 0.2.16;
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

@ -48,6 +48,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
static const int _tabletSmallPageSize = 15; static const int _tabletSmallPageSize = 15;
static const int _tabletLargePageSize = 25; static const int _tabletLargePageSize = 25;
/// Types of story to be shown in the tab bar.
static const Set<StoryType> types = <StoryType>{
StoryType.top,
StoryType.best,
StoryType.latest,
StoryType.ask,
StoryType.show,
};
Future<void> onInitialize( Future<void> onInitialize(
StoriesInitialize event, StoriesInitialize event,
Emitter<StoriesState> emit, Emitter<StoriesState> emit,
@ -70,11 +79,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
currentPageSize: pageSize, currentPageSize: pageSize,
), ),
); );
await loadStories(of: StoryType.top, emit: emit); for (final StoryType type in types) {
await loadStories(of: StoryType.latest, emit: emit); await loadStories(of: type, emit: emit);
await loadStories(of: StoryType.ask, emit: emit); }
await loadStories(of: StoryType.show, emit: emit);
await loadStories(of: StoryType.jobs, emit: emit);
} }
Future<void> loadStories({ Future<void> loadStories({
@ -237,34 +244,17 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
await _cacheRepository.deleteAllStories(); await _cacheRepository.deleteAllStories();
await _cacheRepository.deleteAllComments(); await _cacheRepository.deleteAllComments();
final List<int> topIds = final Set<int> allIds = <int>{};
await _storiesRepository.fetchStoryIds(of: StoryType.top);
final List<int> newIds =
await _storiesRepository.fetchStoryIds(of: StoryType.latest);
final List<int> askIds =
await _storiesRepository.fetchStoryIds(of: StoryType.ask);
final List<int> showIds =
await _storiesRepository.fetchStoryIds(of: StoryType.show);
final List<int> jobIds =
await _storiesRepository.fetchStoryIds(of: StoryType.jobs);
await _cacheRepository.cacheStoryIds(of: StoryType.top, ids: topIds); for (final StoryType type in types) {
await _cacheRepository.cacheStoryIds(of: StoryType.latest, ids: newIds); final List<int> ids = await _storiesRepository.fetchStoryIds(of: type);
await _cacheRepository.cacheStoryIds(of: StoryType.ask, ids: askIds); await _cacheRepository.cacheStoryIds(of: type, ids: ids);
await _cacheRepository.cacheStoryIds(of: StoryType.show, ids: showIds); allIds.addAll(ids);
await _cacheRepository.cacheStoryIds(of: StoryType.jobs, ids: jobIds); }
final List<int> allIds = <int>[
...topIds,
...newIds,
...askIds,
...showIds,
...jobIds
];
try { try {
_storiesRepository _storiesRepository
.fetchStoriesStream(ids: allIds) .fetchStoriesStream(ids: allIds.toList())
.listen((Story story) async { .listen((Story story) async {
if (story.kids.isNotEmpty) { if (story.kids.isNotEmpty) {
await _cacheRepository.cacheStory(story: story); await _cacheRepository.cacheStory(story: story);

View File

@ -28,6 +28,7 @@ class StoriesState extends Equatable {
const StoriesState.init({ const StoriesState.init({
this.storiesByType = const <StoryType, List<Story>>{ this.storiesByType = const <StoryType, List<Story>>{
StoryType.top: <Story>[], StoryType.top: <Story>[],
StoryType.best: <Story>[],
StoryType.latest: <Story>[], StoryType.latest: <Story>[],
StoryType.ask: <Story>[], StoryType.ask: <Story>[],
StoryType.show: <Story>[], StoryType.show: <Story>[],
@ -35,6 +36,7 @@ class StoriesState extends Equatable {
}, },
this.storyIdsByType = const <StoryType, List<int>>{ this.storyIdsByType = const <StoryType, List<int>>{
StoryType.top: <int>[], StoryType.top: <int>[],
StoryType.best: <int>[],
StoryType.latest: <int>[], StoryType.latest: <int>[],
StoryType.ask: <int>[], StoryType.ask: <int>[],
StoryType.show: <int>[], StoryType.show: <int>[],
@ -42,6 +44,7 @@ class StoriesState extends Equatable {
}, },
this.statusByType = const <StoryType, StoriesStatus>{ this.statusByType = const <StoryType, StoriesStatus>{
StoryType.top: StoriesStatus.initial, StoryType.top: StoriesStatus.initial,
StoryType.best: StoriesStatus.initial,
StoryType.latest: StoriesStatus.initial, StoryType.latest: StoriesStatus.initial,
StoryType.ask: StoriesStatus.initial, StoryType.ask: StoriesStatus.initial,
StoryType.show: StoriesStatus.initial, StoryType.show: StoriesStatus.initial,
@ -49,6 +52,7 @@ class StoriesState extends Equatable {
}, },
this.currentPageByType = const <StoryType, int>{ this.currentPageByType = const <StoryType, int>{
StoryType.top: 0, StoryType.top: 0,
StoryType.best: 0,
StoryType.latest: 0, StoryType.latest: 0,
StoryType.ask: 0, StoryType.ask: 0,
StoryType.show: 0, StoryType.show: 0,

View File

@ -21,4 +21,6 @@ class SplitViewCubit extends Cubit<SplitViewState> {
void enableSplitView() => emit(state.copyWith(enabled: true)); void enableSplitView() => emit(state.copyWith(enabled: true));
void disableSplitView() => emit(state.copyWith(enabled: false)); void disableSplitView() => emit(state.copyWith(enabled: false));
void zoom() => emit(state.copyWith(expanded: !state.expanded));
} }

View File

@ -3,19 +3,27 @@ part of 'split_view_cubit.dart';
class SplitViewState extends Equatable { class SplitViewState extends Equatable {
const SplitViewState({ const SplitViewState({
required this.storyScreenArgs, required this.storyScreenArgs,
required this.expanded,
required this.enabled, required this.enabled,
}); });
const SplitViewState.init() const SplitViewState.init()
: enabled = false, : enabled = false,
expanded = false,
storyScreenArgs = null; storyScreenArgs = null;
final bool enabled; final bool enabled;
final bool expanded;
final StoryScreenArgs? storyScreenArgs; final StoryScreenArgs? storyScreenArgs;
SplitViewState copyWith({bool? enabled, StoryScreenArgs? storyScreenArgs}) { SplitViewState copyWith({
bool? enabled,
bool? expanded,
StoryScreenArgs? storyScreenArgs,
}) {
return SplitViewState( return SplitViewState(
enabled: enabled ?? this.enabled, enabled: enabled ?? this.enabled,
expanded: expanded ?? this.expanded,
storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs, storyScreenArgs: storyScreenArgs ?? this.storyScreenArgs,
); );
} }
@ -23,6 +31,7 @@ class SplitViewState extends Equatable {
@override @override
List<Object?> get props => <Object?>[ List<Object?> get props => <Object?>[
enabled, enabled,
expanded,
storyScreenArgs, storyScreenArgs,
]; ];
} }

View File

@ -5,6 +5,7 @@ import 'package:hacki/models/item.dart';
enum StoryType { enum StoryType {
top('topstories'), top('topstories'),
best('beststories'),
latest('newstories'), latest('newstories'),
ask('askstories'), ask('askstories'),
show('showstories'), show('showstories'),
@ -13,6 +14,23 @@ enum StoryType {
const StoryType(this.path); const StoryType(this.path);
final String path; final String path;
String get label {
switch (this) {
case StoryType.top:
return 'TOP';
case StoryType.best:
return 'BEST';
case StoryType.latest:
return 'NEW';
case StoryType.ask:
return 'ASK';
case StoryType.show:
return 'SHOW';
case StoryType.jobs:
return 'JOBS';
}
}
} }
class Story extends Item { class Story extends Item {

View File

@ -222,61 +222,21 @@ class _HomeScreenState extends State<HomeScreen>
HapticFeedback.selectionClick(); HapticFeedback.selectionClick();
}, },
tabs: <Widget>[ tabs: <Widget>[
Tab( for (int i = 0; i < StoriesBloc.types.length; i++)
child: Text( Tab(
'TOP', key: ValueKey<StoryType>(
style: TextStyle( StoriesBloc.types.elementAt(i),
fontSize: currentIndex == 0 ? 14 : 10, ),
color: currentIndex == 0 child: Text(
? Colors.orange StoriesBloc.types.elementAt(i).label,
: Colors.grey, style: TextStyle(
fontSize: currentIndex == i ? 14 : 10,
color: currentIndex == i
? Colors.orange
: Colors.grey,
),
), ),
), ),
),
Tab(
child: Text(
'NEW',
style: TextStyle(
fontSize: currentIndex == 1 ? 14 : 10,
color: currentIndex == 1
? Colors.orange
: Colors.grey,
),
),
),
Tab(
child: Text(
'ASK',
style: TextStyle(
fontSize: currentIndex == 2 ? 14 : 10,
color: currentIndex == 2
? Colors.orange
: Colors.grey,
),
),
),
Tab(
child: Text(
'SHOW',
style: TextStyle(
fontSize: currentIndex == 3 ? 14 : 10,
color: currentIndex == 3
? Colors.orange
: Colors.grey,
),
),
),
Tab(
child: Text(
'JOBS',
style: TextStyle(
fontSize: currentIndex == 4 ? 14 : 10,
color: currentIndex == 4
? Colors.orange
: Colors.grey,
),
),
),
Tab( Tab(
child: DescribedFeatureOverlay( child: DescribedFeatureOverlay(
onBackgroundTap: onFeatureDiscoveryDismissed, onBackgroundTap: onFeatureDiscoveryDismissed,
@ -349,36 +309,13 @@ class _HomeScreenState extends State<HomeScreen>
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
controller: tabController, controller: tabController,
children: <Widget>[ children: <Widget>[
StoriesListView( for (final StoryType type in StoriesBloc.types)
key: const ValueKey<StoryType>(StoryType.top), StoriesListView(
storyType: StoryType.top, key: ValueKey<StoryType>(type),
header: pinnedStories, storyType: type,
onStoryTapped: onStoryTapped, header: pinnedStories,
), onStoryTapped: onStoryTapped,
StoriesListView( ),
key: const ValueKey<StoryType>(StoryType.latest),
storyType: StoryType.latest,
header: pinnedStories,
onStoryTapped: onStoryTapped,
),
StoriesListView(
key: const ValueKey<StoryType>(StoryType.ask),
storyType: StoryType.ask,
header: pinnedStories,
onStoryTapped: onStoryTapped,
),
StoriesListView(
key: const ValueKey<StoryType>(StoryType.show),
storyType: StoryType.show,
header: pinnedStories,
onStoryTapped: onStoryTapped,
),
StoriesListView(
key: const ValueKey<StoryType>(StoryType.jobs),
storyType: StoryType.jobs,
header: pinnedStories,
onStoryTapped: onStoryTapped,
),
const ProfileScreen(), const ProfileScreen(),
], ],
), ),
@ -390,11 +327,11 @@ class _HomeScreenState extends State<HomeScreen>
return ScreenTypeLayout.builder( return ScreenTypeLayout.builder(
mobile: (BuildContext context) { mobile: (BuildContext context) {
context.read<SplitViewCubit>().disableSplitView(); context.read<SplitViewCubit>().disableSplitView();
return _MobileHomeScreenBuilder( return _MobileHomeScreen(
homeScreen: homeScreen, homeScreen: homeScreen,
); );
}, },
tablet: (BuildContext context) => _TabletHomeScreenBuilder( tablet: (BuildContext context) => _TabletHomeScreen(
homeScreen: homeScreen, homeScreen: homeScreen,
), ),
); );
@ -511,8 +448,8 @@ class _HomeScreenState extends State<HomeScreen>
} }
} }
class _MobileHomeScreenBuilder extends StatelessWidget { class _MobileHomeScreen extends StatelessWidget {
const _MobileHomeScreenBuilder({ const _MobileHomeScreen({
Key? key, Key? key,
required this.homeScreen, required this.homeScreen,
}) : super(key: key); }) : super(key: key);
@ -537,8 +474,8 @@ class _MobileHomeScreenBuilder extends StatelessWidget {
} }
} }
class _TabletHomeScreenBuilder extends StatelessWidget { class _TabletHomeScreen extends StatelessWidget {
const _TabletHomeScreenBuilder({ const _TabletHomeScreen({
Key? key, Key? key,
required this.homeScreen, required this.homeScreen,
}) : super(key: key); }) : super(key: key);
@ -556,30 +493,40 @@ class _TabletHomeScreenBuilder extends StatelessWidget {
homeScreenWidth = 345.0; homeScreenWidth = 345.0;
} }
return Stack( return BlocBuilder<SplitViewCubit, SplitViewState>(
children: <Widget>[ buildWhen: (SplitViewState previous, SplitViewState current) =>
Positioned( previous.expanded != current.expanded,
left: 0, builder: (BuildContext context, SplitViewState state) {
top: 0, return Stack(
bottom: 0, children: <Widget>[
width: homeScreenWidth, AnimatedPositioned(
child: homeScreen, left: 0,
), top: 0,
Positioned( bottom: 0,
left: 24, width: state.expanded ? 0 : homeScreenWidth,
bottom: 36, duration: const Duration(milliseconds: 300),
height: 40, curve: Curves.elasticOut,
width: homeScreenWidth - 24, child: homeScreen,
child: const CountdownReminder(), ),
), Positioned(
Positioned( left: 24,
right: 0, bottom: 36,
top: 0, height: 40,
bottom: 0, width: homeScreenWidth - 24,
left: homeScreenWidth, child: const CountdownReminder(),
child: const _TabletStoryView(), ),
), AnimatedPositioned(
], right: 0,
top: 0,
bottom: 0,
left: state.expanded ? 0 : homeScreenWidth,
duration: const Duration(milliseconds: 300),
curve: Curves.elasticOut,
child: const _TabletStoryView(),
),
],
);
},
); );
}, },
); );

View File

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

View File

@ -525,19 +525,34 @@ class _StoryScreenState extends State<StoryScreen> {
Positioned.fill( Positioned.fill(
child: mainView, child: mainView,
), ),
Positioned( BlocBuilder<SplitViewCubit, SplitViewState>(
top: 0, buildWhen: (
left: 0, SplitViewState previous,
right: 0, SplitViewState current,
child: CustomAppBar( ) =>
backgroundColor: Theme.of(context) previous.expanded != current.expanded,
.canvasColor builder:
.withOpacity(0.6), (BuildContext context, SplitViewState state) {
story: widget.story, return Positioned(
scrollController: scrollController, top: 0,
onBackgroundTap: onFeatureDiscoveryDismissed, left: 0,
onDismiss: onFeatureDiscoveryDismissed, right: 0,
), child: CustomAppBar(
backgroundColor: Theme.of(context)
.canvasColor
.withOpacity(0.6),
story: widget.story,
scrollController: scrollController,
onBackgroundTap:
onFeatureDiscoveryDismissed,
onDismiss: onFeatureDiscoveryDismissed,
splitViewEnabled: state.enabled,
expanded: state.expanded,
onZoomTap:
context.read<SplitViewCubit>().zoom,
),
);
},
), ),
Positioned( Positioned(
bottom: 0, bottom: 0,

View File

@ -1,4 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:hacki/models/models.dart'; import 'package:hacki/models/models.dart';
import 'package:hacki/screens/story/widgets/fav_icon_button.dart'; import 'package:hacki/screens/story/widgets/fav_icon_button.dart';
import 'package:hacki/screens/story/widgets/link_icon_button.dart'; import 'package:hacki/screens/story/widgets/link_icon_button.dart';
@ -13,11 +15,29 @@ class CustomAppBar extends AppBar {
required Color backgroundColor, required Color backgroundColor,
required Future<bool> Function() onBackgroundTap, required Future<bool> Function() onBackgroundTap,
required Future<bool> Function() onDismiss, required Future<bool> Function() onDismiss,
bool splitViewEnabled = false,
VoidCallback? onZoomTap,
bool? expanded,
}) : super( }) : super(
key: key, key: key,
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
elevation: 0, elevation: 0,
actions: <Widget>[ actions: <Widget>[
if (splitViewEnabled) ...<Widget>[
IconButton(
icon: Icon(
expanded ?? false
? FeatherIcons.minimize2
: FeatherIcons.maximize2,
size: 20,
),
onPressed: () {
HapticFeedback.lightImpact();
onZoomTap?.call();
},
),
const Spacer(),
],
ScrollUpIconButton( ScrollUpIconButton(
scrollController: scrollController, scrollController: scrollController,
), ),

View File

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

View File

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

View File

@ -1,6 +1,6 @@
name: hacki name: hacki
description: A Hacker News reader. description: A Hacker News reader.
version: 0.2.14+53 version: 0.2.16+55
publish_to: none publish_to: none
environment: environment: