StepanovPlaton/SSAU_Schedule
1
0
Fork 0
mirror of https://github.com/StepanovPlaton/SSAU_Schedule.git synced 2026-04-04 04:40:41 +04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bugs and updated readme.md

Browse Source
This commit is contained in:
Степанов Платон
2024-12-16 12:14:17 +04:00
parent eef73591e2
commit 7fba7cb3c7
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/example/ssau_schedule/MainActivity.kt
View File

@@ -91,7 +91,7 @@ class MainActivity : ComponentActivity() {
val lessons = remember { mutableStateOf<List<Lesson>>(listOf()) }
val animationScope = rememberCoroutineScope()
val pagerState = rememberPagerState(
initialPage = Utils.Date.getDayOfWeek(Date()) - 1, pageCount = { Int.MAX_VALUE })
initialPage = Utils.Date.getDayOfWeek(Date()), pageCount = { Int.MAX_VALUE })
val studyYear = remember { mutableStateOf<Year?>(null) }
val loadedWeeks = remember { mutableStateOf<List<Int>>(listOf()) }
val workStarted = remember { mutableStateOf(false) }
@@ -141,7 +141,7 @@ class MainActivity : ComponentActivity() {
studyYear.value = generalData.year
val day = Utils.Date.addDays(
Date(),
pagerState.currentPage - Utils.Date.getDayOfWeek(Date())+1
pagerState.currentPage - Utils.Date.getDayOfWeek(Date())
)
var week = generalData.year.getWeekOfDate(day)
if (!loadedWeeks.value.contains(week)) getLessons(generalData, week)
@@ -224,7 +224,7 @@ class MainActivity : ComponentActivity() {
Date(),
pagerState.currentPage - Utils.Date.getDayOfWeek(
Date()
)+1
)
)
),
color = MaterialTheme.colorScheme.primary,
@@ -258,10 +258,10 @@ class MainActivity : ComponentActivity() {
HorizontalPager(state = pagerState) { page ->
val todayLessons = lessons.value.filter { lesson ->
lesson.dayOfWeek - 1 == Utils.Date.getDayOfWeek(
Utils.Date.addDays(Date(), page - Utils.Date.getDayOfWeek(Date())+1)
Utils.Date.addDays(Date(), page - Utils.Date.getDayOfWeek(Date()))
) &&
lesson.week == Utils.Date.getWeekOfStudyYear(
Utils.Date.addDays(Date(), page - Utils.Date.getDayOfWeek(Date())+1)
lesson.week - 1 == Utils.Date.getWeekOfStudyYear(
Utils.Date.addDays(Date(), page - Utils.Date.getDayOfWeek(Date()))
)
}.sortedBy { lesson -> lesson.beginTime }
if (todayLessons.isEmpty())

2
app/src/main/java/com/example/ssau_schedule/widget/Widget.kt
View File

@@ -65,7 +65,7 @@ class ScheduleWidget : GlanceAppWidget() {
it
)
) &&
lesson.week == Utils.Date.getWeekOfStudyYear(Date())
lesson.week - 1 == Utils.Date.getWeekOfStudyYear(Date())
}.sortedBy { lesson -> lesson.beginTime }
Box(