sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Merge branch 'release/1.1.2'

Browse Source
This commit is contained in:
Mikołaj Pich 2021-03-16 12:58:56 +01:00
commit 168f750863
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -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
@ -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'

2
app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
View File

@ -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
}

1
app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsFragment.kt
View File

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

4
app/src/main/java/io/github/wulkanowy/ui/modules/timetable/additional/AdditionalLessonsPresenter.kt
View File

@ -80,6 +80,10 @@ class AdditionalLessonsPresenter @Inject constructor(
loadData(currentDate, true)
}
fun onDetailsClick() {
view?.showErrorDetailsDialog(lastError)
}
private fun setBaseDateOnHolidays() {
flow {
val student = studentRepository.getCurrentStudent()

4
app/src/main/play/release-notes/pl-PL/default.txt
View File

@ -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