diff --git a/app/build.gradle b/app/build.gradle
index ce9039df..fff19ebe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
testApplicationId "io.github.tests.wulkanowy"
minSdkVersion 21
targetSdkVersion 33
- versionCode 119
- versionName "1.9.0"
+ versionCode 120
+ versionName "1.9.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resValue "string", "app_name", "Wulkanowy"
@@ -161,8 +161,8 @@ play {
defaultToAppBundles = false
track = 'production'
releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
- userFraction = 0.10d
- updatePriority = 1
+ userFraction = 0.50d
+ updatePriority = 2
enabled.set(false)
}
@@ -186,7 +186,7 @@ ext {
}
dependencies {
- implementation "io.github.wulkanowy:sdk:1.9.0"
+ implementation "io.github.wulkanowy:sdk:1.9.1"
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
@@ -264,7 +264,7 @@ dependencies {
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
- testImplementation 'org.robolectric:robolectric:4.9.1'
+ testImplementation 'org.robolectric:robolectric:4.9.2'
testImplementation "androidx.test:runner:1.5.1"
testImplementation "androidx.test.ext:junit:1.1.4"
testImplementation "androidx.test:core:1.5.0"
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index f94ea7b7..9148b6ab 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -280,11 +280,24 @@ class LoginStudentSelectPresenter @Inject constructor(
private fun onEmailClick() {
view?.openEmail(lastError?.message.ifNullOrBlank {
- registerUser.symbols.flatMap { symbol ->
- symbol.schools.map { it.error?.message } + symbol.error?.message
- }.filterNotNull().distinct().joinToString("; ") {
- it.take(46) + "..."
- }.ifEmpty { "blank" }
+ loginData.baseUrl + "/" + loginData.symbol + "\n" + registerUser.symbols.filterNot {
+ it.error is AccountPermissionException && it.symbol != loginData.symbol
+ }.joinToString(";\n") { symbol ->
+ buildString {
+ append(" -")
+ append(symbol.symbol)
+ append("(${symbol.error?.message?.let { it.take(46) + "..." } ?: symbol.schools.size})")
+ if (symbol.schools.isNotEmpty()) {
+ append(": ")
+ }
+ append(symbol.schools.joinToString(", ") { unit ->
+ buildString {
+ append(unit.schoolShortName)
+ append("(${unit.error?.message?.let { it.take(46) + "..." } ?: unit.students.size})")
+ }
+ })
+ }
+ }
})
}
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 9e24f9d9..76c6a0cb 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 1.9.0
+Wersja 1.9.1
- dodaliśmy obsługę Androida 13 (w tym ikona aplikacji obsługująca Material You)
- przerobiliśmy ekran wyboru ucznia przy pierwszym logowaniu
diff --git a/app/src/main/res/layout/fragment_account_details.xml b/app/src/main/res/layout/fragment_account_details.xml
index af9564b5..0c904c07 100644
--- a/app/src/main/res/layout/fragment_account_details.xml
+++ b/app/src/main/res/layout/fragment_account_details.xml
@@ -111,9 +111,11 @@
+ tools:text="Szkoła Wulkanowego" />
-
\ No newline at end of file
+