Fix post repeat

Author: ShiinaManatsu

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"devicelocale","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\devicelocale-0.3.2\\\\","dependencies":[]},{"name":"esys_flutter_share","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\esys_flutter_share-1.0.2\\\\","dependencies":["path_provider"]},{"name":"flutter_local_notifications","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_local_notifications-2.0.0\\\\","dependencies":[]},{"name":"open_file","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\open_file-3.0.1\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.3\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.18\\\\","dependencies":[]},{"name":"permission_handler","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"shared_preferences","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.12\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1+1\\\\","dependencies":[]},{"name":"uni_links","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.7.2\\\\","dependencies":[]}],"android":[{"name":"devicelocale","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\devicelocale-0.3.2\\\\","dependencies":[]},{"name":"esys_flutter_share","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\esys_flutter_share-1.0.2\\\\","dependencies":["path_provider"]},{"name":"flutter_local_notifications","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_local_notifications-2.0.0\\\\","dependencies":[]},{"name":"open_file","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\open_file-3.0.1\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.3\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.18\\\\","dependencies":[]},{"name":"permission_handler","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"shared_preferences","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.12\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1+1\\\\","dependencies":[]},{"name":"uni_links","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.7.2\\\\","dependencies":[]}],"macos":[{"name":"flutter_local_notifications","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_local_notifications-2.0.0\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.3\\\\","dependencies":[]},{"name":"path_provider_macos","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+4\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1+1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+8\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_linux-0.0.2+2\\\\","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-0.0.1+1\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-0.0.4+1\\\\","dependencies":[]},{"name":"shared_preferences_windows","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_windows-0.0.1+1\\\\","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_windows-0.0.1+1\\\\","dependencies":[]}],"web":[{"name":"shared_preferences_web","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.4+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"devicelocale","dependencies":[]},{"name":"esys_flutter_share","dependencies":["path_provider"]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"open_file","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2020-10-12 15:36:59.156234","version":"1.20.0"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"devicelocale","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\devicelocale-0.3.2\\\\","dependencies":[]},{"name":"esys_flutter_share","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\esys_flutter_share-1.0.2\\\\","dependencies":["path_provider"]},{"name":"flutter_local_notifications","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_local_notifications-2.0.0\\\\","dependencies":[]},{"name":"open_file","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\open_file-3.0.1\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.3\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.18\\\\","dependencies":[]},{"name":"permission_handler","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"shared_preferences","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.12\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1+1\\\\","dependencies":[]},{"name":"uni_links","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.7.2\\\\","dependencies":[]}],"android":[{"name":"devicelocale","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\devicelocale-0.3.2\\\\","dependencies":[]},{"name":"esys_flutter_share","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\esys_flutter_share-1.0.2\\\\","dependencies":["path_provider"]},{"name":"flutter_local_notifications","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_local_notifications-2.0.0\\\\","dependencies":[]},{"name":"open_file","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\open_file-3.0.1\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.3\\\\","dependencies":[]},{"name":"path_provider","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider-1.6.18\\\\","dependencies":[]},{"name":"permission_handler","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\permission_handler-5.0.1+1\\\\","dependencies":[]},{"name":"shared_preferences","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences-0.5.12\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1+1\\\\","dependencies":[]},{"name":"uni_links","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\uni_links-0.4.0\\\\","dependencies":[]},{"name":"url_launcher","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.7.2\\\\","dependencies":[]}],"macos":[{"name":"flutter_local_notifications","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\flutter_local_notifications-2.0.0\\\\","dependencies":[]},{"name":"package_info","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\package_info-0.4.3\\\\","dependencies":[]},{"name":"path_provider_macos","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_macos-0.0.4+4\\\\","dependencies":[]},{"name":"shared_preferences_macos","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_macos-0.0.1+10\\\\","dependencies":[]},{"name":"sqflite","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\sqflite-1.3.1+1\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_macos-0.0.1+8\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_linux-0.0.2+2\\\\","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_linux-0.0.1+1\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\path_provider_windows-0.0.4+1\\\\","dependencies":[]},{"name":"shared_preferences_windows","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_windows-0.0.1+1\\\\","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_windows-0.0.1+1\\\\","dependencies":[]}],"web":[{"name":"shared_preferences_web","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.4+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"devicelocale","dependencies":[]},{"name":"esys_flutter_share","dependencies":["path_provider"]},{"name":"flutter_local_notifications","dependencies":[]},{"name":"open_file","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sqflite","dependencies":[]},{"name":"uni_links","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2020-10-12 17:23:50.707688","version":"1.20.0"}

lib/extensions/list_extension.dart

@@ -3,18 +3,13 @@ import 'package:booru_app/models/rx/booru_bloc.dart';
 import 'package:booru_app/models/yande/post.dart';
 import 'package:booru_app/settings/app_settings.dart';
 import 'package:booru_app/pages/home_page.dart';
+import 'package:rxdart/rxdart.dart';
 // We are moving all the fetched post to the optimized list
 
 extension ListExtension on List<Post> {
   Future<List<Post>> arrange() async {
     if (AppSettings.masonryGrid) {
-      var cache = BooruBloc.cache;
-      if (this.length == 0) {
-        return cache;
-      } else {
-        cache.addAll(this);
-        return cache;
-      }
+      return BooruBloc.cache;
     } else {
       if (this.length == 0) {
         return List<Post>();

lib/main.dart

@@ -35,22 +35,17 @@ void globalInitial() {
           (LocalUser user) => user.clientType == AppSettings.currentClient))
       .listen((event) => event());
 
-  PublishSubject().listen((value) {
-    print("Subject listened");
-  });
 
   if (!Platform.isWindows)
     getUriLinksStream().listen((link) {
       if (AppSettings.currentClient == ClientType.Konachan &&
           link.host.contains("yande")) {
         AppSettings.currentClient = ClientType.Yande;
         booruBloc.onReset.add(null);
-        booruBloc.onRefresh.add(null);
       } else if (AppSettings.currentClient == ClientType.Yande &&
           link.host.contains("konachan")) {
         AppSettings.currentClient = ClientType.Konachan;
         booruBloc.onReset.add(null);
-        booruBloc.onRefresh.add(null);
       }
       ExtendedNavigator.root.push(routes.Routes.postViewPageByPostID,
           arguments: routes.PostViewPageByPostIDArguments(
@@ -77,7 +72,7 @@ void globalInitial() {
     } else {
       AppSettings.previewQuality = PreviewQuality.Low;
       SharedPreferencesExtension.setTyped(
-          "PreviewQuality", EnumToString.parse(PreviewQuality.Low));
+          "PreviewQuality", EnumToString.convertToString(PreviewQuality.Low));
     }
   });
 

lib/pages/widgets/sliver_post_waterfall_widget.dart

@@ -5,6 +5,7 @@ import 'package:booru_app/models/rx/post_state.dart';
 import 'package:booru_app/pages/home_page.dart';
 import 'package:masonry_grid/masonry_grid.dart';
 import 'post_preview.dart';
+import 'package:darq/darq.dart';
 
 class SliverPostWaterfall extends StatefulWidget {
   final ScrollController controller;
@@ -44,8 +45,9 @@ class _SliverPostWaterfallState extends State<SliverPostWaterfall> {
                             child: Wrap(
                               spacing: 4,
                               runSpacing: 4,
-                              children: <Widget>[]..addAll(state.result.map(
-                                  (x) => RepaintBoundary(
+                              children: <Widget>[]..addAll(state.result
+                                  .distinct((x) => x.id)
+                                  .map((x) => RepaintBoundary(
                                       child: PostPreview(post: x)))),
                             )),
                       )
@@ -54,7 +56,7 @@ class _SliverPostWaterfallState extends State<SliverPostWaterfall> {
                         mainAxisSpacing: 4,
                         column: 2,
                         children: state.result
-                            .toSet()
+                            .distinct((x) => x.id)
                             .map((x) => RepaintBoundary(
                                 child: AspectRatio(
                                     aspectRatio: x.ratio,

pubspec.lock

@@ -197,6 +197,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
+  darq:
+    dependency: "direct main"
+    description:
+      name: darq
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.4.0+1"
   dart_style:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: booru_app
 description: App for yande and konachan
 
-version: 0.2.3+7
+version: 0.2.4+8
 
 environment:
   sdk: ">=2.8.0 <3.0.0"
@@ -42,6 +42,7 @@ dependencies:
   package_info: '>=0.4.3 <2.0.0'
   permission_handler: ^5.0.1+1
   masonry_grid: ^0.3.1+2
+  darq: ^0.4.0+1
 
   # flutter_native_splash: ^0.1.9