github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 10:54:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Gradle] Update Kotlin to v1.5.20.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-09-02 17:48:02 +02:00
parent 288c80ea26
commit 96dbb0a057
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/mobidziennik/data/web/MobidziennikWebAttendance.kt
View File

@ -48,7 +48,7 @@ class MobidziennikWebAttendance(override val data: DataMobidziennik,
//syncWeeks.clear() //syncWeeks.clear()
//syncWeeks += Date.fromY_m_d("2019-12-19") //syncWeeks += Date.fromY_m_d("2019-12-19")
syncWeeks.minBy { it.value }?.let { syncWeeks.minByOrNull { it.value }?.let {
data.toRemove.add(DataRemoveModel.Attendance.from(it)) data.toRemove.add(DataRemoveModel.Attendance.from(it))
} }

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/login/LoginProgressFragment.kt
View File

@ -76,7 +76,7 @@ class LoginProgressFragment : Fragment(), CoroutineScope {
val maxProfileId = max( val maxProfileId = max(
app.db.profileDao().lastId ?: 0, app.db.profileDao().lastId ?: 0,
activity.profiles.maxBy { it.profile.id }?.profile?.id ?: 0 activity.profiles.maxByOrNull { it.profile.id }?.profile?.id ?: 0
) )
val loginType = args.getInt("loginType", -1) val loginType = args.getInt("loginType", -1)
val loginMode = args.getInt("loginMode", 0) val loginMode = args.getInt("loginMode", 0)

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableFragment.kt
View File

@ -120,8 +120,8 @@ class TimetableFragment : Fragment(), CoroutineScope {
} }
val lessonRanges = app.db.lessonRangeDao().getAllNow(App.profileId) val lessonRanges = app.db.lessonRangeDao().getAllNow(App.profileId)
startHour = lessonRanges.map { it.startTime.hour }.min() ?: DEFAULT_START_HOUR startHour = lessonRanges.map { it.startTime.hour }.minOrNull() ?: DEFAULT_START_HOUR
endHour = lessonRanges.map { it.endTime.hour }.max()?.plus(1) ?: DEFAULT_END_HOUR endHour = lessonRanges.map { it.endTime.hour }.maxOrNull()?.plus(1) ?: DEFAULT_END_HOUR
} }
deferred.await() deferred.await()
if (!isAdded) if (!isAdded)

2
build.gradle
View File

@ -2,7 +2,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.4.31' kotlin_version = '1.5.20'
release = [ release = [
versionName: "4.8.2", versionName: "4.8.2",