Merge pull request #269 from Gabriel29306/customHomeworkRedesign

Enhancement: Modifiaction de l'interface de devoirs custom sur Android + Possibilité d'avoir du multi line
PapillonApp · Jun 14, 2024 · 874830a · 874830a
2 parents 49b5da0 + 074d0cd
commit 874830a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/views/Devoirs/CreateHomeworkScreen.android.tsx b/views/Devoirs/CreateHomeworkScreen.android.tsx
@@ -386,12 +386,13 @@ function CreateHomeworkScreenAndroid({ route, navigation }: {
                 </NativeItem>
                 <NativeItem>
                     <TextInput
-                        placeholder="Contenu du devoir"
+                        placeholder="Contenu du devoir..."
                         placeholderTextColor={UIColors.text + '77'}
                         style={[styles.input, {color: UIColors.text}]}
                         value={homeworkContent}
                         onChangeText={text => setHomeworkContent(text)}
                         ref={textInputRef}
+                        multiline={true}
                     />
                 </NativeItem>
             </NativeList>
@@ -401,10 +402,12 @@ function CreateHomeworkScreenAndroid({ route, navigation }: {
 
 const styles = StyleSheet.create({
     input: {
-        paddingVertical: 14,
+        paddingVertical: 1,
         paddingHorizontal: 16,
         fontFamily: 'Papillon-Medium',
         fontSize: 16,
+        minHeight: 100,
+        lineHeight: 16
     },
     inputSubject: {
         fontFamily: 'Papillon-Medium',

diff --git a/views/Devoirs/HwScreen.tsx b/views/Devoirs/HwScreen.tsx
@@ -98,7 +98,7 @@ function HomeworkScreen({ route, navigation }: {
                   navigation.navigate("CreateHomework", {homeworkLocalID: homeworkLocalID});
                 }}
               >
-                <Pencil size={20} color={'#0000ff'} />
+                <Pencil size={20} color={'#3493eb'} />
               </TouchableOpacity>
               <TouchableOpacity
                 style={[styles.deleteHw]}
@@ -165,7 +165,11 @@ function HomeworkScreen({ route, navigation }: {
                 ]
               }
             >
-              {convertHTML(homework.description)}
+              {convertHTML(
+                homework.custom ? homework.description
+                                : homework.description.replace('\n', ' '),
+                { preserveNewlines: true }
+              )}
             </ParsedText>
           </NativeItem>
           {homework.difficulty !== PronoteApiHomeworkDifficulty.NONE && (
@@ -472,7 +476,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     justifyContent: 'center',
-    backgroundColor: '#0000ff22',
+    backgroundColor: '#3493eb22',
     borderRadius: 12,
     borderCurve: 'continuous',
     paddingVertical: 8,

diff --git a/views/DevoirsScreen.tsx b/views/DevoirsScreen.tsx
@@ -400,7 +400,11 @@ function Hwitem({ homework, openURL, navigation }: {
           </View>
           <View>
             <NativeText>
-              {convertHTML(homework.description.replace('\n', ' '), { wordwrap: 130 })}
+            {convertHTML(
+              homework.custom ? homework.description
+                              : homework.description.replace('\n', ' '),
+              { wordwrap: 130 }
+            )}
             </NativeText>
           </View>
         </NativeItem>

diff --git a/views/HomeScreen.tsx b/views/HomeScreen.tsx
@@ -1340,11 +1340,15 @@ function DevoirsContent({
                     styles.homeworksDevoirsContentContentDescription,
                     {
                       color: UIColors.text,
-                      height: homework.description.length > 40 ? 38 : 20,
+                      height: (homework.description.length > 40) || homework.custom ? 38 : 20,
                     },
                   ]}
                 >
-                  {convertHTML(homework.description)}
+                  {convertHTML(
+                    homework.custom ? homework.description
+                                    : homework.description.replace('\n', ' '),
+                    { preserveNewlines: true }
+                  )}
                 </Text>
               </Animated.View>