diff --git a/views/Devoirs/CreateHomeworkScreen.android.tsx b/views/Devoirs/CreateHomeworkScreen.android.tsx index 7744c180..298e9cd2 100644 --- a/views/Devoirs/CreateHomeworkScreen.android.tsx +++ b/views/Devoirs/CreateHomeworkScreen.android.tsx @@ -386,12 +386,13 @@ function CreateHomeworkScreenAndroid({ route, navigation }: { setHomeworkContent(text)} ref={textInputRef} + multiline={true} /> @@ -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 index c951d355..5de8b17e 100644 --- a/views/Devoirs/HwScreen.tsx +++ b/views/Devoirs/HwScreen.tsx @@ -98,7 +98,7 @@ function HomeworkScreen({ route, navigation }: { navigation.navigate("CreateHomework", {homeworkLocalID: homeworkLocalID}); }} > - + - {convertHTML(homework.description)} + {convertHTML( + homework.custom ? homework.description + : homework.description.replace('\n', ' '), + { preserveNewlines: true } + )} {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 index 26518fcc..dee26ba6 100644 --- a/views/DevoirsScreen.tsx +++ b/views/DevoirsScreen.tsx @@ -400,7 +400,11 @@ function Hwitem({ homework, openURL, navigation }: { - {convertHTML(homework.description.replace('\n', ' '), { wordwrap: 130 })} + {convertHTML( + homework.custom ? homework.description + : homework.description.replace('\n', ' '), + { wordwrap: 130 } + )} diff --git a/views/HomeScreen.tsx b/views/HomeScreen.tsx index 22516c99..75a70c64 100644 --- 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 } + )}