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

Vérification de l'activation de l'onglet "Discussions" #629

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+161 −123
Open

Vérification de l'activation de l'onglet "Discussions" #629

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
94937b6
fix(Messages): check feature support
NathanBnm Jan 10, 2025
4b15b13
fix(Messages): minor improvements
NathanBnm Jan 10, 2025
7bec553
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
6e4d94f
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
683a92e
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
69f5342
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
8ef497d
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
82258c5
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
30a5a7c
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
f5008ff
Update src/views/account/Chat/Messages.tsx
NathanBnm Jan 10, 2025
7e854b2
Merge branch 'main' into fix/check-messages-support
NathanBnm Jan 12, 2025
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
285 changes: 159 additions & 126 deletions src/views/account/Chat/Messages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useEffect, useLayoutEffect, useState } from "react";
import React, { useCallback, useEffect, useLayoutEffect, useState } from "react";
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
import {
ScrollView,
LogBox,
Expand Down Expand Up @@ -34,6 +34,7 @@ import PapillonHeader from "@/components/Global/PapillonHeader";
import { SquarePen } from "lucide-react-native";
import { TouchableOpacity } from "react-native-gesture-handler";
import InsetsBottomView from "@/components/Global/InsetsBottomView";
import { TabLocation } from "pawnote";

// Voir la documentation de `react-navigation`.
//
Expand All @@ -46,13 +47,17 @@ LogBox.ignoreLogs([

const Discussions: Screen<"Discussions"> = ({ navigation, route }) => {
const theme = useTheme();

const { colors } = theme;

const account = useCurrentAccount((state) => state.account!);

const [chats, setChats] = useState<Chat[] | null>(null);
const [refreshing, setRefreshing] = useState<boolean>(false);

const getChatCreator = (chat: Chat) => chat.creator === account.name ? chat.recipient : chat.creator;
const supported = account.service === AccountService.Pronote;

const enabled = supported && account.instance?.user.resources[0].tabs.get(TabLocation.Discussions);

useLayoutEffect(() => {
navigation.setOptions({
Expand All @@ -62,148 +67,176 @@ const Discussions: Screen<"Discussions"> = ({ navigation, route }) => {

useEffect(() => {
void (async () => {
const chats = await getChats(account);
setChats(chats);
await fetchChats();
})();
}, [account?.instance]);

const onRefresh = async () => {
setRefreshing(true);
const chats = await getChats(account);
setChats(chats);
await fetchChats();
setRefreshing(false);
};

if (account.service !== AccountService.Pronote)
return (
<View
style={{
flex: 1,
backgroundColor: theme.colors.background,
padding: 20,
}}
>
<MissingItem
emoji={"🚧"}
title={"Fonctionnalité en construction"}
description={
"Cette page est en cours de développement, revenez plus tard."
}
/>
</View>
);
const fetchChats = useCallback(async () => {
if (!enabled || !supported) {
return;
}

try {
const chats = await getChats(account);
setChats(chats);
} catch (e) {
console.error("Erreur lors du chargement des discussions :", e);
}

NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
}, [enabled, supported]);

const getChatCreator = useCallback(
(chat: Chat) => (chat.creator === account.name ? chat.recipient : chat.creator),
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
[account.name]
);

return (
<>
<PapillonHeader route={route} navigation={navigation}>
<TouchableOpacity style={{
flex: 1,
flexDirection: "row",
alignItems: "center",
gap: 7,
paddingRight: 8,
}}
onPress={() => navigation.navigate("ChatCreate")}>
<NativeText color={theme.colors.primary}>Composer</NativeText>
<SquarePen color={theme.colors.primary}/>
</TouchableOpacity>
{(supported && enabled) &&
<TouchableOpacity style={{
flex: 1,
flexDirection: "row",
alignItems: "center",
gap: 7,
paddingRight: 8,
}}
onPress={() => navigation.navigate("ChatCreate")}>
<NativeText color={theme.colors.primary}>Composer</NativeText>
<SquarePen color={theme.colors.primary} />
</TouchableOpacity>
}
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
</PapillonHeader>
<ScrollView
contentContainerStyle={{
padding: 20,
paddingTop: 0,
}}
refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
>
{!chats ? (
<Reanimated.View
entering={FadeIn.springify().mass(1).damping(20).stiffness(300)}
exiting={
Platform.OS === "ios"
? FadeOut.springify().mass(1).damping(20).stiffness(300)
: undefined
}
style={{
justifyContent: "center",
alignItems: "center",
padding: 26,
}}
>
<ActivityIndicator size={"large"} />

<Text
style={{
color: colors.text,
fontSize: 18,
textAlign: "center",
fontFamily: "semibold",
marginTop: 10,
}}
>
Chargement des discussions...
</Text>

<Text
{!supported || !enabled ?
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
<View
style={{
flex: 1,
backgroundColor: theme.colors.background,
padding: 20,
}}
>
{!supported &&
<MissingItem
emoji="🚧"
title="Fonctionnalité en construction"
description="Cette page est en cours de développement, revenez plus tard."
entering={animPapillon(FadeInDown)}
exiting={animPapillon(FadeOut)}
style={{ paddingVertical: 26 }}
/>
}
{!enabled &&
<MissingItem
emoji="💬"
title="Discussions désactivées"
description="Les discussions ne sont pas activées par ton établissement."
entering={animPapillon(FadeInDown)}
exiting={animPapillon(FadeOut)}
style={{ paddingVertical: 26 }}
/>
}
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
</View>
:
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
<ScrollView
contentContainerStyle={{
padding: 20,
paddingTop: 0,
}}
refreshControl={<RefreshControl refreshing={refreshing} onRefresh={onRefresh} />}
>
{!chats ? (
<Reanimated.View
entering={FadeIn.springify().mass(1).damping(20).stiffness(300)}
exiting={
Platform.OS === "ios"
? FadeOut.springify().mass(1).damping(20).stiffness(300)
: undefined
}
style={{
color: colors.text,
fontSize: 16,
textAlign: "center",
fontFamily: "medium",
marginTop: 4,
opacity: 0.5,
justifyContent: "center",
alignItems: "center",
padding: 26,
}}
>
Vos conversations arrivent...
</Text>
</Reanimated.View>
) : chats.length === 0 ? (
<MissingItem
emoji="💬"
title="Aucune discussion"
description="Commencez une nouvelle discussion pour les afficher ici."
entering={animPapillon(FadeInDown)}
exiting={animPapillon(FadeOut)}
style={{ paddingVertical: 26 }}
/>
) : (
<NativeList>
{chats.map((chat) => (
<NativeItem
key={chat.id}
onPress={() => navigation.navigate("Chat", { handle: chat })}
leading={
<InitialIndicator
initial={parse_initials(getChatCreator(chat))}
color={getProfileColorByName(getChatCreator(chat)).bright}
textColor={getProfileColorByName(getChatCreator(chat)).dark}
/>
}
<ActivityIndicator size={"large"} />
<Text
style={{
color: colors.text,
fontSize: 18,
textAlign: "center",
fontFamily: "semibold",
marginTop: 10,
}}
>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 5 }}
>
{!chat.read && (
<View
style={{
backgroundColor: getProfileColorByName(getChatCreator(chat))
.dark,
borderRadius: 5,
height: 10,
width: 10,
}}
Chargement des discussions…
</Text>
<Text
style={{
color: colors.text,
fontSize: 16,
textAlign: "center",
fontFamily: "medium",
marginTop: 4,
opacity: 0.5,
}}
>
Vos conversations arrivent...
</Text>
</Reanimated.View>
) : chats.length === 0 ? (
<MissingItem
emoji="💬"
title="Aucune discussion"
description="Commencez une nouvelle discussion pour les afficher ici."
entering={animPapillon(FadeInDown)}
exiting={animPapillon(FadeOut)}
style={{ paddingVertical: 26 }}
/>
) : (
<NativeList>
{chats.map((chat) => (
<NativeItem
key={chat.id}
onPress={() => navigation.navigate("Chat", { handle: chat })}
leading={
<InitialIndicator
initial={parse_initials(getChatCreator(chat))}
color={getProfileColorByName(getChatCreator(chat)).bright}
textColor={getProfileColorByName(getChatCreator(chat)).dark}
/>
)}
<NativeText variant={"subtitle"}>{getChatCreator(chat)}</NativeText>
</View>
<NativeText>{chat.subject || "Aucun sujet"}</NativeText>
<NativeText variant={"subtitle"}>Il y a {Math.floor((new Date().getTime() - new Date(chat.date).getTime()) / (1000 * 60 * 60 * 24))} jours</NativeText>
</NativeItem>
))}
</NativeList>
)}

<InsetsBottomView />
</ScrollView>
}
>
<View
style={{ flexDirection: "row", alignItems: "center", gap: 5 }}
>
{!chat.read && (
<View
style={{
backgroundColor: getProfileColorByName(getChatCreator(chat))
.dark,
borderRadius: 5,
height: 10,
width: 10,
}}
/>
)}
<NativeText variant={"subtitle"}>{getChatCreator(chat)}</NativeText>
</View>
<NativeText>{chat.subject || "Aucun sujet"}</NativeText>
<NativeText variant={"subtitle"}>Il y a {Math.floor((new Date().getTime() - new Date(chat.date).getTime()) / (1000 * 60 * 60 * 24))} jours</NativeText>
</NativeItem>
))}
</NativeList>
)}
<InsetsBottomView />
</ScrollView>
}
NathanBnm marked this conversation as resolved.
Show resolved Hide resolved
</>
);
};
Expand Down