github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-09-20 01:19:08 -05:00
Code

Merge branch 'release/1.9.1'

Browse Source
This commit is contained in:
Mikołaj Pich 2023-01-05 23:01:43 +01:00
commit 4bb1198735
5 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@ -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"

23
app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
View File

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

2
app/src/main/play/release-notes/pl-PL/default.txt
View File

@ -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

8
app/src/main/res/layout/fragment_account_details.xml
View File

@ -111,9 +111,11 @@
<TextView
android:id="@+id/accountDetailsName"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -122,9 +124,11 @@
<TextView
android:id="@+id/accountDetailsSchool"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="5dp"
android:gravity="center_horizontal"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"

12
app/src/main/res/layout/item_dashboard_account.xml
View File

@ -26,27 +26,31 @@
<TextView
android:id="@+id/dashboard_account_item_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/dashboard_account_item_avatar"
app:layout_constraintTop_toTopOf="parent"
tools:text="John Smith" />
<TextView
android:id="@+id/dashboard_account_item_school_name"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/dashboard_account_item_avatar"
app:layout_constraintTop_toBottomOf="@id/dashboard_account_item_name"
tools:text="Szkoła Wulkanowego " />
tools:text="Szkoła Wulkanowego" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.progressindicator.CircularProgressIndicator
@ -56,4 +60,4 @@
android:layout_gravity="center"
android:indeterminate="true"
android:visibility="gone" />
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>