Merge pull request Memmy-App#7 from gkasdorf/development

fix refreshing
gutpull · Jun 13, 2023 · 217695e · 217695e
2 parents 7077199 + 2a0d34d
commit 217695e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 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
@@ -17,7 +17,7 @@ const FeedsCommunityScreen = () => {
     const dispatch = useAppDispatch();
 
     useEffect(() => {
-        load().then();
+        load(true).then();
     }, [sort]);
 
     useEffect(() => {
@@ -33,26 +33,32 @@ const FeedsCommunityScreen = () => {
         }
     }, [updateVote]);
 
-    const load = async () => {
+    const load = async (refresh = false) => {
         setLoading(true);
 
         try {
             const res = await lemmyInstance.getPosts({
                 auth: lemmyAuthToken,
                 community_id: Number(communityId),
                 limit: 50,
+                page: !posts ? 1 : (posts.length / 50) + 1,
                 sort: sort
             });
 
-            setPosts(res.posts);
+            if(!posts || refresh) {
+                setPosts(res.posts);
+            } else {
+                setPosts([...posts, ...res.posts]);
+            }
+
             setLoading(false);
         } catch(e) {
             setLoading(false);
             return;
         }
     };
 
-    return <FeedView posts={posts} load={load} loading={loading} sort={sort} setSort={setSort} communityTitle />;
+    return <FeedView posts={posts} load={load} loading={loading} setSort={setSort} />;
 };
 
 export default FeedsCommunityScreen;
diff --git a/app/tabs/feeds/index.tsx b/app/tabs/feeds/index.tsx
@@ -31,10 +31,10 @@ const FeedsIndexScreen = () => {
     }, [updateVote]);
 
     useEffect(() => {
-        load().then();
+        load(true).then();
     }, [sort]);
 
-    const load = async () => {
+    const load = async (refresh = false) => {
         setLoading(true);
 
         try {
@@ -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 || refresh) {
+                setPosts(res.posts);
+            } else {
+                setPosts([...posts, ...res.posts]);
+            }
+
             setLoading(false);
         } catch(e) {
             setPosts(null);
@@ -64,7 +70,7 @@ const FeedsIndexScreen = () => {
         dispatch(getSubscribedCommunities());
     };
 
-    return <FeedView posts={posts} loading={loading} load={load} sort={sort} setSort={setSort} titleDropsdown={true} />;
+    return <FeedView posts={posts} loading={loading} load={load} setSort={setSort} titleDropsdown={true} />;
 };
 
 export default FeedsIndexScreen;
diff --git a/ui/Feed/FeedView.tsx b/ui/Feed/FeedView.tsx
@@ -14,15 +14,13 @@ import FeedHeaderDropdownDrawer from "./FeedHeaderDropdownDrawer";
 
 interface FeedViewProps {
     posts: PostView[],
-    load: () => Promise<void>,
+    load: (refresh?: boolean) => Promise<void>,
     loading: boolean,
-    sort: SortType,
     titleDropsdown?: boolean,
     setSort:  React.Dispatch<React.SetStateAction<SortType>>,
-    communityTitle?: boolean
 }
 
-const FeedView = ({posts, load, loading, setSort, sort, titleDropsdown = true, communityTitle = false}: FeedViewProps) => {
+const FeedView = ({posts, load, loading, setSort, titleDropsdown = true}: FeedViewProps) => {
     const [sortIcon, setSortIcon] = useState(SortIconType[2]);
 
     const {showActionSheetWithOptions} = useActionSheet();
@@ -84,8 +82,11 @@ const FeedView = ({posts, load, loading, setSort, sort, titleDropsdown = true, c
                 data={posts}
                 renderItem={feedItem}
                 keyExtractor={keyExtractor}
-                refreshControl={<RefreshControl refreshing={loading} onRefresh={load}/>}
+                refreshControl={<RefreshControl refreshing={loading} onRefresh={() => load(true)}/>}
                 estimatedItemSize={200}
+                onEndReached={load}
+                onEndReachedThreshold={0.95}
+                ListFooterComponent={loading ? <LoadingView /> : null}
             />
         </View>
     );