Merge branch 'release/1.1.2'

app/build.gradle

@@ -20,8 +20,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 17
         targetSdkVersion 30
-        versionCode 87
+        versionCode 88
-        versionName "1.1.1"
+        versionName "1.1.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -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 {
@@ -150,7 +150,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:1.1.1"
+    implementation "io.github.wulkanowy:sdk:1.1.2"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 

app/proguard-rules.pro

@@ -23,4 +23,4 @@
 
 
 #Config for Material Components
--keep class com.google.android.material.tabs.** { *; }
+-keep class com.google.android.material.tabs.** { *; }

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
     }

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() }

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()

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