Skip to content

feat(status-item): integrate new status-item design #444

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat(status-item): integrate new status-item design #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d53f1fe
feat(status-item): integrate new status-item design
LucasCharrier Sep 8, 2025
0caec0e
chore: home statu item make a blend of old design and new design
LucasCharrier Sep 9, 2025
a961254
chore: display date only for non editable without date days
LucasCharrier Sep 11, 2025
59240cb
Merge branch 'master' into task/new-status-item
LucasCharrier Sep 11, 2025
a5b1a43
chore: use squircle
LucasCharrier Sep 11, 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
19 changes: 2 additions & 17 deletions app/src/components/CircledIcon.js → app/src/components/CircledIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
import React from "react";
import VeryGoodSvg from "../../assets/svg/veryGood.svg";
import GoodSvg from "../../assets/svg/good.svg";
import MiddleSvg from "../../assets/svg/middle.svg";
import BadSvg from "../../assets/svg/bad.svg";
import VeryBadSvg from "../../assets/svg/veryBad.svg";
import TodaySvg from "../../assets/svg/today.svg";
import YesterdaySvg from "../../assets/svg/yesterday.svg";
import NotesSvg from "../../assets/svg/notes.svg";
import DrugsSvg from "../../assets/svg/drugs.svg";
import HeartsSvg from "../../assets/svg/hearts.svg";
import PlusSvg from "../../assets/svg/plus-1.svg";
import QuestionMarkSvg from "../../assets/svg/QuestionMark.js";

import { StyleSheet, View } from "react-native";
Expand All @@ -18,6 +7,7 @@ import SmileyGood from "@assets/svg/smileys/good";
import SmileyMiddle from "@assets/svg/smileys/middle";
import SmileyBad from "@assets/svg/smileys/bad";
import SmileyVeryBad from "@assets/svg/smileys/veryBad";
import PlusIcon from "@assets/svg/icon/plus";

const styles = StyleSheet.create({
iconContainer: {
Expand All @@ -40,13 +30,8 @@ const mapIconToSvg = (icon) => {
MiddleSvg: SmileyMiddle,
BadSvg: SmileyBad,
VeryBadSvg: SmileyVeryBad,
TodaySvg,
YesterdaySvg,
NotesSvg,
DrugsSvg,
HeartsSvg,
PlusSvg,
QuestionMarkSvg,
Plus: PlusIcon,
};
return iconMap[icon];
};
Expand Down
3 changes: 3 additions & 0 deletions app/src/scenes/goals/status/GoalsStatus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export const GoalsStatus = ({ goalsData, date, withSeparator }) => {
const records = recordIds
.map((id) => goalsData?.records?.data?.[id])
.sort((a, b) => goalsData?.goals?.byOrder?.indexOf?.(a?.goalId) - goalsData?.goals?.byOrder?.indexOf?.(b?.goalId));
if (!records.length) {
return null;
}
return (
<>
{withSeparator && <Separator style={{ paddingHorizontal: 40 }} />}
Expand Down
33 changes: 2 additions & 31 deletions app/src/scenes/status/DiaryList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { canEdit } from "./utils/index";
import { useFocusEffect, useNavigation } from "@react-navigation/native";
import { getGoalsData } from "../../utils/localStorage/goals";
import localStorage from "../../utils/localStorage";
import NewStatusItem from "./NewStatusItem";

export const DiaryList = forwardRef(({ ...props }, ref) => {
const navigation = useNavigation();
Expand All @@ -34,17 +35,7 @@ export const DiaryList = forwardRef(({ ...props }, ref) => {
({ item: date }) => {
return (
<View>
<View style={styles.dateContainer}>
<View style={styles.dateDot} />
{canEdit(date) ? (
<Text style={styles.dateLabel}>{formatDateThread(date)}</Text>
) : (
<TouchableOpacity style={styles.item} onPress={() => navigation.navigate("too-late", { date })}>
<Text style={styles.dateLabel}>{formatDateThread(date)}</Text>
</TouchableOpacity>
)}
</View>
<StatusItem date={date} indicateurs={indicateurs} patientState={diaryData[date]} goalsData={goalsData} navigation={navigation} />
<NewStatusItem date={date} indicateurs={indicateurs} patientState={diaryData[date]} goalsData={goalsData} navigation={navigation} />
</View>
);
},
Expand All @@ -55,23 +46,3 @@ export const DiaryList = forwardRef(({ ...props }, ref) => {

return <Animated.FlatList ref={ref} data={sortedData} renderItem={renderItem} keyExtractor={keyExtractor} {...props} />;
});

const styles = StyleSheet.create({
dateContainer: {
flexDirection: "row",
alignItems: "center",
},
dateDot: {
width: 8,
height: 8,
borderRadius: 4,
backgroundColor: colors.LIGHT_BLUE,
},
dateLabel: {
color: "#000",
fontSize: 13,
textAlign: "left",
paddingLeft: 10,
fontWeight: "600",
},
});
Loading
Loading