Merge branch 'release/0.10.2'

.travis.yml

@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.10.1
+    - 0.10.2
 
 android:
  licenses:

app/build.gradle

@@ -17,8 +17,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 44
+        versionCode 45
-        versionName "0.10.1"
+        versionName "0.10.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -110,11 +110,11 @@ 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"
-    mockito_core = "3.0.6"
+    mockito_core = "3.0.7"
 }
 
 configurations.all {
@@ -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"
@@ -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"
@@ -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"
@@ -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"
     }
 
@@ -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'
     }
 }

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 = {}
     }
 }

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
+    override val formHostValue get() = hostValues[(hostKeys.indexOf(loginFormHost.text.toString()))]
-        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
 
     private lateinit var hostKeys: Array<String>
 
@@ -152,7 +151,7 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
             Triple(
                 loginFormName.text.toString(),
                 loginFormPass.text.toString(),
-                resources.getStringArray(R.array.endpoints_values)[1]
+                formHostValue
             ))
     }
 

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

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)
 

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

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">
 
     <TextView
         android:id="@+id/gradeHeaderSubject"
@@ -48,7 +50,7 @@
         android:textSize="12sp"
         tools:text="12 grades" />
 
-    <TextView
+    <ImageView
         android:id="@+id/gradeHeaderNote"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

build.gradle

@@ -4,16 +4,15 @@ buildscript {
         mavenCentral()
         google()
         jcenter()
-        maven { url 'https://jitpack.io' }
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url 'https://maven.fabric.io/public' }
     }
     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 "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"
     }