diff --git a/app/build.gradle b/app/build.gradle index 7d63e319..ef3f1565 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 21 targetSdkVersion 34 - versionCode 140 - versionName "2.3.0" + versionCode 138 + versionName "2.2.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "app_name", "Wulkanowy" diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt index 057638fb..41a6bedb 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/NoteRepository.kt @@ -4,6 +4,7 @@ import io.github.wulkanowy.data.db.dao.NoteDao import io.github.wulkanowy.data.db.entities.Note import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Student +import io.github.wulkanowy.data.mappers.mapToEntities import io.github.wulkanowy.data.networkBoundResource import io.github.wulkanowy.sdk.Sdk import io.github.wulkanowy.ui.modules.dashboard.DashboardItem @@ -49,7 +50,17 @@ class NoteRepository @Inject constructor( noteDb.loadAll(student.studentId) } }, - fetch = { listOf() }, + fetch = { + val notesHidden = preferencesRepository + .selectedHiddenSettingTiles + .contains(DashboardItem.HiddenSettingTile.NOTES) + + sdk.init(student) + .switchDiary(semester.diaryId, semester.kindergartenDiaryId, semester.schoolYear) + .getNotes() + .filter { !notesHidden } + .mapToEntities(semester) + }, saveFetchResult = { old, new -> noteDb.deleteAll(old uniqueSubtract new) noteDb.insertAll((new uniqueSubtract old).onEach { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt index c93dd9e7..281f2562 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardPresenter.kt @@ -273,6 +273,10 @@ class DashboardPresenter @Inject constructor( private fun loadHorizontalGroup(student: Student, forceRefresh: Boolean) { flow { + val fake = preferencesRepository + .selectedHiddenSettingTiles + .contains(DashboardItem.HiddenSettingTile.ATTENDANCE) + val selectedTiles = selectedDashboardTiles val flowSuccess = flowOf(Resource.Success(null)) @@ -324,7 +328,7 @@ class DashboardPresenter @Inject constructor( } else null }, attendancePercentage = DashboardItem.HorizontalGroup.Cell( - data = attendanceResource.dataOrNull?.calculatePercentage(), + data = attendanceResource.dataOrNull?.calculatePercentage(fake), error = attendanceResource.errorOrNull != null, isLoading = attendanceResource is Resource.Loading, ), diff --git a/build.gradle b/build.gradle index bd2169c9..9c498b60 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.9.22' + kotlin_version = '1.9.21' about_libraries = '10.10.0' hilt_version = '2.50' }