Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

feat(mobile): add loading indicator to link listing pages

daniel31x1326da55dfb936
diff --git a/apps/mobile/app/(tabs)/dashboard/[section].tsx b/apps/mobile/app/(tabs)/dashboard/[section].tsx
index e33781af..c7c42bff 100644
--- a/apps/mobile/app/(tabs)/dashboard/[section].tsx
+++ b/apps/mobile/app/(tabs)/dashboard/[section].tsx
@@ -1,5 +1,12 @@
import { useLinks } from "@linkwarden/router/links";
-import { View, StyleSheet, FlatList, Platform } from "react-native";
+import {
+ View,
+ StyleSheet,
+ FlatList,
+ Platform,
+ ActivityIndicator,
+ Text,
+} from "react-native";
import useAuthStore from "@/store/auth";
import LinkListing from "@/components/LinkListing";
import { useLocalSearchParams, useNavigation } from "expo-router";
@@ -59,29 +66,43 @@ export default function LinksScreen() {
collapsable={false}
collapsableChildren={false}
>
- <FlatList
- contentInsetAdjustmentBehavior="automatic"
- ListHeaderComponent={() => <></>}
- data={links || []}
- refreshControl={
- <Spinner
- refreshing={data.isRefetching}
- onRefresh={() => data.refetch()}
- progressBackgroundColor={
- rawTheme[colorScheme as ThemeName]["base-200"]
- }
- colors={[rawTheme[colorScheme as ThemeName]["base-content"]]}
- />
- }
- initialNumToRender={4}
- keyExtractor={(item) => item.id?.toString() || ""}
- renderItem={({ item }) => (
- <RenderItem item={item} key={item.id?.toString()} />
- )}
- onEndReached={() => data.fetchNextPage()}
- onEndReachedThreshold={0.5}
- ItemSeparatorComponent={() => <View className="bg-base-200 h-px" />}
- />
+ {data.isLoading ? (
+ <View className="flex justify-center h-full items-center">
+ <ActivityIndicator size="large" />
+ <Text className="text-base mt-2.5 text-neutral">Loading...</Text>
+ </View>
+ ) : (
+ <FlatList
+ contentInsetAdjustmentBehavior="automatic"
+ ListHeaderComponent={() => <></>}
+ data={links || []}
+ refreshControl={
+ <Spinner
+ refreshing={data.isRefetching}
+ onRefresh={() => data.refetch()}
+ progressBackgroundColor={
+ rawTheme[colorScheme as ThemeName]["base-200"]
+ }
+ colors={[rawTheme[colorScheme as ThemeName]["base-content"]]}
+ />
+ }
+ initialNumToRender={4}
+ keyExtractor={(item) => item.id?.toString() || ""}
+ renderItem={({ item }) => (
+ <RenderItem item={item} key={item.id?.toString()} />
+ )}
+ onEndReached={() => data.fetchNextPage()}
+ onEndReachedThreshold={0.5}
+ ItemSeparatorComponent={() => <View className="bg-base-200 h-px" />}
+ ListEmptyComponent={
+ <View className="flex justify-center py-10 items-center">
+ <Text className="text-center text-xl text-neutral">
+ Nothing found...
+ </Text>
+ </View>
+ }
+ />
+ )}
</View>
);
}
diff --git a/apps/mobile/app/(tabs)/links/index.tsx b/apps/mobile/app/(tabs)/links/index.tsx
index acf84c82..4e94d316 100644
--- a/apps/mobile/app/(tabs)/links/index.tsx
+++ b/apps/mobile/app/(tabs)/links/index.tsx
@@ -1,5 +1,12 @@
import { useLinks } from "@linkwarden/router/links";
-import { View, StyleSheet, FlatList, Platform } from "react-native";
+import {
+ View,
+ StyleSheet,
+ FlatList,
+ Platform,
+ Text,
+ ActivityIndicator,
+} from "react-native";
import useAuthStore from "@/store/auth";
import LinkListing from "@/components/LinkListing";
import { useLocalSearchParams } from "expo-router";
@@ -35,32 +42,46 @@ export default function LinksScreen() {
collapsable={false}
collapsableChildren={false}
>
- <FlatList
- contentInsetAdjustmentBehavior="automatic"
- ListHeaderComponent={() => <></>}
- data={links || []}
- refreshControl={
- <Spinner
- refreshing={data.isRefetching}
- onRefresh={() => data.refetch()}
- progressBackgroundColor={
- rawTheme[colorScheme as ThemeName]["base-200"]
- }
- colors={[rawTheme[colorScheme as ThemeName]["base-content"]]}
- />
- }
- refreshing={data.isRefetching}
- initialNumToRender={4}
- keyExtractor={(item) => item.id?.toString() || ""}
- renderItem={({ item }) => (
- <RenderItem item={item} key={item.id?.toString()} />
- )}
- onEndReached={() => data.fetchNextPage()}
- onEndReachedThreshold={0.5}
- ItemSeparatorComponent={() => (
- <View className="bg-neutral-content h-px" />
- )}
- />
+ {data.isLoading ? (
+ <View className="flex justify-center h-full items-center">
+ <ActivityIndicator size="large" />
+ <Text className="text-base mt-2.5 text-neutral">Loading...</Text>
+ </View>
+ ) : (
+ <FlatList
+ contentInsetAdjustmentBehavior="automatic"
+ ListHeaderComponent={() => <></>}
+ data={links || []}
+ refreshControl={
+ <Spinner
+ refreshing={data.isRefetching}
+ onRefresh={() => data.refetch()}
+ progressBackgroundColor={
+ rawTheme[colorScheme as ThemeName]["base-200"]
+ }
+ colors={[rawTheme[colorScheme as ThemeName]["base-content"]]}
+ />
+ }
+ refreshing={data.isRefetching}
+ initialNumToRender={4}
+ keyExtractor={(item) => item.id?.toString() || ""}
+ renderItem={({ item }) => (
+ <RenderItem item={item} key={item.id?.toString()} />
+ )}
+ onEndReached={() => data.fetchNextPage()}
+ onEndReachedThreshold={0.5}
+ ItemSeparatorComponent={() => (
+ <View className="bg-neutral-content h-px" />
+ )}
+ ListEmptyComponent={
+ <View className="flex justify-center py-10 items-center">
+ <Text className="text-center text-xl text-neutral">
+ Nothing found...
+ </Text>
+ </View>
+ }
+ />
+ )}
</View>
);
}