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>

README.md

@@ -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)
 [![Play Store](https://img.shields.io/badge/Play%20Store--yellow)](https://play.google.com/store/apps/details?id=com.jiaqifeng.hacki&hl=en_US&gl=US)
+[![Fdroid version](https://img.shields.io/f-droid/v/com.jiaqifeng.hacki)](https://f-droid.org/en/packages/com.jiaqifeng.hacki/)
+[![GH version](https://img.shields.io/github/release/livinglist/hacki.svg?logo=github)](https://github.com/Livinglist/Hacki/releases/latest)
 [![Visits Badge](https://badges.pufler.dev/visits/livinglist/Hacki)](https://badges.pufler.dev)
 [![GitHub](https://img.shields.io/github/stars/livinglist/Hacki?style=social)](https://img.shields.io/github/stars/livinglist/Hacki?style=social)
 [![style: effective dart](https://img.shields.io/badge/style-effective_dart-40c4ff.svg)](https://pub.dev/packages/effective_dart)
@@ -36,24 +38,22 @@ Features:
 
 
 <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>
 

fastlane/metadata/android/en-US/changelogs/55.txt

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

ios/Runner.xcodeproj/project.pbxproj

@@ -577,7 +577,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.15;
+				MARKETING_VERSION = 0.2.16;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -714,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.15;
+				MARKETING_VERSION = 0.2.16;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -745,7 +745,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.15;
+				MARKETING_VERSION = 0.2.16;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/blocs/stories/stories_bloc.dart

@@ -48,6 +48,15 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
   static const int _tabletSmallPageSize = 15;
   static const int _tabletLargePageSize = 25;
 
+  /// Types of story to be shown in the tab bar.
+  static const Set<StoryType> types = <StoryType>{
+    StoryType.top,
+    StoryType.best,
+    StoryType.latest,
+    StoryType.ask,
+    StoryType.show,
+  };
+
   Future<void> onInitialize(
     StoriesInitialize event,
     Emitter<StoriesState> emit,
@@ -70,11 +79,9 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         currentPageSize: pageSize,
       ),
     );
-    await loadStories(of: StoryType.top, emit: emit);
+    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({
@@ -237,34 +244,17 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
     await _cacheRepository.deleteAllStories();
     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 {
       _storiesRepository
-          .fetchStoriesStream(ids: allIds)
+          .fetchStoriesStream(ids: allIds.toList())
           .listen((Story story) async {
         if (story.kids.isNotEmpty) {
           await _cacheRepository.cacheStory(story: story);

lib/blocs/stories/stories_state.dart

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

lib/models/story.dart

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

lib/screens/home_screen.dart

@@ -222,61 +222,21 @@ class _HomeScreenState extends State<HomeScreen>
                         HapticFeedback.selectionClick();
                       },
                       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(
                           child: DescribedFeatureOverlay(
                             onBackgroundTap: onFeatureDiscoveryDismissed,
@@ -349,36 +309,13 @@ class _HomeScreenState extends State<HomeScreen>
               physics: const NeverScrollableScrollPhysics(),
               controller: tabController,
               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(),
               ],
             ),

lib/screens/profile/profile_screen.dart

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

pubspec.yaml

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