From 6e19eb943d271094e919d06a10614f2eb5f4bfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Mon, 29 Mar 2021 17:37:26 +0200 Subject: [PATCH 001/154] Add deploy to AppGallery github actions config (#1259) --- .github/workflows/test.yml | 38 ++++++++++++++++++++++++++++++++++++++ app/build.gradle | 12 ++++++++++++ build.gradle | 1 + 3 files changed, 51 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a81b333f..c26a50bc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,6 +69,44 @@ jobs: PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} run: ./gradlew publishPlayRelease -PenableFirebase --stacktrace; + deploy-app-gallery: + name: Deploy to AppGallery + runs-on: ubuntu-latest + timeout-minutes: 10 + environment: app-gallery + needs: [ unit-tests ] + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + - uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }} + - name: Decrypt keys + env: + ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }} + SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }} + run: | + gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg + gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg + gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg + - name: Build HMS version + env: + PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }} + PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }} + PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} + run: ./gradlew assembleHmsRelease --stacktrace + - name: Upload APK to AppGallery + env: + AGC_CLIENT_ID: ${{ secrets.AGC_CLIENT_ID }} + AGC_CLIENT_SECRET: ${{ secrets.AGC_CLIENT_SECRET }} + run: ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace; + deploy-appcenter: name: Deploy to App Center runs-on: ubuntu-latest diff --git a/app/build.gradle b/app/build.gradle index 80496ff1..a9e9ed76 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,6 +4,7 @@ apply plugin: 'kotlin-kapt' apply plugin: 'dagger.hilt.android.plugin' apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.github.triplet.play' +apply plugin: 'ru.cian.huawei-publish' apply plugin: 'com.mikepenz.aboutlibraries.plugin' apply plugin: 'com.google.gms.google-services' apply plugin: 'com.huawei.agconnect' @@ -140,6 +141,17 @@ play { updatePriority = 3 } +huaweiPublish { + instances { + hmsRelease { + clientId = System.getenv("AGC_CLIENT_ID") + clientSecret = System.getenv("AGC_CLIENT_SECRET") + buildFormat = "apk" + deployType = "draft" + } + } +} + ext { work_manager = "2.5.0" work_hilt = "1.0.0-beta01" diff --git a/build.gradle b/build.gradle index 21ae47e7..222ea177 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,7 @@ buildscript { classpath 'com.huawei.agconnect:agcp:1.5.1.200' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1' classpath "com.github.triplet.gradle:play-publisher:2.8.0" + classpath "ru.cian:huawei-publish-gradle-plugin:1.2.2" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1" classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries" From fada13e2d31396e04ea0682297bf22adf47b6657 Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Mon, 29 Mar 2021 18:39:08 +0200 Subject: [PATCH 002/154] Update issue templates (#1257) --- .../bug_report.md} | 9 +++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++++++ 2 files changed, 29 insertions(+) rename .github/{ISSUE_TEMPLATE.md => ISSUE_TEMPLATE/bug_report.md} (61%) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 61% rename from .github/ISSUE_TEMPLATE.md rename to .github/ISSUE_TEMPLATE/bug_report.md index 27d57f59..237721cb 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,3 +1,12 @@ +--- +name: Bug report +about: Utwórz raport błędu, aby pomóc nam ulepszyć Wulkanowego +title: '' +labels: '' +assignees: '' + +--- + ## Co powinno się dziać diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..6194a41e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Zaproponuj nowy pomysł dla Wulkanowego +title: '' +labels: '' +assignees: '' + +--- + +** Czy Twoja prośba o funkcję jest związana z problemem? Proszę opisz.** +Jasny i zwięzły opis problemu. Np. Zawsze jestem sfrustrowany, gdy [...] + +** Opisz żądane rozwiązanie ** +Jasny i zwięzły opis tego, co chcesz, aby się wydarzyło. + +** Opisz alternatywy, które rozważałeś ** +Jasny i zwięzły opis wszelkich rozważanych alternatywnych rozwiązań lub funkcji. + +** Dodatkowy kontekst ** +Dodaj inny kontekst lub zrzuty ekranu dotyczące żądania funkcji tutaj. From 8a5ca8c91fc024d3b9a258630911be63a2cbf1f7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 10:48:12 +0000 Subject: [PATCH 003/154] Bump firebase-bom from 26.7.0 to 26.8.0 (#1263) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a9e9ed76..acb7f112 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -218,7 +218,7 @@ dependencies { implementation "io.github.wulkanowy:AppKillerManager:3.0.0" implementation 'me.xdrop:fuzzywuzzy:1.3.1' - playImplementation platform('com.google.firebase:firebase-bom:26.7.0') + playImplementation platform('com.google.firebase:firebase-bom:26.8.0') playImplementation 'com.google.firebase:firebase-analytics-ktx' playImplementation 'com.google.firebase:firebase-messaging:' playImplementation 'com.google.firebase:firebase-crashlytics:' From f2130998eca6b1c4423468966ee74cc55fb4afbb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 10:49:40 +0000 Subject: [PATCH 004/154] Bump firebase-crashlytics-gradle from 2.5.1 to 2.5.2 (#1264) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 222ea177..9f74cc3d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" classpath 'com.google.gms:google-services:4.3.5' classpath 'com.huawei.agconnect:agcp:1.5.1.200' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' classpath "com.github.triplet.gradle:play-publisher:2.8.0" classpath "ru.cian:huawei-publish-gradle-plugin:1.2.2" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.1.1" From 3071e1958480b251ce27484c9659151daa88d0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Studzi=C5=84ski?= <48914870+studzinskik@users.noreply.github.com> Date: Tue, 30 Mar 2021 13:59:36 +0200 Subject: [PATCH 005/154] Implement a toggleable setting to count an arithmetic average of grades when all weights are equal to zero (#1186) --- .../repositories/PreferencesRepository.kt | 6 ++ .../ui/modules/grade/GradeAverageProvider.kt | 12 ++-- .../github/wulkanowy/utils/GradeExtension.kt | 9 ++- .../main/res/values/preferences_defaults.xml | 1 + app/src/main/res/values/preferences_keys.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../res/xml/scheme_preferences_advanced.xml | 6 ++ .../modules/grade/GradeAverageProviderTest.kt | 70 ++++++++++++++++++- .../wulkanowy/utils/GradeExtensionTest.kt | 2 +- 9 files changed, 97 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt index 5bd1f3c1..375dd62e 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt @@ -146,6 +146,12 @@ class PreferencesRepository @Inject constructor( R.bool.pref_default_subjects_without_grades ) + val isOptionalArithmeticAverage: Boolean + get() = getBoolean( + R.string.pref_key_optional_arithmetic_average, + R.bool.pref_default_optional_arithmetic_average + ) + var isKitkatDialogDisabled: Boolean get() = sharedPref.getBoolean("kitkat_dialog_disabled", false) set(value) = sharedPref.edit { putBoolean("kitkat_dialog_disabled", value) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt index 7e9b56b9..67472fa3 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt @@ -34,6 +34,8 @@ class GradeAverageProvider @Inject constructor( private val minusModifier get() = preferencesRepository.gradeMinusModifier + private val isOptionalArithmeticAverage get() = preferencesRepository.isOptionalArithmeticAverage + fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) = flowWithResourceIn { val semesters = semesterRepository.getSemesters(student) @@ -130,7 +132,7 @@ class GradeAverageProvider @Inject constructor( val updatedFirstSemesterGrades = firstSemesterSubject?.grades?.updateModifiers(student).orEmpty() - (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage() + (updatedSecondSemesterGrades + updatedFirstSemesterGrades).calcAverage(isOptionalArithmeticAverage) } else { secondSemesterSubject.average } @@ -146,9 +148,9 @@ class GradeAverageProvider @Inject constructor( return if (!isAnyVulcanAverage || gradeAverageForceCalc) { val secondSemesterAverage = - secondSemesterSubject.grades.updateModifiers(student).calcAverage() + secondSemesterSubject.grades.updateModifiers(student).calcAverage(isOptionalArithmeticAverage) val firstSemesterAverage = firstSemesterSubject?.grades?.updateModifiers(student) - ?.calcAverage() ?: secondSemesterAverage + ?.calcAverage(isOptionalArithmeticAverage) ?: secondSemesterAverage (secondSemesterAverage + firstSemesterAverage) / divider } else { @@ -179,7 +181,7 @@ class GradeAverageProvider @Inject constructor( GradeSubject( subject = summary.subject, average = if (!isAnyAverage || gradeAverageForceCalc) { - grades.updateModifiers(student).calcAverage() + grades.updateModifiers(student).calcAverage(isOptionalArithmeticAverage) } else summary.average, points = summary.pointsSum, summary = summary, @@ -211,7 +213,7 @@ class GradeAverageProvider @Inject constructor( proposedPoints = "", finalPoints = "", pointsSum = "", - average = if (calcAverage) details.updateModifiers(student).calcAverage() else .0 + average = if (calcAverage) details.updateModifiers(student).calcAverage(isOptionalArithmeticAverage) else .0 ) } } diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt index 6facb5ef..820e7f43 100644 --- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt +++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt @@ -3,14 +3,17 @@ package io.github.wulkanowy.utils import io.github.wulkanowy.R import io.github.wulkanowy.data.db.entities.Grade import io.github.wulkanowy.data.db.entities.GradeSummary +import io.github.wulkanowy.sdk.scrapper.grades.* -fun List.calcAverage(): Double { +fun List.calcAverage(isOptionalArithmeticAverage: Boolean): Double { + val isArithmeticAverage = isOptionalArithmeticAverage && !any { it.weightValue != .0 } var counter = 0.0 var denominator = 0.0 forEach { - counter += (it.value + it.modifier) * it.weightValue - denominator += it.weightValue + val weight = if (isArithmeticAverage && isGradeValid(it.entry)) 1.0 else it.weightValue + counter += (it.value + it.modifier) * weight + denominator += weight } return if (denominator != 0.0) counter / denominator else 0.0 } diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml index fb82e0ed..a3aa62f8 100644 --- a/app/src/main/res/values/preferences_defaults.xml +++ b/app/src/main/res/values/preferences_defaults.xml @@ -24,4 +24,5 @@ false false false + false diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml index 0cfa485e..1d00dcd6 100644 --- a/app/src/main/res/values/preferences_keys.xml +++ b/app/src/main/res/values/preferences_keys.xml @@ -26,4 +26,5 @@ timetable_show_timers homework_fullscreen subjects_without_grades + optional_arithmetic_average diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c4109d2b..1b7c9e42 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -507,6 +507,7 @@ Value of the plus Value of the minus Reply with message history + Show arithmetic average when no weights provided Advanced Appearance & Behavior diff --git a/app/src/main/res/xml/scheme_preferences_advanced.xml b/app/src/main/res/xml/scheme_preferences_advanced.xml index 1d7e9b83..46103787 100644 --- a/app/src/main/res/xml/scheme_preferences_advanced.xml +++ b/app/src/main/res/xml/scheme_preferences_advanced.xml @@ -25,6 +25,12 @@ app:key="@string/pref_key_grade_average_force_calc" app:singleLineTitle="false" app:title="@string/pref_view_grade_average_force_calc" /> + () to emptyList() } @@ -227,6 +271,7 @@ class GradeAverageProviderTest { @Test fun `force calc current semester average with default modifiers in scraper mode`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER coEvery { semesterRepository.getSemesters(student) } returns semesters coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier } @@ -241,6 +286,7 @@ class GradeAverageProviderTest { val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name) every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeMinusModifier } returns .33 every { preferencesRepository.gradePlusModifier } returns .33 @@ -258,6 +304,7 @@ class GradeAverageProviderTest { val student = student.copy(loginMode = Sdk.Mode.API.name) every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode every { preferencesRepository.gradePlusModifier } returns .33 @@ -275,6 +322,7 @@ class GradeAverageProviderTest { val student = student.copy(loginMode = Sdk.Mode.HYBRID.name) every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode every { preferencesRepository.gradePlusModifier } returns .33 @@ -290,6 +338,7 @@ class GradeAverageProviderTest { @Test fun `calc current semester average`() { every { preferencesRepository.gradeAverageForceCalc } returns false + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries } @@ -303,6 +352,7 @@ class GradeAverageProviderTest { @Test fun `force calc current semester average`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries } @@ -316,6 +366,7 @@ class GradeAverageProviderTest { @Test fun `force calc full year average when current is first`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries } @@ -329,6 +380,7 @@ class GradeAverageProviderTest { @Test fun `calc full year average when current is first with load from cache sequence`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { semesterRepository.getSemesters(student) } returns semesters coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow { @@ -361,6 +413,7 @@ class GradeAverageProviderTest { fun `calc both semesters average`() { every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS every { preferencesRepository.gradeAverageForceCalc } returns false + every { preferencesRepository.isOptionalArithmeticAverage } returns false coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to listOf( getSummary(22, "Matematyka", 3.0), @@ -384,6 +437,7 @@ class GradeAverageProviderTest { @Test fun `calc both semesters average when current is second with load from cache sequence`() { every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageForceCalc } returns false coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow { emit(Resource.loading()) @@ -431,6 +485,7 @@ class GradeAverageProviderTest { @Test fun `force calc full year average`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries } coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { @@ -450,6 +505,7 @@ class GradeAverageProviderTest { @Test fun `calc full year average when current is second with load from cache sequence`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { semesterRepository.getSemesters(student) } returns semesters coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flow { @@ -492,6 +548,7 @@ class GradeAverageProviderTest { @Test fun `calc both semesters average when no summaries`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList() } @@ -507,6 +564,7 @@ class GradeAverageProviderTest { @Test fun `force calc full year average when no summaries`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList() } @@ -522,6 +580,7 @@ class GradeAverageProviderTest { @Test fun `calc both semesters average when missing summaries in both semesters`() { every { preferencesRepository.gradeAverageForceCalc } returns false + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { @@ -545,6 +604,7 @@ class GradeAverageProviderTest { @Test fun `calc both semesters average when missing summary in second semester`() { every { preferencesRepository.gradeAverageForceCalc } returns false + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries } @@ -560,6 +620,7 @@ class GradeAverageProviderTest { @Test fun `calc both semesters average when missing summary in first semester`() { every { preferencesRepository.gradeAverageForceCalc } returns false + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) } @@ -575,6 +636,7 @@ class GradeAverageProviderTest { @Test fun `force calc full year average when missing summary in first semester`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) } @@ -591,6 +653,7 @@ class GradeAverageProviderTest { fun `force calc both semesters average with different average from all grades and from two semesters`() { every { preferencesRepository.gradeAverageForceCalc } returns true every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS + every { preferencesRepository.isOptionalArithmeticAverage } returns false coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { listOf( @@ -620,6 +683,7 @@ class GradeAverageProviderTest { @Test fun `force calc full year average with different average from all grades and from two semesters`() { every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { @@ -652,6 +716,7 @@ class GradeAverageProviderTest { val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name) every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeMinusModifier } returns .33 every { preferencesRepository.gradePlusModifier } returns .5 @@ -688,6 +753,7 @@ class GradeAverageProviderTest { val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name) every { preferencesRepository.gradeAverageForceCalc } returns true + every { preferencesRepository.isOptionalArithmeticAverage } returns false every { preferencesRepository.gradeMinusModifier } returns .33 every { preferencesRepository.gradePlusModifier } returns .5 @@ -719,7 +785,7 @@ class GradeAverageProviderTest { assertEquals(5.5555, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,8 → .average() } - private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0, weight: Double = 1.0): Grade { + private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0, weight: Double = 1.0, entry: String = ""): Grade { return Grade( studentId = 101, semesterId = semesterId, @@ -731,7 +797,7 @@ class GradeAverageProviderTest { date = now(), weight = "", gradeSymbol = "", - entry = "", + entry = entry, description = "", comment = "", color = "" diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt index 958b9169..32b1602e 100644 --- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt +++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt @@ -28,7 +28,7 @@ class GradeExtensionTest { createGrade(4.0, 1.0, 0.0), createGrade(1.0, 9.0, 0.5), createGrade(0.0, .0, 0.0) - ).calcAverage(), 0.005) + ).calcAverage(false), 0.005) } @Test From 0bdd33ef4a54e34e2ef2372456de4915139e088f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Sat, 3 Apr 2021 11:46:36 +0200 Subject: [PATCH 006/154] Migrate to material components bottom navigation (#1244) --- app/build.gradle | 1 - .../wulkanowy/ui/modules/main/MainActivity.kt | 43 +++++++------------ .../ui/widgets/SwipeDisabledViewPager.kt | 19 ++++++++ app/src/main/res/layout/activity_login.xml | 6 +-- app/src/main/res/layout/activity_main.xml | 9 ++-- app/src/main/res/values/dimens.xml | 5 --- app/src/main/res/values/styles.xml | 4 ++ app/src/main/res/xml/identificators.xml | 9 ---- 8 files changed, 47 insertions(+), 49 deletions(-) create mode 100644 app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt delete mode 100644 app/src/main/res/values/dimens.xml delete mode 100644 app/src/main/res/xml/identificators.xml diff --git a/app/build.gradle b/app/build.gradle index e5e51b10..c29a25c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -202,7 +202,6 @@ dependencies { implementation "androidx.hilt:hilt-work:$work_hilt" kapt "androidx.hilt:hilt-compiler:$work_hilt" - implementation "com.aurelhubert:ahbottomnavigation:2.3.4" implementation "com.ncapdevi:frag-nav:3.3.0" implementation "com.github.YarikSOffice:lingver:1.3.0" diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt index 37c6c6e7..741cfb18 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt @@ -26,8 +26,6 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import com.aurelhubert.ahbottomnavigation.AHBottomNavigation.TitleState.ALWAYS_SHOW -import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem import com.google.android.material.elevation.ElevationOverlayProvider import com.ncapdevi.fragnav.FragNavController import com.ncapdevi.fragnav.FragNavController.Companion.HIDE @@ -220,32 +218,21 @@ class MainActivity : BaseActivity(), MainVie } with(binding.mainBottomNav) { - addItems( - listOf( - AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0), - AHBottomNavigationItem( - R.string.attendance_title, - R.drawable.ic_main_attendance, - 0 - ), - AHBottomNavigationItem(R.string.exam_title, R.drawable.ic_main_exam, 0), - AHBottomNavigationItem( - R.string.timetable_title, - R.drawable.ic_main_timetable, - 0 - ), - AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0) - ) - ) - accentColor = getThemeAttrColor(R.attr.colorPrimary) - inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153) - defaultBackgroundColor = - overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f)) - titleState = ALWAYS_SHOW - currentItem = startMenuIndex - isBehaviorTranslationEnabled = false - setTitleTextSizeInSp(10f, 10f) - setOnTabSelectedListener(presenter::onTabSelected) + with(menu) { + add(Menu.NONE, 0, Menu.NONE, R.string.grade_title) + .setIcon(R.drawable.ic_main_grade) + add(Menu.NONE, 1, Menu.NONE, R.string.attendance_title) + .setIcon(R.drawable.ic_main_attendance) + add(Menu.NONE, 2, Menu.NONE, R.string.exam_title) + .setIcon(R.drawable.ic_main_exam) + add(Menu.NONE, 3, Menu.NONE, R.string.timetable_title) + .setIcon(R.drawable.ic_main_timetable) + add(Menu.NONE, 4, Menu.NONE, R.string.more_title) + .setIcon(R.drawable.ic_main_more) + } + selectedItemId = startMenuIndex + setOnNavigationItemSelectedListener { presenter.onTabSelected(it.itemId, false) } + setOnNavigationItemReselectedListener { presenter.onTabSelected(it.itemId, true) } } with(navController) { diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt new file mode 100644 index 00000000..eb5cae4f --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/SwipeDisabledViewPager.kt @@ -0,0 +1,19 @@ +package io.github.wulkanowy.ui.widgets + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.view.MotionEvent +import androidx.viewpager.widget.ViewPager + +class SwipeDisabledViewPager : ViewPager { + + constructor(context: Context) : super(context) + + constructor(context: Context, attr: AttributeSet) : super(context, attr) + + @SuppressLint("ClickableViewAccessibility") + override fun onTouchEvent(ev: MotionEvent) = false + + override fun onInterceptTouchEvent(ev: MotionEvent) = false +} diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 3841b25c..e55ea8b9 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -6,11 +6,11 @@ + android:layout_height="wrap_content" + android:background="@android:color/transparent" /> - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2ea0a4d3..91283abe 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -17,11 +17,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="?actionBarSize" - android:layout_marginBottom="@dimen/bottom_navigation_height" /> + android:layout_marginBottom="56dp" /> - + android:layout_gravity="bottom" + app:itemTextAppearanceActive="@style/WulkanowyTheme.TextAppearanceBottomNavigation" + app:itemTextAppearanceInactive="@style/WulkanowyTheme.TextAppearanceBottomNavigation" + app:labelVisibilityMode="labeled" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index a4bf80ed..00000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - 8dp - 8dp - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 297a4f28..08867b79 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,6 +34,10 @@ ?android:textColorPrimary + + - - - \ No newline at end of file diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml index 44f54c17..2d2eedb4 100644 --- a/app/src/main/res/values/preferences_values.xml +++ b/app/src/main/res/values/preferences_values.xml @@ -109,15 +109,4 @@ both_semesters all_year - - - Don\'t show - Show all - Show smaller - - - no - yes - small - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b7c9e42..3d54c16a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,7 +40,6 @@ Hybrid Token PIN - API key Symbol Sign in Password too short @@ -66,7 +65,6 @@ Email Discord Send email - Describe details of problem: Zgłoszenie: Problemy z logowaniem Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nOstatni błąd: %5$s\n\nOpis problemu: Make sure you select the correct UONET+ register variation! @@ -91,13 +89,10 @@ Weight Weight: %s Comment - No new grades Number of new ratings: %1$d Average: %1$.2f Points: %s No average - Predicted: %1$s - Final: %1$s Total points Final grade Predicted grade @@ -188,10 +183,6 @@ Unknown Number of lesson No entries - - %1$d absence - %1$d absences - Absence reason (optional) Send Absence excuse request sent successfully! @@ -200,7 +191,6 @@ - Attendance Total @@ -216,7 +206,6 @@ Trash (no subject) No messages - An error occurred while downloading message content From: To: Date: %s @@ -357,8 +346,6 @@ Student logout Student account Parent account - Mobile API mode - Hybrid mode Edit data Accounts manager Select student @@ -479,7 +466,6 @@ Mark current lesson Show groups next to subjects Show chart list in class grades - Show whole class lessons Show subjects without grades Grades color scheme Subjects sorting @@ -532,7 +518,6 @@ - New entries in register New grades Lucky number New messages diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 08867b79..8fb07e1a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,6 +11,7 @@ @color/colorError @color/colorDivider @color/colorSwipeRefresh + @android:color/darker_gray ?android:textColorPrimary @style/PreferenceThemeOverlay false @@ -24,6 +25,8 @@ + + + + From ec6d18968f8d7c996314c8a1f1c3db7dcba5b4c4 Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Sat, 7 Aug 2021 10:27:51 +0200 Subject: [PATCH 124/154] Fix filter search bug (#1427) * Fix filter search bug * refractor --- .../wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt index cf181182..93c7408f 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt @@ -185,7 +185,9 @@ class MessageTabPresenter @Inject constructor( .debounce(250) .map { query -> lastSearchQuery = query - getFilteredData(query) + val isOnlyUnread = view?.onlyUnread == true + val isOnlyWithAttachments = view?.onlyWithAttachments == true + getFilteredData(query, isOnlyUnread, isOnlyWithAttachments) } .catch { Timber.e(it) } .collect { From 2a913461551c57919bb0a797067d106a13777fcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 13:53:54 +0000 Subject: [PATCH 125/154] Bump activity-ktx from 1.3.0 to 1.3.1 (#1434) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0b279ca4..dd6f3e5a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -172,7 +172,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1" implementation "androidx.core:core-ktx:1.6.0" - implementation "androidx.activity:activity-ktx:1.3.0" + implementation "androidx.activity:activity-ktx:1.3.1" implementation "androidx.appcompat:appcompat:1.3.1" implementation "androidx.appcompat:appcompat-resources:1.3.1" implementation "androidx.fragment:fragment-ktx:1.3.6" From 7c94837af01d56a737b66235454740e00d7af509 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 13:54:31 +0000 Subject: [PATCH 126/154] Bump coil from 1.3.1 to 1.3.2 (#1433) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index dd6f3e5a..9783c14d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -214,7 +214,7 @@ dependencies { implementation "at.favre.lib:slf4j-timber:1.0.1" implementation 'com.github.bastienpaulfr:Treessence:1.0.4' implementation "com.mikepenz:aboutlibraries-core:$about_libraries" - implementation "io.coil-kt:coil:1.3.1" + implementation "io.coil-kt:coil:1.3.2" implementation "io.github.wulkanowy:AppKillerManager:3.0.0" implementation 'me.xdrop:fuzzywuzzy:1.3.1' implementation 'com.fredporciuncula:flow-preferences:1.5.0' From 4ae3f7b0163357f48057eeba26e84a38523f5e86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 13:54:48 +0000 Subject: [PATCH 127/154] Bump google-services from 4.3.8 to 4.3.9 (#1432) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f70f811..23c0276f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.android.tools.build:gradle:7.0.0' classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" - classpath 'com.google.gms:google-services:4.3.8' + classpath 'com.google.gms:google-services:4.3.9' classpath 'com.huawei.agconnect:agcp:1.6.0.300' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' classpath "com.github.triplet.gradle:play-publisher:2.8.0" From 72ef5f428ea17a63d6fc3ba161a55cfcd09c0aa3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 13:55:03 +0000 Subject: [PATCH 128/154] Bump firebase-bom from 28.3.0 to 28.3.1 (#1431) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9783c14d..05d1a150 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -219,7 +219,7 @@ dependencies { implementation 'me.xdrop:fuzzywuzzy:1.3.1' implementation 'com.fredporciuncula:flow-preferences:1.5.0' - playImplementation platform('com.google.firebase:firebase-bom:28.3.0') + playImplementation platform('com.google.firebase:firebase-bom:28.3.1') playImplementation 'com.google.firebase:firebase-analytics-ktx' playImplementation 'com.google.firebase:firebase-messaging:' playImplementation 'com.google.firebase:firebase-crashlytics:' From 626169de115072abb1612a04b3544a03796de43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Tue, 10 Aug 2021 11:55:51 +0200 Subject: [PATCH 129/154] Add drag and drop to dashboard tiles (#1415) --- .../repositories/PreferencesRepository.kt | 30 +++++++++- .../ui/modules/dashboard/DashboardAdapter.kt | 57 +++++++++++++------ .../ui/modules/dashboard/DashboardFragment.kt | 9 +++ .../dashboard/DashboardItemMoveCallback.kt | 55 ++++++++++++++++++ .../modules/dashboard/DashboardPresenter.kt | 18 +++++- .../item_dashboard_horizontal_group.xml | 5 +- .../res/layout/subitem_dashboard_grades.xml | 13 ++++- app/src/main/res/values/strings.xml | 2 +- 8 files changed, 162 insertions(+), 27 deletions(-) create mode 100644 app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt index 5b97b65d..1e6cd511 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt @@ -2,9 +2,12 @@ package io.github.wulkanowy.data.repositories import android.content.Context import android.content.SharedPreferences -import com.squareup.moshi.Moshi +import androidx.core.content.edit import com.fredporciuncula.flow.preferences.FlowSharedPreferences import com.fredporciuncula.flow.preferences.Preference +import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.Moshi +import com.squareup.moshi.adapter import dagger.hilt.android.qualifiers.ApplicationContext import io.github.wulkanowy.R import io.github.wulkanowy.ui.modules.dashboard.DashboardItem @@ -21,8 +24,13 @@ import javax.inject.Singleton class PreferencesRepository @Inject constructor( private val sharedPref: SharedPreferences, private val flowSharedPref: FlowSharedPreferences, - @ApplicationContext val context: Context + @ApplicationContext val context: Context, + moshi: Moshi ) { + @OptIn(ExperimentalStdlibApi::class) + private val dashboardItemsPositionAdapter: JsonAdapter> = + moshi.adapter() + val startMenuIndex: Int get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt() @@ -160,6 +168,19 @@ class PreferencesRepository @Inject constructor( R.bool.pref_default_optional_arithmetic_average ) + var dashboardItemsPosition: Map? + get() { + val json = sharedPref.getString(PREF_KEY_DASHBOARD_ITEMS_POSITION, null) ?: return null + + return dashboardItemsPositionAdapter.fromJson(json) + } + set(value) = sharedPref.edit { + putString( + PREF_KEY_DASHBOARD_ITEMS_POSITION, + dashboardItemsPositionAdapter.toJson(value) + ) + } + val selectedDashboardTilesFlow: Flow> get() = selectedDashboardTilesPreference.asFlow() .map { set -> @@ -199,4 +220,9 @@ class PreferencesRepository @Inject constructor( private fun getBoolean(id: String, default: Int) = sharedPref.getBoolean(id, context.resources.getBoolean(default)) + + private companion object { + + private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position" + } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt index 9f3d546e..fa081ce7 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardAdapter.kt @@ -12,7 +12,6 @@ import androidx.core.view.updateLayoutParams import androidx.core.view.updateMarginsRelative import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import io.github.wulkanowy.R import io.github.wulkanowy.data.db.entities.Timetable @@ -38,10 +37,9 @@ import java.util.Timer import javax.inject.Inject import kotlin.concurrent.timer -class DashboardAdapter @Inject constructor() : - ListAdapter(DashboardAdapterDiffCallback()) { +class DashboardAdapter @Inject constructor() : RecyclerView.Adapter() { - var lessonsTimer: Timer? = null + private var lessonsTimer: Timer? = null var onAccountTileClickListener: () -> Unit = {} @@ -63,7 +61,23 @@ class DashboardAdapter @Inject constructor() : var onConferencesTileClickListener: () -> Unit = {} - override fun getItemViewType(position: Int) = getItem(position).type.ordinal + val items = mutableListOf() + + fun submitList(newItems: List) { + val diffResult = + DiffUtil.calculateDiff(DiffCallback(newItems, items.toMutableList())) + + with(items) { + clear() + addAll(newItems) + } + + diffResult.dispatchUpdatesTo(this) + } + + override fun getItemCount() = items.size + + override fun getItemViewType(position: Int) = items[position].type.ordinal override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val inflater = LayoutInflater.from(parent.context) @@ -119,7 +133,7 @@ class DashboardAdapter @Inject constructor() : } private fun bindAccountViewHolder(accountViewHolder: AccountViewHolder, position: Int) { - val item = getItem(position) as DashboardItem.Account + val item = items[position] as DashboardItem.Account val student = item.student val isLoading = item.isLoading @@ -147,7 +161,7 @@ class DashboardAdapter @Inject constructor() : horizontalGroupViewHolder: HorizontalGroupViewHolder, position: Int ) { - val item = getItem(position) as DashboardItem.HorizontalGroup + val item = items[position] as DashboardItem.HorizontalGroup val unreadMessagesCount = item.unreadMessagesCount val attendancePercentage = item.attendancePercentage val luckyNumber = item.luckyNumber @@ -221,7 +235,7 @@ class DashboardAdapter @Inject constructor() : } private fun bindGradesViewHolder(gradesViewHolder: GradesViewHolder, position: Int) { - val item = getItem(position) as DashboardItem.Grades + val item = items[position] as DashboardItem.Grades val subjectWithGrades = item.subjectWithGrades.orEmpty() val gradeTheme = item.gradeTheme val error = item.error @@ -250,7 +264,7 @@ class DashboardAdapter @Inject constructor() : } private fun bindLessonsViewHolder(lessonsViewHolder: LessonsViewHolder, position: Int) { - val item = getItem(position) as DashboardItem.Lessons + val item = items[position] as DashboardItem.Lessons val timetableFull = item.lessons val binding = lessonsViewHolder.binding @@ -519,7 +533,7 @@ class DashboardAdapter @Inject constructor() : } private fun bindHomeworkViewHolder(homeworkViewHolder: HomeworkViewHolder, position: Int) { - val item = getItem(position) as DashboardItem.Homework + val item = items[position] as DashboardItem.Homework val homeworkList = item.homework.orEmpty() val error = item.error val isLoading = item.isLoading @@ -557,7 +571,7 @@ class DashboardAdapter @Inject constructor() : announcementsViewHolder: AnnouncementsViewHolder, position: Int ) { - val item = getItem(position) as DashboardItem.Announcements + val item = items[position] as DashboardItem.Announcements val schoolAnnouncementList = item.announcement.orEmpty() val error = item.error val isLoading = item.isLoading @@ -594,7 +608,7 @@ class DashboardAdapter @Inject constructor() : } private fun bindExamsViewHolder(examsViewHolder: ExamsViewHolder, position: Int) { - val item = getItem(position) as DashboardItem.Exams + val item = items[position] as DashboardItem.Exams val exams = item.exams.orEmpty() val error = item.error val isLoading = item.isLoading @@ -630,7 +644,7 @@ class DashboardAdapter @Inject constructor() : conferencesViewHolder: ConferencesViewHolder, position: Int ) { - val item = getItem(position) as DashboardItem.Conferences + val item = items[position] as DashboardItem.Conferences val conferences = item.conferences.orEmpty() val error = item.error val isLoading = item.isLoading @@ -703,13 +717,20 @@ class DashboardAdapter @Inject constructor() : val adapter by lazy { DashboardConferencesAdapter() } } - class DashboardAdapterDiffCallback : DiffUtil.ItemCallback() { + private class DiffCallback( + private val newList: List, + private val oldList: List + ) : DiffUtil.Callback() { - override fun areItemsTheSame(oldItem: DashboardItem, newItem: DashboardItem) = - oldItem.type == newItem.type + override fun getNewListSize() = newList.size - override fun areContentsTheSame(oldItem: DashboardItem, newItem: DashboardItem) = - oldItem == newItem + override fun getOldListSize() = oldList.size + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = + newList[newItemPosition] == oldList[oldItemPosition] + + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = + newList[newItemPosition].type == oldList[oldItemPosition].type } private companion object { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt index 283f5745..3392280b 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardFragment.kt @@ -8,6 +8,7 @@ import android.view.View import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import androidx.recyclerview.widget.DefaultItemAnimator +import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint import io.github.wulkanowy.R @@ -68,6 +69,12 @@ class DashboardFragment : BaseFragment(R.layout.fragme override fun initView() { val mainActivity = requireActivity() as MainActivity + val itemTouchHelper = ItemTouchHelper( + DashboardItemMoveCallback( + dashboardAdapter, + presenter::onDragAndDropEnd + ) + ) dashboardAdapter.apply { onAccountTileClickListener = { mainActivity.pushView(AccountFragment.newInstance()) } @@ -104,6 +111,8 @@ class DashboardFragment : BaseFragment(R.layout.fragme adapter = dashboardAdapter (itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false } + + itemTouchHelper.attachToRecyclerView(dashboardRecycler) } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt new file mode 100644 index 00000000..cf4097a4 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/dashboard/DashboardItemMoveCallback.kt @@ -0,0 +1,55 @@ +package io.github.wulkanowy.ui.modules.dashboard + +import androidx.recyclerview.widget.ItemTouchHelper +import androidx.recyclerview.widget.RecyclerView +import java.util.Collections + +class DashboardItemMoveCallback( + private val dashboardAdapter: DashboardAdapter, + private var onUserInteractionEndListener: (List) -> Unit = {} +) : ItemTouchHelper.Callback() { + + override fun isLongPressDragEnabled() = true + + override fun isItemViewSwipeEnabled() = false + + override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { + //Not implemented + } + + override fun getMovementFlags( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder + ): Int { + val dragFlags = if (viewHolder.bindingAdapterPosition != 0) { + ItemTouchHelper.UP or ItemTouchHelper.DOWN + } else 0 + + return makeMovementFlags(dragFlags, 0) + } + + override fun canDropOver( + recyclerView: RecyclerView, + current: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder + ) = target.bindingAdapterPosition != 0 + + override fun onMove( + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + target: RecyclerView.ViewHolder + ): Boolean { + val list = dashboardAdapter.items.toMutableList() + + Collections.swap(list, viewHolder.bindingAdapterPosition, target.bindingAdapterPosition) + + dashboardAdapter.submitList(list) + return true + } + + override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) { + super.clearView(recyclerView, viewHolder) + + onUserInteractionEndListener(dashboardAdapter.items.toList()) + } +} 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 12374859..0e24f0a1 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 @@ -68,6 +68,16 @@ class DashboardPresenter @Inject constructor( .launch("dashboard_pref") } + fun onDragAndDropEnd(list: List) { + dashboardItemLoadedList.clear() + dashboardItemLoadedList.addAll(list) + + val positionList = + list.mapIndexed { index, dashboardItem -> Pair(dashboardItem.type, index) }.toMap() + + preferencesRepository.dashboardItemsPosition = positionList + } + fun loadData(forceRefresh: Boolean = false, tilesToLoad: Set) { val oldDashboardDataToLoad = dashboardTilesToLoad @@ -622,6 +632,7 @@ class DashboardPresenter @Inject constructor( private fun updateData(dashboardItem: DashboardItem, forceRefresh: Boolean) { val isForceRefreshError = forceRefresh && dashboardItem.error != null + val dashboardItemsPosition = preferencesRepository.dashboardItemsPosition with(dashboardItemLoadedList) { removeAll { it.type == dashboardItem.type && !isForceRefreshError } @@ -636,7 +647,12 @@ class DashboardPresenter @Inject constructor( } } - dashboardItemLoadedList.sortBy { tile -> dashboardItemsToLoad.single { it == tile.type }.ordinal } + dashboardItemLoadedList.sortBy { tile -> + dashboardItemsPosition?.getOrDefault( + tile.type, + tile.type.ordinal + 100 + ) ?: tile.type.ordinal + } val isItemsLoaded = dashboardItemsToLoad.all { type -> dashboardItemLoadedList.any { it.type == type } } diff --git a/app/src/main/res/layout/item_dashboard_horizontal_group.xml b/app/src/main/res/layout/item_dashboard_horizontal_group.xml index a8532e6f..bbd8f351 100644 --- a/app/src/main/res/layout/item_dashboard_horizontal_group.xml +++ b/app/src/main/res/layout/item_dashboard_horizontal_group.xml @@ -4,8 +4,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" - android:layout_marginVertical="2dp"> + android:paddingHorizontal="12dp" + android:layout_marginVertical="2dp" + android:clipToPadding="false"> + app:layout_constraintTop_toTopOf="parent"> + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c6323668..c1b3a3ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -501,7 +501,7 @@ until %1$s No upcoming lessons - An error occurred while loading the lesson + An error occurred while loading the lessons Homework No homework to do From 9c819835ca8debbe5890add702148630c2ecef02 Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Sun, 15 Aug 2021 15:59:32 +0200 Subject: [PATCH 130/154] Add last sync date in sync settings (#1436) --- .../data/repositories/PreferencesRepository.kt | 15 +++++++++++++++ .../github/wulkanowy/services/sync/SyncWorker.kt | 3 +++ .../ui/modules/settings/sync/SyncFragment.kt | 6 ++++++ .../ui/modules/settings/sync/SyncPresenter.kt | 15 ++++++++++++++- .../ui/modules/settings/sync/SyncView.kt | 2 ++ app/src/main/res/values/preferences_defaults.xml | 1 + app/src/main/res/values/preferences_keys.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt index 1e6cd511..e725c42a 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt @@ -13,9 +13,12 @@ import io.github.wulkanowy.R import io.github.wulkanowy.ui.modules.dashboard.DashboardItem import io.github.wulkanowy.ui.modules.grade.GradeAverageMode import io.github.wulkanowy.ui.modules.grade.GradeSortingMode +import io.github.wulkanowy.utils.toLocalDateTime +import io.github.wulkanowy.utils.toTimestamp import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import java.time.LocalDateTime import javax.inject.Inject import javax.inject.Singleton @@ -168,6 +171,13 @@ class PreferencesRepository @Inject constructor( R.bool.pref_default_optional_arithmetic_average ) + var lasSyncDate: LocalDateTime + get() = getLong( + R.string.pref_key_last_sync_date, + R.string.pref_default_last_sync_date + ).toLocalDateTime() + set(value) = sharedPref.edit().putLong("last_sync_date", value.toTimestamp()).apply() + var dashboardItemsPosition: Map? get() { val json = sharedPref.getString(PREF_KEY_DASHBOARD_ITEMS_POSITION, null) ?: return null @@ -211,6 +221,11 @@ class PreferencesRepository @Inject constructor( return flowSharedPref.getStringSet(prefKey, defaultSet) } + private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default) + + private fun getLong(id: String, default: Int) = + sharedPref.getLong(id, context.resources.getString(default).toLong()) + private fun getString(id: Int, default: Int) = getString(context.getString(id), default) private fun getString(id: String, default: Int) = diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt index 49d61a41..ea1f79cb 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt @@ -22,6 +22,8 @@ import io.github.wulkanowy.services.sync.works.Work import io.github.wulkanowy.utils.getCompatColor import kotlinx.coroutines.coroutineScope import timber.log.Timber +import java.time.LocalDateTime +import java.time.ZoneId import kotlin.random.Random @HiltWorker @@ -48,6 +50,7 @@ class SyncWorker @AssistedInject constructor( Timber.i("${work::class.java.simpleName} is starting") work.doWork(student, semester) Timber.i("${work::class.java.simpleName} result: Success") + preferencesRepository.lasSyncDate = LocalDateTime.now(ZoneId.systemDefault()) null } catch (e: Throwable) { Timber.w("${work::class.java.simpleName} result: An exception ${e.message} occurred") diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt index 207fe2ff..34298809 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt @@ -39,6 +39,12 @@ class SyncFragment : PreferenceFragmentCompat(), } } + override fun setLastSyncDate(lastSyncDate: String) { + findPreference(getString(R.string.pref_key_services_force_sync))?.run { + summary = getString(R.string.pref_services_last_full_sync_date, lastSyncDate) + } + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) presenter.onAttachView(this) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt index 36b8d792..63e86a47 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt @@ -8,6 +8,7 @@ import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.ErrorHandler import io.github.wulkanowy.utils.AnalyticsHelper import io.github.wulkanowy.utils.isHolidays +import io.github.wulkanowy.utils.toFormattedString import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach import timber.log.Timber @@ -27,6 +28,7 @@ class SyncPresenter @Inject constructor( Timber.i("Settings sync view was initialized") view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays) view.initView() + setSyncDateInView() } fun onSharedPreferenceChanged(key: String) { @@ -63,10 +65,21 @@ class SyncPresenter @Inject constructor( } else -> Timber.d("Sync now state: ${workInfo.state}") } - if (workInfo.state.isFinished) setSyncInProgress(false) + if (workInfo.state.isFinished) { + setSyncInProgress(false) + setSyncDateInView() + } }.catch { Timber.e(it, "Sync now failed") }.launch("sync") } } + + private fun setSyncDateInView() { + val lastSyncDate = preferencesRepository.lasSyncDate + + if (lastSyncDate.year == 1970) return + + view?.setLastSyncDate(lastSyncDate.toFormattedString("dd.MM.yyyy HH:mm:ss")) + } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt index 9da473ba..6ffe156f 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncView.kt @@ -10,6 +10,8 @@ interface SyncView : BaseView { fun initView() + fun setLastSyncDate(lastSyncDate: String) + fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) fun setSyncInProgress(inProgress: Boolean) diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml index 5721763f..1ba9359c 100644 --- a/app/src/main/res/values/preferences_defaults.xml +++ b/app/src/main/res/values/preferences_defaults.xml @@ -25,6 +25,7 @@ false false false + 0 LUCKY_NUMBER MESSAGES diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml index 876e4333..aa60bb7e 100644 --- a/app/src/main/res/values/preferences_keys.xml +++ b/app/src/main/res/values/preferences_keys.xml @@ -31,4 +31,5 @@ optional_arithmetic_average message_send_is_draft message_send_recipients + last_sync_date diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1b3a3ee..0b25f4a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -615,6 +615,7 @@ Synced! Sync failed Sync in progress + Last full sync: %s Value of the plus Value of the minus From 428e40d7fe6f9b8b67a078868bbc98bd9040d753 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Aug 2021 13:32:34 +0000 Subject: [PATCH 131/154] Bump hianalytics from 6.1.0.300 to 6.1.1.300 (#1441) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 05d1a150..fae7d6e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -225,7 +225,7 @@ dependencies { playImplementation 'com.google.firebase:firebase-crashlytics:' playImplementation 'com.google.android.play:core-ktx:1.8.1' - hmsImplementation 'com.huawei.hms:hianalytics:6.1.0.300' + hmsImplementation 'com.huawei.hms:hianalytics:6.1.1.300' hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.6.0.300' releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker" From 9c5d2fbf8462b5f9c927154818e037b6abdb7835 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Aug 2021 13:32:48 +0000 Subject: [PATCH 132/154] Bump google-services from 4.3.9 to 4.3.10 (#1439) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 23c0276f..fecbb019 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.android.tools.build:gradle:7.0.0' classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" - classpath 'com.google.gms:google-services:4.3.9' + classpath 'com.google.gms:google-services:4.3.10' classpath 'com.huawei.agconnect:agcp:1.6.0.300' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' classpath "com.github.triplet.gradle:play-publisher:2.8.0" From d3b3939d2649ff7d1e9d779d31f6ecdd9b3f495d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Aug 2021 13:44:06 +0000 Subject: [PATCH 133/154] Bump timber from 4.7.1 to 5.0.1 (#1440) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index fae7d6e6..5e1ae9ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -210,7 +210,7 @@ dependencies { implementation "com.squareup.moshi:moshi-adapters:$moshi" kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi" - implementation "com.jakewharton.timber:timber:4.7.1" + implementation "com.jakewharton.timber:timber:5.0.1" implementation "at.favre.lib:slf4j-timber:1.0.1" implementation 'com.github.bastienpaulfr:Treessence:1.0.4' implementation "com.mikepenz:aboutlibraries-core:$about_libraries" From eb94e06d54c88a6f1069df4f06e5f6ef5560fe87 Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Sun, 22 Aug 2021 16:33:12 +0200 Subject: [PATCH 134/154] Fix buggy timers in timetable (#1428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Rafał Borcz --- .../ui/modules/timetable/TimetableAdapter.kt | 201 +++++++++++++----- .../ui/modules/timetable/TimetableFragment.kt | 20 +- 2 files changed, 152 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt index f049f828..87b3362d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt @@ -7,6 +7,7 @@ import android.view.View.VISIBLE import android.view.ViewGroup import android.widget.TextView import androidx.core.view.ViewCompat +import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import io.github.wulkanowy.R import io.github.wulkanowy.data.db.entities.Timetable @@ -26,31 +27,58 @@ import kotlin.concurrent.timer class TimetableAdapter @Inject constructor() : RecyclerView.Adapter() { - private enum class ViewType(val id: Int) { - ITEM_NORMAL(1), - ITEM_SMALL(2) + private enum class ViewType { + ITEM_NORMAL, + ITEM_SMALL } - var items = mutableListOf() - set(value) { - field = value - resetTimers() - } - var onClickListener: (Timetable) -> Unit = {} - var showWholeClassPlan: String = "no" + private var showWholeClassPlan: String = "no" - var showGroupsInPlan: Boolean = false + private var showGroupsInPlan: Boolean = false - var showTimers: Boolean = false + private var showTimers: Boolean = false - private val timers = mutableMapOf() + private val timers = mutableMapOf() - fun resetTimers() { - Timber.d("Timetable timers (${timers.size}) reset") + private val items = mutableListOf() + + fun submitList( + newTimetable: List, + showWholeClassPlan: String = this.showWholeClassPlan, + showGroupsInPlan: Boolean = this.showGroupsInPlan, + showTimers: Boolean = this.showTimers + ) { + val isFlagsDifferent = this.showWholeClassPlan != showWholeClassPlan + || this.showGroupsInPlan != showGroupsInPlan + || this.showTimers != showTimers + + val diffResult = DiffUtil.calculateDiff( + TimetableAdapterDiffCallback( + oldList = items.toMutableList(), + newList = newTimetable, + isFlagsDifferent = isFlagsDifferent + ) + ) + + this.showGroupsInPlan = showGroupsInPlan + this.showTimers = showTimers + this.showWholeClassPlan = showWholeClassPlan + + items.clear() + items.addAll(newTimetable) + + diffResult.dispatchUpdatesTo(this) + } + + fun clearTimers() { + Timber.d("Timetable timers (${timers.size}) cleared") with(timers) { - forEach { (_, timer) -> timer.cancel() } + forEach { (_, timer) -> + timer?.cancel() + timer?.purge() + } clear() } } @@ -58,16 +86,20 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter ViewType.ITEM_SMALL.id - else -> ViewType.ITEM_NORMAL.id + !items[position].isStudentPlan && showWholeClassPlan == "small" -> ViewType.ITEM_SMALL.ordinal + else -> ViewType.ITEM_NORMAL.ordinal } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val inflater = LayoutInflater.from(parent.context) return when (viewType) { - ViewType.ITEM_NORMAL.id -> ItemViewHolder(ItemTimetableBinding.inflate(inflater, parent, false)) - ViewType.ITEM_SMALL.id -> SmallItemViewHolder(ItemTimetableSmallBinding.inflate(inflater, parent, false)) + ViewType.ITEM_NORMAL.ordinal -> ItemViewHolder( + ItemTimetableBinding.inflate(inflater, parent, false) + ) + ViewType.ITEM_SMALL.ordinal -> SmallItemViewHolder( + ItemTimetableSmallBinding.inflate(inflater, parent, false) + ) else -> throw IllegalStateException() } } @@ -111,6 +143,12 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter i < position && !item.isStudentPlan }.size)?.let { - if (!it.canceled && it.isStudentPlan) it.end - else null - } + return items.filter { it.isStudentPlan } + .getOrNull(position - 1 - items.filterIndexed { i, item -> i < position && !item.isStudentPlan }.size) + ?.let { + if (!it.canceled && it.isStudentPlan) it.end + else null + } } private fun updateTimeLeft(binding: ItemTimetableBinding, lesson: Timetable, position: Int) { @@ -148,11 +188,18 @@ class TimetableAdapter @Inject constructor() : RecyclerView.Adapter, + private val newList: List, + private val isFlagsDifferent: Boolean + ) : DiffUtil.Callback() { + + override fun getOldListSize() = oldList.size + + override fun getNewListSize() = newList.size + + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition].id == newList[newItemPosition].id + + override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) = + oldList[oldItemPosition] == newList[newItemPosition] && !isFlagsDifferent + } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt index 2bc7aa59..a374e166 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt @@ -49,7 +49,7 @@ class TimetableFragment : BaseFragment(R.layout.fragme override val titleStringId get() = R.string.timetable_title - override val isViewEmpty get() = timetableAdapter.items.isEmpty() + override val isViewEmpty get() = timetableAdapter.itemCount > 0 override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize @@ -109,20 +109,16 @@ class TimetableFragment : BaseFragment(R.layout.fragme showGroupsInPlanType: Boolean, showTimetableTimers: Boolean ) { - with(timetableAdapter) { - items = data.toMutableList() - showTimers = showTimetableTimers + timetableAdapter.submitList( + newTimetable = data.toMutableList(), + showGroupsInPlan = showGroupsInPlanType, + showTimers = showTimetableTimers, showWholeClassPlan = showWholeClassPlanType - showGroupsInPlan = showGroupsInPlanType - notifyDataSetChanged() - } + ) } override fun clearData() { - with(timetableAdapter) { - items = mutableListOf() - notifyDataSetChanged() - } + timetableAdapter.submitList(listOf()) } override fun updateNavigationDay(date: String) { @@ -226,7 +222,7 @@ class TimetableFragment : BaseFragment(R.layout.fragme } override fun onDestroyView() { - timetableAdapter.resetTimers() + timetableAdapter.clearTimers() presenter.onDetachView() super.onDestroyView() } From 02b87c8c6a7b419a552abff2d63bfb7f0b840637 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 13:42:20 +0000 Subject: [PATCH 135/154] Bump firebase-bom from 28.3.1 to 28.4.0 (#1446) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5e1ae9ab..1338bd8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -219,7 +219,7 @@ dependencies { implementation 'me.xdrop:fuzzywuzzy:1.3.1' implementation 'com.fredporciuncula:flow-preferences:1.5.0' - playImplementation platform('com.google.firebase:firebase-bom:28.3.1') + playImplementation platform('com.google.firebase:firebase-bom:28.4.0') playImplementation 'com.google.firebase:firebase-analytics-ktx' playImplementation 'com.google.firebase:firebase-messaging:' playImplementation 'com.google.firebase:firebase-crashlytics:' From 1cfabe43a5e837b46d8041137f1f1246512a6660 Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Mon, 23 Aug 2021 15:48:48 +0200 Subject: [PATCH 136/154] Add captions for averages from how many items have been counted (#1437) --- .../grade/summary/GradeSummaryAdapter.kt | 38 ++++++++++++++----- .../scrollable_header_grade_summary.xml | 20 ++++++++++ app/src/main/res/values/strings.xml | 1 + 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt index 4de6044b..9a888ddc 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView +import io.github.wulkanowy.R import io.github.wulkanowy.data.db.entities.GradeSummary import io.github.wulkanowy.data.repositories.PreferencesRepository import io.github.wulkanowy.databinding.ItemGradeSummaryBinding @@ -35,8 +36,12 @@ class GradeSummaryAdapter @Inject constructor( val inflater = LayoutInflater.from(parent.context) return when (viewType) { - ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false)) - ViewType.ITEM.id -> ItemViewHolder(ItemGradeSummaryBinding.inflate(inflater, parent, false)) + ViewType.HEADER.id -> HeaderViewHolder( + ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false) + ) + ViewType.ITEM.id -> ItemViewHolder( + ItemGradeSummaryBinding.inflate(inflater, parent, false) + ) else -> throw IllegalStateException() } } @@ -51,13 +56,27 @@ class GradeSummaryAdapter @Inject constructor( private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) { if (items.isEmpty()) return + val context = binding.root.context + val finalItemsCount = items.count { it.finalGrade.matches("[0-6][+-]?".toRegex()) } + val calculatedItemsCount = items.count { value -> value.average != 0.0 } + val finalAverage = items.calcAverage( + preferencesRepository.gradePlusModifier, + preferencesRepository.gradeMinusModifier + ) + val calculatedAverage = items.filter { value -> value.average != 0.0 } + .map { values -> values.average } + .reversed() // fix average precision + .average() + with(binding) { - gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage(preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier)) - gradeSummaryScrollableHeaderCalculated.text = formatAverage(items - .filter { value -> value.average != 0.0 } - .map { values -> values.average } - .reversed() // fix average precision - .average() + gradeSummaryScrollableHeaderFinal.text = formatAverage(finalAverage) + gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedAverage) + gradeSummaryScrollableHeaderFinalSubjectCount.text = + context.getString(R.string.grade_summary_from_subjects, finalItemsCount, items.size) + gradeSummaryScrollableHeaderCalculatedSubjectCount.text = context.getString( + R.string.grade_summary_from_subjects, + calculatedItemsCount, + items.size ) } } @@ -71,7 +90,8 @@ class GradeSummaryAdapter @Inject constructor( gradeSummaryItemPredicted.text = "${item.predictedGrade} ${item.proposedPoints}".trim() gradeSummaryItemFinal.text = "${item.finalGrade} ${item.finalPoints}".trim() - gradeSummaryItemPointsContainer.visibility = if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE + gradeSummaryItemPointsContainer.visibility = + if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE } } diff --git a/app/src/main/res/layout/scrollable_header_grade_summary.xml b/app/src/main/res/layout/scrollable_header_grade_summary.xml index 2eea20f4..29657ba1 100644 --- a/app/src/main/res/layout/scrollable_header_grade_summary.xml +++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml @@ -20,6 +20,7 @@ android:layout_height="wrap_content" android:gravity="center" android:minLines="2" + android:textStyle="bold" android:text="@string/grade_summary_calculated_average" android:textSize="16sp" /> @@ -30,6 +31,15 @@ android:gravity="center_horizontal" android:textSize="21sp" tools:text="6,00" /> + + @@ -53,5 +64,14 @@ android:gravity="center_horizontal" android:textSize="21sp" tools:text="6,00" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b25f4a5..8b3f3b8e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -101,6 +101,7 @@ Predicted grade Calculated average Final average + From %d of %d subjects Summary Class Mark as read From 076948a680b1e576cbdf1386b498dc763c165fbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 13:53:04 +0000 Subject: [PATCH 137/154] Bump gradle from 7.0.0 to 7.0.1 (#1445) --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index fecbb019..d169291d 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.0.1' classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" classpath 'com.google.gms:google-services:4.3.10' classpath 'com.huawei.agconnect:agcp:1.6.0.300' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af7be50b..a0f7639f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..744e882e 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) From aba2068a849882a8e38cff5972ea6953f4bdf2d9 Mon Sep 17 00:00:00 2001 From: killerkeemstar <40898410+killerk3emstar@users.noreply.github.com> Date: Mon, 23 Aug 2021 18:02:21 +0200 Subject: [PATCH 138/154] New timetable widget design (#1384) --- app/build.gradle | 2 +- .../background_widget_header_timetable.xml | 7 +++++++ ...ackground_widget_header_timetable_dark.xml | 7 +++++++ .../background_widget_item_timetable.xml | 5 +++++ .../background_widget_item_timetable_dark.xml | 5 +++++ .../drawable/background_widget_timetable.xml | 5 +++++ .../background_widget_timetable_dark.xml | 5 +++++ .../drawable/img_timetable_widget_preview.png | Bin 5284 -> 25538 bytes .../main/res/layout/item_widget_timetable.xml | 7 +------ .../res/layout/item_widget_timetable_dark.xml | 7 +------ .../layout/item_widget_timetable_small.xml | 2 +- .../item_widget_timetable_small_dark.xml | 2 +- app/src/main/res/layout/widget_timetable.xml | 13 ++++++++++--- .../main/res/layout/widget_timetable_dark.xml | 13 ++++++++++--- 14 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/background_widget_header_timetable.xml create mode 100644 app/src/main/res/drawable/background_widget_header_timetable_dark.xml create mode 100644 app/src/main/res/drawable/background_widget_item_timetable.xml create mode 100644 app/src/main/res/drawable/background_widget_item_timetable_dark.xml create mode 100644 app/src/main/res/drawable/background_widget_timetable.xml create mode 100644 app/src/main/res/drawable/background_widget_timetable_dark.xml mode change 100644 => 100755 app/src/main/res/drawable/img_timetable_widget_preview.png diff --git a/app/build.gradle b/app/build.gradle index 1338bd8d..409e6c4d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -164,7 +164,7 @@ ext { } dependencies { - implementation "io.github.wulkanowy:sdk:496dc01d15" + implementation "io.github.wulkanowy:sdk:b991d0c" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/app/src/main/res/drawable/background_widget_header_timetable.xml b/app/src/main/res/drawable/background_widget_header_timetable.xml new file mode 100644 index 00000000..98eec700 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_header_timetable.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_header_timetable_dark.xml b/app/src/main/res/drawable/background_widget_header_timetable_dark.xml new file mode 100644 index 00000000..616a9127 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_header_timetable_dark.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_item_timetable.xml b/app/src/main/res/drawable/background_widget_item_timetable.xml new file mode 100644 index 00000000..08854fba --- /dev/null +++ b/app/src/main/res/drawable/background_widget_item_timetable.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_item_timetable_dark.xml b/app/src/main/res/drawable/background_widget_item_timetable_dark.xml new file mode 100644 index 00000000..e432a648 --- /dev/null +++ b/app/src/main/res/drawable/background_widget_item_timetable_dark.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_timetable.xml b/app/src/main/res/drawable/background_widget_timetable.xml new file mode 100644 index 00000000..2267587d --- /dev/null +++ b/app/src/main/res/drawable/background_widget_timetable.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_widget_timetable_dark.xml b/app/src/main/res/drawable/background_widget_timetable_dark.xml new file mode 100644 index 00000000..6fe7d0ab --- /dev/null +++ b/app/src/main/res/drawable/background_widget_timetable_dark.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png old mode 100644 new mode 100755 index 550260258a82ae1fcb8c54530efff52985580153..8494301878a1bdcb838aee6ee82be8b42c3904cd GIT binary patch literal 25538 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 literal 5284 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 q4yw-=) - - diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml index 34535c69..06233244 100644 --- a/app/src/main/res/layout/item_widget_timetable_dark.xml +++ b/app/src/main/res/layout/item_widget_timetable_dark.xml @@ -6,12 +6,12 @@ android:layout_height="wrap_content" android:minHeight="45dp" android:orientation="vertical" + android:background="@drawable/background_widget_item_timetable_dark" tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory"> - - diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml index 36a6bbdd..1bf4072d 100644 --- a/app/src/main/res/layout/item_widget_timetable_small.xml +++ b/app/src/main/res/layout/item_widget_timetable_small.xml @@ -91,7 +91,7 @@ tools:text="@tools:sample/lorem/random" /> - diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml index a02d8585..50bbbd03 100644 --- a/app/src/main/res/layout/item_widget_timetable_small_dark.xml +++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml @@ -90,7 +90,7 @@ tools:text="@tools:sample/lorem/random" /> - diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml index 8a08b5d2..059bb741 100644 --- a/app/src/main/res/layout/widget_timetable.xml +++ b/app/src/main/res/layout/widget_timetable.xml @@ -3,13 +3,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/white" + android:background="@drawable/background_widget_timetable" tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider"> + android:background="@drawable/background_widget_header_timetable"> @@ -77,7 +78,12 @@ android:id="@+id/timetableWidgetList" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="56dp" + android:layout_marginLeft="10dp" + android:layout_marginTop="66dp" + android:layout_marginRight="10dp" + android:layout_marginBottom="10dp" + android:divider="#00ffffff" + android:dividerHeight="4dp" tools:listitem="@layout/item_widget_timetable" /> diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml index 5533eaee..9c8b8c56 100644 --- a/app/src/main/res/layout/widget_timetable_dark.xml +++ b/app/src/main/res/layout/widget_timetable_dark.xml @@ -3,13 +3,13 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/colorWidgetBackground" + android:background="@drawable/background_widget_timetable_dark" tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider"> + android:background="@drawable/background_widget_header_timetable_dark"> @@ -77,7 +78,12 @@ android:id="@+id/timetableWidgetList" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="56dp" + android:layout_marginTop="66dp" + android:layout_marginBottom="10dp" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:divider="#00ffffff" + android:dividerHeight="4dp" tools:listitem="@layout/item_widget_timetable_dark" /> From 2979d8b62ac47cc034028e34286dd7805930866b Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Mon, 23 Aug 2021 18:16:41 +0200 Subject: [PATCH 139/154] Show information when the recipient has read the message (#1430) --- .../data/repositories/MessageRepository.kt | 5 +- .../message/preview/MessagePreviewAdapter.kt | 52 ++++++++++++++++--- .../main/res/layout/item_message_preview.xml | 13 ++++- app/src/main/res/values/strings.xml | 7 ++- 4 files changed, 64 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt index 2034000e..2d70e26e 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt @@ -20,14 +20,12 @@ import io.github.wulkanowy.data.pojos.MessageDraftJsonAdapter import io.github.wulkanowy.sdk.Sdk import io.github.wulkanowy.sdk.pojo.Folder import io.github.wulkanowy.sdk.pojo.SentMessage -import io.github.wulkanowy.ui.modules.message.send.RecipientChipItem import io.github.wulkanowy.utils.AutoRefreshHelper import io.github.wulkanowy.utils.getRefreshKey import io.github.wulkanowy.utils.init import io.github.wulkanowy.utils.networkBoundResource import io.github.wulkanowy.utils.uniqueSubtract import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.map import kotlinx.coroutines.sync.Mutex import timber.log.Timber import java.time.LocalDateTime.now @@ -79,8 +77,9 @@ class MessageRepository @Inject constructor( }, saveFetchResult = { old, (downloadedMessage, attachments) -> checkNotNull(old, { "Fetched message no longer exist!" }) - messagesDb.updateAll(listOf(old.message.copy(unread = !markAsRead).apply { + messagesDb.updateAll(listOf(old.message.apply { id = old.message.id + unread = !markAsRead content = content.ifBlank { downloadedMessage } })) messageAttachmentDao.insertAttachments(attachments) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt index 206a7460..421453c9 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt @@ -33,7 +33,8 @@ class MessagePreviewAdapter @Inject constructor() : private var attachments: List = emptyList() - override fun getItemCount() = if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0 + override fun getItemCount() = + if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0 override fun getItemViewType(position: Int) = when (position) { 0 -> ViewType.MESSAGE.id @@ -45,25 +46,60 @@ class MessagePreviewAdapter @Inject constructor() : val inflater = LayoutInflater.from(parent.context) return when (viewType) { - ViewType.MESSAGE.id -> MessageViewHolder(ItemMessagePreviewBinding.inflate(inflater, parent, false)) - ViewType.DIVIDER.id -> DividerViewHolder(ItemMessageDividerBinding.inflate(inflater, parent, false)) - ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemMessageAttachmentBinding.inflate(inflater, parent, false)) + ViewType.MESSAGE.id -> MessageViewHolder( + ItemMessagePreviewBinding.inflate(inflater, parent, false) + ) + ViewType.DIVIDER.id -> DividerViewHolder( + ItemMessageDividerBinding.inflate(inflater, parent, false) + ) + ViewType.ATTACHMENT.id -> AttachmentViewHolder( + ItemMessageAttachmentBinding.inflate(inflater, parent, false) + ) else -> throw IllegalStateException() } } override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { when (holder) { - is MessageViewHolder -> bindMessage(holder, requireNotNull(messageWithAttachment).message) - is AttachmentViewHolder -> bindAttachment(holder, requireNotNull(messageWithAttachment).attachments[position - 2]) + is MessageViewHolder -> bindMessage( + holder, + requireNotNull(messageWithAttachment).message + ) + is AttachmentViewHolder -> bindAttachment( + holder, + requireNotNull(messageWithAttachment).attachments[position - 2] + ) } } @SuppressLint("SetTextI18n") private fun bindMessage(holder: MessageViewHolder, message: Message) { + val context = holder.binding.root.context + val recipientCount = message.unreadBy + message.readBy + + val readText = when { + recipientCount > 1 -> { + context.resources.getQuantityString( + R.plurals.message_read_by, + message.readBy, + message.readBy, + recipientCount + ) + } + message.readBy == 1 -> { + context.getString(R.string.message_read, context.getString(R.string.all_yes)) + } + else -> context.getString(R.string.message_read, context.getString(R.string.all_no)) + } + with(holder.binding) { - messagePreviewSubject.text = message.subject.ifBlank { root.context.getString(R.string.message_no_subject) } - messagePreviewDate.text = root.context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss")) + messagePreviewSubject.text = + message.subject.ifBlank { root.context.getString(R.string.message_no_subject) } + messagePreviewDate.text = root.context.getString( + R.string.message_date, + message.date.toFormattedString("yyyy-MM-dd HH:mm:ss") + ) + messagePreviewRead.text = readText messagePreviewContent.text = message.content messagePreviewFromSender.text = message.sender messagePreviewToRecipient.text = message.recipient diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml index 83a4406b..c5dc2fa9 100644 --- a/app/src/main/res/layout/item_message_preview.xml +++ b/app/src/main/res/layout/item_message_preview.xml @@ -78,6 +78,17 @@ app:layout_constraintTop_toBottomOf="@id/messagePreviewToLabel" tools:text="@tools:sample/date/ddmmyy" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b3f3b8e..b655769d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -101,7 +101,7 @@ Predicted grade Calculated average Final average - From %d of %d subjects + From %1$d of %2$d subjects Summary Class Mark as read @@ -237,6 +237,11 @@ The message content must be at least 3 characters Only unread Only with attachments + Read: %s + + Read by: %1$d of %2$d people + Read by: %1$d of %2$d people + %d message %d messages From a6a2bcff3b2beec3b535f4e6364f30c28a7bf937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Tue, 24 Aug 2021 19:51:08 +0200 Subject: [PATCH 140/154] Remove Zachowanie from all count of subjects (#1447) --- .../ui/modules/grade/summary/GradeSummaryAdapter.kt | 9 +++++++-- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt index 9a888ddc..0754361c 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt @@ -59,6 +59,7 @@ class GradeSummaryAdapter @Inject constructor( val context = binding.root.context val finalItemsCount = items.count { it.finalGrade.matches("[0-6][+-]?".toRegex()) } val calculatedItemsCount = items.count { value -> value.average != 0.0 } + val allItemsCount = items.count { !it.subject.equals("zachowanie", true) } val finalAverage = items.calcAverage( preferencesRepository.gradePlusModifier, preferencesRepository.gradeMinusModifier @@ -72,11 +73,15 @@ class GradeSummaryAdapter @Inject constructor( gradeSummaryScrollableHeaderFinal.text = formatAverage(finalAverage) gradeSummaryScrollableHeaderCalculated.text = formatAverage(calculatedAverage) gradeSummaryScrollableHeaderFinalSubjectCount.text = - context.getString(R.string.grade_summary_from_subjects, finalItemsCount, items.size) + context.getString( + R.string.grade_summary_from_subjects, + finalItemsCount, + allItemsCount + ) gradeSummaryScrollableHeaderCalculatedSubjectCount.text = context.getString( R.string.grade_summary_from_subjects, calculatedItemsCount, - items.size + allItemsCount ) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b655769d..ee911cfb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -101,7 +101,7 @@ Predicted grade Calculated average Final average - From %1$d of %2$d subjects + from %1$d of %2$d subjects Summary Class Mark as read From b4b9d91ea6f706efe6bb007b4989e7c4f29b7e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Wed, 25 Aug 2021 20:49:44 +0200 Subject: [PATCH 141/154] Update dependencies (#1448) --- app/build.gradle | 18 +++++------------- app/jacoco.gradle | 6 +++--- .../alarm/TimetableNotificationReceiver.kt | 4 ++-- .../wulkanowy/ui/modules/main/MainActivity.kt | 4 ++-- .../message/send/SendMessageActivity.kt | 4 +--- .../message/send/SendMessagePresenter.kt | 2 -- .../modules/message/tab/MessageTabFragment.kt | 2 -- .../modules/message/tab/MessageTabPresenter.kt | 3 +-- .../timetablewidget/TimetableWidgetProvider.kt | 2 ++ build.gradle | 2 +- gradle.properties | 8 +++++--- 11 files changed, 22 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 409e6c4d..d5fccac6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' apply plugin: 'kotlin-kapt' apply plugin: 'dagger.hilt.android.plugin' +apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.github.triplet.play' apply plugin: 'ru.cian.huawei-publish' apply plugin: 'com.mikepenz.aboutlibraries.plugin' -apply plugin: 'com.google.gms.google-services' apply plugin: 'com.huawei.agconnect' apply from: 'jacoco.gradle' apply from: 'sonarqube.gradle' @@ -15,7 +15,6 @@ apply from: 'hooks.gradle' android { compileSdkVersion 30 - buildToolsVersion '30.0.3' defaultConfig { applicationId "io.github.wulkanowy" @@ -98,7 +97,7 @@ android { } buildFeatures { - viewBinding = true + viewBinding true } testOptions.unitTests { @@ -107,12 +106,12 @@ android { compileOptions { coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"] } @@ -128,12 +127,6 @@ android { kapt { correctErrorTypes true - - javacOptions { - //Bug workaround https://youtrack.jetbrains.com/issue/KT-47416 - option("-Adagger.fastInit=ENABLED") - option("-Adagger.hilt.android.internal.disableAndroidSuperclassValidation=true") - } } play { @@ -168,7 +161,6 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1" implementation "androidx.core:core-ktx:1.6.0" diff --git a/app/jacoco.gradle b/app/jacoco.gradle index 9c1f5b1c..f253673e 100644 --- a/app/jacoco.gradle +++ b/app/jacoco.gradle @@ -2,7 +2,7 @@ apply plugin: "jacoco" jacoco { toolVersion "0.8.7" - reportsDirectory = file("$buildDir/reports") + reportsDirectory.set(file("$buildDir/reports")) } tasks.withType(Test) { @@ -16,8 +16,8 @@ task jacocoTestReport(type: JacocoReport) { description = "Generate Jacoco coverage reports" reports { - xml.enabled = true - html.enabled = true + xml.required.set(true) + html.required.set(true) } def excludes = ['**/R.class', diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt index 8eefc032..406d91f5 100644 --- a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt +++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt @@ -1,6 +1,5 @@ package io.github.wulkanowy.services.alarm -import android.annotation.SuppressLint import android.app.PendingIntent import android.app.PendingIntent.FLAG_UPDATE_CURRENT import android.content.Context @@ -20,6 +19,7 @@ import io.github.wulkanowy.ui.modules.main.MainView import io.github.wulkanowy.utils.flowWithResource import io.github.wulkanowy.utils.getCompatColor import io.github.wulkanowy.utils.toLocalDateTime +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -50,7 +50,7 @@ class TimetableNotificationReceiver : HiltBroadcastReceiver() { const val LESSON_END = "end_timestamp" } - @SuppressLint("CheckResult") + @OptIn(DelicateCoroutinesApi::class) override fun onReceive(context: Context, intent: Intent) { super.onReceive(context, intent) Timber.d("Receiving intent... ${intent.toUri(0)}") diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt index 188cf5fc..b44bb4b2 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt @@ -230,8 +230,8 @@ class MainActivity : BaseActivity(), MainVie .setIcon(R.drawable.ic_main_more) } selectedItemId = startMenuIndex - setOnNavigationItemSelectedListener { presenter.onTabSelected(it.itemId, false) } - setOnNavigationItemReselectedListener { presenter.onTabSelected(it.itemId, true) } + setOnItemSelectedListener { presenter.onTabSelected(it.itemId, false) } + setOnItemReselectedListener { presenter.onTabSelected(it.itemId, true) } } with(navController) { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt index f169de9f..d49c9b83 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt @@ -23,8 +23,6 @@ import io.github.wulkanowy.ui.base.BaseActivity import io.github.wulkanowy.utils.dpToPx import io.github.wulkanowy.utils.hideSoftInput import io.github.wulkanowy.utils.showSoftInput -import kotlinx.coroutines.FlowPreview -import timber.log.Timber import javax.inject.Inject @AndroidEntryPoint @@ -67,7 +65,6 @@ class SendMessageActivity : BaseActivity presenter.clearDraft() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt index b1cf3b64..f6154218 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt @@ -1,6 +1,5 @@ package io.github.wulkanowy.ui.modules.message.send -import io.github.wulkanowy.R import io.github.wulkanowy.data.Status import io.github.wulkanowy.data.db.entities.Message import io.github.wulkanowy.data.db.entities.Recipient @@ -41,7 +40,6 @@ class SendMessagePresenter @Inject constructor( private val messageUpdateChannel = Channel() - @FlowPreview fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) { super.onAttachView(view) view.initView() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt index dfd95b72..54ee74eb 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt @@ -21,7 +21,6 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment import io.github.wulkanowy.ui.widgets.DividerItemDecoration import io.github.wulkanowy.utils.getThemeAttrColor -import kotlinx.coroutines.FlowPreview import javax.inject.Inject @AndroidEntryPoint @@ -58,7 +57,6 @@ class MessageTabFragment : BaseFragment(R.layout.frag setHasOptionsMenu(true) } - @FlowPreview override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding = FragmentMessageTabBinding.bind(view) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt index 93c7408f..3e5e09b4 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt @@ -44,7 +44,6 @@ class MessageTabPresenter @Inject constructor( private val searchChannel = Channel() - @FlowPreview fun onAttachView(view: MessageTabView, folder: MessageFolder) { super.onAttachView(view) view.initView() @@ -178,7 +177,7 @@ class MessageTabPresenter @Inject constructor( } } - @FlowPreview + @OptIn(FlowPreview::class) private fun initializeSearchStream() { launch { searchChannel.consumeAsFlow() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt index 733eb17f..f9079b5f 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt @@ -35,6 +35,7 @@ import io.github.wulkanowy.utils.nextSchoolDay import io.github.wulkanowy.utils.nickOrName import io.github.wulkanowy.utils.previousSchoolDay import io.github.wulkanowy.utils.toFormattedString +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import timber.log.Timber @@ -81,6 +82,7 @@ class TimetableWidgetProvider : HiltBroadcastReceiver() { "timetable_widget_current_theme_$appWidgetId" } + @OptIn(DelicateCoroutinesApi::class) override fun onReceive(context: Context, intent: Intent) { super.onReceive(context, intent) GlobalScope.launch { diff --git a/build.gradle b/build.gradle index d169291d..afe0285c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.5.21' + kotlin_version = '1.5.30' about_libraries = '8.9.1' hilt_version = "2.38.1" } diff --git a/gradle.properties b/gradle.properties index 998e3195..38603830 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,19 @@ # any settings specified in this file. # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx1536m +# android.enableJetifier=true android.useAndroidX=true +# kotlin.code.style=official -kapt.incremental.apt=true +# kapt.use.worker.api=true kapt.include.compile.classpath=false - +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects From 4a38a0be709ac180cf8fb780da81b2852ecc2098 Mon Sep 17 00:00:00 2001 From: Piotr Romanowski Date: Thu, 26 Aug 2021 19:35:41 +0200 Subject: [PATCH 142/154] Add change password snackbar (#1336) --- .../github/wulkanowy/ui/base/BaseActivity.kt | 21 ++++++++++++------- .../wulkanowy/ui/base/BaseDialogFragment.kt | 4 ++++ .../github/wulkanowy/ui/base/BaseFragment.kt | 4 ++++ .../github/wulkanowy/ui/base/BasePresenter.kt | 1 + .../io/github/wulkanowy/ui/base/BaseView.kt | 2 ++ .../github/wulkanowy/ui/base/ErrorHandler.kt | 5 +++++ .../settings/advanced/AdvancedFragment.kt | 4 ++++ .../settings/appearance/AppearanceFragment.kt | 4 ++++ .../notifications/NotificationsFragment.kt | 4 ++++ .../ui/modules/settings/sync/SyncFragment.kt | 4 ++++ .../wulkanowy/utils/ContextExtension.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 12 files changed, 47 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt index 9b93953d..0521b4a0 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt @@ -3,8 +3,6 @@ package io.github.wulkanowy.ui.base import android.app.ActivityManager import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK import android.content.Intent.FLAG_ACTIVITY_NEW_TASK -import android.os.Build.VERSION.SDK_INT -import android.os.Build.VERSION_CODES.LOLLIPOP import android.os.Bundle import android.view.View import android.widget.Toast @@ -19,6 +17,7 @@ import io.github.wulkanowy.ui.modules.login.LoginActivity import io.github.wulkanowy.utils.FragmentLifecycleLogger import io.github.wulkanowy.utils.getThemeAttrColor import io.github.wulkanowy.utils.lifecycleAwareVariable +import io.github.wulkanowy.utils.openInternetBrowser import javax.inject.Inject abstract class BaseActivity, VB : ViewBinding> : @@ -43,12 +42,10 @@ abstract class BaseActivity, VB : ViewBinding> : supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true) AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) - if (SDK_INT >= LOLLIPOP) { - @Suppress("DEPRECATION") - setTaskDescription( - ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)) - ) - } + @Suppress("DEPRECATION") + setTaskDescription( + ActivityManager.TaskDescription(null, null, getThemeAttrColor(R.attr.colorSurface)) + ) } override fun showError(text: String, error: Throwable) { @@ -77,6 +74,14 @@ abstract class BaseActivity, VB : ViewBinding> : .show() } + override fun showChangePasswordSnackbar(redirectUrl: String) { + messageContainer?.let { + Snackbar.make(it, R.string.error_password_change_required, LENGTH_LONG) + .setAction(R.string.all_change) { openInternetBrowser(redirectUrl) } + .show() + } + } + override fun openClearLoginView() { startActivity(LoginActivity.getStartIntent(this) .apply { addFlags(FLAG_ACTIVITY_CLEAR_TASK or FLAG_ACTIVITY_NEW_TASK) }) diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt index 1c31976e..25a53395 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt @@ -30,6 +30,10 @@ abstract class BaseDialogFragment : DialogFragment(), BaseView (activity as? BaseActivity<*, *>)?.openClearLoginView() } + override fun showChangePasswordSnackbar(redirectUrl: String) { + (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl) + } + override fun showErrorDetailsDialog(error: Throwable) { ErrorDialog.newInstance(error).show(childFragmentManager, error.toString()) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt index c6a2e1d1..dbc5af3a 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt @@ -45,4 +45,8 @@ abstract class BaseFragment(@LayoutRes layoutId: Int) : Fragme override fun openClearLoginView() { (activity as? BaseActivity<*, *>)?.openClearLoginView() } + + override fun showChangePasswordSnackbar(redirectUrl: String) { + (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl) + } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt index b222b0ab..be530049 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt @@ -34,6 +34,7 @@ open class BasePresenter( showErrorMessage = view::showError onSessionExpired = view::showExpiredDialog onNoCurrentStudent = view::openClearLoginView + onPasswordChangeRequired = view::showChangePasswordSnackbar } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt index 0f4df92c..d3165ea4 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseView.kt @@ -11,4 +11,6 @@ interface BaseView { fun openClearLoginView() fun showErrorDetailsDialog(error: Throwable) + + fun showChangePasswordSnackbar(redirectUrl: String) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt index 34dd3ec1..7c32ef18 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt @@ -3,6 +3,7 @@ package io.github.wulkanowy.ui.base import android.content.res.Resources import io.github.wulkanowy.data.exceptions.NoCurrentStudentException import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException +import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException import io.github.wulkanowy.utils.getString import io.github.wulkanowy.utils.security.ScramblerException import timber.log.Timber @@ -16,6 +17,8 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources) var onNoCurrentStudent: () -> Unit = {} + var onPasswordChangeRequired: (String) -> Unit = {} + fun dispatch(error: Throwable) { Timber.e(error, "An exception occurred while the Wulkanowy was running") proceed(error) @@ -24,6 +27,7 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources) protected open fun proceed(error: Throwable) { showErrorMessage(resources.getString(error), error) when (error) { + is PasswordChangeRequiredException -> onPasswordChangeRequired(error.redirectUrl) is ScramblerException, is BadCredentialsException -> onSessionExpired() is NoCurrentStudentException -> onNoCurrentStudent() } @@ -33,5 +37,6 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources) showErrorMessage = { _, _ -> } onSessionExpired = {} onNoCurrentStudent = {} + onPasswordChangeRequired = {} } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt index 524d7ba6..9f29731f 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt @@ -58,6 +58,10 @@ class AdvancedFragment : PreferenceFragmentCompat(), (activity as? BaseActivity<*, *>)?.showExpiredDialog() } + override fun showChangePasswordSnackbar(redirectUrl: String) { + (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl) + } + override fun openClearLoginView() { (activity as? BaseActivity<*, *>)?.openClearLoginView() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt index 5ac801dc..a7ee800b 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt @@ -70,6 +70,10 @@ class AppearanceFragment : PreferenceFragmentCompat(), (activity as? BaseActivity<*, *>)?.showExpiredDialog() } + override fun showChangePasswordSnackbar(redirectUrl: String) { + (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl) + } + override fun openClearLoginView() { (activity as? BaseActivity<*, *>)?.openClearLoginView() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt index 96d14a1b..0fc7e68e 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt @@ -107,6 +107,10 @@ class NotificationsFragment : PreferenceFragmentCompat(), (activity as? BaseActivity<*, *>)?.showExpiredDialog() } + override fun showChangePasswordSnackbar(redirectUrl: String) { + (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl) + } + override fun openClearLoginView() { (activity as? BaseActivity<*, *>)?.openClearLoginView() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt index 34298809..83caa3b0 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt @@ -86,6 +86,10 @@ class SyncFragment : PreferenceFragmentCompat(), (activity as? BaseActivity<*, *>)?.showExpiredDialog() } + override fun showChangePasswordSnackbar(redirectUrl: String) { + (activity as? BaseActivity<*, *>)?.showChangePasswordSnackbar(redirectUrl) + } + override fun openClearLoginView() { (activity as? BaseActivity<*, *>)?.openClearLoginView() } diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt index be664a47..cb31389e 100644 --- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt +++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt @@ -56,7 +56,7 @@ fun Context.getCompatDrawable(@DrawableRes drawableRes: Int, @ColorRes colorRes: fun Context.getCompatBitmap(@DrawableRes drawableRes: Int, @ColorRes colorRes: Int) = getCompatDrawable(drawableRes, colorRes)?.toBitmap() -fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit) { +fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -> Unit = {}) { Intent.parseUri(uri, 0).let { if (it.resolveActivity(packageManager) != null) startActivity(it) else onActivityNotFound(uri) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee911cfb..39478a2e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -678,6 +678,7 @@ Copied Undo + Change From cebd1aa75d77b53eeb10b116d40fe7fda3154505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Sat, 28 Aug 2021 12:14:01 +0200 Subject: [PATCH 143/154] Remove lithuanian lang (#1449) --- .../res/values-lt-v29/preferences_values.xml | 9 - .../main/res/values-lt/preferences_values.xml | 48 -- app/src/main/res/values-lt/strings.xml | 548 ------------------ 3 files changed, 605 deletions(-) delete mode 100644 app/src/main/res/values-lt-v29/preferences_values.xml delete mode 100644 app/src/main/res/values-lt/preferences_values.xml delete mode 100644 app/src/main/res/values-lt/strings.xml diff --git a/app/src/main/res/values-lt-v29/preferences_values.xml b/app/src/main/res/values-lt-v29/preferences_values.xml deleted file mode 100644 index 18cbd4cf..00000000 --- a/app/src/main/res/values-lt-v29/preferences_values.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Sistemos tema - Šviesi - Tamsi - Juoda (AMOLED) - - diff --git a/app/src/main/res/values-lt/preferences_values.xml b/app/src/main/res/values-lt/preferences_values.xml deleted file mode 100644 index 5999a2fd..00000000 --- a/app/src/main/res/values-lt/preferences_values.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - Šviesi - Tamsi - Juoda (AMOLED) - - - Sistemos kalba - Polski - English - Pусский - Українська - Deutsch - Čeština - Slovenčina - - - 15 minučių - 30 minučių - 1 valandą - 2 valandas - 6 valandas - 12 valandas - 24 valandas - - - 0,00 - 0,25 - 0,33 - 0,5 - 0,75 - - - Pagal abėcėlę - Pagal datą - - - Dzienniczek+ - Wulkanowy - Laipsnio spalvos registre - - - Antrojo semestro laipsnių vidurkis - Abiejų semestrų laipsnių vidurkis - Visų metų laipsnių vidurkis - - diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml deleted file mode 100644 index cf9d44d1..00000000 --- a/app/src/main/res/values-lt/strings.xml +++ /dev/null @@ -1,548 +0,0 @@ - - - - Prisijungti - Wulkanowy - Laipsnis - Attendance - Exams - Timetable - Nustatymai - Daugiau - Apie - Peržiūrėti žurnalą - Prisidėję - Licencijos - Žinutės - Nauja žinutė - Pastabos ir pasiekimai - Namų darbai - Paskyros valdymas - Pasirinkite paskyrą - Paskyros informacija - Studentų informacija - - Semestras %1$d, %2$d/%3$d - - Sign in with the student or parent account - Enter the symbol from the register page - Vartotojo vardas - El. paštas - Prisijunkite, PESEL arba el. paštas - Slaptažodis - UONET+ register variant - Mobile API - Scraper - Hibridas - Token - PIN - Symbol - Prisijungti - Slaptažodis per trumpas - Login details are incorrect. Make sure the correct UONET+ register variation is selected in the field below - Netinkamas PIN kodas - Invalid token - Token expired - Neteisingas el. paštas - Use the assigned login instead of email - Use the assigned login or email in @%1$s - Netinkamas simbolis - Student not found. Validate the symbol and the chosen variation of the UONET+ register - This field is required - Selected student is already logged in - The symbol can be found on the register page in Uczeń → Dostęp Mobilny → Zarejestruj urządzenie mobilne.\n\nMake sure that you have set the appropriate register variant in the UONET+ register variant field on the previous screen. Wulkanowy does not detect pre-school students at the moment - Select students to log in to the application - Papildomi nustatymai - In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices - This mode displays the same data as it appears on the register website - The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase - Privatumo politika - Trouble signing in? Contact us! - El. paštas - Discord - Send email - Make sure you select the correct UONET+ register variation! - I forgot my password - Recover your account - Atkurti - Student is already signed in - - Paskyros valdymas - Prisijungti - Sesijos laikas baigėsi - Sesijos laikas baigėsi, prašome prisijungti iš naujo - - Laipsnis - Semestras %d - Keisti semestrą - Jokių laipsnių - Svoris - Svoris: %s - Pastabos - Number of new ratings: %1$d - Vidurkis: %1$.2f - Puantai: %s - Jokiu vidurkis - Bendras punktų skaičius - Galutinis laipsnis - Numatomas laipsnis - Calculated average - Final average - Summary - Class - Mark as read - Partial - Semester - Points - Legend - Average: %1$s - Class - Student - - %d grade - %d grades - %d grades - %d grades - - - New grade - New grades - New grades - New grades - - - New predicted grade - New predicted grades - New predicted grades - New predicted grades - - - New final grade - New final grades - New final grades - New final grades - - - You received %1$d grade - You received %1$d grades - You received %1$d grades - You received %1$d grades - - - You received %1$d predicted grade - You received %1$d predicted grades - You received %1$d predicted grades - You received %1$d predicted grades - - - You received %1$d final grade - You received %1$d final grades - You received %1$d final grades - You received %1$d final grades - - - Lesson - Room - Group - Hours - Changes - No lessons this day - %s min - %s sec - %1$s left - in %1$s - Finished - Now: %s - Next: %s - Later: %s - - Completed lessons - Show completed lessons - No info about completed lessons - Topic - Absence - Resources - - Additional lessons - Show additional lessons - No info about additional lessons - - Attendance summary - Absent for school reasons - Excused absence - Unexcused absence - Exemption - Excused lateness - Unexcused lateness - Present - Deleted - Unknown - Number of lesson - No entries - Absence reason (optional) - Send - Absence excuse request sent successfully! - You must select at least one absence! - Excuse - - Total - - No exams this week - Type - Entry date - - New exam - New exams - New exams - New exams - - - %d exam - %d exams - %d exams - %d exams - - - Inbox - Sent - Trash - (no subject) - No messages - From: - To: - Date: %s - Reply - Forward - Delete - Move to trash - Delete permanently - Message deleted successfully - Share - Print - Subject - Content - Message sent successfully - Message does not exist - You need to choose at least 1 recipient - The message content must be at least 3 characters - - %d message - %d messages - %d messages - %d messages - - - New message - New messages - New messages - New messages - - - You received %1$d message - You received %1$d messages - You received %1$d messages - You received %1$d messages - - - No info about notes - Points - - %d note - %d notes - %d notes - %d notes - - - New note - New notes - New notes - New notes - - - You received %1$d note - You received %1$d notes - You received %1$d notes - You received %1$d notes - - - - %d praise - %d praises - %d praises - %d praises - - - New praise - New praises - New praises - New praises - - - You received %1$d praise - You received %1$d praises - You received %1$d praises - You received %1$d praises - - - - %d neutral note - %d neutral notes - %d neutral notes - %d neutral notes - - - New neutral note - New neutral notes - New neutral notes - New neutral notes - - - You received %1$d neutral note - You received %1$d neutral notes - You received %1$d neutral notes - You received %1$d neutral notes - - - No info about homework - Mark as done - Mark as undone - Attachments - - New homework - New homework - New homework - New homework - - - %d homework - %d homework - %d homework - %d homework - - - Lucky number - Today\'s lucky number is - No info about the lucky number - Lucky number for today - Today\'s lucky number is: %s - Show history - - Lucky number history - No info about lucky numbers - - Mobile devices - No devices - Deregister - Device removed - QR code - Token - Symbol - PIN - - School and teachers - - School - No info about school - School name - School address - Telephone - Name of headmaster - Name of pedagogue - Show on map - Call - - Teachers - No info about teachers - No subject - - Conferences - No info about conferences - - Add account - Logout - Do you want to log out this student? - Student logout - Student account - Parent account - Edit data - Accounts manager - Select student - Family - Contact - Residence details - Personal information - - App version - Contributors - List of Wulkanowy developers - Report a bug - Send a bug report via e-mail - FAQ - Read Frequently Asked Questions - Discord server - Join the Wulkanowy community - Facebook fanpage - Like our facebook fanpage - Privacy policy - Rules for collecting personal data - System settings - Open system settings - Homepage - Visit the website and help develop the application - Licenses - Licenses of libraries used in the application - - License - - Avatar - See more on GitHub - - No info about student or student family - Name - Second name - Gender - Polish citizenship - Family name - Mother\'s and father\'s names - Phone - Cellphone - E-mail - Address of residence - Address of registration - Correspondence address - Surname and first name - Degree of kinship - Address - Phones - Male - Female - Last name - - Nick - Add nick - Choose avatar color - - Share logs - Refresh - - Check for updates - Before reporting a bug, check first if an update with the bug fix is available - - Content - Retry - Description - No description - Teacher - Date - Entry date - Color - Details - Category - Close - No data - Subject - Prev - Next - Search - Search… - Yes - No - Save - - No lessons - Choose theme - Light - Dark - System Theme - - App appearance & behavior - Default view - Calculation of the end-of-year average - Force average calculation by app - Show presence - Theme - Expand grades - Mark current lesson - Show groups next to subjects - Show chart list in class grades - Show subjects without grades - Grades color scheme - Subjects sorting - Language - Notifications - Show notifications - Show upcoming lesson notifications - Open system notification settings - Fix synchronization & notifications issues - Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings. - Go to settings - Show debug notifications - Synchronization is disabled - Synchronization - Automatic update - Suspended on holidays - Updates interval - Wi-Fi only - Sync now - Synced! - Sync failed - Sync in progress - Value of the plus - Value of the minus - Reply with message history - Show arithmetic average when no weights provided - Advanced - Appearance & Behavior - Notifications - Synchronization - Grades - Attendance - Timetable - Grades - Messages - Appearance & Behavior - Languages, themes, subjects sorting - App notifications, fix problems - Notifications - Synchronization - Automatic update, synchronization interval - Plus and minus values, average calculation - Advanced - App version, contributors, social portals, licenses - - New grades - New homework - New exams - Lucky number - New messages - New notes - Push notifications - Upcoming lessons - Debug - - Black - Red - Blue - Green - Purple - No color - - Copied - Undo - - Download of updates has started… - An update has just been downloaded. - Restart - Update failed! Wulkanowy may not function properly. Consider updating - - No internet connection - Connection to register failed. Servers can be overloaded. Please try again later - Loading data failed. Please try again later - Register password change required - Maintenance underway UONET + register. Try again later - Unknown UONET + register error. Try again later - Unknown application error. Please try again later - An unexpected error occurred - Feature disabled by your school - Feature not available. Login in a mode other than Mobile API - From 55518cb0449f1073b056d0778a8f2618a924d7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Sat, 28 Aug 2021 21:43:10 +0200 Subject: [PATCH 144/154] Add missing dashboard item in default view settings (#1450) --- .../repositories/PreferencesRepository.kt | 1 + .../wulkanowy/ui/modules/exam/ExamFragment.kt | 10 +----- .../ui/modules/exam/ExamPresenter.kt | 10 ------ .../wulkanowy/ui/modules/exam/ExamView.kt | 2 -- .../wulkanowy/ui/modules/main/MainActivity.kt | 6 ++-- .../ui/modules/main/MainPresenter.kt | 10 +++--- .../wulkanowy/ui/modules/main/MainView.kt | 36 ++++++++++--------- .../wulkanowy/utils/FragmentExtension.kt | 4 +-- app/src/main/res/values/preferences_keys.xml | 2 +- .../main/res/values/preferences_values.xml | 2 +- 10 files changed, 33 insertions(+), 50 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt index e725c42a..7b3cd67b 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt @@ -30,6 +30,7 @@ class PreferencesRepository @Inject constructor( @ApplicationContext val context: Context, moshi: Moshi ) { + @OptIn(ExperimentalStdlibApi::class) private val dashboardItemsPositionAdapter: JsonAdapter> = moshi.adapter() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt index 0940b0bd..fb7939bc 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt @@ -20,7 +20,7 @@ import javax.inject.Inject @AndroidEntryPoint class ExamFragment : BaseFragment(R.layout.fragment_exam), ExamView, - MainView.MainChildView, MainView.TitledView { + MainView.TitledView { @Inject lateinit var presenter: ExamPresenter @@ -90,14 +90,6 @@ class ExamFragment : BaseFragment(R.layout.fragment_exam), } } - override fun resetView() { - binding.examRecycler.scrollToPosition(0) - } - - override fun onFragmentReselected() { - if (::presenter.isInitialized) presenter.onViewReselected() - } - override fun showEmpty(show: Boolean) { binding.examEmpty.visibility = if (show) VISIBLE else GONE } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt index b70a648f..582641fc 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt @@ -82,16 +82,6 @@ class ExamPresenter @Inject constructor( view?.showExamDialog(exam) } - fun onViewReselected() { - Timber.i("Exam view is reselected") - baseDate.also { - if (currentDate != it) { - reloadView(it) - loadData() - } else if (view?.isViewEmpty == false) view?.resetView() - } - } - private fun setBaseDateOnHolidays() { flow { val student = studentRepository.getCurrentStudent() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt index ac1a87fe..45b9e788 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt @@ -17,8 +17,6 @@ interface ExamView : BaseView { fun showRefresh(show: Boolean) - fun resetView() - fun showEmpty(show: Boolean) fun showErrorView(show: Boolean) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt index b44bb4b2..cf31040a 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt @@ -34,6 +34,7 @@ import io.github.wulkanowy.ui.modules.account.accountquick.AccountQuickDialog import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment import io.github.wulkanowy.ui.modules.conference.ConferenceFragment import io.github.wulkanowy.ui.modules.dashboard.DashboardFragment +import io.github.wulkanowy.ui.modules.exam.ExamFragment import io.github.wulkanowy.ui.modules.grade.GradeFragment import io.github.wulkanowy.ui.modules.homework.HomeworkFragment import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment @@ -107,11 +108,12 @@ class MainActivity : BaseActivity(), MainVie private val moreMenuFragments = mapOf( MainView.Section.MESSAGE.id to MessageFragment.newInstance(), + MainView.Section.EXAM.id to ExamFragment.newInstance(), MainView.Section.HOMEWORK.id to HomeworkFragment.newInstance(), MainView.Section.NOTE.id to NoteFragment.newInstance(), - MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance(), - MainView.Section.SCHOOL_ANNOUNCEMENT.id to SchoolAnnouncementFragment.newInstance(), MainView.Section.CONFERENCE.id to ConferenceFragment.newInstance(), + MainView.Section.SCHOOL_ANNOUNCEMENT.id to SchoolAnnouncementFragment.newInstance(), + MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance(), ) @SuppressLint("NewApi") diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt index c0eb2b11..a2fb07f6 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt @@ -118,11 +118,9 @@ class MainPresenter @Inject constructor( view?.showStudentAvatar(currentStudent) } - private fun getProperViewIndexes(initMenu: MainView.Section?): Pair { - return when (initMenu?.id) { - in 0..3 -> initMenu!!.id to -1 - in 4..10 -> 4 to initMenu!!.id - else -> prefRepository.startMenuIndex to -1 - } + private fun getProperViewIndexes(initMenu: MainView.Section?) = when (initMenu?.id) { + in 0..3 -> initMenu!!.id to -1 + in 4..100 -> 4 to initMenu!!.id + else -> prefRepository.startMenuIndex to -1 } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt index 44f37d50..7402d37e 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt @@ -56,22 +56,24 @@ interface MainView : BaseView { set(_) {} } - enum class Section(val id: Int) { - GRADE(0), - ATTENDANCE(1), - EXAM(2), - TIMETABLE(3), - MORE(4), - MESSAGE(5), - HOMEWORK(6), - NOTE(7), - LUCKY_NUMBER(8), - SETTINGS(9), - ABOUT(10), - SCHOOL(11), - ACCOUNT(12), - STUDENT_INFO(13), - CONFERENCE(14), - SCHOOL_ANNOUNCEMENT(15) + enum class Section { + DASHBOARD, + GRADE, + ATTENDANCE, + TIMETABLE, + MORE, + MESSAGE, + EXAM, + HOMEWORK, + NOTE, + CONFERENCE, + SCHOOL_ANNOUNCEMENT, + SCHOOL, + LUCKY_NUMBER, + ACCOUNT, + STUDENT_INFO, + SETTINGS; + + val id get() = ordinal } } diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt index 4651dffd..210a6209 100644 --- a/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt +++ b/app/src/main/java/io/github/wulkanowy/utils/FragmentExtension.kt @@ -1,11 +1,11 @@ package io.github.wulkanowy.utils import androidx.fragment.app.Fragment -import io.github.wulkanowy.ui.modules.about.AboutFragment import io.github.wulkanowy.ui.modules.account.AccountFragment import io.github.wulkanowy.ui.modules.account.accountdetails.AccountDetailsFragment import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment import io.github.wulkanowy.ui.modules.conference.ConferenceFragment +import io.github.wulkanowy.ui.modules.dashboard.DashboardFragment import io.github.wulkanowy.ui.modules.exam.ExamFragment import io.github.wulkanowy.ui.modules.grade.GradeFragment import io.github.wulkanowy.ui.modules.homework.HomeworkFragment @@ -32,13 +32,13 @@ fun Fragment.toSection(): MainView.Section? { is NoteFragment -> MainView.Section.NOTE is LuckyNumberFragment -> MainView.Section.LUCKY_NUMBER is SettingsFragment -> MainView.Section.SETTINGS - is AboutFragment -> MainView.Section.ABOUT is SchoolAndTeachersFragment -> MainView.Section.SCHOOL is AccountFragment -> MainView.Section.ACCOUNT is AccountDetailsFragment -> MainView.Section.ACCOUNT is StudentInfoFragment -> MainView.Section.STUDENT_INFO is ConferenceFragment -> MainView.Section.CONFERENCE is SchoolAnnouncementFragment -> MainView.Section.SCHOOL_ANNOUNCEMENT + is DashboardFragment -> MainView.Section.DASHBOARD else -> null } } diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml index aa60bb7e..09dac700 100644 --- a/app/src/main/res/values/preferences_keys.xml +++ b/app/src/main/res/values/preferences_keys.xml @@ -1,6 +1,6 @@ - start_menu + default_menu_index attendance_present app_theme dashboard_tiles diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml index f5a2b864..9c1a0421 100644 --- a/app/src/main/res/values/preferences_values.xml +++ b/app/src/main/res/values/preferences_values.xml @@ -1,9 +1,9 @@ + @string/dashboard_title @string/grade_title @string/attendance_title - @string/exam_title @string/timetable_title From 04c727a0c8a5a8a5ed5476a2439eceb0b23d7249 Mon Sep 17 00:00:00 2001 From: Tomasz F Date: Sun, 29 Aug 2021 00:41:58 +0200 Subject: [PATCH 145/154] Exams and homework notification fixes (#1292) --- .../wulkanowy/data/repositories/ExamRepository.kt | 6 ++++-- .../data/repositories/HomeworkRepository.kt | 6 ++++-- .../sync/notifications/NewConferenceNotification.kt | 11 ++++++++--- .../sync/notifications/NewExamNotification.kt | 13 +++++++++---- .../sync/notifications/NewHomeworkNotification.kt | 13 +++++++++---- .../modules/debug/notification/mock/conference.kt | 2 +- app/src/main/res/values/strings.xml | 8 ++++++++ 7 files changed, 43 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt index 9406c77c..93d5a47c 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/ExamRepository.kt @@ -40,8 +40,10 @@ class ExamRepository @Inject constructor( ) = networkBoundResource( mutex = saveFetchResultMutex, shouldFetch = { - it.isEmpty() || forceRefresh - || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) + val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed( + key = getRefreshKey(cacheKey, semester, start, end) + ) + it.isEmpty() || forceRefresh || isShouldBeRefreshed }, query = { examDb.loadAll( diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt index 476a810c..23dd74c2 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/HomeworkRepository.kt @@ -36,8 +36,10 @@ class HomeworkRepository @Inject constructor( ) = networkBoundResource( mutex = saveFetchResultMutex, shouldFetch = { - it.isEmpty() || forceRefresh || - refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, semester, start, end)) + val isShouldBeRefreshed = refreshHelper.isShouldBeRefreshed( + key = getRefreshKey(cacheKey, semester, start, end) + ) + it.isEmpty() || forceRefresh || isShouldBeRefreshed }, query = { homeworkDb.loadAll( diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt index 25648b93..fda2922f 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewConferenceNotification.kt @@ -8,6 +8,8 @@ import io.github.wulkanowy.data.db.entities.Conference import io.github.wulkanowy.data.db.entities.Student import io.github.wulkanowy.data.pojos.MultipleNotifications import io.github.wulkanowy.ui.modules.main.MainView +import io.github.wulkanowy.utils.toFormattedString +import java.time.LocalDateTime import javax.inject.Inject class NewConferenceNotification @Inject constructor( @@ -16,6 +18,11 @@ class NewConferenceNotification @Inject constructor( ) : BaseNotification(context, notificationManager) { fun notify(items: List, student: Student) { + val today = LocalDateTime.now() + val lines = items.filter { !it.date.isBefore(today) }.map { + "${it.date.toFormattedString("dd.MM")} - ${it.title}: ${it.subject}" + }.ifEmpty { return } + val notification = MultipleNotifications( type = NotificationType.NEW_CONFERENCE, icon = R.drawable.ic_more_conferences, @@ -23,9 +30,7 @@ class NewConferenceNotification @Inject constructor( contentStringRes = R.plurals.conference_notify_new_items, summaryStringRes = R.plurals.conference_number_item, startMenu = MainView.Section.CONFERENCE, - lines = items.map { - "${it.title}: ${it.subject}" - } + lines = lines ) sendNotification(notification, student) diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt index a41c44e5..d493c4d2 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewExamNotification.kt @@ -8,6 +8,8 @@ import io.github.wulkanowy.data.db.entities.Exam import io.github.wulkanowy.data.db.entities.Student import io.github.wulkanowy.data.pojos.MultipleNotifications import io.github.wulkanowy.ui.modules.main.MainView +import io.github.wulkanowy.utils.toFormattedString +import java.time.LocalDate import javax.inject.Inject class NewExamNotification @Inject constructor( @@ -16,16 +18,19 @@ class NewExamNotification @Inject constructor( ) : BaseNotification(context, notificationManager) { fun notify(items: List, student: Student) { + val today = LocalDate.now() + val lines = items.filter { !it.date.isBefore(today) }.map { + "${it.date.toFormattedString("dd.MM")} - ${it.subject}: ${it.description}" + }.ifEmpty { return } + val notification = MultipleNotifications( type = NotificationType.NEW_EXAM, icon = R.drawable.ic_main_exam, titleStringRes = R.plurals.exam_notify_new_item_title, - contentStringRes = R.plurals.exam_notify_new_item_title, // TODO add missing string + contentStringRes = R.plurals.exam_notify_new_item_content, summaryStringRes = R.plurals.exam_number_item, startMenu = MainView.Section.EXAM, - lines = items.map { - "${it.subject}: ${it.description}" - } + lines = lines ) sendNotification(notification, student) diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt index 844aed97..fe973cad 100644 --- a/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt +++ b/app/src/main/java/io/github/wulkanowy/services/sync/notifications/NewHomeworkNotification.kt @@ -8,6 +8,8 @@ import io.github.wulkanowy.data.db.entities.Homework import io.github.wulkanowy.data.db.entities.Student import io.github.wulkanowy.data.pojos.MultipleNotifications import io.github.wulkanowy.ui.modules.main.MainView +import io.github.wulkanowy.utils.toFormattedString +import java.time.LocalDate import javax.inject.Inject class NewHomeworkNotification @Inject constructor( @@ -16,16 +18,19 @@ class NewHomeworkNotification @Inject constructor( ) : BaseNotification(context, notificationManager) { fun notify(items: List, student: Student) { + val today = LocalDate.now() + val lines = items.filter { !it.date.isBefore(today) }.map { + "${it.date.toFormattedString("dd.MM")} - ${it.subject}: ${it.content}" + }.ifEmpty { return } + val notification = MultipleNotifications( type = NotificationType.NEW_HOMEWORK, icon = R.drawable.ic_more_homework, titleStringRes = R.plurals.homework_notify_new_item_title, - contentStringRes = R.plurals.homework_notify_new_item_title, // todo: you received %d new homework + contentStringRes = R.plurals.homework_notify_new_item_content, summaryStringRes = R.plurals.homework_number_item, startMenu = MainView.Section.HOMEWORK, - lines = items.map { - "${it.subject}: ${it.content}" - } + lines = lines ) sendNotification(notification, student) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt index 969b1cf2..40af6bfb 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/conference.kt @@ -53,6 +53,6 @@ private fun generateConference(title: String, subject: String) = Conference( diaryId = 0, agenda = "", conferenceId = 0, - date = LocalDateTime.now(), + date = LocalDateTime.now().plusMinutes(10), presentOnConference = "", ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 39478a2e..ea1187c8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -206,6 +206,10 @@ New exam New exams + + You received %d new exam + You received %d new exams + %d exam %d exams @@ -312,6 +316,10 @@ New homework New homework + + You received %d new homework + You received %d new homework + %d homework %d homework From 765f8a2d1f0a18fb2cc2d48f9da7d3fb5d7602b6 Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Sun, 29 Aug 2021 00:43:58 +0200 Subject: [PATCH 146/154] Add in app review (#1435) --- app/build.gradle | 1 + .../wulkanowy/utils/InAppReviewHelper.kt | 17 +++++++++++ .../wulkanowy/utils/InAppReviewHelper.kt | 17 +++++++++++ .../repositories/PreferencesRepository.kt | 21 ++++++++++++++ .../wulkanowy/ui/modules/main/MainActivity.kt | 8 ++++++ .../ui/modules/main/MainPresenter.kt | 17 +++++++++++ .../wulkanowy/ui/modules/main/MainView.kt | 2 ++ .../wulkanowy/utils/InAppReviewHelper.kt | 28 +++++++++++++++++++ 8 files changed, 111 insertions(+) create mode 100644 app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt create mode 100644 app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt create mode 100644 app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt diff --git a/app/build.gradle b/app/build.gradle index d5fccac6..c05aa034 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -215,6 +215,7 @@ dependencies { playImplementation 'com.google.firebase:firebase-analytics-ktx' playImplementation 'com.google.firebase:firebase-messaging:' playImplementation 'com.google.firebase:firebase-crashlytics:' + playImplementation 'com.google.android.play:core:1.10.0' playImplementation 'com.google.android.play:core-ktx:1.8.1' hmsImplementation 'com.huawei.hms:hianalytics:6.1.1.300' diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt new file mode 100644 index 00000000..d052b54b --- /dev/null +++ b/app/src/fdroid/java/io/github/wulkanowy/utils/InAppReviewHelper.kt @@ -0,0 +1,17 @@ +package io.github.wulkanowy.utils + +import android.content.Context +import dagger.hilt.android.qualifiers.ApplicationContext +import io.github.wulkanowy.ui.modules.main.MainActivity +import javax.inject.Singleton +import javax.inject.Inject + +@Singleton +class InAppReviewHelper @Inject constructor( + @ApplicationContext private val context: Context +) { + + fun showInAppReview(activity: MainActivity) { + // do nothing + } +} \ No newline at end of file diff --git a/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt new file mode 100644 index 00000000..fb9bcae6 --- /dev/null +++ b/app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt @@ -0,0 +1,17 @@ +package io.github.wulkanowy.utils + +import android.content.Context +import dagger.hilt.android.qualifiers.ApplicationContext +import io.github.wulkanowy.ui.modules.main.MainActivity +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class InAppReviewHelper @Inject constructor( + @ApplicationContext private val context: Context +) { + + fun showInAppReview(activity: MainActivity) { + // do nothing + } +} \ No newline at end of file diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt index 7b3cd67b..bc8100f2 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/PreferencesRepository.kt @@ -10,14 +10,17 @@ import com.squareup.moshi.Moshi import com.squareup.moshi.adapter import dagger.hilt.android.qualifiers.ApplicationContext import io.github.wulkanowy.R +import io.github.wulkanowy.sdk.toLocalDate import io.github.wulkanowy.ui.modules.dashboard.DashboardItem import io.github.wulkanowy.ui.modules.grade.GradeAverageMode import io.github.wulkanowy.ui.modules.grade.GradeSortingMode +import io.github.wulkanowy.utils.toTimestamp import io.github.wulkanowy.utils.toLocalDateTime import io.github.wulkanowy.utils.toTimestamp import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map +import java.time.LocalDate import java.time.LocalDateTime import javax.inject.Inject import javax.inject.Singleton @@ -222,6 +225,18 @@ class PreferencesRepository @Inject constructor( return flowSharedPref.getStringSet(prefKey, defaultSet) } + var inAppReviewCount: Int + get() = sharedPref.getInt(PREF_KEY_IN_APP_REVIEW_COUNT, 0) + set(value) = sharedPref.edit().putInt(PREF_KEY_IN_APP_REVIEW_COUNT, value).apply() + + var inAppReviewDate: LocalDate? + get() = sharedPref.getLong(PREF_KEY_IN_APP_REVIEW_DATE, 0).takeIf { it != 0L }?.toLocalDate() + set(value) = sharedPref.edit().putLong(PREF_KEY_IN_APP_REVIEW_DATE, value!!.toTimestamp()).apply() + + var isAppReviewDone: Boolean + get() = sharedPref.getBoolean(PREF_KEY_IN_APP_REVIEW_DONE, false) + set(value) = sharedPref.edit().putBoolean(PREF_KEY_IN_APP_REVIEW_DONE, value).apply() + private fun getLong(id: Int, default: Int) = getLong(context.getString(id), default) private fun getLong(id: String, default: Int) = @@ -240,5 +255,11 @@ class PreferencesRepository @Inject constructor( private companion object { private const val PREF_KEY_DASHBOARD_ITEMS_POSITION = "dashboard_items_position" + + private const val PREF_KEY_IN_APP_REVIEW_COUNT = "in_app_review_count" + + private const val PREF_KEY_IN_APP_REVIEW_DATE = "in_app_review_date" + + private const val PREF_KEY_IN_APP_REVIEW_DONE = "in_app_review_done" } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt index cf31040a..d758ac0d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt @@ -45,6 +45,7 @@ import io.github.wulkanowy.ui.modules.schoolannouncement.SchoolAnnouncementFragm import io.github.wulkanowy.ui.modules.timetable.TimetableFragment import io.github.wulkanowy.utils.AnalyticsHelper import io.github.wulkanowy.utils.AppInfo +import io.github.wulkanowy.utils.InAppReviewHelper import io.github.wulkanowy.utils.UpdateHelper import io.github.wulkanowy.utils.createNameInitialsDrawable import io.github.wulkanowy.utils.dpToPx @@ -68,6 +69,9 @@ class MainActivity : BaseActivity(), MainVie @Inject lateinit var updateHelper: UpdateHelper + @Inject + lateinit var inAppReviewHelper: InAppReviewHelper + @Inject lateinit var appInfo: AppInfo @@ -362,6 +366,10 @@ class MainActivity : BaseActivity(), MainVie } } + override fun showInAppReview() { + inAppReviewHelper.showInAppReview(this) + } + override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) navController.onSaveInstanceState(outState) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt index a2fb07f6..4805b5a1 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt @@ -14,6 +14,7 @@ import io.github.wulkanowy.utils.AnalyticsHelper import io.github.wulkanowy.utils.flowWithResource import kotlinx.coroutines.flow.onEach import timber.log.Timber +import java.time.LocalDate import javax.inject.Inject class MainPresenter @Inject constructor( @@ -106,11 +107,27 @@ class MainPresenter @Inject constructor( } else { notifyMenuViewChanged() switchMenuView(index) + checkInAppReview() true } } == true } + private fun checkInAppReview() { + prefRepository.inAppReviewCount++ + + if (prefRepository.inAppReviewDate == null) { + prefRepository.inAppReviewDate = LocalDate.now() + } + + if (!prefRepository.isAppReviewDone && prefRepository.inAppReviewCount >= 50 && + LocalDate.now().minusDays(14).isAfter(prefRepository.inAppReviewDate) + ) { + view?.showInAppReview() + prefRepository.isAppReviewDone = true + } + } + private fun showCurrentStudentAvatar() { val currentStudent = studentsWitSemesters?.singleOrNull { it.student.isCurrent }?.student ?: return diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt index 7402d37e..8851f587 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt @@ -40,6 +40,8 @@ interface MainView : BaseView { fun showStudentAvatar(student: Student) + fun showInAppReview() + interface MainChildView { fun onFragmentReselected() diff --git a/app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt new file mode 100644 index 00000000..1dcece99 --- /dev/null +++ b/app/src/play/java/io/github/wulkanowy/utils/InAppReviewHelper.kt @@ -0,0 +1,28 @@ +package io.github.wulkanowy.utils + +import android.content.Context +import com.google.android.play.core.review.ReviewManagerFactory +import dagger.hilt.android.qualifiers.ApplicationContext +import io.github.wulkanowy.ui.modules.main.MainActivity +import timber.log.Timber +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class InAppReviewHelper @Inject constructor( + @ApplicationContext private val context: Context +) { + + fun showInAppReview(activity: MainActivity) { + val manager = ReviewManagerFactory.create(context) + val request = manager.requestReviewFlow() + request.addOnCompleteListener { task -> + if (task.isSuccessful) { + val reviewInfo = task.result + manager.launchReviewFlow(activity, reviewInfo) + } else { + Timber.e(task.exception) + } + } + } +} \ No newline at end of file From 2f43b6e55247167852e1f8f4c4396f63c4edec6d Mon Sep 17 00:00:00 2001 From: Daniel Olczyk <44818681+MRmlik12@users.noreply.github.com> Date: Sun, 29 Aug 2021 14:08:48 +0200 Subject: [PATCH 147/154] Change display name for MRmlik12 (#1451) --- app/src/main/assets/contributors.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json index c1e7e209..b2849931 100644 --- a/app/src/main/assets/contributors.json +++ b/app/src/main/assets/contributors.json @@ -36,7 +36,7 @@ "githubUsername": "Luncenok" }, { - "displayName": "MRmlik12", + "displayName": "Daniel Olczyk", "githubUsername": "MRmlik12" }, { From 57d11e825be154c8d40046add5d133e422f12c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 29 Aug 2021 15:40:28 +0200 Subject: [PATCH 148/154] Update readBy and unreadBy fields during message list fetch (#1452) --- .../data/repositories/MessageRepository.kt | 83 ++++++++-- .../repositories/MessageRepositoryTest.kt | 156 ++++++++++++++++-- 2 files changed, 205 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt index 2d70e26e..9977e1d5 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/MessageRepository.kt @@ -4,10 +4,12 @@ import android.content.Context import com.squareup.moshi.Moshi import dagger.hilt.android.qualifiers.ApplicationContext import io.github.wulkanowy.R +import io.github.wulkanowy.data.Resource import io.github.wulkanowy.data.db.SharedPrefProvider import io.github.wulkanowy.data.db.dao.MessageAttachmentDao import io.github.wulkanowy.data.db.dao.MessagesDao import io.github.wulkanowy.data.db.entities.Message +import io.github.wulkanowy.data.db.entities.MessageWithAttachment import io.github.wulkanowy.data.db.entities.Recipient import io.github.wulkanowy.data.db.entities.Semester import io.github.wulkanowy.data.db.entities.Student @@ -48,22 +50,54 @@ class MessageRepository @Inject constructor( private val cacheKey = "message" @Suppress("UNUSED_PARAMETER") - fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource( + fun getMessages( + student: Student, semester: Semester, + folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false + ): Flow>> = networkBoundResource( mutex = saveFetchResultMutex, - shouldFetch = { it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed(getRefreshKey(cacheKey, student, folder)) }, + shouldFetch = { + it.isEmpty() || forceRefresh || refreshHelper.isShouldBeRefreshed( + getRefreshKey(cacheKey, student, folder) + ) + }, query = { messagesDb.loadAll(student.id.toInt(), folder.id) }, - fetch = { sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).mapToEntities(student) }, + fetch = { + sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()) + .mapToEntities(student) + }, saveFetchResult = { old, new -> messagesDb.deleteAll(old uniqueSubtract new) messagesDb.insertAll((new uniqueSubtract old).onEach { it.isNotified = !notify }) + messagesDb.updateAll(getMessagesWithReadByChange(old, new, !notify)) refreshHelper.updateLastRefreshTimestamp(getRefreshKey(cacheKey, student, folder)) } ) - fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource( + private fun getMessagesWithReadByChange( + old: List, new: List, + setNotified: Boolean + ): List { + val oldMeta = old.map { Triple(it, it.readBy, it.unreadBy) } + val newMeta = new.map { Triple(it, it.readBy, it.unreadBy) } + + val updatedItems = newMeta uniqueSubtract oldMeta + + return updatedItems.map { + val oldItem = old.find { item -> item.messageId == it.first.messageId } + it.first.apply { + id = oldItem?.id ?: 0 + isNotified = oldItem?.isNotified ?: setNotified + content = oldItem?.content.orEmpty() + } + } + } + + fun getMessage( + student: Student, message: Message, markAsRead: Boolean = false + ): Flow> = networkBoundResource( shouldFetch = { checkNotNull(it, { "This message no longer exist!" }) Timber.d("Message content in db empty: ${it.message.content.isEmpty()}") @@ -71,7 +105,12 @@ class MessageRepository @Inject constructor( }, query = { messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId) }, fetch = { - sdk.init(student).getMessageDetails(it!!.message.messageId, message.folderId, markAsRead, message.realId).let { details -> + sdk.init(student).getMessageDetails( + messageId = it!!.message.messageId, + folderId = message.folderId, + read = markAsRead, + id = message.realId + ).let { details -> details.content to details.attachments.mapToEntities() } }, @@ -95,26 +134,34 @@ class MessageRepository @Inject constructor( return messagesDb.updateAll(messages) } - suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List): SentMessage { - return sdk.init(student).sendMessage( - subject = subject, - content = content, - recipients = recipients.mapFromEntities() - ) - } + suspend fun sendMessage( + student: Student, subject: String, content: String, + recipients: List + ): SentMessage = sdk.init(student).sendMessage( + subject = subject, + content = content, + recipients = recipients.mapFromEntities() + ) suspend fun deleteMessage(student: Student, message: Message) { - val isDeleted = sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId) + val isDeleted = sdk.init(student).deleteMessages( + messages = listOf(message.messageId), message.folderId + ) - if (message.folderId != MessageFolder.TRASHED.id) { - if (isDeleted) messagesDb.updateAll(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply { + if (message.folderId != MessageFolder.TRASHED.id && isDeleted) { + val deletedMessage = message.copy(folderId = MessageFolder.TRASHED.id).apply { id = message.id content = message.content - })) + } + messagesDb.updateAll(listOf(deletedMessage)) } else messagesDb.deleteAll(listOf(message)) } var draftMessage: MessageDraft? - get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft))?.let { MessageDraftJsonAdapter(moshi).fromJson(it) } - set(value) = sharedPrefProvider.putString(context.getString(R.string.pref_key_message_send_draft), value?.let { MessageDraftJsonAdapter(moshi).toJson(it) }) + get() = sharedPrefProvider.getString(context.getString(R.string.pref_key_message_send_draft)) + ?.let { MessageDraftJsonAdapter(moshi).fromJson(it) } + set(value) = sharedPrefProvider.putString( + context.getString(R.string.pref_key_message_send_draft), + value?.let { MessageDraftJsonAdapter(moshi).toJson(it) } + ) } diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt index 8b72479f..cadc4225 100644 --- a/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt +++ b/app/src/test/java/io/github/wulkanowy/data/repositories/MessageRepositoryTest.kt @@ -8,19 +8,25 @@ import io.github.wulkanowy.data.db.dao.MessageAttachmentDao import io.github.wulkanowy.data.db.dao.MessagesDao import io.github.wulkanowy.data.db.entities.Message import io.github.wulkanowy.data.db.entities.MessageWithAttachment +import io.github.wulkanowy.data.enums.MessageFolder +import io.github.wulkanowy.getSemesterEntity import io.github.wulkanowy.getStudentEntity import io.github.wulkanowy.sdk.Sdk +import io.github.wulkanowy.sdk.pojo.Folder import io.github.wulkanowy.sdk.pojo.MessageDetails +import io.github.wulkanowy.sdk.pojo.Sender import io.github.wulkanowy.utils.AutoRefreshHelper import io.github.wulkanowy.utils.toFirstResult import io.mockk.MockKAnnotations import io.mockk.Runs +import io.mockk.checkEquals import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every import io.mockk.impl.annotations.MockK import io.mockk.impl.annotations.SpyK import io.mockk.just +import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.toList import kotlinx.coroutines.runBlocking @@ -29,6 +35,7 @@ import org.junit.Before import org.junit.Test import java.net.UnknownHostException import java.time.LocalDateTime +import kotlin.test.assertTrue class MessageRepositoryTest { @@ -52,7 +59,9 @@ class MessageRepositoryTest { private val student = getStudentEntity() - private lateinit var messageRepository: MessageRepository + private val semester = getSemesterEntity() + + private lateinit var repository: MessageRepository @MockK private lateinit var moshi: Moshi @@ -62,15 +71,92 @@ class MessageRepositoryTest { MockKAnnotations.init(this) every { refreshHelper.isShouldBeRefreshed(any()) } returns false - messageRepository = MessageRepository(messageDb, messageAttachmentDao, sdk, context, refreshHelper, sharedPrefProvider, moshi) + repository = MessageRepository( + messagesDb = messageDb, + messageAttachmentDao = messageAttachmentDao, + sdk = sdk, + context = context, + refreshHelper = refreshHelper, + sharedPrefProvider = sharedPrefProvider, + moshi = moshi, + ) + } + + @Test + fun `get messages when read by values was changed on already read message`() = runBlocking { + every { messageDb.loadAll(any(), any()) } returns flow { + val dbMessage = getMessageEntity(3, "", false).apply { + unreadBy = 10 + readBy = 5 + isNotified = true + } + emit(listOf(dbMessage)) + } + coEvery { sdk.getMessages(Folder.RECEIVED, any(), any()) } returns listOf( + getMessageDto(messageId = 3, content = "", unread = false).copy( + unreadBy = 5, + readBy = 10, + ) + ) + coEvery { messageDb.deleteAll(any()) } just Runs + coEvery { messageDb.insertAll(any()) } returns listOf() + + repository.getMessages( + student = student, + semester = semester, + folder = MessageFolder.RECEIVED, + forceRefresh = true, + notify = true, // all new messages will be marked as not notified + ).toFirstResult().data.orEmpty() + + coVerify(exactly = 1) { messageDb.deleteAll(emptyList()) } + coVerify(exactly = 1) { messageDb.insertAll(emptyList()) } + coVerify(exactly = 1) { + messageDb.updateAll(withArg { + assertEquals(1, it.size) + assertEquals(5, it.single().unreadBy) + assertEquals(10, it.single().readBy) + }) + } + } + + @Test + fun `get messages when fetched completely new message without notify`() = runBlocking { + every { messageDb.loadAll(any(), any()) } returns flowOf(emptyList()) + coEvery { sdk.getMessages(Folder.RECEIVED, any(), any()) } returns listOf( + getMessageDto(messageId = 4, content = "Test", unread = true).copy( + unreadBy = 5, + readBy = 10, + ) + ) + coEvery { messageDb.deleteAll(any()) } just Runs + coEvery { messageDb.insertAll(any()) } returns listOf() + + repository.getMessages( + student = student, + semester = semester, + folder = MessageFolder.RECEIVED, + forceRefresh = true, + notify = false, + ).toFirstResult().data.orEmpty() + + coVerify(exactly = 1) { messageDb.deleteAll(withArg { checkEquals(emptyList()) }) } + coVerify { + messageDb.insertAll(withArg { + assertEquals(4, it.single().messageId) + assertTrue(it.single().isNotified) + }) + } } @Test(expected = NoSuchElementException::class) fun `throw error when message is not in the db`() { val testMessage = getMessageEntity(1, "", false) - coEvery { messageDb.loadMessageWithAttachment(1, 1) } throws NoSuchElementException("No message in database") + coEvery { + messageDb.loadMessageWithAttachment(1, 1) + } throws NoSuchElementException("No message in database") - runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() } + runBlocking { repository.getMessage(student, testMessage).toFirstResult() } } @Test @@ -78,9 +164,11 @@ class MessageRepositoryTest { val testMessage = getMessageEntity(123, "Test", false) val messageWithAttachment = MessageWithAttachment(testMessage, emptyList()) - coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returns flowOf(messageWithAttachment) + coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returns flowOf( + messageWithAttachment + ) - val res = runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() } + val res = runBlocking { repository.getMessage(student, testMessage).toFirstResult() } assertEquals(null, res.error) assertEquals(Status.SUCCESS, res.status) @@ -95,12 +183,24 @@ class MessageRepositoryTest { val mWa = MessageWithAttachment(testMessage, emptyList()) val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList()) - coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent)) - coEvery { sdk.getMessageDetails(testMessage.messageId, 1, false, testMessage.realId) } returns MessageDetails("Test", emptyList()) + coEvery { + messageDb.loadMessageWithAttachment( + 1, + testMessage.messageId + ) + } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent)) + coEvery { + sdk.getMessageDetails( + messageId = testMessage.messageId, + folderId = 1, + read = false, + id = testMessage.realId + ) + } returns MessageDetails("Test", emptyList()) coEvery { messageDb.updateAll(any()) } just Runs coEvery { messageAttachmentDao.insertAttachments(any()) } returns listOf(1) - val res = runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() } + val res = runBlocking { repository.getMessage(student, testMessage).toFirstResult() } assertEquals(null, res.error) assertEquals(Status.SUCCESS, res.status) @@ -112,18 +212,22 @@ class MessageRepositoryTest { fun `get message when content in db is empty and there is no internet connection`() { val testMessage = getMessageEntity(123, "", false) - coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } throws UnknownHostException() + coEvery { + messageDb.loadMessageWithAttachment(1, testMessage.messageId) + } throws UnknownHostException() - runBlocking { messageRepository.getMessage(student, testMessage).toFirstResult() } + runBlocking { repository.getMessage(student, testMessage).toFirstResult() } } @Test(expected = UnknownHostException::class) fun `get message when content in db is empty, unread and there is no internet connection`() { val testMessage = getMessageEntity(123, "", true) - coEvery { messageDb.loadMessageWithAttachment(1, testMessage.messageId) } throws UnknownHostException() + coEvery { + messageDb.loadMessageWithAttachment(1, testMessage.messageId) + } throws UnknownHostException() - runBlocking { messageRepository.getMessage(student, testMessage).toList()[1] } + runBlocking { repository.getMessage(student, testMessage).toList()[1] } } private fun getMessageEntity( @@ -135,10 +239,10 @@ class MessageRepositoryTest { realId = 1, messageId = messageId, sender = "", - senderId = 1, - recipient = "", + senderId = 0, + recipient = "Wielu adresatów", subject = "", - date = LocalDateTime.now(), + date = LocalDateTime.MAX, folderId = 1, unread = unread, removed = false, @@ -148,4 +252,24 @@ class MessageRepositoryTest { unreadBy = 1 readBy = 1 } + + private fun getMessageDto( + messageId: Int, + content: String, + unread: Boolean, + ) = io.github.wulkanowy.sdk.pojo.Message( + id = 1, + messageId = messageId, + sender = Sender("", "", 0, 0, 0, ""), + recipients = listOf(), + subject = "", + content = content, + date = LocalDateTime.MAX, + folderId = 1, + unread = unread, + unreadBy = 0, + readBy = 0, + removed = false, + hasAttachments = false, + ) } From 4aa6b0b99519db7e16dfec03cd72a14b6776b475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 29 Aug 2021 19:00:30 +0200 Subject: [PATCH 149/154] Hide keyboard on opening login host dropdown (#1455) --- .../wulkanowy/ui/modules/login/form/LoginFormFragment.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt index 5250ceb6..e383072e 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt @@ -81,6 +81,9 @@ class LoginFormFragment : BaseFragment(R.layout.fragme loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() } loginFormRecoverLinkSecond.setOnClickListener { presenter.onRecoverClick() } loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() } + loginFormHost.setOnFocusChangeListener { _, hasFocus -> + if (hasFocus) requireActivity().hideSoftInput() + } } with(binding.loginFormHost) { From ea0fb00bdebaa48e9c7ac6dfa01ee39bc67e6bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 29 Aug 2021 19:31:28 +0200 Subject: [PATCH 150/154] Fix crash on opening date pickers during holidays (#1456) --- .../modules/attendance/AttendanceFragment.kt | 30 ++++++++++--------- .../history/LuckyNumberHistoryFragment.kt | 20 ++++++------- .../history/LuckyNumberHistoryPresenter.kt | 18 +++++++++++ .../ui/modules/timetable/TimetableFragment.kt | 21 +++++++------ 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt index 10cab3df..7ae1e058 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt @@ -35,7 +35,8 @@ import java.time.LocalDate import javax.inject.Inject @AndroidEntryPoint -class AttendanceFragment : BaseFragment(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView, +class AttendanceFragment : BaseFragment(R.layout.fragment_attendance), + AttendanceView, MainView.MainChildView, MainView.TitledView { @Inject @@ -118,7 +119,9 @@ class AttendanceFragment : BaseFragment(R.layout.frag with(binding) { attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh) attendanceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary)) - attendanceSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)) + attendanceSwipe.setProgressBackgroundColorSchemeColor( + requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh) + ) attendanceErrorRetry.setOnClickListener { presenter.onRetry() } attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() } @@ -208,7 +211,7 @@ class AttendanceFragment : BaseFragment(R.layout.frag } override fun showNextButton(show: Boolean) { - binding. attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE + binding.attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE } override fun showExcuseButton(show: Boolean) { @@ -220,20 +223,19 @@ class AttendanceFragment : BaseFragment(R.layout.frag } override fun showDatePickerDialog(currentDate: LocalDate) { - val now = LocalDate.now() - val startOfSchoolYear = now.schoolYearStart.toTimestamp() - val endWeek = now.plusWeeks(1).toTimestamp() + val baseDate = currentDate.schoolYearStart + val rangeStart = baseDate.toTimestamp() + val rangeEnd = LocalDate.now().plusWeeks(1).toTimestamp() val constraintsBuilder = CalendarConstraints.Builder().apply { - setValidator(SchoolDaysValidator(startOfSchoolYear, endWeek)) - setStart(startOfSchoolYear) - setEnd(endWeek) + setValidator(SchoolDaysValidator(rangeStart, rangeEnd)) + setStart(rangeStart) + setEnd(rangeEnd) } - val datePicker = - MaterialDatePicker.Builder.datePicker() - .setCalendarConstraints(constraintsBuilder.build()) - .setSelection(currentDate.toTimestamp()) - .build() + val datePicker = MaterialDatePicker.Builder.datePicker() + .setCalendarConstraints(constraintsBuilder.build()) + .setSelection(currentDate.toTimestamp()) + .build() datePicker.addOnPositiveButtonClickListener { val date = it.toLocalDateTime() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt index 4981aad2..dc141f8d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryFragment.kt @@ -112,19 +112,19 @@ class LuckyNumberHistoryFragment : } override fun showDatePickerDialog(currentDate: LocalDate) { - val now = LocalDate.now() - val startOfSchoolYear = now.schoolYearStart.toTimestamp() + val baseDate = currentDate.schoolYearStart + val rangeStart = baseDate.toTimestamp() + val rangeEnd = LocalDate.now().plusWeeks(1).toTimestamp() val constraintsBuilder = CalendarConstraints.Builder().apply { - setValidator(SchoolDaysValidator(startOfSchoolYear, now.toTimestamp())) - setStart(startOfSchoolYear) - setEnd(now.toTimestamp()) + setValidator(SchoolDaysValidator(rangeStart, rangeEnd)) + setStart(rangeStart) + setEnd(rangeEnd) } - val datePicker = - MaterialDatePicker.Builder.datePicker() - .setCalendarConstraints(constraintsBuilder.build()) - .setSelection(currentDate.toTimestamp()) - .build() + val datePicker = MaterialDatePicker.Builder.datePicker() + .setCalendarConstraints(constraintsBuilder.build()) + .setSelection(currentDate.toTimestamp()) + .build() datePicker.addOnPositiveButtonClickListener { val date = it.toLocalDateTime() diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt index 556dda75..c45cb69a 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/history/LuckyNumberHistoryPresenter.kt @@ -2,18 +2,22 @@ package io.github.wulkanowy.ui.modules.luckynumber.history import io.github.wulkanowy.data.Status import io.github.wulkanowy.data.repositories.LuckyNumberRepository +import io.github.wulkanowy.data.repositories.SemesterRepository import io.github.wulkanowy.data.repositories.StudentRepository import io.github.wulkanowy.ui.base.BasePresenter import io.github.wulkanowy.ui.base.ErrorHandler import io.github.wulkanowy.utils.AnalyticsHelper import io.github.wulkanowy.utils.afterLoading import io.github.wulkanowy.utils.flowWithResource +import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday import io.github.wulkanowy.utils.isHolidays import io.github.wulkanowy.utils.monday import io.github.wulkanowy.utils.previousOrSameSchoolDay import io.github.wulkanowy.utils.sunday import io.github.wulkanowy.utils.toFormattedString +import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.onEach import timber.log.Timber import java.time.LocalDate @@ -22,6 +26,7 @@ import javax.inject.Inject class LuckyNumberHistoryPresenter @Inject constructor( errorHandler: ErrorHandler, studentRepository: StudentRepository, + private val semesterRepository: SemesterRepository, private val luckyNumberRepository: LuckyNumberRepository, private val analytics: AnalyticsHelper ) : BasePresenter(errorHandler, studentRepository) { @@ -40,6 +45,19 @@ class LuckyNumberHistoryPresenter @Inject constructor( Timber.i("Lucky number history view was initialized") errorHandler.showErrorMessage = ::showErrorViewOnError loadData() + if (currentDate.isHolidays) setBaseDateOnHolidays() + } + + private fun setBaseDateOnHolidays() { + flow { + val student = studentRepository.getCurrentStudent() + emit(semesterRepository.getCurrentSemester(student)) + }.catch { + Timber.i("Loading semester result: An exception occurred") + }.onEach { + currentDate = currentDate.getLastSchoolDayIfHoliday(it.schoolYear) + reloadNavigation() + }.launch("holidays") } private fun loadData() { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt index a374e166..a65d6921 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt @@ -185,20 +185,19 @@ class TimetableFragment : BaseFragment(R.layout.fragme } override fun showDatePickerDialog(currentDate: LocalDate) { - val now = LocalDate.now() - val startOfSchoolYear = now.schoolYearStart.toTimestamp() - val endOfSchoolYear = now.schoolYearEnd.toTimestamp() + val baseDate = currentDate.schoolYearStart + val rangeStart = baseDate.toTimestamp() + val rangeEnd = LocalDate.now().schoolYearEnd.toTimestamp() val constraintsBuilder = CalendarConstraints.Builder().apply { - setValidator(SchoolDaysValidator(startOfSchoolYear, endOfSchoolYear)) - setStart(startOfSchoolYear) - setEnd(endOfSchoolYear) + setValidator(SchoolDaysValidator(rangeStart, rangeEnd)) + setStart(rangeStart) + setEnd(rangeEnd) } - val datePicker = - MaterialDatePicker.Builder.datePicker() - .setCalendarConstraints(constraintsBuilder.build()) - .setSelection(currentDate.toTimestamp()) - .build() + val datePicker = MaterialDatePicker.Builder.datePicker() + .setCalendarConstraints(constraintsBuilder.build()) + .setSelection(currentDate.toTimestamp()) + .build() datePicker.addOnPositiveButtonClickListener { val date = it.toLocalDateTime() From 98dcc62bb73de7b5eaef04dfe6ff1437eeb8fd2c Mon Sep 17 00:00:00 2001 From: Mateusz Idziejczak Date: Sun, 29 Aug 2021 19:47:14 +0200 Subject: [PATCH 151/154] Add excuse function to "not excusable" account (#1429) --- .../modules/attendance/AttendanceAdapter.kt | 3 +- .../modules/attendance/AttendanceFragment.kt | 25 ++++++++++++++-- .../modules/attendance/AttendancePresenter.kt | 30 +++++++++++++++++-- .../ui/modules/attendance/AttendanceView.kt | 2 ++ .../message/send/SendMessageActivity.kt | 8 +++++ .../message/send/SendMessagePresenter.kt | 6 +++- .../wulkanowy/utils/AttendanceExtension.kt | 3 ++ app/src/main/res/values/strings.xml | 2 ++ 8 files changed, 72 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt index 03ec1c84..6cee2396 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt @@ -10,6 +10,7 @@ import io.github.wulkanowy.data.db.entities.Attendance import io.github.wulkanowy.data.enums.SentExcuseStatus import io.github.wulkanowy.databinding.ItemAttendanceBinding import io.github.wulkanowy.utils.description +import io.github.wulkanowy.utils.isExcusableOrNotExcused import javax.inject.Inject class AttendanceAdapter @Inject constructor() : @@ -56,7 +57,7 @@ class AttendanceAdapter @Inject constructor() : attendanceItemExcuseInfo.visibility = View.VISIBLE } else -> { - if (item.excusable && excuseActionMode) { + if (item.isExcusableOrNotExcused && excuseActionMode) { attendanceItemNumber.visibility = View.GONE attendanceItemExcuseCheckbox.visibility = View.VISIBLE } else { diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt index 7ae1e058..05894679 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt @@ -24,6 +24,7 @@ import io.github.wulkanowy.ui.base.BaseFragment import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment import io.github.wulkanowy.ui.modules.main.MainActivity import io.github.wulkanowy.ui.modules.main.MainView +import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity import io.github.wulkanowy.ui.widgets.DividerItemDecoration import io.github.wulkanowy.utils.SchoolDaysValidator import io.github.wulkanowy.utils.dpToPx @@ -120,7 +121,9 @@ class AttendanceFragment : BaseFragment(R.layout.frag attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh) attendanceSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary)) attendanceSwipe.setProgressBackgroundColorSchemeColor( - requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh) + requireContext().getThemeAttrColor( + R.attr.colorSwipeRefresh + ) ) attendanceErrorRetry.setOnClickListener { presenter.onRetry() } attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() } @@ -253,8 +256,13 @@ class AttendanceFragment : BaseFragment(R.layout.frag .setNegativeButton(android.R.string.cancel) { _, _ -> } .create() .apply { - setButton(BUTTON_POSITIVE, getString(R.string.attendance_excuse_dialog_submit)) { _, _ -> - presenter.onExcuseDialogSubmit(dialogBinding.excuseReason.text?.toString().orEmpty()) + setButton( + BUTTON_POSITIVE, + getString(R.string.attendance_excuse_dialog_submit) + ) { _, _ -> + presenter.onExcuseDialogSubmit( + dialogBinding.excuseReason.text?.toString().orEmpty() + ) } }.show() } @@ -267,6 +275,17 @@ class AttendanceFragment : BaseFragment(R.layout.frag actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback) } + override fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String) { + val reasonFullText = getString( + R.string.attendance_excuse_formula, + date, + numbers, + if (reason.isNotBlank()) " ${getString(R.string.attendance_excuse_reason)} " else "", + reason.ifBlank { "" } + ) + startActivity(SendMessageActivity.getStartIntent(requireContext(), reasonFullText)) + } + override fun showExcuseCheckboxes(show: Boolean) { attendanceAdapter.apply { excuseActionMode = show diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt index 333e7103..9a159812 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt @@ -15,6 +15,7 @@ import io.github.wulkanowy.utils.capitalise import io.github.wulkanowy.utils.flowWithResource import io.github.wulkanowy.utils.flowWithResourceIn import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday +import io.github.wulkanowy.utils.isExcusableOrNotExcused import io.github.wulkanowy.utils.isHolidays import io.github.wulkanowy.utils.nextSchoolDay import io.github.wulkanowy.utils.previousOrSameSchoolDay @@ -47,6 +48,8 @@ class AttendancePresenter @Inject constructor( private val attendanceToExcuseList = mutableListOf() + private var isVulcanExcusedFunctionEnabled = false + fun onAttachView(view: AttendanceView, date: Long?) { super.onAttachView(view) view.initView() @@ -148,7 +151,21 @@ class AttendancePresenter @Inject constructor( fun onExcuseDialogSubmit(reason: String) { view?.finishActionMode() - excuseAbsence(if (reason != "") reason else null, attendanceToExcuseList.toList()) + + if (isVulcanExcusedFunctionEnabled) { + excuseAbsence( + reason = reason.takeIf { it.isNotBlank() }, + toExcuseList = attendanceToExcuseList.toList() + ) + } else { + val attendanceToExcuseNumbers = attendanceToExcuseList.map { it.number } + + view?.startSendMessageIntent( + date = attendanceToExcuseList[0].date, + numbers = attendanceToExcuseNumbers.joinToString(", "), + reason = reason + ) + } } fun onPrepareActionMode(): Boolean { @@ -188,8 +205,12 @@ class AttendancePresenter @Inject constructor( private fun loadData(forceRefresh: Boolean = false) { Timber.i("Loading attendance data started") + var isParent = false + flowWithResourceIn { val student = studentRepository.getCurrentStudent() + isParent = student.isParent + val semester = semesterRepository.getCurrentSemester(student) attendanceRepository.getAttendance( student, @@ -227,12 +248,17 @@ class AttendancePresenter @Inject constructor( it.data?.filter { item -> !item.presence }.orEmpty() } + isVulcanExcusedFunctionEnabled = + filteredAttendance.any { item -> item.excusable } + view?.apply { updateData(filteredAttendance.sortedBy { item -> item.number }) showEmpty(filteredAttendance.isEmpty()) showErrorView(false) showContent(filteredAttendance.isNotEmpty()) - showExcuseButton(filteredAttendance.any { item -> item.excusable }) + showExcuseButton(filteredAttendance.any { item -> + (!isParent && isVulcanExcusedFunctionEnabled) || (isParent && item.isExcusableOrNotExcused) + }) } analytics.logEvent( "load_data", diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt index 0459dfcf..738f2ff8 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt @@ -54,6 +54,8 @@ interface AttendanceView : BaseView { fun openSummaryView() + fun startSendMessageIntent(date: LocalDate, numbers: String, reason: String) + fun startActionMode() fun showExcuseCheckboxes(show: Boolean) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt index d49c9b83..1432a994 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt @@ -35,6 +35,8 @@ class SendMessageActivity : BaseActivity() - fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) { + fun onAttachView(view: SendMessageView, reason: String?, message: Message?, reply: Boolean?) { super.onAttachView(view) view.initView() initializeSubjectStream() @@ -50,6 +50,10 @@ class SendMessagePresenter @Inject constructor( if (messageRepository.draftMessage != null && reply == null) { view.showMessageBackupDialog() } + reason?.let { + setSubject("Usprawiedliwenie") + setContent(it) + } message?.let { setSubject(when (reply) { true -> "RE: " diff --git a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt index 8bccec62..479cc518 100644 --- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt +++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt @@ -16,6 +16,9 @@ private inline val AttendanceSummary.allPresences: Double private inline val AttendanceSummary.allAbsences: Double get() = absence.toDouble() + absenceExcused +inline val Attendance.isExcusableOrNotExcused: Boolean + get() = excusable || ((absence || lateness) && !excused) + fun AttendanceSummary.calculatePercentage() = calculatePercentage(allPresences, allAbsences) fun List.calculatePercentage(): Double { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea1187c8..08776c1a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -192,6 +192,8 @@ Absence excuse request sent successfully! You must select at least one absence! Excuse + z powodu + Dzień dobry,\nProszę o usprawiedliwienie mojego dziecka w dniu %s z lekcji %s%s%s.\n\nPozdrawiam. From 79e9e1a780c8c600d9380ffe3ad3ddd273955295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Sun, 29 Aug 2021 20:01:36 +0200 Subject: [PATCH 152/154] New Crowdin updates (#1321) --- .../main/res/values-cs/preferences_values.xml | 11 + app/src/main/res/values-cs/strings.xml | 163 ++++++++++++++- .../main/res/values-de/preferences_values.xml | 11 + app/src/main/res/values-de/strings.xml | 147 +++++++++++-- .../main/res/values-pl/preferences_values.xml | 11 + app/src/main/res/values-pl/strings.xml | 153 +++++++++++++- .../main/res/values-ru/preferences_values.xml | 11 + app/src/main/res/values-ru/strings.xml | 183 ++++++++++++++-- .../main/res/values-sk/preferences_values.xml | 11 + app/src/main/res/values-sk/strings.xml | 163 ++++++++++++++- .../main/res/values-uk/preferences_values.xml | 11 + app/src/main/res/values-uk/strings.xml | 195 +++++++++++++++--- 12 files changed, 999 insertions(+), 71 deletions(-) diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml index ce32f22b..fb938f09 100644 --- a/app/src/main/res/values-cs/preferences_values.xml +++ b/app/src/main/res/values-cs/preferences_values.xml @@ -45,4 +45,15 @@ Průměr známek z obou semestrů Průměr známek z celého roku + + Šťastné číslo + Nepřečtené zprávy + Docházka + Lekce + Známky + Domácí úkoly + Školní oznámení + Zkoušky + Setkání + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8929f6c2..3b847655 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -11,6 +11,8 @@ Více O aplikaci Prohlížeč protokolů + Ladění + Ladění oznámení Tvůrci Licence Zprávy @@ -21,6 +23,7 @@ Vyberte účet Podrobnosti účtu Informace o žáku + Domů Semestr %1$d, %2$d/%3$d @@ -88,6 +91,7 @@ Předpokládaná známka Vypočítaný průměr Konečný průměr + z %1$d z %2$d předmětů Shrnutí Třída Označit jako přečtené @@ -196,6 +200,12 @@ Nové zkoušky Nové zkoušky + + Máte %d novou zkoušku + Máte %d nové zkoušky + Máte %d nových zkoušek + Máte %d nových zkoušek + %d zkouška %d zkoušky @@ -203,7 +213,7 @@ %d zkoušek - Doručená pošta + Doručené Odesláno Koš (žádný předmět) @@ -225,6 +235,15 @@ Zpráva neexistuje Musíte vybrat alespoň 1 příjemce Obsah zprávy musí mít alespoň 3 znaky + Pouze nepřečtené + Pouze s přílohami + Přečtena: %s + + Přečtena přes: %1$d z %2$d osob + Přečtena přes: %1$d z %2$d osob + Přečtena přes: %1$d z %2$d osob + Přečtena přes: %1$d z %2$d osob + %d zpráva %d zprávy @@ -237,6 +256,8 @@ Nové zprávy Nové zprávy + Chcete obnovit koncept zprávy? + Chcete obnovit koncept zprávy s příjemci: %s? Máte %1$d novou zprávu Máte %1$d nové zprávy @@ -313,6 +334,12 @@ Nové domácí úkoly Nové domácí úkoly + + Máte %d nový domácí úkol + Máte %d nové domácí úkoly + Máte %d nových domácích úkolů + Máte %d nových domácích úkolů + %d domácí úkol %d domácí úkoly @@ -324,7 +351,7 @@ Dnešní šťastné číslo je Žádné informace o šťastném čísle Šťastné číslo pro dnešek - Dnes je šťastným číslem: %s + Dnešní šťastné číslo je: %s Zobrazit historii Historie šťastných čísel @@ -357,6 +384,45 @@ Setkání Žádné informace o setkáních + + %d setkání + %d setkání + %d setkání + %d setkání + + + Nové setkání + Nová setkání + Nová setkání + Nová setkání + + + Máte %1$d nové setkání + Máte %1$d nové setkání + Máte %1$d nových setkání + Máte %1$d nových setkání + + + Školní oznámení + Žádná školní oznámení + + %d školní oznámení + %d školní oznámení + %d školní oznámení + %d školní oznámení + + + Nové školní oznámení + Nová školní oznámení + Nová školní oznámení + Nová školní oznámení + + + Máte %1$d nové školní oznámení + Máte %1$d nové školní oznámení + Máte %1$d nových školních oznámení + Máte %1$d nových školních oznámení + Přidat účet Odhlásit @@ -382,6 +448,8 @@ Server Discord Připojte se ke komunitě Wulkanového Facebooková fanpage + Twitter stránka + Sledujte nás na Twitteru Stejně jako naše facebooková fanpage Zásady ochrany osobních údajů Pravidla pro shromažďování osobních údajů @@ -417,6 +485,7 @@ Muž Žena Příjmení + Opatrovník Přezdívka Přidat přezdívku @@ -424,6 +493,80 @@ Sdílet protokoly Obnovit + + Lekce + (Zítra) + %1$s (%2$s) + Za chvíli: + Brzy: + První: + Teď: + + za %1$d minutu + za %1$d minuty + za %1$d minut + za %1$d minut + + + ještě %1$d minutu + ještě %1$d minuty + ještě %1$d minut + ještě %1$d minut + + Konec lekcí + Další: + Později: + + ještě %1$d další lekce + ještě %1$d další lekce + ještě %1$d dalších lekcí + ještě %1$d dalších lekcí + + do %1$s + Žádné nadcházející lekce + Při načítání lekcí došlo k chybě + Domácí úkoly + Žádné domácí úkoly do vykonána + Při načítání domácích úkolů došlo k chybě + + Ještě %1$d další domácí úkol + Ještě %1$d další domácí úkoly + Ještě %1$d dalších domácích úkolů + Ještě %1$d dalších domácích úkolů + + do %1$s + Poslední známky + Žádné nové známky + Při načítání známek došlo k chybě + Školní oznámení + Žádná aktuální oznámení + Při načítání oznámení došlo k chybě + + Ještě %1$d další oznámení + Ještě %1$d další oznámení + Ještě %1$d dalších oznámení + Ještě %1$d dalších oznámení + + Zkoušky + Žádné nadcházející zkoušky + Při načítání zkoušek došlo k chybě + + Ještě %1$d další zkouška + Ještě %1$d další zkoušky + Ještě %1$d dalších zkoušek + Ještě %1$d dalších zkoušek + + Setkání + Žádná nadcházející setkání + Při načítání setkání došlo k chybě + + Ještě %1$d další setkání + Ještě %1$d další setkání + Ještě %1$d dalších setkání + Ještě %1$d dalších setkání + + Při načítání dat došlo k chybě + Žádné Zkontrolovat aktualizace Před hlášením chyby zkontrolujte, zda je k dispozici aktualizace s opravou chyb @@ -487,6 +630,7 @@ Synchronizováno! Synchronizace selhala Probíhá synchronizace + Poslední úplná synchronizace: %s Hodnota plusu Hodnota mínusu Odpovědět s historií zpráv @@ -496,6 +640,8 @@ Upozornění Synchronizace Známky + Domů + Viditelnost dlaždic Docházka Plán lekce Známky @@ -512,23 +658,26 @@ Nové známky Nové domácí úkoly + Nová setkání Nové zkoušky Šťastné číslo Nové zprávy Nové poznámky + Nové školní oznámení Push upozornění Nadcházející lekce Ladění - Černý - Červený - Modrý - Zelený - Fialový + Černá + Červená + Modrá + Zelená + Fialová Žádná barva Zkopírováno Vrátit + Změnit Stahování aktualizací začalo… Aktualizace byla stažena. diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml index 35e93059..53faaf9b 100644 --- a/app/src/main/res/values-de/preferences_values.xml +++ b/app/src/main/res/values-de/preferences_values.xml @@ -45,4 +45,15 @@ Durchschnitt der Noten aus beiden Semestern Durchschnitt der Noten aus dem ganzen Jahr + + Lucky number + Unread messages + Attendance + Lessons + Grades + Homework + School announcements + Exams + Conferences + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7399e1de..4bbf7767 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -11,6 +11,8 @@ Mehr Über die Applikation Log Viewer + Debuggen + Benachrichtigungen debuggen Mitarbeiter Lizenzen Nachrichten @@ -21,6 +23,7 @@ Konto auswählen Kontodetails Schülerinfo + Übersicht Semester %1$d, %2$d/%3$d @@ -88,6 +91,7 @@ Vorhergesagte Note Berechnender Durchschnitt Finaler Durchschnitt + aus %1$d von %2$d Schulfächern Zusammenfassung Klasse Als gelesen markieren @@ -177,12 +181,16 @@ Form Eintrittsdatum - New exam - New exams + Neue prüfung + Neue prüfungen + + + You received %d new exam + Du hast %d neue Prüfungen bekommen - %d exam - %d exams + %d prüfung + %d prüfungen Posteingang @@ -207,6 +215,13 @@ Nachricht existiert nicht Sie müssen mindestens 1 Empfänger auswählen. Der Inhalt der Nachricht muss mindestens 3 Zeichen lang sein. + Nur ungelesen + Nur mit Anhängen + Lesen: %s + + Read by: %1$d of %2$d people + Read by: %1$d of %2$d people + %d nachricht %d nachrichten @@ -215,6 +230,8 @@ Neu nachricht Neue nachrichten + Do you want to restore draft message? + Do you want to restore draft message with recipients: %s? Du hast %1$d nachricht bekommen Du hast %1$d nachrichten bekommen @@ -266,19 +283,23 @@ Unvollständig Anhänge - New homework - New homework + Neue hausaufgaben + Neue hausaufgaben + + + You received %d new homework + Du hast %d neue Hausaufgaben bekommen - %d homework - %d homework + %d hausaufgaben + %d hausaufgaben Glückliche Nummer Die heutige Glücksnummer ist Keine Information über die Glücksnummer. Glücksnummer für heute - Die heutige Glücksnummer ist: %s + Heutige Glückszahl ist: %s Verlauf anzeigen Glücksnummerverlauf @@ -311,6 +332,33 @@ Sitzungen Keine Informationen über Sitzungen + + %d konferenz + %d konferenzen + + + Neue konferenz + Neue konferenzen + + + Sie haben %1$d neue konferenz + Sie haben %1$d neue konferenzen + + + Schulankündigungen + Keine schulankündigungen + + %d schulankündigung + %d schulankündigungen + + + Ankündigung der neuen schule + Neue schulankündigungen + + + Sie haben %1$d neue schulmitteilungen + Sie haben %1$d neue schulankündigungen + Konto hinzufügen Abmelden @@ -336,11 +384,13 @@ Discord server Treten Sie der Wulkanowy-Gemeinschaft bei Facebook fanpage + Twitter-Seite + Folgen Sie uns bei Twitter Gefällt unsere Facebook-Fanpage Datenschutzerklärung Regeln für die Sammlung persönlicher Daten - System settings - Open system settings + Systemeinstellungen + Systemeinstellungen öffnen Startseite Besuchen Sie die Website und helfen Sie bei der Entwicklung der Anwendung Lizenzen @@ -371,6 +421,7 @@ Mann Frau Nachname + Wächter Nick Nick hinzufügen @@ -378,6 +429,66 @@ Logs teilen Aktualisieren + + Lektionen + (Morgen) + %1$s (%2$s) + Gleich: + Bald: + Erstens: + Jetzt: + + in %1$d Minute + in %1$d Minuten + + + Noch %1$d Minute + Noch %1$d Minuten + + Ende der Lektion + Nächste: + Später: + + Noch %1$d Lektion + %1$d more lessons + + until %1$s + No upcoming lessons + An error occurred while loading the lessons + Homework + No homework to do + An error occurred while loading the homework + + %1$d more homework + %1$d more homework + + due %1$s + Last grades + No new grades + An error occurred while loading the grades + School announcements + No current announcements + An error occurred while loading the announcements + + %1$d more announcement + %1$d more announcements + + Exams + No upcoming exams + An error occurred while loading the exams + + %1$d more exam + %1$d more exams + + Conferences + No upcoming conferences + An error occurred while loading the conferences + + %1$d more conference + %1$d more conferences + + An error occurred while loading data + None Auf Updates prüfen Bevor Sie einen Fehler melden, prüfen Sie zuerst, ob ein Update mit der Fehlerbehebung verfügbar ist @@ -426,7 +537,7 @@ Benachrichtigungen Benachrichtigungen anzeigen Benachrichtigungen über bevorstehende Lektionen anzeigen - Open system notification settings + Systembenachrichtigungseinstellungen öffnen Synchronisierungs- und Benachrichtigungsprobleme reparieren Ihr Gerät hat möglicherweise Probleme mit der Datensynchronisierung und Benachrichtigungen.\n\nUm diese zu reparieren, fügen Sie Wulkanowy zum Autostart hinzu und deaktivieren Sie die Batterieoptimierung in den Systemeinstellungen des Geräts. Gehe zu den Einstellungen @@ -441,15 +552,18 @@ Synchronisiert! Synchronisierung fehlgeschlagen Synchronisierung läuft + Last full sync: %s Wert des Plus Wert des Minus Antwort mit Nachrichtenhistorie - Show arithmetic average when no weights provided + Arithmetisches Mittel anzeigen, wenn keine Gewichte angegeben sind Erweitert Aussehen & Verhalten Benachrichtigungen Synchronisierung Noten + Dashboard + Tiles visibility Schulbesuch Zeitplan Noten @@ -465,11 +579,13 @@ App-Version, Mitarbeiter, soziale Portale, Lizenzen Neue Noten - New homework - New exams + Neue Hausaufgaben + Neue Konferenzen + Neue Prüfungen Glückliche Nummer Neue Nachrichten Neue Eintragen + Neue Schulankündigungen Push-Benachrichtigungen Bevorstehende Lektionen Debuggen @@ -483,6 +599,7 @@ Kopiert lösen + Change Download der Updates wurde gestartet… Ein Update wurde gerade heruntergeladen. diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml index 91869785..12cfda8c 100644 --- a/app/src/main/res/values-pl/preferences_values.xml +++ b/app/src/main/res/values-pl/preferences_values.xml @@ -45,4 +45,15 @@ Średnia średnich z obu semestrów Średnia wszystkich ocen z całego roku + + Szczęśliwy numerek + Nieprzeczytane wiadomości + Frekwencja + Lekcje + Oceny + Zadania domowe + Ogłoszenia szkolne + Sprawdziany + Zebrania + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a855ebd1..74627ed1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -11,6 +11,8 @@ Więcej O aplikacji Przeglądarka logów + Debugowanie + Debugowanie powiadomień Twórcy Licencje Wiadomości @@ -21,6 +23,7 @@ Wybierz konto Szczegóły konta Informacje o uczniu + Start Semestr %1$d, %2$d/%3$d @@ -88,6 +91,7 @@ Przewidywana ocena Obliczona średnia Końcowa średnia + z %1$d na %2$d przedmiotów Podsumowanie Klasa Oznacz jako przeczytane @@ -196,6 +200,12 @@ Nowe sprawdziany Nowe sprawdziany + + Masz %d nowy sprawdzian + Masz %d nowe sprawdziany + Masz %d nowych sprawdzianów + Masz %d nowych sprawdzianów + %d sprawdzian %d sprawdziany @@ -225,6 +235,15 @@ Wiadomość nie istnieje Musisz wybrać co najmniej 1 adresata Treść wiadomości musi zawierać co najmniej 3 znaki + Tylko nieprzeczytane + Tylko z załącznikami + Przeczytana: %s + + Przeczytana przez: %1$d z %2$d osób + Przeczytana przez: %1$d z %2$d osób + Przeczytana przez: %1$d z %2$d osób + Przeczytana przez: %1$d z %2$d osób + %d wiadomość %d wiadomości @@ -237,6 +256,8 @@ Nowe wiadomości Nowe wiadomości + Czy chcesz przywrócić wersję roboczą wiadomości? + Czy chcesz przywrócić wersję roboczą wiadomości z adresatami: %s? Masz %1$d nową wiadomość Masz %1$d nowe wiadomości @@ -313,6 +334,12 @@ Nowe zadania domowe Nowe zadania domowe + + Masz %d nowe zadanie domowe + Masz %d nowe zadania domowe + Masz %d nowych zadań domowych + Masz %d nowych zadań domowych + %d zadanie domowe %d zadania domowe @@ -324,7 +351,7 @@ Dzisiejszym szczęśliwym numerkiem jest Brak informacji o szczęśliwym numerku Szczęśliwy numerek na dzisiaj - Dziś szczęśliwym numerkiem jest: %s + Dzisiejszym szczęśliwym numerkiem jest: %s Pokaż historię Historia numerków @@ -357,6 +384,45 @@ Zebrania Brak informacji o zebraniach + + %d zebranie + %d zebrania + %d zebrań + %d zebrań + + + Nowe zebranie + Nowe zebrania + Nowe zebrania + Nowe zebrania + + + Masz %1$d nowe zebranie + Masz %1$d nowe zebrania + Masz %1$d nowych zebrań + Masz %1$d nowych zebrań + + + Ogłoszenia szkolne + Brak ogłoszeń szkolnych + + %d ogłoszenie szkolne + %d ogłoszenia szkolne + %d ogłoszeń szkolnych + %d ogłoszeń szkolnych + + + Nowe ogłoszenie szkolne + Nowe ogłoszenia szkolne + Nowe ogłoszenia szkolne + Nowe ogłoszenia szkolne + + + Masz %1$d nowe ogłoszenie szkolne + Masz %1$d nowe ogłoszenia szkolne + Masz %1$d nowych ogłoszeń szkolnych + Masz %1$d nowych ogłoszeń szkolnych + Dodaj konto Wyloguj @@ -382,6 +448,8 @@ Serwer Discord Dołącz do społeczności Wulkanowego Fanpage na Facebooku + Strona na Twitterze + Śledź nas na Twitterze Polub nasz fanpage na Facebooku Polityka prywatności Zasady zbierania danych osobowych @@ -417,6 +485,7 @@ Mężczyzna Kobieta Nazwisko + Opiekun Pseudonim Dodaj pseudonim @@ -424,6 +493,80 @@ Udostępnij logi Odśwież + + Lekcje + (Jutro) + %1$s (%2$s) + Za chwilę: + Wkrótce: + Pierwsza: + Teraz: + + za %1$d minutę + za %1$d minuty + za %1$d minut + za %1$d minut + + + jeszcze %1$d minuta + jeszcze %1$d minuty + jeszcze %1$d minut + jeszcze %1$d minut + + Koniec lekcji + Następnie: + Później: + + jeszcze %1$d dodatkowa lekcja + jeszcze %1$d dodatkowe lekcje + jeszcze %1$d dodatkowych lekcji + jeszcze %1$d dodatkowych lekcji + + do %1$s + Brak nadchodzących lekcji + Wystąpił błąd podczas ładowania lekcji + Zadania domowe + Brak prac domowych do wykonania + Wystąpił błąd podczas ładowania zadań domowych + + Jeszcze %1$d dodatkowe zadanie domowe + Jeszcze %1$d dodatkowe zadania domowe + Jeszcze %1$d dodatkowych zadań domowych + Jeszcze %1$d dodatkowych zadań domowych + + do %1$s + Ostatnie oceny + Brak nowych ocen + Wystąpił błąd podczas ładowania ocen + Ogłoszenia szkolne + Brak aktualnych ogłoszeń + Wystąpił błąd podczas ładowania ogłoszeń + + Jeszcze %1$d dodatkowe ogłoszenie + Jeszcze %1$d dodatkowe ogłoszenia + Jeszcze %1$d dodatkowych ogłoszeń + Jeszcze %1$d dodatkowych ogłoszeń + + Sprawdziany + Brak nadchodzących sprawdzianów + Wystąpił błąd podczas ładowania sprawdzianów + + Jeszcze %1$d dodatkowy sprawdzian + Jeszcze %1$d dodatkowe sprawdziany + Jeszcze %1$d dodatkowych sprawdzianów + Jeszcze %1$d dodatkowych sprawdzianów + + Zebrania + Brak nadchodzących zebrań + Wystąpił błąd podczas ładowania zebrań + + Jeszcze %1$d dodatkowe zebranie + Jeszcze %1$d dodatkowe zebrania + Jeszcze %1$d dodatkowych zebrań + Jeszcze %1$d dodatkowych zebrań + + Wystąpił błąd podczas ładowania danych + Brak Sprawdź dostępność aktualizacji Przed zgłoszeniem błędu sprawdź wcześniej, czy dostępna jest już aktualizacja z poprawką błędu @@ -472,7 +615,7 @@ Powiadomienia Pokazuj powiadomienia Pokazuj powiadomienia o nadchodzących lekcjach - Otwórz ustawienia systemowe powiadomień + Otwórz systemowe ustawienia powiadomień Napraw problemy z synchronizacją i powiadomieniami Na twoim urządzeniu mogą występować problemy z synchronizacją danych i powiadomieniami.\n\nBy je naprawić, dodaj Wulkanowego do autostartu i wyłącz optymalizację/oszczędzanie baterii w ustawieniach systemowych telefonu. Przejdź do ustawień @@ -487,6 +630,7 @@ Zsynchronizowano! Synchronizacja nie powiodła się Synchronizacja w trakcie + Ostatnia pełna synchronizacja: %s Wartość plusa Wartość minusa Odpowiadaj z historią wiadomości @@ -496,6 +640,8 @@ Powiadomienia Synchronizacja Oceny + Start + Widoczność kafelków Frekwencja Plan lekcji Oceny @@ -512,10 +658,12 @@ Nowe oceny Nowe zadania domowe + Nowe zebrania Nowe sprawdziany Szczęśliwy numerek Nowe wiadomości Nowe uwagi + Nowe ogłoszenia szkolne Powiadomienia push Nadchodzące lekcje Debugowanie @@ -529,6 +677,7 @@ Skopiowano Cofnij + Zmień Rozpoczęto pobieranie aktualizacji… Aktualizacja została pobrana. diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml index 4ea5a614..7c4d14df 100644 --- a/app/src/main/res/values-ru/preferences_values.xml +++ b/app/src/main/res/values-ru/preferences_values.xml @@ -45,4 +45,15 @@ Средняя оценка с двух семестров Средняя оценок со всего года + + Счастливый номер + Непрочитанные сообщения + Посещаемость + Уроки + Оценки + Домашняя работа + Объявления школ + Экзамены + Конференции + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1c67d284..e9349313 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -11,6 +11,8 @@ Ещё О приложении Просмотр журнала + Отладка + Отладка уведомления Разработчики Лицензии Сообщения @@ -21,6 +23,7 @@ Выбор учетной записи Данные аккаунта Информация о студенте + Панель %1$d семестр, %2$d/%3$d @@ -88,6 +91,7 @@ Ожидаемая оценка Рассчитанная средняя оценка Итоговая средняя оценка + от %1$d из %2$d субъектов Итоги Класс Пометить как \"прочитанное\" @@ -191,16 +195,22 @@ Тип Дата записи - New exam - New exams - New exams - New exams + Новый экзамен + Новый экзамен + Новый экзамен + Новые экзамены + + + Вы получили %d новый экзамен + Вы получили %d новый экзамен + Вы получили %d новый экзамен + Вы получили %d новых экзаменов - %d exam - %d exams - %d exams - %d exams + %d экзамен + %d экзамен + %d экзамен + %d экзаменов Полученные @@ -225,6 +235,15 @@ Сообщения не существует Вы должны выбрать как минимум одного получателя Текст сообщения должен содержать как минимум 3 знака + Только непрочитанные + Только с вложениями + Чтение: %s + + Прочитано: %1$d из %2$d человек + Прочитано: %1$d из %2$d человек + Прочитано: %1$d из %2$d человек + Прочитано: %1$d из %2$d человек + %d сообщение %d сообщения @@ -237,6 +256,8 @@ Новые сообщения Новые сообщения + Вы хотите восстановить черновичное сообщение? + Вы хотите восстановить черновик сообщения с получателями: %s? Вы получили %1$d новое сообщение Вы получили %1$d новых сообщения @@ -308,23 +329,29 @@ Отметить как невыполненное Вложения - New homework - New homework - New homework - New homework + Новая домашняя работа + Новая домашняя работа + Новая домашняя работа + Новая домашняя работа + + + Вы получили %d новых домашних заданий + Вы получили %d новых домашних заданий + Вы получили %d новых домашних заданий + Вы получили %d новых домашних заданий - %d homework - %d homework - %d homework - %d homework + %d домашних заданий + %d домашних заданий + %d домашних заданий + %d домашних заданий Счастливый номер Сегодняшний счастливый номер это Нет данных о счастливом номере Сегодняшний счастливый номер - Сегодняшний счастливый номер это: %s + Сегодняшний номер удачи: %s Показать историю История удачных чисел @@ -357,6 +384,45 @@ Встречи Нет информации о встречах + + %d конференция + %d конференция + %d конференция + %d конференций + + + Новая конференция + Новая конференция + Новая конференция + Новые конференции + + + У вас %1$d новая конференция + У вас %1$d новая конференция + У вас %1$d новая конференция + У вас %1$d новых конференций + + + Объявления школ + Нет объявлений о школе + + Объявление о школе %d + Объявление о школе %d + Объявление о школе %d + Объявления школы %d + + + Объявление о новой школе + New school announcements + New school announcements + New school announcements + + + You have %1$d new school announcement + You have %1$d new school announcements + You have %1$d new school announcements + You have %1$d new school announcements + Добавить аккаунт Выйти @@ -382,6 +448,8 @@ Сервер Discord Присоединиться к сообществу приложения Facebook фан-страница + Twitter page + Follow us on twitter Поставьте лайк на нашей странице в Facebook Политика приватности Правила хранения личных данных @@ -417,6 +485,7 @@ Муж Женская Фамилия + Guardian Ник Добавить ник @@ -424,6 +493,80 @@ Поделиться логами Обновить + + Lessons + (Tomorrow) + %1$s (%2$s) + In a moment: + Soon: + First: + Now: + + in %1$d minute + in %1$d minutes + in %1$d minutes + in %1$d minutes + + + %1$d more minute + %1$d more minutes + %1$d more minutes + %1$d more minutes + + End of lessons + Next: + Later: + + %1$d more lesson + %1$d more lessons + %1$d more lessons + %1$d more lessons + + until %1$s + No upcoming lessons + An error occurred while loading the lessons + Homework + No homework to do + An error occurred while loading the homework + + %1$d more homework + %1$d more homework + %1$d more homework + %1$d more homework + + due %1$s + Last grades + No new grades + An error occurred while loading the grades + School announcements + No current announcements + An error occurred while loading the announcements + + %1$d more announcement + %1$d more announcements + %1$d more announcements + %1$d more announcements + + Exams + No upcoming exams + An error occurred while loading the exams + + %1$d more exam + %1$d more exams + %1$d more exams + %1$d more exams + + Conferences + No upcoming conferences + An error occurred while loading the conferences + + %1$d more conference + %1$d more conferences + %1$d more conferences + %1$d more conferences + + An error occurred while loading data + None Проверить наличие обновлений Прежде чем сообщать об ошибке, проверьте наличие обновлений @@ -487,6 +630,7 @@ Синхронизировано! Синхронизация не удалась Идёт синхронизация + Last full sync: %s Стоимость плюса Стоимость минуса Отвечать с историей сообщений @@ -496,6 +640,8 @@ Уведомления Синхронизация Оценки + Dashboard + Tiles visibility Посещаемость Расписание Оценки @@ -512,10 +658,12 @@ Новые оценки New homework + New conferences New exams Счастливый номер Новые сообщения Новые заметки + New school announcements Показывать push-уведомления Будущие уроки Дебаг @@ -529,6 +677,7 @@ Скопировано Отменить + Change Загрузка обновлений началась… Только что было скачано обновление. diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml index b51bfa40..108af555 100644 --- a/app/src/main/res/values-sk/preferences_values.xml +++ b/app/src/main/res/values-sk/preferences_values.xml @@ -45,4 +45,15 @@ Priemer známok z oboch semestrov Priemer známok z celého roka + + Šťastné číslo + Neprečítané správy + Dochádzka + Lekcie + Známky + Domáce úlohy + Školské oznámenia + Skúšky + Stretnutie + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a9656eab..81a76cf3 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -11,6 +11,8 @@ Viac O aplikácii Prehliadač protokolov + Ladenie + Ladenie oznámení Prispievatelia Licencie Správy @@ -21,6 +23,7 @@ Vyberte účet Podrobnosti účtu Informácie o žiakovi + Domov Semester %1$d, %2$d/%3$d @@ -88,6 +91,7 @@ Predpokladaná známka Vypočítaný priemer Konečný priemer + z %1$d z %2$d predmetov Zhrnutie Trieda Označiť ako prečítané @@ -196,6 +200,12 @@ Nové skúšky Nové skúšky + + You received %d new exam + You received %d new exams + You received %d new exams + You received %d new exams + %d skúška %d skúšky @@ -203,7 +213,7 @@ %d skúšok - Doručená pošta + Doručené Odoslané Kôš (žiadny predmet) @@ -225,6 +235,15 @@ Správa neexistuje Musíte vybrať aspoň 1 príjemca Obsah správy musí mať aspoň 3 znaky + Iba neprečítané + Iba s prílohami + Prečítaná: %s + + Prečítaná cez: %1$d z %2$d osôb + Prečítaná cez: %1$d z %2$d osôb + Prečítaná cez: %1$d z %2$d osôb + Prečítaná cez: %1$d z %2$d osôb + %d správa %d správy @@ -237,6 +256,8 @@ Nové správy Nové správy + Chcete obnoviť koncept správy? + Chcete obnoviť koncept správy s príjemcami:%s? Máte %1$d novú správu Máte %1$d nové správy @@ -313,6 +334,12 @@ Nové domáce úlohy Nové domáce úlohy + + You received %d new homework + You received %d new homework + You received %d new homework + You received %d new homework + %d domáci úloh %d domáce úlohy @@ -324,7 +351,7 @@ Dnešné šťastné číslo je Žiadne informácie o šťastnom čísle Šťastné číslo pre dnešok - Dnes je šťastným číslom: %s + Dnešné šťastné číslo je: %s Zobraziť históriu História šťastných čísel @@ -357,6 +384,45 @@ Stretnutie Žiadne informácie o stretnutiach + + %d stretnutie + %d stretnutia + %d stretnutí + %d stretnutí + + + Nové stretnutie + Nová stretnutia + Nová stretnutia + Nová stretnutia + + + Máte %1$d nové stretnutie + Máte %1$d nové stretnutia + Máte %1$d nových stretnutí + Máte %1$d nových stretnutí + + + Školské oznámenia + Žiadne školské oznámenia + + %d školské oznámenie + %d školské oznámenia + %d školských oznámení + %d školských oznámení + + + Nové školské oznámenie + Nové školské oznámenia + Nové školské oznámenia + Nové školské oznámenia + + + Máte %1$d nové školské oznámenie + Máte %1$d nové školské oznámenia + Máte %1$d nových školských oznámení + Máte %1$d nových školských oznámení + Pridať účet Odhlásiť @@ -382,6 +448,8 @@ Server Discord Pripojte sa ku komunite Wulkanového Facebooková fanpage + Twitter stránka + Sledujte nás na Twitteri Rovnako ako naše facebooková fanpage Zásady ochrany osobných údajov Pravidlá pre zhromažďovanie osobných údajov @@ -417,6 +485,7 @@ Muž Žena Priezvisko + Opatrovník Prezývka Pridať prezývku @@ -424,6 +493,80 @@ Zdieľať protokoly Obnoviť + + Lekcie + (Zajtra) + %1$s (%2$s) + Za chvíľu: + Čoskoro: + Prvá: + Teraz: + + za %1$d minútu + za %1$d minúty + za %1$d minút + za %1$d minút + + + ešte %1$d minútu + ešte %1$d minúty + ešte %1$d minút + ešte %1$d minút + + Koniec lekcií + Ďalej: + Neskôr: + + ešte %1$d ďalší lekcia + ešte %1$d ďalšie lekcie + ešte %1$d ďalších lekcií + ešte %1$d ďalších lekcií + + do %1$s + Žiadne nadchádzajúce lekcie + Pri načítaní lekcií došlo k chybe + Domáce úlohy + Žiadne domáce úlohy do vykonaná + Pri načítaní domácich úloh došlo k chybe + + Ešte %1$d ďalšia domáca úloha + Ešte %1$d ďalšie domáce úlohy + Ešte %1$d ďalších domácich úloh + Ešte %1$d ďalších domácich úloh + + do %1$s + Posledné známky + Žiadne nové známky + Pri načítaní známok došlo k chybe + Školské oznámenia + Žiadne aktuálne oznámenia + Pri načítaní oznámení došlo k chybe + + Ešte %1$d ďalšie oznámenie + Ešte %1$d ďalšie oznámenia + Ešte %1$d ďalších oznámení + Ešte %1$d ďalších oznámení + + Skúšky + Žiadne nadchádzajúce skúšky + Pri načítaní skúšok došlo k chybe + + Ešte %1$d ďalšia skúška + Ešte %1$d ďalšie skúšky + Ešte %1$d ďalších skúšok + Ešte %1$d ďalších skúšok + + Stretnutie + Žiadna nadchádzajúce stretnutie + Pri načítaní stretnutí došlo k chybe + + Ešte %1$d ďalšie stretnutie + Ešte %1$d ďalšie stretnutia + Ešte %1$d ďalších stretnutí + Ešte %1$d ďalších stretnutí + + Pri načítaní dát došlo k chybe + Žiadne Skontrolovať aktualizácie Pred hlásením chyby skontrolujte, či je k dispozícii aktualizácia s opravou chýb @@ -487,6 +630,7 @@ Synchronizovano! Synchronizácia zlyhala Prebieha synchronizácia + Posledná úplná synchronizácia: %s Hodnota plusu Hodnota mínusu Odpovedať s históriou správ @@ -496,6 +640,8 @@ Upozornenia Synchronizácia Známky + Domov + Viditeľnosť dlaždíc Dochádzka Plán lekcie Známky @@ -512,23 +658,26 @@ Nové známky Nové domáce úlohy + Nová stretnutia Nové skúšky Šťastné číslo Nové správy Nové poznámky + Nové školské oznámenia Push upozornenia Nadchádzajúce lekcie Ladenie - Čierny - Červený - Modrý - Zelený - Fialový + Čierna + Červená + Modrá + Zelená + Fialová Žiadna farba Skopírované Vrátiť + Zmeniť Sťahovanie aktualizácií začalo… Aktualizácia bola stiahnutá. diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml index 5c70bd53..f6f5b984 100644 --- a/app/src/main/res/values-uk/preferences_values.xml +++ b/app/src/main/res/values-uk/preferences_values.xml @@ -45,4 +45,15 @@ Середнє оцінювання за обидва семестри Середнє оцінювання за весь рік + + Щасливий номер + Непрочитані повідомлення + Відвідуваність + Уроки + Оцінки + Домашні завдання + Оголошення школи + Тести + Конференції + diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8bc1b8e3..4850e239 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -11,6 +11,8 @@ Інше Про додаток Переглядач журналів + Відладка + Налагодження сповіщень Розробники Ліцензії Повідомлення @@ -21,6 +23,7 @@ Виберіть обліковий запис Деталі облікового запису Інформація про учня + Дошка %1$d семестр, %2$d/%3$d @@ -88,6 +91,7 @@ Очікувана оцінка Розрахована середня оцінка Підсумкова середня оцінка + з %1$d із %2$d тем Підсумок Клас Позначити як прочитане @@ -191,16 +195,22 @@ Тип Дата запису - New exam - New exams - New exams - New exams + Новий іспит + Новий іспит + Новий іспит + Нові іспити + + + Ви отримали %d новий іспит + Ви отримали %d новий іспит + Ви отримали %d новий іспит + Ви отримали %d нових іспитів - %d exam - %d exams - %d exams - %d exams + %d екзамен + %d екзамен + %d екзамен + %d іспити Отримані @@ -225,6 +235,15 @@ Такого повідомлення не існує Необхідно обрати принаймні 1 адресата Зміст повідомлення мусить складатися принаймні з 3 знаків + Лише непрочитані + Тільки з вкладеннями + Читання: %s + + Прочитані: %1$d з %2$d осіб + Прочитані: %1$d з %2$d осіб + Прочитані: %1$d з %2$d осіб + Прочитані: %1$d з %2$d осіб + %d повідомлення %d повідомлення @@ -237,6 +256,8 @@ Нові повідомлення Нові повідомлення + Ви хочете відновити повідомлення в чернетці? + Ви хочете відновити чернетку повідомлення з отримувачами: %s? Ви отримали %1$d нове повідомлення Ви отримали %1$d нових повідомлення @@ -308,23 +329,29 @@ Позначити як не зроблене Додатки - New homework - New homework - New homework - New homework + Нова домашня робота + Нова домашня робота + Нова домашня робота + Нова домашня робота + + + Ви отримали %d нове домашнє завдання + Ви отримали %d нове домашнє завдання + Ви отримали %d нове домашнє завдання + Ви отримали %d нове домашнє завдання - %d homework - %d homework - %d homework - %d homework + %d домашнє завдання + %d домашнє завдання + %d домашнє завдання + %d домашнє завдання Щасливий номер Сьогоднішній щасливий номер Брак інформації о щасливому номері Сьогоднішній щасливий номер - Сьогоднішнім щасливим номером є %s + Сьогоднішній щасливий номер: %s Показати історію Історія щасливих чисел @@ -357,6 +384,45 @@ Зустрічі Немає інформації про зустрічі + + %d конференція + %d конференція + %d конференція + %d конференцій + + + Нова конференція + Нова конференція + Нова конференція + Нові конференції + + + У вас є %1$d нова конференція + У вас є %1$d нова конференція + У вас є %1$d нова конференція + У вас є %1$d нових конференцій + + + Оголошення школи + Жодних навчальних оголошень + + %d оголошення про школу + %d оголошення про школу + %d оголошення про школу + Оголошення нової школи + + + Оголошення нової школи + Оголошення нової школи + Нові шкільні оголошення + Нові шкільні оголошення + + + У вас є %1$d нове оголошення про школу + У вас є %1$d нове оголошення про школу + У вас є %1$d нове оголошення про школу + У вас є %1$d нових оголошень про школи + Додати аккаунт Вийти @@ -382,11 +448,13 @@ Сервер Discord Приєднатися до спільноти додатка Фен-сторінка Facebook + Сторінка Twitter + Стежте за нами у Твіттері Вподобати нашу фансторінку у Facebook Політика конфіденційності Правила зберігання особистих даних - System settings - Open system settings + Налаштування системи + Відкрити налаштування системи Домашня сторінка Допомогти розвитку додатка Ліцензії @@ -417,6 +485,7 @@ Чоловіча Жінка Прізвище + Охоронець Псевдонім Додати псевдонім @@ -424,6 +493,80 @@ Поділитися логами Оновити + + Уроки + (Завтра) + %1$s (%2$s) + Через мить: + Незабаром: + Перше: + Зараз: + + через %1$d хвилину + через %1$d хвилину + через %1$d хвилину + через %1$d хвилин + + + %1$d більше хвилини + %1$d більше хвилини + %1$d більше хвилини + %1$d ще хвилин + + Кінець уроків + Далі: + Пізніше : + + %1$d більше уроку + %1$d більше уроку + %1$d більше уроку + %1$d більше уроків + + до %1$s + Немає майбутніх уроків + Сталася помилка під час завантаження уроків + Домашня робота + Немає домашнього завдання для виконання + Помилка при завантаженні домашньої роботи + + Ще %1$d домашнє завдання + Ще %1$d домашнє завдання + Ще %1$d домашнє завдання + Ще %1$d домашнє завдання + + до %1$s + Останні оцінки + Немає нових оцінок + Помилка при завантаженні класів + Оголошення школи + Немає поточних оголошень + Помилка при завантаженні анонсів + + %1$d нових оголошень + %1$d нових оголошень + %1$d нових оголошень + %1$d нових оголошень + + Іспити + Немає майбутніх іспитів + Помилка при завантаженні іспитів + + %1$d ще екзамен + %1$d ще екзамен + %1$d ще екзамен + %1$d ще іспитів + + Конференції + Немає майбутніх конференцій + Помилка при завантаженні конференцій + + Ще %1$d конференція + Ще %1$d конференція + Ще %1$d конференція + %1$d більше конференцій + + Помилка при завантаженні даних + Нічого Провірити наявність оновлень Перед тим, як повідомлювати о помілці, перевірте наявність оновлень @@ -472,7 +615,7 @@ Повідомлення Показувати повідомлення Показувати повідомлення о наступних уроках - Open system notification settings + Відкрити налаштування сповіщень системи Виправити помилки з синхронізацією і повідомленнями На вашому пристрої можуть бути помилки з синхронізацією і повідомленнями\n\nЩоб виправити іх, вам необхідно додати Wulkanowy в авто-старт и вимкнути оптимізацію/экономію батареї в налаштуваннях пристрою. Перейти до налаштувань @@ -487,15 +630,18 @@ Синхронізовано! Синхронізація не вдалася Триває синхронізація + Остання синхронізація: %s Вартість плюсу Вага мінуса Відповісти з історією повідомлень - Show arithmetic average when no weights provided + Показувати в середньому арифметику, якщо немає ваги Додатково Вигляд & Поведінка Повідомлення Синхронізація Оцінки + Дошка + Видимість плиток Відвідуваність Розклад Класи @@ -511,11 +657,13 @@ Версія програми, учасники, соціальні портали, ліцензії Нові оцінки - New homework - New exams + Нова домашня робота + Нові конференції + Нові іспити Щасливий номер Нові повідомлення Нові нотатки + Оголошення нової школи Показувати push-повідомлення Наступні уроки Дебаг @@ -529,6 +677,7 @@ Скопійовано Відмінити + Змінити Завантаження оновлень розпочато… Щойно завантажено оновлення. From 170b7c43798606aa1ef12cc0e7013788286bfe7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Sun, 29 Aug 2021 21:06:33 +0200 Subject: [PATCH 153/154] New Crowdin updates (#1459) --- .../main/res/values-de/preferences_values.xml | 18 +- app/src/main/res/values-de/strings.xml | 82 ++++----- app/src/main/res/values-ru/strings.xml | 160 +++++++++--------- app/src/main/res/values-sk/strings.xml | 16 +- 4 files changed, 138 insertions(+), 138 deletions(-) diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml index 53faaf9b..1e0df8de 100644 --- a/app/src/main/res/values-de/preferences_values.xml +++ b/app/src/main/res/values-de/preferences_values.xml @@ -46,14 +46,14 @@ Durchschnitt der Noten aus dem ganzen Jahr - Lucky number - Unread messages - Attendance - Lessons - Grades - Homework - School announcements - Exams - Conferences + Glückszahl + Ungelesene Nachrichten + Schulbesuch + Lektionen + Noten + Hausaufgaben + Schulankündigungen + Prüfungen + Sitzungen diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4bbf7767..29d5c763 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -185,8 +185,8 @@ Neue prüfungen - You received %d new exam - Du hast %d neue Prüfungen bekommen + Du hast %d neue Prüfung erhalten + Sie haben %d neue Prüfungen erhalten %d prüfung @@ -219,8 +219,8 @@ Nur mit Anhängen Lesen: %s - Read by: %1$d of %2$d people - Read by: %1$d of %2$d people + Lesen von: %1$d von %2$d Personen + Lesen von: %1$d von %2$d Personen %d nachricht @@ -230,8 +230,8 @@ Neu nachricht Neue nachrichten - Do you want to restore draft message? - Do you want to restore draft message with recipients: %s? + Möchten Sie den Entwurf der Nachricht wiederherstellen? + Möchten Sie die Entwurfsnachricht mit den Empfängern wiederherstellen: %s? Du hast %1$d nachricht bekommen Du hast %1$d nachrichten bekommen @@ -287,8 +287,8 @@ Neue hausaufgaben - You received %d new homework - Du hast %d neue Hausaufgaben bekommen + Du hast %d neue Hausaufgaben erhalten + Du hast %d neue Hausaufgaben erhalten %d hausaufgaben @@ -450,45 +450,45 @@ Später: Noch %1$d Lektion - %1$d more lessons + Noch %1$d Lektionen - until %1$s - No upcoming lessons - An error occurred while loading the lessons - Homework - No homework to do - An error occurred while loading the homework + bis %1$s + Keine anstehenden Lektionen + Fehler beim Laden des Lektionen + Hausaufgaben + Keine Hausaufgaben zu tun + Fehler beim Laden der Hausaufgaben - %1$d more homework - %1$d more homework + Noch %1$d Hausaufgabe + Noch %1$d Hausaufgaben - due %1$s - Last grades - No new grades - An error occurred while loading the grades - School announcements - No current announcements - An error occurred while loading the announcements + bis %1$s + Letzte Noten + Keine neuen Noten + Ein Fehler ist beim Laden der Noten + Schulankündigungen + Keine aktuellen Ankündigungen + Fehler beim Laden der Ankündigungen - %1$d more announcement - %1$d more announcements + Noch %1$d Schulankündigung + Noch %1$d Schulankündigungen - Exams - No upcoming exams - An error occurred while loading the exams + Prüfungen + Keine bevorstehenden Prüfungen + Fehler beim Laden der Prüfungen - %1$d more exam - %1$d more exams + Noch %1$d Prüfung + Noch %1$d Prüfungen - Conferences - No upcoming conferences - An error occurred while loading the conferences + Sitzungen + Keine bevorstehenden Ankündigungen + Beim Laden der Konferenzen trat ein Fehler auf - %1$d more conference - %1$d more conferences + %1$d weitere Konferenz + %1$d weitere Konferenzen - An error occurred while loading data - None + Fehler beim Laden der Daten + Keine Auf Updates prüfen Bevor Sie einen Fehler melden, prüfen Sie zuerst, ob ein Update mit der Fehlerbehebung verfügbar ist @@ -552,7 +552,7 @@ Synchronisiert! Synchronisierung fehlgeschlagen Synchronisierung läuft - Last full sync: %s + Letzte vollständige Synchronisierung: %s Wert des Plus Wert des Minus Antwort mit Nachrichtenhistorie @@ -563,7 +563,7 @@ Synchronisierung Noten Dashboard - Tiles visibility + Sichtbarkeit der Kacheln Schulbesuch Zeitplan Noten @@ -599,7 +599,7 @@ Kopiert lösen - Change + Ändern Download der Updates wurde gestartet… Ein Update wurde gerade heruntergeladen. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e9349313..db78f595 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -413,15 +413,15 @@ Объявление о новой школе - New school announcements - New school announcements - New school announcements + Объявление о новой школе + Объявление о новой школе + Объявления о новых школах - You have %1$d new school announcement - You have %1$d new school announcements - You have %1$d new school announcements - You have %1$d new school announcements + У вас %1$d объявление о новой школе + У вас %1$d объявление о новой школе + У тебя %1$d новых школьных объявлений + У тебя %1$d новых школьных объявлений Добавить аккаунт @@ -448,13 +448,13 @@ Сервер Discord Присоединиться к сообществу приложения Facebook фан-страница - Twitter page - Follow us on twitter + Странница в твиттере + Подпишись на нас в твиттере Поставьте лайк на нашей странице в Facebook Политика приватности Правила хранения личных данных - System settings - Open system settings + Параметры системы + Открыть системные настройки Домашняя страница Помочь в развитии приложения Лицензии @@ -485,7 +485,7 @@ Муж Женская Фамилия - Guardian + Опекун Ник Добавить ник @@ -494,79 +494,79 @@ Поделиться логами Обновить - Lessons - (Tomorrow) + Уроки + (Завтра) %1$s (%2$s) - In a moment: - Soon: - First: - Now: + Сейчас: + Скоро: + Первый: + Сейчас: - in %1$d minute - in %1$d minutes - in %1$d minutes - in %1$d minutes + через %1$d минуту + через %1$d минуту + через %1$d минуту + через %1$d минут - %1$d more minute - %1$d more minutes - %1$d more minutes - %1$d more minutes + Еще %1$d минута + Еще %1$d минута + Еще %1$d минута + Ещё %1$d минут - End of lessons - Next: - Later: + Окончание уроков + Далее: + Позднее: - %1$d more lesson - %1$d more lessons - %1$d more lessons - %1$d more lessons + Еще %1$d урок + Еще %1$d урок + Еще %1$d урок + Ещё %1$d уроков - until %1$s - No upcoming lessons - An error occurred while loading the lessons - Homework - No homework to do - An error occurred while loading the homework + до %1$s + Нет предстоящих занятий + Произошла ошибка при загрузке уроков + Домашняя работа + Нет домашних заданий + Произошла ошибка при загрузке домашнего задания - %1$d more homework - %1$d more homework - %1$d more homework - %1$d more homework + Ещё %1$d домашних заданий + Ещё %1$d домашних заданий + Ещё %1$d домашних заданий + Ещё %1$d домашних заданий - due %1$s - Last grades - No new grades - An error occurred while loading the grades - School announcements - No current announcements - An error occurred while loading the announcements + срок до %1$s + Последние оценки + Нет новых оценок + Произошла ошибка при загрузке оценок + Объявления школ + Нет текущих объявлений + Произошла ошибка при загрузке объявлений - %1$d more announcement - %1$d more announcements - %1$d more announcements - %1$d more announcements + Ещё %1$d объявление + Ещё %1$d объявление + Ещё %1$d объявление + Ещё %1$d объявлений - Exams - No upcoming exams - An error occurred while loading the exams + Экзамены + Нет предстоящих экзаменов + Произошла ошибка при загрузке экзамена - %1$d more exam - %1$d more exams - %1$d more exams - %1$d more exams + Еще %1$d экзамен + Еще %1$d экзамен + Еще %1$d экзамен + ещё %1$d экзаменов - Conferences - No upcoming conferences - An error occurred while loading the conferences + Конференции + Нет предстоящих конференций + Произошла ошибка при загрузке конференций - %1$d more conference - %1$d more conferences - %1$d more conferences - %1$d more conferences + Еще %1$d конференция + Еще %1$d конференция + Еще %1$d конференция + Еще %1$d конференций - An error occurred while loading data - None + Произошла ошибка при загрузке данных + Отсутствует Проверить наличие обновлений Прежде чем сообщать об ошибке, проверьте наличие обновлений @@ -615,7 +615,7 @@ Уведомления Показывать уведомления Показывать уведомления о будущих уроках - Open system notification settings + Открыть настройки уведомлений системы Исправить проблемы с синхронизацией и уведомлениями На вашем устройстве могут быть проблемы с синхронизацией данных и уведомлениями.\n\nЧтобы их исправить, вам необходимо добавить Wulkanowy в авто-старт и выключить оптимизацию/экономию батареи в настройках устройства. Перейти в настройски @@ -630,18 +630,18 @@ Синхронизировано! Синхронизация не удалась Идёт синхронизация - Last full sync: %s + Последняя полная синхронизация: %s Стоимость плюса Стоимость минуса Отвечать с историей сообщений - Show arithmetic average when no weights provided + Показывать среднее арифметическое при отсутствии весов Расширенные Внешний вид & Поведение Уведомления Синхронизация Оценки - Dashboard - Tiles visibility + Панель + Видимость плиток Посещаемость Расписание Оценки @@ -657,13 +657,13 @@ Версия приложения, участники, социальные порталы, лицензии Новые оценки - New homework - New conferences - New exams + Новая домашняя работа + Новые конференции + Новые экзамены Счастливый номер Новые сообщения Новые заметки - New school announcements + Объявления о новых школах Показывать push-уведомления Будущие уроки Дебаг @@ -677,7 +677,7 @@ Скопировано Отменить - Change + Изменить Загрузка обновлений началась… Только что было скачано обновление. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 81a76cf3..72899b78 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -201,10 +201,10 @@ Nové skúšky - You received %d new exam - You received %d new exams - You received %d new exams - You received %d new exams + Máte %d novú skúšku + Máte %d nové skúšky + Máte %d nových skúšok + Máte %d nových skúšok %d skúška @@ -335,10 +335,10 @@ Nové domáce úlohy - You received %d new homework - You received %d new homework - You received %d new homework - You received %d new homework + Máte %d novú domácu úlohu + Máte %d nové domáce úlohy + Máte %d nových domácich úloh + Máte %d nových domácich úloh %d domáci úloh From 72d8b4aa8480a4d7c32b1ccb225b7a2498dbe24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Sun, 29 Aug 2021 21:08:08 +0200 Subject: [PATCH 154/154] Version 1.2.0 --- app/build.gradle | 10 +++++----- app/src/main/play/release-notes/pl-PL/default.txt | 10 +++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c05aa034..61e47534 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 21 targetSdkVersion 30 - versionCode 92 - versionName "1.1.6" + versionCode 93 + versionName "1.2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -133,8 +133,8 @@ play { serviceAccountEmail = System.getenv("PLAY_SERVICE_ACCOUNT_EMAIL") ?: "jan@fakelog.cf" serviceAccountCredentials = file('key.p12') defaultToAppBundles = false - track = 'production' - updatePriority = 5 + track = 'beta' + updatePriority = 3 } huaweiPublish { @@ -157,7 +157,7 @@ ext { } dependencies { - implementation "io.github.wulkanowy:sdk:b991d0c" + implementation "io.github.wulkanowy:sdk:1.2.0" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt index a6f3f44e..42fd2229 100644 --- a/app/src/main/play/release-notes/pl-PL/default.txt +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -1,6 +1,10 @@ -Wersja 1.1.6 +Wersja 1.2.0 -- naprawiliśmy błąd przy wysyłaniu wiadomości -- naprawiliśmy oznaczanie odwołanych lekcji jako zastępstwa +- dodaliśmy nowy ekran startowy 🎉 +- usprawniliśmy powiadomienia +- dodaliśmy wersje robocze, filtrowanie oraz informację o odczytaniu przez odbiorcę w wiadomościach +- dodaliśmy informacje o liczeniu średniej w podsumowaniu ocen +- dodaliśmy opcję generowania wiadomości z usprawiedliwieniem dni w szkołach pozbawionych funkcji usprawiedliwiania przez zakładkę frekwencja +- oraz wiele wiele innych ulepszeń i poprawek Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases