Merge pull request #175 from sparcs-kaist/bug@infinite-loading-maximu…

…m-scroll Fix #115, Fix infinite loading if maximum scrolled
sparcs-kaist · Apr 4, 2024 · ad2294c · ad2294c
2 parents 9d99f22 + 47256c8
commit ad2294c
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 43 deletions.
diff --git a/lib/pages/liked_review_page.dart b/lib/pages/liked_review_page.dart
@@ -22,6 +22,7 @@ class LikedReviewPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final user = context.watch<InfoModel>().user;
     final reviews = context.watch<LikedReviewModel>().likedReviews(user);
+    final reviewPage = context.watch<LikedReviewModel>().page;
 
     return OTLScaffold(
       child: OTLLayout(
@@ -77,23 +78,25 @@ class LikedReviewPage extends StatelessWidget {
                                   childCount: reviews.length,
                                 ),
                               ),
-                              SliverList(
-                                  delegate: SliverChildListDelegate([
-                                Padding(
-                                  padding: const EdgeInsets.only(
-                                      top: 4.0, bottom: 12.0),
-                                  child: const Center(
-                                    child: SizedBox(
-                                      width: 24,
-                                      height: 24,
-                                      child: CircularProgressIndicator(
-                                        color: OTLColor.grayE,
-                                        strokeWidth: 2,
+                              if (reviewPage * 10 == reviews.length) ...[
+                                SliverList(
+                                    delegate: SliverChildListDelegate([
+                                  Padding(
+                                    padding: const EdgeInsets.only(
+                                        top: 4.0, bottom: 12.0),
+                                    child: const Center(
+                                      child: SizedBox(
+                                        width: 24,
+                                        height: 24,
+                                        child: CircularProgressIndicator(
+                                          color: OTLColor.grayE,
+                                          strokeWidth: 2,
+                                        ),
                                       ),
                                     ),
-                                  ),
-                                )
-                              ]))
+                                  )
+                                ]))
+                              ]
                             ],
                           ),
                         ),

diff --git a/lib/pages/review_page.dart b/lib/pages/review_page.dart
@@ -85,6 +85,7 @@ class LatestReviewsPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final _scrollController = context.watch<HallOfFameModel>().scrollController;
     final latestReviews = context.watch<LatestReviewsModel>().latestReviews;
+    final latestReviewPage = context.watch<LatestReviewsModel>().page;
 
     return Expanded(
       child: RefreshIndicator(
@@ -111,22 +112,24 @@ class LatestReviewsPage extends StatelessWidget {
                   childCount: latestReviews.length,
                 ),
               ),
-              SliverList(
-                  delegate: SliverChildListDelegate([
-                Padding(
-                  padding: const EdgeInsets.only(top: 4.0, bottom: 12.0),
-                  child: const Center(
-                    child: SizedBox(
-                      width: 24,
-                      height: 24,
-                      child: CircularProgressIndicator(
-                        color: OTLColor.grayE,
-                        strokeWidth: 2,
+              if (latestReviewPage * 10 == latestReviews.length) ...[
+                SliverList(
+                    delegate: SliverChildListDelegate([
+                  Padding(
+                    padding: const EdgeInsets.only(top: 4.0, bottom: 12.0),
+                    child: const Center(
+                      child: SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: CircularProgressIndicator(
+                          color: OTLColor.grayE,
+                          strokeWidth: 2,
+                        ),
                       ),
                     ),
-                  ),
-                )
-              ]))
+                  )
+                ]))
+              ]
             ],
           ),
         ),
@@ -142,6 +145,7 @@ class HallOfFamePage extends StatelessWidget {
   Widget build(BuildContext context) {
     final _scrollController = context.watch<HallOfFameModel>().scrollController;
     final hallOfFames = context.watch<HallOfFameModel>().hallOfFame;
+    final hallOfFamesPage = context.watch<HallOfFameModel>().page;
 
     return Expanded(
       child: RefreshIndicator(
@@ -168,22 +172,24 @@ class HallOfFamePage extends StatelessWidget {
                   childCount: hallOfFames.length,
                 ),
               ),
-              SliverList(
-                  delegate: SliverChildListDelegate([
-                Padding(
-                  padding: const EdgeInsets.only(top: 4.0, bottom: 12.0),
-                  child: const Center(
-                    child: SizedBox(
-                      width: 24,
-                      height: 24,
-                      child: CircularProgressIndicator(
-                        color: OTLColor.grayE,
-                        strokeWidth: 2,
+              if (hallOfFamesPage * 10 == hallOfFames.length) ...[
+                SliverList(
+                    delegate: SliverChildListDelegate([
+                  Padding(
+                    padding: const EdgeInsets.only(top: 4.0, bottom: 12.0),
+                    child: const Center(
+                      child: SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: CircularProgressIndicator(
+                          color: OTLColor.grayE,
+                          strokeWidth: 2,
+                        ),
                       ),
                     ),
-                  ),
-                )
-              ]))
+                  )
+                ]))
+              ]
             ],
           ),
         ),