diff --git a/mobile/.idea/caches/deviceStreaming.xml b/mobile/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..b81700b --- /dev/null +++ b/mobile/.idea/caches/deviceStreaming.xml @@ -0,0 +1,329 @@ + + + + + + \ No newline at end of file diff --git a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt index 7dcfd02..1afea78 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt @@ -23,11 +23,15 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.selection.TextSelectionColors import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.AutoAwesome +import androidx.compose.material.icons.filled.EditNote import androidx.compose.material3.Button import androidx.compose.material3.ButtonColors import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.material3.TextField import androidx.compose.material3.TextFieldDefaults @@ -411,7 +415,10 @@ private fun DayScreen(day: Day) { } } - Box (modifier = subjectModifier(day, subject, subject.number.toInt())) { + Box ( + modifier = subjectModifier(day, subject, subject.number.toInt()), + contentAlignment = Alignment.TopStart + ) { Row { if (subject.substitute != "2") { Box( @@ -545,6 +552,20 @@ private fun DayScreen(day: Day) { selectedLecture = lectureId showDetailDialog.value = true }) + + if ( + lectureNotes[lectureId] == null || + (lectureNotes[lectureId] != null && lectureNotes[lectureId]?.value?.note?.value != "") || + (lectureNotes[lectureId] != null && lectureNotes[lectureId]?.value?.type?.value != LectureNoteType.Normal) && + (lectureNotes[lectureId] != null && lectureNotes[lectureId]?.value?.type?.value != LectureNoteType.Other) + ) { + Icon( + modifier = Modifier.padding(start = 3.dp, top = 1.dp), + imageVector = Icons.Default.EditNote, + contentDescription = "Lecture has note", + tint = Color.White // You can customize the icon color + ) + } } } }