From 4956cf3988018417e51deaa5c02c8dd10166a993 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 21:17:57 +0000
Subject: [PATCH 01/34] Bump kotlin_version from 1.3.31 to 1.3.40 (#427)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ac8a0926d..d783ce487 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.40'
     repositories {
         mavenCentral()
         google()

From 2883b21ddf0313a8a3e35593ee131538961cb814 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 21:22:57 +0000
Subject: [PATCH 02/34] Bump dagger-compiler from 2.23.1 to 2.23.2 (#426)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2a59303c5..727a0227b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -124,7 +124,7 @@ dependencies {
     kapt "androidx.room:room-compiler:2.1.0"
 
     implementation "com.google.dagger:dagger-android-support:2.23.1"
-    kapt "com.google.dagger:dagger-compiler:2.23.1"
+    kapt "com.google.dagger:dagger-compiler:2.23.2"
     kapt "com.google.dagger:dagger-android-processor:2.23.1"
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
     kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0"

From d8b3c5d9d65fb1f50fa400a2938defdc9e192e53 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 21:43:05 +0000
Subject: [PATCH 03/34] Bump dagger-android-processor from 2.23.1 to 2.23.2
 (#425)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 727a0227b..2db82abb9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -125,7 +125,7 @@ dependencies {
 
     implementation "com.google.dagger:dagger-android-support:2.23.1"
     kapt "com.google.dagger:dagger-compiler:2.23.2"
-    kapt "com.google.dagger:dagger-android-processor:2.23.1"
+    kapt "com.google.dagger:dagger-android-processor:2.23.2"
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
     kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0"
 

From 851486df281c832e7458ad0b7b3c8fc6ed1f26eb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 20 Jun 2019 22:00:35 +0000
Subject: [PATCH 04/34] Bump dagger-android-support from 2.23.1 to 2.23.2
 (#424)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2db82abb9..a4d0d9b73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -123,7 +123,7 @@ dependencies {
     implementation "androidx.room:room-rxjava2:2.1.0"
     kapt "androidx.room:room-compiler:2.1.0"
 
-    implementation "com.google.dagger:dagger-android-support:2.23.1"
+    implementation "com.google.dagger:dagger-android-support:2.23.2"
     kapt "com.google.dagger:dagger-compiler:2.23.2"
     kapt "com.google.dagger:dagger-android-processor:2.23.2"
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"

From 01318c8c291b8e5ab65f56f8f0cce6707f5de0a2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2019 10:08:49 +0000
Subject: [PATCH 05/34] Bump rxjava from 2.2.9 to 2.2.10 (#428)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a4d0d9b73..bdbc19492 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -136,7 +136,7 @@ dependencies {
 
     implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.9"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.10"
 
     implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"

From 344fa1bbd797756d55b1c1553d149e30d9af4c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 21 Jun 2019 14:54:10 +0200
Subject: [PATCH 06/34] Increase min SDK to 16 (#429)

---
 app/build.gradle                 | 2 +-
 app/src/main/AndroidManifest.xml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bdbc19492..14e24eef4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 28
         versionCode 41
         versionName "0.9.3"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65a140f2d..5e4292f6e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,8 +4,6 @@
     package="io.github.wulkanowy"
     android:installLocation="internalOnly">
 
-    <uses-sdk tools:overrideLibrary="com.readystatesoftware.chuck" />
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

From 73fa21d45f961d902e815d915542398983a52150 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2019 14:06:24 +0000
Subject: [PATCH 07/34] Bump firebase-core from 16.0.9 to 17.0.0 (#423)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 14e24eef4..df76bdd26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -147,7 +147,7 @@ dependencies {
     implementation "com.mikepenz:aboutlibraries:6.2.3"
     implementation "com.takisoft.preferencex:preferencex:1.0.0"
 
-    playImplementation "com.google.firebase:firebase-core:16.0.9"
+    playImplementation "com.google.firebase:firebase-core:17.0.0"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     releaseImplementation "fr.o80.chucker:library-no-op:2.0.4"

From df9c6852172135633fae8628cc69520346cfa2dc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2019 11:44:23 +0000
Subject: [PATCH 08/34] Bump frag-nav from 3.2.0 to 3.3.0 (#430)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index df76bdd26..d1f446da9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -132,7 +132,7 @@ dependencies {
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
-    implementation "com.ncapdevi:frag-nav:3.2.0"
+    implementation "com.ncapdevi:frag-nav:3.3.0"
 
     implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"

From c5323ee811a3510ef94a35918a0b66d01c8fcece Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2019 18:29:30 +0000
Subject: [PATCH 09/34] Bump google-services from 4.2.0 to 4.3.0 (#432)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d783ce487..a76a3f44b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.android.tools.build:gradle:3.4.1'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.0'
         classpath "io.fabric.tools:gradle:1.29.0"
         classpath "com.github.triplet.gradle:play-publisher:2.2.1"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"

From ba5bad042a63517c251bcf509383c6072f1cbc03 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2019 07:21:54 +0000
Subject: [PATCH 10/34] Bump mockito-core from 2.28.2 to 3.0.1 (#436)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index d1f446da9..b052c10a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -158,7 +158,7 @@ dependencies {
     testImplementation "junit:junit:4.12"
     testImplementation "io.mockk:mockk:1.9.2"
     testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-core:2.28.2"
+    testImplementation "org.mockito:mockito-core:3.0.1"
     testImplementation("org.mockito:mockito-inline:2.28.2") {
         exclude group: "org.mockito", module: "mockito-core"
     }

From 68b37fc5dde424594daaa381abc97e4c769dff1a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2019 07:22:24 +0000
Subject: [PATCH 11/34] Bump mockito-android from 2.28.2 to 3.0.1 (#435)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b052c10a9..f349aa496 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -170,7 +170,7 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:2.1.0"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     androidTestImplementation "org.mockito:mockito-core:2.28.2"
-    androidTestImplementation("org.mockito:mockito-android:2.28.2") {
+    androidTestImplementation("org.mockito:mockito-android:3.0.1") {
         exclude group: 'org.mockito', module: 'mockito-core'
     }
 }

From 12cf1e0b664d810287ae9bb2ba720d2326bc1b71 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2019 07:40:24 +0000
Subject: [PATCH 12/34] Bump mockito-inline from 2.28.2 to 3.0.1 (#434)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f349aa496..ab5d3ca4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -159,7 +159,7 @@ dependencies {
     testImplementation "io.mockk:mockk:1.9.2"
     testImplementation "org.threeten:threetenbp:1.4.0"
     testImplementation "org.mockito:mockito-core:3.0.1"
-    testImplementation("org.mockito:mockito-inline:2.28.2") {
+    testImplementation("org.mockito:mockito-inline:3.0.1") {
         exclude group: "org.mockito", module: "mockito-core"
     }
 

From 35f094b983a72b03ed9663aca92d60b20d137e15 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2019 07:45:20 +0000
Subject: [PATCH 13/34] Bump kotlin_version from 1.3.40 to 1.3.41 (#433)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a76a3f44b..0a0f1224b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.40'
+    ext.kotlin_version = '1.3.41'
     repositories {
         mavenCentral()
         google()

From 86f24e582106382d3d242f039163828f4b8edb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Tue, 9 Jul 2019 13:33:36 +0200
Subject: [PATCH 14/34] Group dependencies versions in variables (#437)

---
 app/build.gradle | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab5d3ca4c..b299d39a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,6 +97,15 @@ play {
     track = 'alpha'
 }
 
+ext {
+    work_manager = "2.0.1"
+    room = "2.1.0"
+    dagger = "2.23.2"
+    chucker = "2.0.4"
+    mockk = "1.9.2"
+    mockito_core = "3.0.1"
+}
+
 dependencies {
     implementation "io.github.wulkanowy:api:0.9.3"
 
@@ -116,16 +125,16 @@ dependencies {
     implementation "com.github.wulkanowy:MaterialChipsInput:b72fd0ee6f"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
 
-    implementation "androidx.work:work-runtime:2.0.1"
-    implementation "androidx.work:work-rxjava2:2.0.1"
+    implementation "androidx.work:work-runtime:$work_manager"
+    implementation "androidx.work:work-rxjava2:$work_manager"
 
-    implementation "androidx.room:room-runtime:2.1.0"
-    implementation "androidx.room:room-rxjava2:2.1.0"
-    kapt "androidx.room:room-compiler:2.1.0"
+    implementation "androidx.room:room-runtime:$room"
+    implementation "androidx.room:room-rxjava2:$room"
+    kapt "androidx.room:room-compiler:$room"
 
-    implementation "com.google.dagger:dagger-android-support:2.23.2"
-    kapt "com.google.dagger:dagger-compiler:2.23.2"
-    kapt "com.google.dagger:dagger-android-processor:2.23.2"
+    implementation "com.google.dagger:dagger-android-support:$dagger"
+    kapt "com.google.dagger:dagger-compiler:$dagger"
+    kapt "com.google.dagger:dagger-android-processor:$dagger"
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
     kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0"
 
@@ -150,15 +159,15 @@ dependencies {
     playImplementation "com.google.firebase:firebase-core:17.0.0"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
-    releaseImplementation "fr.o80.chucker:library-no-op:2.0.4"
+    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
 
-    debugImplementation "fr.o80.chucker:library:2.0.4"
+    debugImplementation "fr.o80.chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.12"
-    testImplementation "io.mockk:mockk:1.9.2"
+    testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-core:3.0.1"
+    testImplementation "org.mockito:mockito-core:$mockito_core"
     testImplementation("org.mockito:mockito-inline:3.0.1") {
         exclude group: "org.mockito", module: "mockito-core"
     }
@@ -166,10 +175,10 @@ dependencies {
     androidTestImplementation "androidx.test:core:1.2.0"
     androidTestImplementation "androidx.test:runner:1.2.0"
     androidTestImplementation "androidx.test.ext:junit:1.1.1"
-    androidTestImplementation "io.mockk:mockk-android:1.9.2"
-    androidTestImplementation "androidx.room:room-testing:2.1.0"
+    androidTestImplementation "io.mockk:mockk-android:$mockk"
+    androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-core:2.28.2"
+    androidTestImplementation "org.mockito:mockito-core:$mockito_core"
     androidTestImplementation("org.mockito:mockito-android:3.0.1") {
         exclude group: 'org.mockito', module: 'mockito-core'
     }

From bdf0fba95b4739e11b5a86ff0d49d7d8171c799d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2019 07:22:59 +0000
Subject: [PATCH 15/34] Bump gradle from 3.4.1 to 3.4.2 (#438)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0a0f1224b..3b52963b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.google.gms:google-services:4.3.0'
         classpath "io.fabric.tools:gradle:1.29.0"
         classpath "com.github.triplet.gradle:play-publisher:2.2.1"

From 09303153a5ea5779b364d4201ba638376ebd5a8a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 08:44:52 +0000
Subject: [PATCH 16/34] Bump firebase-core from 17.0.0 to 17.0.1 (#440)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index b299d39a8..780a25214 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,7 +156,7 @@ dependencies {
     implementation "com.mikepenz:aboutlibraries:6.2.3"
     implementation "com.takisoft.preferencex:preferencex:1.0.0"
 
-    playImplementation "com.google.firebase:firebase-core:17.0.0"
+    playImplementation "com.google.firebase:firebase-core:17.0.1"
     playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
 
     releaseImplementation "fr.o80.chucker:library-no-op:$chucker"

From 7136c9282e9989579a9da86123e7d519bef36152 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 08:46:52 +0000
Subject: [PATCH 17/34] Bump mockito-core from 3.0.1 to 3.0.2 (#445)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 780a25214..39076e364 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -103,7 +103,7 @@ ext {
     dagger = "2.23.2"
     chucker = "2.0.4"
     mockk = "1.9.2"
-    mockito_core = "3.0.1"
+    mockito_core = "3.0.2"
 }
 
 dependencies {

From 0b68091e5503320e8a0b7fc193b719822a4a5ac8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 08:47:11 +0000
Subject: [PATCH 18/34] Bump mockito-android from 3.0.1 to 3.0.2 (#444)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 39076e364..e44cc688b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     androidTestImplementation "org.mockito:mockito-core:$mockito_core"
-    androidTestImplementation("org.mockito:mockito-android:3.0.1") {
+    androidTestImplementation("org.mockito:mockito-android:3.0.2") {
         exclude group: 'org.mockito', module: 'mockito-core'
     }
 }

From 5b0232f77e520ab77ccff3175e2c33be81e8dd64 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 08:47:36 +0000
Subject: [PATCH 19/34] Bump mockito-inline from 3.0.1 to 3.0.2 (#442)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e44cc688b..29fbe46ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -168,7 +168,7 @@ dependencies {
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
     testImplementation "org.mockito:mockito-core:$mockito_core"
-    testImplementation("org.mockito:mockito-inline:3.0.1") {
+    testImplementation("org.mockito:mockito-inline:3.0.2") {
         exclude group: "org.mockito", module: "mockito-core"
     }
 

From ea4f55c06dc45cd94f147454ec42f88a811efc31 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 08:48:33 +0000
Subject: [PATCH 20/34] Bump gradle from 1.29.0 to 1.30.0 (#443)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3b52963b7..55a2e0c60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.google.gms:google-services:4.3.0'
-        classpath "io.fabric.tools:gradle:1.29.0"
+        classpath "io.fabric.tools:gradle:1.30.0"
         classpath "com.github.triplet.gradle:play-publisher:2.2.1"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0"

From 03f5ddaf0dad4ab3181c0176d8826ee88d65d7fa Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 12 Jul 2019 12:50:56 +0000
Subject: [PATCH 21/34] Bump work_manager from 2.0.1 to 2.1.0 (#441)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 29fbe46ab..7d3e0240d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -98,7 +98,7 @@ play {
 }
 
 ext {
-    work_manager = "2.0.1"
+    work_manager = "2.1.0"
     room = "2.1.0"
     dagger = "2.23.2"
     chucker = "2.0.4"

From 39916c2796a7736375f0a5da34ad309d8cbacdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Wed, 17 Jul 2019 13:41:47 +0200
Subject: [PATCH 22/34] Update README (#447)

---
 .idea/codeStyles/Project.xml |  3 ++
 LICENSE                      |  2 +-
 README.en.md                 | 61 ++++++++++++++++++++++++++++++++++++
 README.md                    | 61 +++++++++++++++++++++++++++++-------
 4 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 README.en.md

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 43e9b544a..dcdde40fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -21,6 +21,9 @@
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="false" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
     </JetCodeStyleSettings>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <XML>
       <option name="XML_KEEP_LINE_BREAKS" value="false" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/LICENSE b/LICENSE
index f48b21143..5dd9cacf7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 wulkanowy
+   Copyright 2019 Wulkanowy
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.en.md b/README.en.md
new file mode 100644
index 000000000..9e1585156
--- /dev/null
+++ b/README.en.md
@@ -0,0 +1,61 @@
+[Polska wersja README](README.md)
+
+# Wulkanowy
+[![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
+[![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
+[![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
+[![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)
+
+Unofficial android VULCAN UONET+ register client for student and parent
+
+## Features
+
+* logging in using the email and password
+* functions from the register website:
+    * grades
+    * grade statistics
+    * attendance
+    * percentage of attendance
+    * exams
+    * timetable
+    * completed lessons
+    * messages
+    * homework
+    * notes
+    * lucky number
+* calculation of the average
+* notifications, e.g. about a new grade
+* dark and black (AMOLED) theme
+* offline mode
+* no ads
+
+## Download
+
+You can download the current beta from the Google Play or Fdroid store
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Get it on Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on Fdroid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+    
+You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features prepared for the next release
+
+## Built With
+
+
+* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Contributing
+
+Please contribute to the project either by creating a PR or submitting an issue on GitHub.
+
+## License
+
+This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details
diff --git a/README.md b/README.md
index 07f06d7f2..559c8f44d 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,62 @@
-# Wulkanowy
+[English version of README](README.en.md)
 
+# Wulkanowy
 [![Travis](https://img.shields.io/travis/com/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://travis-ci.com/wulkanowy/wulkanowy)
-[![Bitrise](https://img.shields.io/bitrise/daeff1893f3c8128/master.svg?token=Hjm1ACamk86JDeVVJHOeqQ&style=flat-square)](https://www.bitrise.io/app/daeff1893f3c8128)
 [![Codecov](https://img.shields.io/codecov/c/github/wulkanowy/wulkanowy/master.svg?style=flat-square)](https://codecov.io/gh/wulkanowy/wulkanowy)
-[![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
-[![Sonarcloud](https://sonarcloud.io/api/project_badges/measure?project=io.github.wulkanowy%3Aapp&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=io.github.wulkanowy%3Aapp)
-[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=shield)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_shield)
 [![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 [![F-Droid](https://img.shields.io/f-droid/v/io.github.wulkanowy.svg)](https://f-droid.org/packages/io.github.wulkanowy/)
 [![Last release](https://img.shields.io/github/release/wulkanowy/wulkanowy.svg?logo=github)](https://github.com/wulkanowy/wulkanowy/releases)
 
-[Pobierz wersję beta z Google Play](https://play.google.com/store/apps/details?id=io.github.wulkanowy&amp;utm_source=vcs)
+Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
-[Pobierz wersję DEV](https://bitrise-redirector.herokuapp.com/v0.1/apps/f841f20d8f8b1dc8/builds/master/artifacts/0)
-[(Więcej wersji DEV)](https://wulkanowy.github.io/dev.html)
+## Funkcje
 
-Androidowy klient dziennika VULCAN UONET+.
+* logowanie za pomocą e-maila i hasła
+* funkcje ze strony internetowej dziennika:
+    * oceny
+    * statystyki ocen
+    * frekwencja
+    * procent frekwencji
+    * sprawdziany
+    * plan lekcji
+    * lekcje zrealizowane
+    * wiadomości
+    * zadania domowe
+    * uwagi
+    * szczęśliwy numerek
+* obliczanie średniej
+* powiadomienia np. o nowej ocenie
+* ciemny i czarny (AMOLED) motyw
+* tryb offilne
+* brak reklam
+
+## Pobierz
+
+Aktualną wersję beta możesz pobrać ze sklepu Google Play lub Fdroid
+
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+      alt="Pobierz z Google Play"
+      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Pobierz z Fdroid"
+    height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
 
 
-## License
+Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
 
-[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy.svg?type=large)](https://app.fossa.com/projects/custom%2B5644%2Fgithub.com%2Fwulkanowy%2Fwulkanowy?ref=badge_large)
+
+## Zbudowana za pomocą
+
+* [Wulkanowy API](https://github.com/wulkanowy/api)
+* [RxJava 2](https://github.com/ReactiveX/RxJava)
+* [Dagger 2](https://github.com/google/dagger)
+* [Room](https://developer.android.com/topic/libraries/architecture/room)
+* [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
+
+## Współpraca
+
+Wnieś swój wkład w projekt, tworząc PR lub wysyłając issue na GitHub.
+
+## Licencja
+
+Ten projekt jest licencjonowany w ramach Apache License 2.0 - szczegóły w pliku [LICENSE](LICENSE)
\ No newline at end of file

From f9b3bd7b3a5bd0dea465bd7f9373b268fc852de4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2019 08:14:13 +0000
Subject: [PATCH 23/34] Bump gradle from 1.30.0 to 1.31.0 (#448)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 55a2e0c60..9a08dc70c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.google.gms:google-services:4.3.0'
-        classpath "io.fabric.tools:gradle:1.30.0"
+        classpath "io.fabric.tools:gradle:1.31.0"
         classpath "com.github.triplet.gradle:play-publisher:2.2.1"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0"

From 13f9981be64fa95827c2c5e905c0d7000ff3084e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 28 Jul 2019 12:41:29 +0200
Subject: [PATCH 24/34] Bump dagger from 2.23.2 to 2.24 (#449)

---
 app/build.gradle                                       |  2 +-
 .../java/io/github/wulkanowy/ui/base/BaseActivity.kt   | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7d3e0240d..c7ec31c75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,7 +100,7 @@ play {
 ext {
     work_manager = "2.1.0"
     room = "2.1.0"
-    dagger = "2.23.2"
+    dagger = "2.24"
     chucker = "2.0.4"
     mockk = "1.9.2"
     mockito_core = "3.0.2"
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 0879aa3c4..6fc72d06d 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
@@ -8,22 +8,20 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.fragment.app.Fragment
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
 import dagger.android.AndroidInjection
 import dagger.android.DispatchingAndroidInjector
-import dagger.android.support.HasSupportFragmentInjector
+import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
-    HasSupportFragmentInjector {
+abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView, HasAndroidInjector {
 
     @Inject
-    lateinit var supportFragmentInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var androidInjector: DispatchingAndroidInjector<Any>
 
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
@@ -78,5 +76,5 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
         presenter.onDetachView()
     }
 
-    override fun supportFragmentInjector() = supportFragmentInjector
+    override fun androidInjector() = androidInjector
 }

From 91268dcc67ec013e458088d4e0fd0703c82f3914 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 07:02:15 +0000
Subject: [PATCH 25/34] Bump mockito-inline from 3.0.2 to 3.0.4 (#452)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index c7ec31c75..62c83282b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -168,7 +168,7 @@ dependencies {
     testImplementation "io.mockk:mockk:$mockk"
     testImplementation "org.threeten:threetenbp:1.4.0"
     testImplementation "org.mockito:mockito-core:$mockito_core"
-    testImplementation("org.mockito:mockito-inline:3.0.2") {
+    testImplementation("org.mockito:mockito-inline:3.0.4") {
         exclude group: "org.mockito", module: "mockito-core"
     }
 

From c5b16bb0d0350cdf77ad0a8fe4da3c0858180327 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 07:04:29 +0000
Subject: [PATCH 26/34] Bump mockito-android from 3.0.2 to 3.0.4 (#450)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 62c83282b..f82d91d02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -179,7 +179,7 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     androidTestImplementation "org.mockito:mockito-core:$mockito_core"
-    androidTestImplementation("org.mockito:mockito-android:3.0.2") {
+    androidTestImplementation("org.mockito:mockito-android:3.0.4") {
         exclude group: 'org.mockito', module: 'mockito-core'
     }
 }

From 462b917832e5f12f032effee908f3ca8e1780952 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2019 07:34:21 +0000
Subject: [PATCH 27/34] Bump mockito-core from 3.0.2 to 3.0.4 (#451)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index f82d91d02..1d6cc5a15 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -103,7 +103,7 @@ ext {
     dagger = "2.24"
     chucker = "2.0.4"
     mockk = "1.9.2"
-    mockito_core = "3.0.2"
+    mockito_core = "3.0.4"
 }
 
 dependencies {

From 1267a39e32d8e76b3acc59017ad65c1e947d9bda Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 2 Aug 2019 11:01:28 +0000
Subject: [PATCH 28/34] Bump rxjava from 2.2.10 to 2.2.11 (#454)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1d6cc5a15..a7d8d5a00 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -145,7 +145,7 @@ dependencies {
 
     implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.10"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.11"
 
     implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"

From bf0ea1b012b5a07c4fcf367301fbfdd92a12d2bb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2019 17:09:26 +0000
Subject: [PATCH 29/34] Bump reactivenetwork-rx2 from 3.0.3 to 3.0.4 (#456)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index a7d8d5a00..7dbf4de7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,7 +143,7 @@ dependencies {
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.3"
+    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.4"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
     implementation "io.reactivex.rxjava2:rxjava:2.2.11"
 

From 4adfb268a33416987cd74a6034a2b52c517c022a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Thu, 8 Aug 2019 17:40:23 +0200
Subject: [PATCH 30/34] Update gitignore (#455)

---
 .gitignore                   | 114 +++++++++++++++++++++++++++--------
 .idea/gradle.xml             |  18 ------
 app/.gitignore               |   1 -
 app/key-encrypted.p12        | Bin 2496 -> 0 bytes
 app/upload-key-encrypted.jks | Bin 2096 -> 0 bytes
 5 files changed, 88 insertions(+), 45 deletions(-)
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 app/.gitignore
 delete mode 100644 app/key-encrypted.p12
 delete mode 100644 app/upload-key-encrypted.jks

diff --git a/.gitignore b/.gitignore
index 63783326a..6cb549fa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,90 @@
-/captures
-.externalNativeBuild
-
-## https://gist.github.com/iainconnor/8605514
+# Created by https://www.gitignore.io
 
 # Built application files
-/build
-/*/build/
+*.apk
+*.ap_
+*.aab
 
-# Crashlytics configuations
-com_crashlytics_export_strings.xml
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Gradle generated files
-.gradle/
+# Proguard folder generated by Eclipse
+proguard/
 
-# Signing files
-.signing/
+# Log Files
+*.log
 
-# User-specific configurations
-.idea/copyright/profiles_settings.xml
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ configurations
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+.idea/modules.xml
+.idea/navEditor.xml
+.idea/caches/
 .idea/libraries/
-.idea/inspectionProfiles/
+.idea/shelf/
 .idea/.name
 .idea/compiler.xml
+.idea/copyright/profiles_settings.xml
 .idea/encodings.xml
 .idea/misc.xml
-.idea/modules.xml
 .idea/scopes/scope_settings.xml
-.idea/tasks.xml
 .idea/vcs.xml
-.idea/workspace.xml
-.idea/caches/
-*.iml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/runConfigurations.xml
+
+# Keystore files
+*.jks
+*.keystore
+*.p12
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+lint/reports/
+
+### Android Patch ###
+gen-external-apklibs
+output.json
 
 # OS-specific files
 .DS_Store
@@ -43,9 +94,20 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-.idea/caches/
-app/key.p12
-app/upload-key.jks
-*.log
-.idea/assetWizardSettings.xml
-.idea/uiDesigner.xml
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 7ac24c777..000000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 796b96d1c..000000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/app/key-encrypted.p12 b/app/key-encrypted.p12
deleted file mode 100644
index d9811213feb8a1ea01f5f588f08d840cfe002b11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2496
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
KI=F9g_Ny-;McbJG

diff --git a/app/upload-key-encrypted.jks b/app/upload-key-encrypted.jks
deleted file mode 100644
index 6ad925d83f53ee675fc7bbde4515393b04db657a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2096
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
aIO!IK|KBKi!kFule?1&0U=-iYg6G<&!4EwE


From 72ef36682911a08becaf77aa32623fa7bd53b857 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2019 11:28:33 +0000
Subject: [PATCH 31/34] Bump assisted-inject-processor-dagger2 from 0.4.0 to
 0.5.0 (#457)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7dbf4de7c..5bd00bd20 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -136,7 +136,7 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$dagger"
     kapt "com.google.dagger:dagger-android-processor:$dagger"
     implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.4.0"
+    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"
     implementation "eu.davidea:flexible-adapter-ui:1.0.0"

From 070fba734c08963e2cc27a389b06854a8b3ce0c8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 9 Aug 2019 12:04:05 +0000
Subject: [PATCH 32/34] Bump assisted-inject-annotations-dagger2 from 0.4.0 to
 0.5.0 (#458)

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5bd00bd20..3eba017d6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -135,7 +135,7 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger"
     kapt "com.google.dagger:dagger-compiler:$dagger"
     kapt "com.google.dagger:dagger-android-processor:$dagger"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.4.0"
+    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.0"
     kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.0"
 
     implementation "eu.davidea:flexible-adapter:5.1.0"

From 6bd07d265151475f8748d9de80e04db66c177087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 12 Aug 2019 12:17:39 +0200
Subject: [PATCH 33/34] Fix day/week navigation on holiday (#459)

---
 .../modules/attendance/AttendancePresenter.kt |  37 +++-
 .../ui/modules/exam/ExamPresenter.kt          |  33 +++-
 .../ui/modules/homework/HomeworkPresenter.kt  |  29 ++-
 .../modules/timetable/TimetablePresenter.kt   |  30 ++-
 .../completed/CompletedLessonsPresenter.kt    |  28 ++-
 .../github/wulkanowy/utils/TimeExtension.kt   |  85 +++++----
 .../wulkanowy/utils/TimeExtensionTest.kt      | 176 ++++++++++--------
 7 files changed, 284 insertions(+), 134 deletions(-)

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 5e7333e19..df311f784 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
@@ -8,7 +8,13 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.*
+import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
+import io.github.wulkanowy.utils.isHolidays
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousOrSameSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDate.now
 import org.threeten.bp.LocalDate.ofEpochDay
@@ -26,6 +32,8 @@ class AttendancePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().previousOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -33,7 +41,8 @@ class AttendancePresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Attendance view was initialized")
-        loadData(ofEpochDay(date ?: now().previousOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -56,7 +65,7 @@ class AttendancePresenter @Inject constructor(
         Timber.i("Attendance view is reselected")
         view?.also { view ->
             if (view.currentStackSize == 1) {
-                now().previousOrSameSchoolDay.also {
+                baseDate.also {
                     if (currentDate != it) {
                         loadData(it)
                         reloadView()
@@ -78,6 +87,20 @@ class AttendancePresenter @Inject constructor(
         return true
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
         currentDate = date
@@ -127,8 +150,14 @@ class AttendancePresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
+            showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
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 4045a956f..93109922c 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
@@ -10,6 +10,7 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
@@ -30,6 +31,8 @@ class ExamPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -37,7 +40,8 @@ class ExamPresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Exam view was initialized")
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -65,7 +69,7 @@ class ExamPresenter @Inject constructor(
 
     fun onViewReselected() {
         Timber.i("Exam view is reselected")
-        now().nextOrSameSchoolDay.also {
+        baseDate.also {
             if (currentDate != it) {
                 loadData(it)
                 reloadView()
@@ -73,6 +77,20 @@ class ExamPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading exam data started")
         currentDate = date
@@ -81,9 +99,8 @@ class ExamPresenter @Inject constructor(
             add(studentRepository.getCurrentStudent()
                 .delay(200, MILLISECONDS)
                 .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap {
-                    examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh)
-                }.map { it.groupBy { exam -> exam.date }.toSortedMap() }
+                .flatMap { examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh) }
+                .map { it.groupBy { exam -> exam.date }.toSortedMap() }
                 .map { createExamItems(it) }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
@@ -126,6 +143,12 @@ class ExamPresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 682e87d4b..6829031c1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -10,11 +10,13 @@ import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
 import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.ofEpochDay
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -28,6 +30,8 @@ class HomeworkPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -35,7 +39,8 @@ class HomeworkPresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Homework view was initialized")
-        loadData(LocalDate.ofEpochDay(date ?: LocalDate.now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -61,6 +66,20 @@ class HomeworkPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading homework data started")
         currentDate = date
@@ -113,8 +132,14 @@ class HomeworkPresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(7).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(7).isHolidays)
+            showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
                 currentDate.friday.toFormattedString("dd.MM"))
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index bead42286..baf347aed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -8,6 +8,7 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
@@ -29,6 +30,8 @@ class TimetablePresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -36,7 +39,8 @@ class TimetablePresenter @Inject constructor(
         super.onAttachView(view)
         view.initView()
         Timber.i("Timetable was initialized")
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
     }
 
@@ -59,7 +63,7 @@ class TimetablePresenter @Inject constructor(
         Timber.i("Timetable view is reselected")
         view?.also { view ->
             if (view.currentStackSize == 1) {
-                now().nextOrSameSchoolDay.also {
+                baseDate.also {
                     if (currentDate != it) {
                         loadData(it)
                         reloadView()
@@ -81,6 +85,20 @@ class TimetablePresenter @Inject constructor(
         return true
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading timetable data started")
         currentDate = date
@@ -125,8 +143,14 @@ class TimetablePresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
+            showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index 0db5210f4..b9e1fe2d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -7,6 +7,7 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
 import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
@@ -28,6 +29,8 @@ class CompletedLessonsPresenter @Inject constructor(
     private val analytics: FirebaseAnalyticsHelper
 ) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
 
+    private var baseDate: LocalDate = now().nextOrSameSchoolDay
+
     lateinit var currentDate: LocalDate
         private set
 
@@ -35,7 +38,8 @@ class CompletedLessonsPresenter @Inject constructor(
         super.onAttachView(view)
         Timber.i("Completed lessons is attached")
         view.initView()
-        loadData(ofEpochDay(date ?: now().nextOrSameSchoolDay.toEpochDay()))
+        loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
+        if (currentDate.isHolidays) setBaseDateOnHolidays()
         reloadView()
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
@@ -65,6 +69,20 @@ class CompletedLessonsPresenter @Inject constructor(
         }
     }
 
+    private fun setBaseDateOnHolidays() {
+        disposable.add(studentRepository.getCurrentStudent()
+            .flatMap { semesterRepository.getCurrentSemester(it) }
+            .subscribeOn(schedulers.backgroundThread)
+            .observeOn(schedulers.mainThread)
+            .subscribe({
+                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+                currentDate = baseDate
+                reloadNavigation()
+            }) {
+                Timber.i("Loading semester result: An exception occurred")
+            })
+    }
+
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading completed lessons data started")
         currentDate = date
@@ -109,8 +127,14 @@ class CompletedLessonsPresenter @Inject constructor(
             showContent(false)
             showEmpty(false)
             clearData()
-            showNextButton(!currentDate.plusDays(1).isHolidays)
+            reloadNavigation()
+        }
+    }
+
+    private fun reloadNavigation() {
+        view?.apply {
             showPreButton(!currentDate.minusDays(1).isHolidays)
+            showNextButton(!currentDate.plusDays(1).isHolidays)
             updateNavigationDay(currentDate.toFormattedString("EEEE\ndd.MM.YYYY").capitalize())
         }
     }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index 426816f44..a2672f865 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -6,11 +6,11 @@ import org.threeten.bp.DayOfWeek.MONDAY
 import org.threeten.bp.DayOfWeek.SATURDAY
 import org.threeten.bp.DayOfWeek.SUNDAY
 import org.threeten.bp.Instant
+import org.threeten.bp.Instant.ofEpochMilli
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.Month
 import org.threeten.bp.ZoneId
-import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.DateTimeFormatter.ofPattern
 import org.threeten.bp.format.TextStyle.FULL_STANDALONE
 import org.threeten.bp.temporal.TemporalAdjusters.firstInMonth
@@ -21,21 +21,15 @@ import java.util.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
 
-fun Date.toLocalDate(): LocalDate {
-    return Instant.ofEpochMilli(this.time).atZone(ZoneId.systemDefault()).toLocalDate()
-}
+fun Date.toLocalDate(): LocalDate = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDate()
 
-fun Date.toLocalDateTime(): LocalDateTime {
-    return Instant.ofEpochMilli(this.time).atZone(ZoneId.systemDefault()).toLocalDateTime()
-}
+fun Date.toLocalDateTime(): LocalDateTime = ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDateTime()
 
-fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate {
-    return LocalDate.parse(this, DateTimeFormatter.ofPattern(format))
-}
+fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.parse(this, ofPattern(format))
 
-fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
+fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
-fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = this.format(ofPattern(format))
+fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
 fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
 
@@ -66,62 +60,81 @@ fun Month.getFormattedName(): String {
 
 inline val LocalDate.nextSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            FRIDAY, SATURDAY, SUNDAY -> this.with(next(MONDAY))
-            else -> this.plusDays(1)
+        return when (dayOfWeek) {
+            FRIDAY, SATURDAY, SUNDAY -> with(next(MONDAY))
+            else -> plusDays(1)
         }
     }
 
 inline val LocalDate.previousSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            SATURDAY, SUNDAY, MONDAY -> this.with(previous(FRIDAY))
-            else -> this.minusDays(1)
+        return when (dayOfWeek) {
+            SATURDAY, SUNDAY, MONDAY -> with(previous(FRIDAY))
+            else -> minusDays(1)
         }
     }
 
 inline val LocalDate.nextOrSameSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            SATURDAY, SUNDAY -> this.with(next(MONDAY))
+        return when (dayOfWeek) {
+            SATURDAY, SUNDAY -> with(next(MONDAY))
             else -> this
         }
     }
 
 inline val LocalDate.previousOrSameSchoolDay: LocalDate
     get() {
-        return when (this.dayOfWeek) {
-            SATURDAY, SUNDAY -> this.with(previous(FRIDAY))
+        return when (dayOfWeek) {
+            SATURDAY, SUNDAY -> with(previous(FRIDAY))
             else -> this
         }
     }
 
 inline val LocalDate.weekDayName: String
-    get() = this.format(ofPattern("EEEE", Locale.getDefault()))
+    get() = format(ofPattern("EEEE", Locale.getDefault()))
 
 inline val LocalDate.shortcutWeekDayName: String
-    get() = this.format(ofPattern("EEE", Locale.getDefault()))
+    get() = format(ofPattern("EEE", Locale.getDefault()))
 
 inline val LocalDate.monday: LocalDate
-    get() = this.with(MONDAY)
+    get() = with(MONDAY)
 
 inline val LocalDate.friday: LocalDate
-    get() = this.with(FRIDAY)
+    get() = with(FRIDAY)
 
 /**
  * [Dz.U. 2016 poz. 1335](http://prawo.sejm.gov.pl/isap.nsf/DocDetails.xsp?id=WDU20160001335)
  */
 
 inline val LocalDate.isHolidays: Boolean
-    get() {
-        return LocalDate.of(this.year, 9, 1).run {
-            when (dayOfWeek) {
-                FRIDAY, SATURDAY, SUNDAY -> with(firstInMonth(MONDAY))
-                else -> this
-            }
-        }.let { firstSchoolDay ->
-            LocalDate.of(this.year, 6, 20)
-                .with(next(FRIDAY))
-                .let { lastSchoolDay -> this.isBefore(firstSchoolDay) && this.isAfter(lastSchoolDay) }
+    get() = isBefore(firstSchoolDay) && isAfter(lastSchoolDay)
+
+inline val LocalDate.firstSchoolDay: LocalDate
+    get() = LocalDate.of(year, 9, 1).run {
+        when (dayOfWeek) {
+            FRIDAY, SATURDAY, SUNDAY -> with(firstInMonth(MONDAY))
+            else -> this
         }
     }
+
+inline val LocalDate.lastSchoolDay: LocalDate
+    get() = LocalDate.of(year, 6, 20)
+        .with(next(FRIDAY))
+
+
+private fun Int.getSchoolYearByMonth(monthValue: Int): Int {
+    return when (monthValue) {
+        in 9..12 -> this
+        else -> this + 1
+    }
+}
+
+fun LocalDate.getLastSchoolDayIfHoliday(schoolYear: Int): LocalDate {
+    val date = LocalDate.of(schoolYear.getSchoolYearByMonth(monthValue), monthValue, dayOfMonth)
+
+    if (date.isHolidays) {
+        return date.lastSchoolDay
+    }
+
+    return date
+}
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index 442356dc6..024b4727b 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -4,7 +4,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDate.of
 import org.threeten.bp.LocalDateTime
 import org.threeten.bp.Month.JANUARY
 import java.util.Locale
@@ -13,13 +13,13 @@ class TimeExtensionTest {
 
     @Test
     fun toLocalDateTest() {
-        assertEquals(LocalDate.of(1970, 1, 1), "1970-01-01".toLocalDate("yyyy-MM-dd"))
+        assertEquals(of(1970, 1, 1), "1970-01-01".toLocalDate("yyyy-MM-dd"))
     }
 
     @Test
     fun toFormattedStringLocalDateTest() {
-        assertEquals("01.10.2018", LocalDate.of(2018, 10, 1).toFormattedString())
-        assertEquals("2018-10.01", LocalDate.of(2018, 10, 1).toFormattedString("yyyy-MM.dd"))
+        assertEquals("01.10.2018", of(2018, 10, 1).toFormattedString())
+        assertEquals("2018-10.01", of(2018, 10, 1).toFormattedString("yyyy-MM.dd"))
     }
 
     @Test
@@ -30,20 +30,20 @@ class TimeExtensionTest {
 
     @Test
     fun mondayTest() {
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 2).monday)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 5).monday)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 6).monday)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 7).monday)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 8).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 2).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 5).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 6).monday)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 7).monday)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 8).monday)
     }
 
     @Test
     fun fridayTest() {
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 2).friday)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 5).friday)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 6).friday)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 7).friday)
-        assertEquals(LocalDate.of(2018, 10, 12), LocalDate.of(2018, 10, 8).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 2).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 5).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 6).friday)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 7).friday)
+        assertEquals(of(2018, 10, 12), of(2018, 10, 8).friday)
     }
 
     @Test
@@ -57,106 +57,118 @@ class TimeExtensionTest {
     @Test
     fun weekDayNameTest() {
         Locale.setDefault(Locale.forLanguageTag("PL"))
-        assertEquals("poniedziałek", LocalDate.of(2018, 10, 1).weekDayName)
+        assertEquals("poniedziałek", of(2018, 10, 1).weekDayName)
         Locale.setDefault(Locale.forLanguageTag("US"))
-        assertEquals("Monday", LocalDate.of(2018, 10, 1).weekDayName)
+        assertEquals("Monday", of(2018, 10, 1).weekDayName)
     }
 
     @Test
     fun nextSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 10, 2), LocalDate.of(2018, 10, 1).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 3), LocalDate.of(2018, 10, 2).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 4), LocalDate.of(2018, 10, 3).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 4).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 5).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 6).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 7).nextSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 9), LocalDate.of(2018, 10, 8).nextSchoolDay)
+        assertEquals(of(2018, 10, 2), of(2018, 10, 1).nextSchoolDay)
+        assertEquals(of(2018, 10, 3), of(2018, 10, 2).nextSchoolDay)
+        assertEquals(of(2018, 10, 4), of(2018, 10, 3).nextSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 4).nextSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 5).nextSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 6).nextSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 7).nextSchoolDay)
+        assertEquals(of(2018, 10, 9), of(2018, 10, 8).nextSchoolDay)
     }
 
     @Test
     fun previousSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 10, 9), LocalDate.of(2018, 10, 10).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 8), LocalDate.of(2018, 10, 9).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 8).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 7).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 5), LocalDate.of(2018, 10, 6).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 4), LocalDate.of(2018, 10, 5).previousSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 3), LocalDate.of(2018, 10, 4).previousSchoolDay)
+        assertEquals(of(2018, 10, 9), of(2018, 10, 10).previousSchoolDay)
+        assertEquals(of(2018, 10, 8), of(2018, 10, 9).previousSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 8).previousSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 7).previousSchoolDay)
+        assertEquals(of(2018, 10, 5), of(2018, 10, 6).previousSchoolDay)
+        assertEquals(of(2018, 10, 4), of(2018, 10, 5).previousSchoolDay)
+        assertEquals(of(2018, 10, 3), of(2018, 10, 4).previousSchoolDay)
     }
 
     @Test
     fun nextOrSameSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 28).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 9, 29).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 9, 30).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 1).nextOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 2), LocalDate.of(2018, 10, 2).nextOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 28).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 9, 29).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 9, 30).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 1).nextOrSameSchoolDay)
+        assertEquals(of(2018, 10, 2), of(2018, 10, 2).nextOrSameSchoolDay)
     }
 
     @Test
     fun previousOrSameSchoolDayTest() {
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 28).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 29).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 9, 28), LocalDate.of(2018, 9, 30).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 1), LocalDate.of(2018, 10, 1).previousOrSameSchoolDay)
-        assertEquals(LocalDate.of(2018, 10, 2), LocalDate.of(2018, 10, 2).previousOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 28).previousOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 29).previousOrSameSchoolDay)
+        assertEquals(of(2018, 9, 28), of(2018, 9, 30).previousOrSameSchoolDay)
+        assertEquals(of(2018, 10, 1), of(2018, 10, 1).previousOrSameSchoolDay)
+        assertEquals(of(2018, 10, 2), of(2018, 10, 2).previousOrSameSchoolDay)
     }
 
     @Test
     fun isHolidays_schoolEndTest() {
-        assertFalse(LocalDate.of(2017, 6, 23).isHolidays)
-        assertFalse(LocalDate.of(2018, 6, 22).isHolidays)
-        assertFalse(LocalDate.of(2019, 6, 21).isHolidays)
-        assertFalse(LocalDate.of(2020, 6, 26).isHolidays)
-        assertFalse(LocalDate.of(2021, 6, 25).isHolidays)
-        assertFalse(LocalDate.of(2022, 6, 24).isHolidays)
-        assertFalse(LocalDate.of(2023, 6, 23).isHolidays)
-        assertFalse(LocalDate.of(2024, 6, 21).isHolidays)
-        assertFalse(LocalDate.of(2025, 6, 27).isHolidays)
+        assertFalse(of(2017, 6, 23).isHolidays)
+        assertFalse(of(2018, 6, 22).isHolidays)
+        assertFalse(of(2019, 6, 21).isHolidays)
+        assertFalse(of(2020, 6, 26).isHolidays)
+        assertFalse(of(2021, 6, 25).isHolidays)
+        assertFalse(of(2022, 6, 24).isHolidays)
+        assertFalse(of(2023, 6, 23).isHolidays)
+        assertFalse(of(2024, 6, 21).isHolidays)
+        assertFalse(of(2025, 6, 27).isHolidays)
     }
 
     @Test
     fun isHolidays_holidaysStartTest() {
-        assertTrue(LocalDate.of(2017, 6, 24).isHolidays)
-        assertTrue(LocalDate.of(2018, 6, 23).isHolidays)
-        assertTrue(LocalDate.of(2019, 6, 22).isHolidays)
-        assertTrue(LocalDate.of(2020, 6, 27).isHolidays)
-        assertTrue(LocalDate.of(2021, 6, 26).isHolidays)
-        assertTrue(LocalDate.of(2022, 6, 25).isHolidays)
-        assertTrue(LocalDate.of(2023, 6, 24).isHolidays)
-        assertTrue(LocalDate.of(2024, 6, 22).isHolidays)
-        assertTrue(LocalDate.of(2025, 6, 28).isHolidays)
+        assertTrue(of(2017, 6, 24).isHolidays)
+        assertTrue(of(2018, 6, 23).isHolidays)
+        assertTrue(of(2019, 6, 22).isHolidays)
+        assertTrue(of(2020, 6, 27).isHolidays)
+        assertTrue(of(2021, 6, 26).isHolidays)
+        assertTrue(of(2022, 6, 25).isHolidays)
+        assertTrue(of(2023, 6, 24).isHolidays)
+        assertTrue(of(2024, 6, 22).isHolidays)
+        assertTrue(of(2025, 6, 28).isHolidays)
     }
 
     @Test
     fun isHolidays_holidaysEndTest() {
-        assertTrue(LocalDate.of(2017, 9, 1).isHolidays) // friday
-        assertTrue(LocalDate.of(2017, 9, 2).isHolidays) // saturday
-        assertTrue(LocalDate.of(2017, 9, 3).isHolidays) // sunday
-        assertTrue(LocalDate.of(2018, 9, 1).isHolidays) // saturday
-        assertTrue(LocalDate.of(2018, 9, 2).isHolidays) // sunday
-        assertTrue(LocalDate.of(2019, 9, 1).isHolidays) // sunday
-        assertTrue(LocalDate.of(2020, 8, 31).isHolidays) // monday
-        assertTrue(LocalDate.of(2021, 8, 31).isHolidays) // tuesday
-        assertTrue(LocalDate.of(2022, 8, 31).isHolidays) // wednesday
-        assertTrue(LocalDate.of(2023, 9, 1).isHolidays) // friday
-        assertTrue(LocalDate.of(2023, 9, 2).isHolidays) // saturday
-        assertTrue(LocalDate.of(2023, 9, 3).isHolidays) // sunday
-        assertTrue(LocalDate.of(2024, 9, 1).isHolidays) // sunday
-        assertTrue(LocalDate.of(2025, 8, 31).isHolidays) // sunday
+        assertTrue(of(2017, 9, 1).isHolidays) // friday
+        assertTrue(of(2017, 9, 2).isHolidays) // saturday
+        assertTrue(of(2017, 9, 3).isHolidays) // sunday
+        assertTrue(of(2018, 9, 1).isHolidays) // saturday
+        assertTrue(of(2018, 9, 2).isHolidays) // sunday
+        assertTrue(of(2019, 9, 1).isHolidays) // sunday
+        assertTrue(of(2020, 8, 31).isHolidays) // monday
+        assertTrue(of(2021, 8, 31).isHolidays) // tuesday
+        assertTrue(of(2022, 8, 31).isHolidays) // wednesday
+        assertTrue(of(2023, 9, 1).isHolidays) // friday
+        assertTrue(of(2023, 9, 2).isHolidays) // saturday
+        assertTrue(of(2023, 9, 3).isHolidays) // sunday
+        assertTrue(of(2024, 9, 1).isHolidays) // sunday
+        assertTrue(of(2025, 8, 31).isHolidays) // sunday
     }
 
     @Test
     fun isHolidays_schoolStartTest() {
-        assertFalse(LocalDate.of(2017, 9, 4).isHolidays) // monday
-        assertFalse(LocalDate.of(2018, 9, 3).isHolidays) // monday
-        assertFalse(LocalDate.of(2019, 9, 2).isHolidays) // monday
-        assertFalse(LocalDate.of(2020, 9, 1).isHolidays) // tuesday
-        assertFalse(LocalDate.of(2021, 9, 1).isHolidays) // wednesday
-        assertFalse(LocalDate.of(2022, 9, 1).isHolidays) // thursday
-        assertFalse(LocalDate.of(2023, 9, 4).isHolidays) // monday
-        assertFalse(LocalDate.of(2024, 9, 2).isHolidays) // monday
-        assertFalse(LocalDate.of(2025, 9, 1).isHolidays) // monday
+        assertFalse(of(2017, 9, 4).isHolidays) // monday
+        assertFalse(of(2018, 9, 3).isHolidays) // monday
+        assertFalse(of(2019, 9, 2).isHolidays) // monday
+        assertFalse(of(2020, 9, 1).isHolidays) // tuesday
+        assertFalse(of(2021, 9, 1).isHolidays) // wednesday
+        assertFalse(of(2022, 9, 1).isHolidays) // thursday
+        assertFalse(of(2023, 9, 4).isHolidays) // monday
+        assertFalse(of(2024, 9, 2).isHolidays) // monday
+        assertFalse(of(2025, 9, 1).isHolidays) // monday
+    }
+
+    @Test
+    fun getCorrectedDate_holidays() {
+        assertEquals(of(2019, 6, 21), of(2019, 8, 9).getLastSchoolDayIfHoliday(2018))
+        assertEquals(of(2018, 6, 22), of(2019, 8, 9).getLastSchoolDayIfHoliday(2017))
+    }
+
+    @Test
+    fun getCorrectedDate_schoolYear() {
+        assertEquals(of(2019, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2018))
+        assertEquals(of(2018, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2017))
     }
 }

From db7b7dbadf6d9510b977cfb09aece6eac7827566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Pich?= <m.pich@outlook.com>
Date: Mon, 12 Aug 2019 23:17:02 +0200
Subject: [PATCH 34/34] Version 0.9.4

---
 .travis.yml                                       | 2 +-
 app/build.gradle                                  | 6 +++---
 app/src/main/play/release-notes/pl-PL/default.txt | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0bcf9bdb7..3b19799aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.9.2
+    - 0.9.4
 
 android:
  licenses:
diff --git a/app/build.gradle b/app/build.gradle
index 3eba017d6..499f06361 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 41
-        versionName "0.9.3"
+        versionCode 42
+        versionName "0.9.4"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -107,7 +107,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:api:0.9.3"
+    implementation "io.github.wulkanowy:api:0.9.4"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "androidx.core:core:1.0.2"
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 2bb64db6c..512e5055a 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,8 +1,6 @@
-Wersja 0.9.3
+Wersja 0.9.4
 
-Naprawiliśmy:
-- problemy z logowaniem jeśli symbol zawierał cyfry
-- bardzo rzadkie problemy z ładowaniem ocen
-- jeszcze rzadsze problemy ze stabilnością podczas logowania
+- naprawienie nawigacji we frekwencji, sprawdzianach, planie lekcji na wakacjach
+- wyświetlanie szczęśliwego numerka po ostatniej aktualizacji dziennika VULCAN (19.06)
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases