From bb6023709f22a410c462931670430cb3d8da454b Mon Sep 17 00:00:00 2001 From: Dominik Korsa Date: Sun, 8 Sep 2019 15:10:29 +0200 Subject: [PATCH 01/11] Fix grade details header unread info (#494) --- app/src/main/res/layout/header_grade_details.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml index a83951dd..40f486cf 100644 --- a/app/src/main/res/layout/header_grade_details.xml +++ b/app/src/main/res/layout/header_grade_details.xml @@ -7,9 +7,11 @@ android:background="?selectableItemBackground" android:paddingLeft="16dp" android:paddingTop="10dp" - android:paddingRight="16dp" + android:paddingRight="12dp" android:paddingBottom="10dp" - tools:context=".ui.modules.grade.details.GradeDetailsHeader"> + tools:context=".ui.modules.grade.details.GradeDetailsHeader" + android:paddingEnd="12dp" + android:paddingStart="16dp"> - Date: Mon, 9 Sep 2019 08:23:22 +0000 Subject: [PATCH 02/11] Bump logging-interceptor from 3.12.3 to 3.12.4 (#496) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 725316f6..0fe09049 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -173,7 +173,7 @@ dependencies { implementation "com.jakewharton.threetenabp:threetenabp:1.2.1" implementation "com.jakewharton.timber:timber:4.7.1" implementation "at.favre.lib:slf4j-timber:1.0.1" - implementation "com.squareup.okhttp3:logging-interceptor:3.12.3" + implementation "com.squareup.okhttp3:logging-interceptor:3.12.4" implementation "com.mikepenz:aboutlibraries:7.0.3" playImplementation "com.google.firebase:firebase-core:17.2.0" From e65000ec2ca1cf40993b59c476a187c8a216ae99 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 08:25:29 +0000 Subject: [PATCH 03/11] Bump mockito-inline from 3.0.6 to 3.0.7 (#497) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0fe09049..03723e05 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -188,7 +188,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.6") { + testImplementation("org.mockito:mockito-inline:3.0.7") { exclude group: "org.mockito", module: "mockito-core" } From 385a3205362400a466f34b12f773aeae35de93c8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 08:25:51 +0000 Subject: [PATCH 04/11] Bump google-services from 4.3.1 to 4.3.2 (#498) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e8f29a52..b050f207 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.android.tools.build:gradle:3.5.0' - classpath 'com.google.gms:google-services:4.3.1' + classpath 'com.google.gms:google-services:4.3.2' classpath "io.fabric.tools:gradle:1.31.0" classpath "com.github.Triple-T:gradle-play-publisher:cdaeb61a87fedd1874e15e94eab7c6b80fda6727" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" From a5f212e6bedcd13baba274424e1e401934f6a6eb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 08:39:39 +0000 Subject: [PATCH 05/11] Bump room from 2.2.0-beta01 to 2.2.0-rc01 (#499) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 03723e05..fe89daab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,7 +110,7 @@ play { ext { work_manager = "2.2.0" - room = "2.2.0-beta01" + room = "2.2.0-rc01" dagger = "2.24" chucker = "2.0.4" mockk = "1.9.2" From e542ef003cee79d1ccb48bfbd7fb4a5f8241cd29 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 08:54:03 +0000 Subject: [PATCH 06/11] Bump mockito-android from 3.0.6 to 3.0.7 (#503) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index fe89daab..20da9a66 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -199,7 +199,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.6") { + androidTestImplementation("org.mockito:mockito-android:3.0.7") { exclude group: 'org.mockito', module: 'mockito-core' } } From 8b41ab27bdefaec90622bfa3561eaef123b1e5fc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 09:25:52 +0000 Subject: [PATCH 07/11] Bump mockito-core from 3.0.6 to 3.0.7 (#502) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 20da9a66..331b1e8a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,7 +114,7 @@ ext { dagger = "2.24" chucker = "2.0.4" mockk = "1.9.2" - mockito_core = "3.0.6" + mockito_core = "3.0.7" } configurations.all { From 867951136a53409b0a1d2c94e187666ee8c63a72 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 13:43:55 +0000 Subject: [PATCH 08/11] Bump gradle-play-publisher from `cdaeb61` to 2.4.0 (#501) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b050f207..a4791238 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.google.gms:google-services:4.3.2' classpath "io.fabric.tools:gradle:1.31.0" - classpath "com.github.Triple-T:gradle-play-publisher:cdaeb61a87fedd1874e15e94eab7c6b80fda6727" + classpath "com.github.Triple-T:gradle-play-publisher:2.4.0" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0" } From 81ce328abdb35b8aca267315aebf8cc973ba6abd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2019 14:05:04 +0000 Subject: [PATCH 09/11] Bump recyclerview from 1.1.0-beta03 to 1.1.0-beta04 (#504) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 331b1e8a..bca0bb4a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -135,7 +135,7 @@ dependencies { implementation "androidx.multidex:multidex:2.0.1" implementation "androidx.preference:preference-ktx:1.1.0" - implementation "androidx.recyclerview:recyclerview:1.1.0-beta03" + implementation "androidx.recyclerview:recyclerview:1.1.0-beta04" implementation "androidx.viewpager:viewpager:1.0.0" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" implementation "androidx.constraintlayout:constraintlayout:1.1.3" From f5f11d51309b7248357e48a51181ecb2ae38ff4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Tue, 10 Sep 2019 12:25:08 +0200 Subject: [PATCH 10/11] Fix login in symbol view (#493) --- .../github/wulkanowy/ui/modules/login/LoginErrorHandler.kt | 1 + .../wulkanowy/ui/modules/login/form/LoginFormFragment.kt | 5 ++--- .../wulkanowy/ui/modules/login/form/LoginFormPresenter.kt | 2 +- .../github/wulkanowy/ui/modules/login/form/LoginFormView.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt index a70ff2d6..76832bda 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt @@ -28,5 +28,6 @@ class LoginErrorHandler @Inject constructor( override fun clear() { super.clear() onBadCredentials = {} + onStudentDuplicate = {} } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt index 94259aa8..c847d005 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt @@ -38,8 +38,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView { override val formPassValue get() = loginFormPass.text.toString() - override val formHostValue - get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString())) + override val formHostValue get() = hostValues[(hostKeys.indexOf(loginFormHost.text.toString()))] private lateinit var hostKeys: Array @@ -152,7 +151,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView { Triple( loginFormName.text.toString(), loginFormPass.text.toString(), - resources.getStringArray(R.array.endpoints_values)[1] + formHostValue )) } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt index 6949200c..6310f36a 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt @@ -40,7 +40,7 @@ class LoginFormPresenter @Inject constructor( view?.apply { clearPassError() clearNameError() - if (formHostValue?.contains("fakelog") == true) setCredentials("jan@fakelog.cf", "jan123") + if (formHostValue.contains("fakelog")) setCredentials("jan@fakelog.cf", "jan123") } } diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt index 2532547a..3c21e25d 100644 --- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt +++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt @@ -11,7 +11,7 @@ interface LoginFormView : BaseView { val formPassValue: String - val formHostValue: String? + val formHostValue: String fun setCredentials(name: String, pass: String) From dfc84b42082d3360839146081deeeca95687c204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pich?= Date: Tue, 10 Sep 2019 12:58:27 +0200 Subject: [PATCH 11/11] Version 0.10.2 --- .travis.yml | 2 +- app/build.gradle | 6 +++--- app/src/main/play/release-notes/pl-PL/default.txt | 2 +- build.gradle | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1baa9238..d3f5049c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ cache: branches: only: - develop - - 0.10.1 + - 0.10.2 android: licenses: diff --git a/app/build.gradle b/app/build.gradle index bca0bb4a..68a673e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { testApplicationId "io.github.tests.wulkanowy" minSdkVersion 16 targetSdkVersion 28 - versionCode 44 - versionName "0.10.1" + versionCode 45 + versionName "0.10.2" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -123,7 +123,7 @@ configurations.all { } dependencies { - implementation "io.github.wulkanowy:api:0.10.1" + implementation "io.github.wulkanowy:api:0.10.2" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "androidx.core:core-ktx:1.1.0" 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 f60764da..9c8c3196 100644 --- a/app/src/main/play/release-notes/pl-PL/default.txt +++ b/app/src/main/play/release-notes/pl-PL/default.txt @@ -1,4 +1,4 @@ -Wersja 0.10.0 +Wersja 0.10 - odświeżyliśmy wygląd aplikacji - poprawiliśmy wyświetlanie nauczycieli w planie lekcji diff --git a/build.gradle b/build.gradle index a4791238..c7ca235a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ buildscript { mavenCentral() google() jcenter() - maven { url 'https://jitpack.io' } maven { url "https://plugins.gradle.org/m2/" } maven { url 'https://maven.fabric.io/public' } } @@ -13,7 +12,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.5.0' classpath 'com.google.gms:google-services:4.3.2' classpath "io.fabric.tools:gradle:1.31.0" - classpath "com.github.Triple-T:gradle-play-publisher:2.4.0" + classpath "com.github.triplet.gradle:play-publisher:2.4.1" classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1" classpath "gradle.plugin.com.star-zero.gradle:githook:1.1.0" }