Modified CollectionPaging.

hukusuke1007 · Oct 30, 2020 · 181fe03 · 181fe03
1 parent b4024ca
commit 181fe03
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -228,11 +228,11 @@ final collectionPaging = CollectionPaging<User>(
 List<User> items = [];
 
 // Load 
-final _items = await collectionPaging.load<User>();
+final _items = await collectionPaging.load();
 items = _items;
 
 // LoadMore
-final _items = await collectionPaging.loadMore<User>();
+final _items = await collectionPaging.loadMore();
 items.addAll(_items);
 ```
 

diff --git a/README_j.md b/README_j.md
@@ -242,11 +242,11 @@ final collectionPaging = CollectionPaging<User>(
 List<User> items = [];
 
 // Load 
-final _items = await collectionPaging.load<User>();
+final _items = await collectionPaging.load();
 items = _items;
 
 // LoadMore
-final _items = await collectionPaging.loadMore<User>();
+final _items = await collectionPaging.loadMore();
 items.addAll(_items);
 ```
 

diff --git a/flamingo/CHANGELOG.md b/flamingo/CHANGELOG.md
@@ -1,4 +1,7 @@
-# 1.8.0
+# 1.8.1
+Modified CollectionPaging.
+
+## 1.8.0
 Modified to set Collection Reference by Snapshot.
 
 ## 1.7.0

diff --git a/flamingo/README.md b/flamingo/README.md
@@ -228,11 +228,11 @@ final collectionPaging = CollectionPaging<User>(
 List<User> items = [];
 
 // Load 
-final _items = await collectionPaging.load<User>();
+final _items = await collectionPaging.load();
 items = _items;
 
 // LoadMore
-final _items = await collectionPaging.loadMore<User>();
+final _items = await collectionPaging.loadMore();
 items.addAll(_items);
 ```
 

diff --git a/flamingo/example/lib/collection_paging_page.dart b/flamingo/example/lib/collection_paging_page.dart
@@ -41,7 +41,7 @@ class _State extends State<CollectionPagingPage> {
   }
 
   void initLoad() async {
-    final _items = await collectionPaging.load<User>();
+    final _items = await collectionPaging.load();
     setState(() {
       items = _items;
     });
@@ -91,14 +91,14 @@ class _State extends State<CollectionPagingPage> {
               },
             ),
             onRefresh: () async {
-              final _items = await collectionPaging.load<User>();
+              final _items = await collectionPaging.load();
               setState(() {
                 items = _items;
               });
               refreshController.refreshCompleted();
             },
             onLoading: () async {
-              final _items = await collectionPaging.loadMore<User>();
+              final _items = await collectionPaging.loadMore();
               setState(() {
                 items.addAll(_items);
               });

diff --git a/flamingo/example/lib/flamingo_test.dart b/flamingo/example/lib/flamingo_test.dart
@@ -60,7 +60,7 @@ class FlamingoTest {
   }
   final DocumentAccessor documentAccessor = DocumentAccessor();
 
-  CollectionPaging _collectionPaging;
+  CollectionPaging<User> _collectionPaging;
 
   Future all() async {
     print('------- start -------');
@@ -1148,7 +1148,7 @@ class FlamingoTest {
       limit: 5,
       decode: (snap) => AppUser(snapshot: snap),
     );
-    final list = await collectionPaging.load<AppUser>();
+    final list = await collectionPaging.load();
     assert(list.isNotEmpty, 'list is empty');
   }
 
@@ -1342,15 +1342,15 @@ class FlamingoTest {
   }
 
   Future<List<User>> loadUsers() async {
-    final documents = await _collectionPaging.load<User>();
+    final documents = await _collectionPaging.load();
     for (var doc in documents) {
       print('${doc.id} ${doc.toData()}');
     }
     return documents;
   }
 
   Future<List<User>> loadMoreUsers() async {
-    final documents = await _collectionPaging.loadMore<User>();
+    final documents = await _collectionPaging.loadMore();
     for (var doc in documents) {
       print('${doc.id} ${doc.toData()}');
     }

diff --git a/flamingo/lib/src/collection_paging.dart b/flamingo/lib/src/collection_paging.dart
@@ -15,19 +15,19 @@ class CollectionPaging<T extends Document<T>> {
   final T Function(DocumentSnapshot) decode;
   DocumentSnapshot _startAfterDocument;
 
-  Future<List<D>> load<D extends Document<D>>({
+  Future<List<T>> load({
     Source source = Source.serverAndCache,
   }) async {
     final documents = await _load(source: source);
-    return documents.map(decode).cast<D>().toList();
+    return documents.map(decode).cast<T>().toList();
   }
 
-  Future<List<D>> loadMore<D extends Document<D>>({
+  Future<List<T>> loadMore({
     Source source = Source.serverAndCache,
   }) async {
     final documents =
         await _load(source: source, startAfterDocument: _startAfterDocument);
-    return documents.map(decode).cast<D>().toList();
+    return documents.map(decode).cast<T>().toList();
   }
 
   Future<List<DocumentSnapshot>> _load({

diff --git a/flamingo/pubspec.yaml b/flamingo/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flamingo
 description: This is Firebase Firestore Model Framework Library. Can be manage document reference and collection reference. And provide Firestore and Cloud Storage interface.
-version: 1.8.0
+version: 1.8.1
 repository: https://github.com/hukusuke1007/flamingo
 homepage: https://github.com/hukusuke1007/flamingo