can't reach the end!

Memmy-App · Jun 13, 2023 · fec3380 · fec3380
1 parent 440c3c3
commit fec3380
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/app.json b/app.json
@@ -22,7 +22,7 @@
     "ios": {
       "bundleIdentifier": "com.gkasdorf.memmyapp",
       "supportsTablet": false,
-      "buildNumber": "1"
+      "buildNumber": "3"
     },
     "plugins": [
       [

diff --git a/app/tabs/feeds/[communityId].tsx b/app/tabs/feeds/[communityId].tsx
@@ -41,10 +41,16 @@ const FeedsCommunityScreen = () => {
                 auth: lemmyAuthToken,
                 community_id: Number(communityId),
                 limit: 50,
+                page: !posts ? 1 : (posts.length / 50) + 1,
                 sort: sort
             });
 
-            setPosts(res.posts);
+            if(!posts) {
+                setPosts(res.posts);
+            } else {
+                setPosts([...posts, ...res.posts]);
+            }
+
             setLoading(false);
         } catch(e) {
             setLoading(false);

diff --git a/app/tabs/feeds/index.tsx b/app/tabs/feeds/index.tsx
@@ -50,10 +50,16 @@ const FeedsIndexScreen = () => {
             const res = await lemmyInstance.getPosts({
                 auth: lemmyAuthToken,
                 limit: 50,
+                page: !posts ? 1 : (posts.length / 50) + 1,
                 sort: sort
             });
 
-            setPosts(res.posts);
+            if(!posts) {
+                setPosts(res.posts);
+            } else {
+                setPosts([...posts, ...res.posts]);
+            }
+
             setLoading(false);
         } catch(e) {
             setPosts(null);

diff --git a/ui/Feed/FeedView.tsx b/ui/Feed/FeedView.tsx
@@ -86,6 +86,9 @@ const FeedView = ({posts, load, loading, setSort, sort, titleDropsdown = true, c
                 keyExtractor={keyExtractor}
                 refreshControl={<RefreshControl refreshing={loading} onRefresh={load}/>}
                 estimatedItemSize={200}
+                onEndReached={load}
+                onEndReachedThreshold={0.95}
+                ListFooterComponent={loading ? <LoadingView /> : null}
             />
         </View>
     );