diff --git a/.travis.yml b/.travis.yml index 1baa92389..d3f5049c4 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 725316f64..68a673e01 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 @@ -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' } } 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 a70ff2d65..76832bdac 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 94259aa8a..c847d0054 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 6949200c6..6310f36ac 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 2532547a0..3c21e25d4 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) 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 f60764da1..9c8c31968 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/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml index a83951dd5..40f486cf5 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"> -