Skip to content

Commit 96f22c7

Browse files
authored
Merge pull request #67 from JothishKamal/v3
2 parents 01476b0 + 8ea111d commit 96f22c7

6 files changed

Lines changed: 8 additions & 4 deletions

File tree

app/src/main/java/com/dscvit/vitty/model/PeriodDetails.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package com.dscvit.vitty.model
22

33
import com.google.firebase.Timestamp
44
import java.util.Date
5+
import java.util.UUID
56

67
data class PeriodDetails(
78
// var courseType: String = "",
9+
val id: String = UUID.randomUUID().toString(),
810
var courseCode: String = "",
911
var courseName: String = "",
1012
var startTime: Timestamp = Timestamp(Date()),

app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ fun AcademicsScreenContent(
172172
alertDaysBefore,
173173
attachmentUrl,
174174
->
175+
coursePageViewModel.setCourseId(selectedCourseForReminder!!.code)
176+
coursePageViewModel.setCourseTitle(selectedCourseForReminder!!.title)
177+
175178
coursePageViewModel.addReminder(
176179
title = title,
177180
description = description,

app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ fun CourseCard(
470470
}
471471
}
472472

473-
@RequiresApi(Build.VERSION_CODES.O)
474473
@Composable
475474
fun RemindersContent(
476475
reminders: List<Reminder>,

app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ private fun DayScheduleContent(
398398
) {
399399
items(
400400
items = periods,
401-
key = { period -> "${period.courseCode}_${period.slot}" },
401+
key = { period -> period.id },
402402
) { period ->
403403
CircleMemberPeriodCard(
404404
period = period,

app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ private fun DayScheduleContent(
772772
) {
773773
items(
774774
items = periods,
775-
key = { period -> "${periods.indexOf(period)}${period.startTime}_${period.courseCode}_${period.slot}_${period.endTime}" },
775+
key = { period -> period.id },
776776
) { period ->
777777
FriendPeriodCard(
778778
period = period,

app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ private fun DayContent(
410410
) {
411411
items(
412412
items = periods,
413-
key = { period -> "${periods.indexOf(period)}${period.startTime}_${period.courseCode}_${period.slot}_${period.endTime}" },
413+
key = { period -> period.id },
414414
) { period ->
415415
PeriodCard(
416416
period = period,

0 commit comments

Comments
 (0)