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

Feat(News): intégration "J'ai pris connaissance..." + changes #281

Merged
merged 33 commits into from
Nov 26, 2024
Merged

Feat(News): intégration "J'ai pris connaissance..." + changes #281

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
64b0cac
intégration acknowledge + changes
Kgeek33 Oct 9, 2024
2635045
Merge branch 'PapillonApp:main' into feat/accuseNews
Kgeek33 Oct 9, 2024
29ff543
quelques fix
Kgeek33 Oct 11, 2024
7927e0b
Merge branch 'PapillonApp:main' into feat/accuseNews
Kgeek33 Oct 11, 2024
f6e5bdc
Merge branch 'main' into feat/accuseNews
Kgeek33 Oct 13, 2024
5ce6b8b
fix conflit + supp "contentContainerStyle "
Kgeek33 Oct 13, 2024
01905e3
Merge remote-tracking branch 'upstream/main' into feat/accuseNews
Kgeek33 Oct 15, 2024
7f01527
correction des conflits !!
Kgeek33 Oct 15, 2024
3890f62
correction d'un affichage aléatoire
Kgeek33 Oct 15, 2024
f7a6ca3
Merge remote-tracking branch 'upstream/main' into feat/accuseNews
Kgeek33 Oct 18, 2024
9583102
Merge remote-tracking branch 'upstream/main' into feat/accuseNews
Kgeek33 Oct 19, 2024
7edd528
marquer comme lu/non lu disponible sauf pour ED
Kgeek33 Oct 19, 2024
6e58c5b
correction indentation Prettier + _ sur la variable event
Kgeek33 Oct 21, 2024
c53f2f4
Merge remote-tracking branch 'upstream/main' into feat/accuseNews
Kgeek33 Oct 21, 2024
6d266c7
Merge remote-tracking branch 'upstream/main' into feat/accuseNews
Kgeek33 Oct 22, 2024
12628f9
Merge remote-tracking branch 'upstream/main' into feat/accuseNews
Kgeek33 Oct 25, 2024
e62f59c
Merge branch 'main' into feat/accuseNews
Kgeek33 Oct 26, 2024
1c77526
fix typage
Kgeek33 Oct 26, 2024
756dced
Merge branch 'main' into feat/accuseNews
Kgeek33 Oct 27, 2024
41c27d8
Merge branch 'main' into feat/accuseNews
Kgeek33 Oct 30, 2024
211ce4e
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 3, 2024
107f3e0
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 11, 2024
ce47924
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 11, 2024
de4983a
Merge branch 'PapillonApp:main' into feat/accuseNews
Kgeek33 Nov 15, 2024
a3484d4
correction suppression actualités lors du filtrage avec Papillon Magic
Kgeek33 Nov 16, 2024
36ecda3
correction conflit ed et les autres services
Kgeek33 Nov 16, 2024
ad52a75
intrégration fix erreur <FlatList>
Kgeek33 Nov 16, 2024
b0761e0
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 16, 2024
2b28196
fix erreur translation
Kgeek33 Nov 16, 2024
de7ac99
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 18, 2024
6917567
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 21, 2024
91ad2fa
Merge branch 'main' into feat/accuseNews
Kgeek33 Nov 25, 2024
9487cdc
fix(ui): Apparence du "j'ai pris connaissance"
ecnivtwelve Nov 26, 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
5 changes: 2 additions & 3 deletions src/views/account/News/Document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ const NewsItem = ({ route, navigation }) => {
flex: 1,
}}
contentContainerStyle={{
paddingBottom: !message.ref.needToAcknowledge ? 16 : 0,
paddingTop: !message.ref.needToAcknowledge ? 96 : 0,
paddingBottom: !message.ref.mustAcknowledge ? 16 : 0,
}}
>
<View style={{ paddingHorizontal: 16, marginTop: message.ref.needToAcknowledge ? 100 : 0 }}>
Kgeek33 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -158,7 +157,7 @@ const NewsItem = ({ route, navigation }) => {
/>
<Text
style={{
color: message.acknowledged ? "grey" : theme.dark ? "white" : "dark",
color: message.acknowledged ? "grey" : theme.colors.text,
}}
>
J'ai lu et pris connaissance
Expand Down