Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix(News): affichage plein de fois de "Aucune actualité" #271

Merged
merged 13 commits into from
Oct 13, 2024
Merged

Fix(News): affichage plein de fois de "Aucune actualité" #271

Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
00a4c41
Update start_build.yml
Kgeek33 Sep 25, 2024
815970e
erreur fatal
Kgeek33 Sep 25, 2024
062c363
Merge branch 'PapillonApp:main' into main
Kgeek33 Sep 26, 2024
0584529
Merge branch 'PapillonApp:main' into main
Kgeek33 Sep 27, 2024
0cb8806
Merge branch 'PapillonApp:main' into main
Kgeek33 Sep 29, 2024
52b5bb1
Merge branch 'PapillonApp:main' into main
Kgeek33 Oct 1, 2024
453166d
Merge branch 'PapillonApp:main' into main
Kgeek33 Oct 2, 2024
61f1aff
Merge branch 'PapillonApp:main' into main
Kgeek33 Oct 3, 2024
1be8495
Merge branch 'PapillonApp:main' into main
Kgeek33 Oct 5, 2024
67abc5a
correction affichage plein de fois "Aucune actualité"
Kgeek33 Oct 6, 2024
855e844
Merge branch 'PapillonApp:main' into fix/News
Kgeek33 Oct 9, 2024
6dc49c8
Merge branch 'PapillonApp:main' into fix/News
Kgeek33 Oct 11, 2024
fa153a3
simplification du formatage des dates
Kgeek33 Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 73 additions & 60 deletions src/views/account/News/News.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const NewsScreen: Screen<"News"> = ({ route, navigation }) => {
const account = useCurrentAccount((store) => store.account!);
const informations = useNewsStore((store) => store.informations);

const [isLoading, setIsLoading] = useState(false);
const [isLoading, setIsLoading] = useState(true);
const [importantMessages, setImportantMessages] = useState<NewsItem[]>([]);
const [sortedMessages, setSortedMessages] = useState<NewsItem[]>([]);

Expand All @@ -36,26 +36,33 @@ const NewsScreen: Screen<"News"> = ({ route, navigation }) => {
});
}, [navigation, route.params, theme.colors.text]);

const fetchData = useCallback(async (hidden: boolean = false) => {
if (!hidden) setIsLoading(true);
await updateNewsInCache(account);
setIsLoading(false);
const fetchData = useCallback((_hidden: boolean = false) => {
setIsLoading(true);
setTimeout(async () => {
await updateNewsInCache(account);
setIsLoading(false);
}, 100);
}, [account]);

useEffect(() => {
navigation.addListener("focus", () => fetchData(true));
fetchData();
}, [account.instance]);
if (sortedMessages.length === 0) {
navigation.addListener("focus", () => fetchData(true));
fetchData();
}
}, [sortedMessages, account.instance]);

useEffect(() => {
if (informations) {
if (account.personalization?.magicEnabled) {
const { importantMessages, normalMessages } = categorizeMessages(informations);
setImportantMessages(importantMessages.map(message => ({ ...message, date: message.date.toString() })));
setSortedMessages(normalMessages.map(message => ({ ...message, date: message.date.toString() })).sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()));
const element1 = importantMessages.map(message => ({ ...message, date: message.date.toString() }));
const element2 = normalMessages.map(message => ({ ...message, date: message.date.toString() })).sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
setImportantMessages(element1);
setSortedMessages(element2);
} else {
const element3 = informations.map(info => ({ ...info, date: info.date.toString(), title: info.title || "" })).sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
setImportantMessages([]);
setSortedMessages(informations.map(info => ({ ...info, date: info.date.toString(), title: info.title || "" })).sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()));
setSortedMessages(element3);
}
}
}, [informations, account.personalization?.magicEnabled]);
Expand Down Expand Up @@ -93,58 +100,64 @@ const NewsScreen: Screen<"News"> = ({ route, navigation }) => {
<RefreshControl refreshing={isLoading} onRefresh={fetchData} />
}
>
{importantMessages.length > 0 && (
<Reanimated.View
entering={animPapillon(FadeInUp)}
exiting={animPapillon(FadeOut)}
layout={animPapillon(LinearTransition)}
>
<NativeListHeader
label="Peut-être Important"
animated
leading={
<Image
source={require("@/../assets/images/magic/icon_magic.png")}
style={styles.magicIcon}
resizeMode="contain"
/>
{!isLoading && (
!hasNews ? <NoNewsMessage /> : (
<>
{
importantMessages.length > 0 && (
<Reanimated.View
entering={animPapillon(FadeInUp)}
exiting={animPapillon(FadeOut)}
layout={animPapillon(LinearTransition)}
>
<NativeListHeader
label="Peut-être Important"
animated
leading={
<Image
source={require("@/../assets/images/magic/icon_magic.png")}
style={styles.magicIcon}
resizeMode="contain"
/>
}
trailing={<BetaIndicator />}
/>

<NativeList animated>
<LinearGradient
colors={!theme.dark ? [theme.colors.card, "#BFF6EF"] : [theme.colors.card, "#2C2C2C"]}
start={[0, 0]}
end={[2, 0]}
>
<FlatList
data={importantMessages}
renderItem={renderItem}
keyExtractor={(_, index) => `important-${index}`}
/>
</LinearGradient>
</NativeList>
</Reanimated.View>
)
}
trailing={<BetaIndicator />}
/>

<NativeList animated>
<LinearGradient
colors={!theme.dark ? [theme.colors.card, "#BFF6EF"] : [theme.colors.card, "#2C2C2C"]}
start={[0, 0]}
end={[2, 0]}
>
<FlatList
data={importantMessages}
renderItem={renderItem}
keyExtractor={(_, index) => `important-${index}`}
/>
</LinearGradient>
</NativeList>
</Reanimated.View>
)}

{sortedMessages.length > 0 && (
<Reanimated.View
entering={animPapillon(FadeInUp)}
exiting={animPapillon(FadeOut)}
layout={animPapillon(LinearTransition)}
>
<NativeList animated inline>
<FlatList
data={sortedMessages}
renderItem={renderItem}
keyExtractor={(_, index) => `sorted-${index}`}
/>
</NativeList>
</Reanimated.View>
{sortedMessages.length > 0 && (
<Reanimated.View
entering={animPapillon(FadeInUp)}
exiting={animPapillon(FadeOut)}
layout={animPapillon(LinearTransition)}
>
<NativeList animated inline>
<FlatList
data={sortedMessages}
renderItem={renderItem}
keyExtractor={(_, index) => `sorted-${index}`}
/>
</NativeList>
</Reanimated.View>
)}
</>
)
)}

{!isLoading && !hasNews && <NoNewsMessage />}
</Reanimated.ScrollView>
);
};
Expand Down