From 3f6159e976cad3e3224a2a38c7530e8b3fdcb361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 16 Mar 2021 12:47:51 +0100 Subject: [PATCH 1/3] Fix show error details button in additional lessons (#1225) --- app/build.gradle | 2 +- .../modules/timetable/additional/AdditionalLessonsFragment.kt | 1 + .../timetable/additional/AdditionalLessonsPresenter.kt | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d2f59239..78a31aac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -150,7 +150,7 @@ ext { } dependencies { - implementation "io.github.wulkanowy:sdk:1.1.1" + implementation "com.github.wulkanowy:sdk:340cf4ebd3" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt index 18551faa..7982387d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt @@ -57,6 +57,7 @@ class AdditionalLessonsFragment : additionalLessonsSwipe.setColorSchemeColors(requireContext().getThemeAttrColor(R.attr.colorPrimary)) additionalLessonsSwipe.setProgressBackgroundColorSchemeColor(requireContext().getThemeAttrColor(R.attr.colorSwipeRefresh)) additionalLessonsErrorRetry.setOnClickListener { presenter.onRetry() } + additionalLessonsErrorDetails.setOnClickListener { presenter.onDetailsClick() } additionalLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() } additionalLessonsNavDate.setOnClickListener { presenter.onPickDate() } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt index 623160e7..21997b33 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt @@ -80,6 +80,10 @@ class AdditionalLessonsPresenter @Inject constructor( loadData(currentDate, true) } + fun onDetailsClick() { + view?.showErrorDetailsDialog(lastError) + } + private fun setBaseDateOnHolidays() { flow { val student = studentRepository.getCurrentStudent() From 21ef2adcf6d6e7769ac8707d122575238ca936db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Tue, 16 Mar 2021 12:49:17 +0100 Subject: [PATCH 2/3] Disable optimization in r8 config and fix crash in grade fragment (#1226) --- app/build.gradle | 2 +- app/proguard-rules.pro | 2 +- .../java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 78a31aac..ba49f448 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -60,7 +60,7 @@ android { release { minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } debug { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index c8379560..fd948261 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -23,4 +23,4 @@ #Config for Material Components --keep class com.google.android.material.tabs.** { *; } \ No newline at end of file +-keep class com.google.android.material.tabs.** { *; } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt index c467c421..504c730d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt @@ -50,7 +50,7 @@ class GradePresenter @Inject constructor( fun onSemesterSwitch(): Boolean { if (semesters.isNotEmpty()) { - view?.showSemesterDialog(selectedIndex - 1, semesters.slice(0..1)) + view?.showSemesterDialog(selectedIndex - 1, semesters.take(2)) } return true } From 3e1acbd3bfdc94363a30477600f9d166c3e34abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 16 Mar 2021 12:58:52 +0100 Subject: [PATCH 3/3] Version 1.1.2 --- app/build.gradle | 6 +++--- app/src/main/play/release-notes/pl-PL/default.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ba49f448..b8b6f016 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 17 targetSdkVersion 30 - versionCode 87 - versionName "1.1.1" + versionCode 88 + versionName "1.1.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -150,7 +150,7 @@ ext { } dependencies { - implementation "com.github.wulkanowy:sdk:340cf4ebd3" + implementation "io.github.wulkanowy:sdk:1.1.2" 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 2b0af6e5..8ab595f9 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,6 @@ -Wersja 1.1.1 +Wersja 1.1.2 -- naprawiliśmy wyświetlanie planu lekcji +- naprawiliśmy wyświetlanie planu lekcji i lekcji dodatkowych - naprawiliśmy kilka rzadkich problemów ze stabilnością Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases