From 21cc7f27df27d72b20c221f325d3535c1bf13548 Mon Sep 17 00:00:00 2001 From: rblaha15 <72446087+rblaha15@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:59:39 +0200 Subject: [PATCH 1/2] #404 --- .../jaro/dpmcb/ui/loading/LoadingViewModel.kt | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/cz/jaro/dpmcb/ui/loading/LoadingViewModel.kt b/app/src/main/java/cz/jaro/dpmcb/ui/loading/LoadingViewModel.kt index 380fe180..563221cd 100644 --- a/app/src/main/java/cz/jaro/dpmcb/ui/loading/LoadingViewModel.kt +++ b/app/src/main/java/cz/jaro/dpmcb/ui/loading/LoadingViewModel.kt @@ -456,18 +456,14 @@ class LoadingViewModel( println(connStops) println(timeCodes) - coroutineScope { - launch { - repo.write( - connStops = connStops.distinctBy { Triple(it.tab, it.connNumber, it.stopIndexOnLine) }.toTypedArray(), - stops = stops.distinctBy { it.tab to it.stopNumber }.toTypedArray(), - timeCodes = timeCodes.distinctBy { Quadruple(it.tab, it.code, it.connNumber, it.termIndex) }.toTypedArray(), - lines = lines.distinctBy { it.tab }.toTypedArray(), - conns = conns.distinctBy { it.tab to it.connNumber }.toTypedArray(), - version = newVersion, - ) - }.join() - } + repo.write( + connStops = connStops.distinctBy { Triple(it.tab, it.connNumber, it.stopIndexOnLine) }.toTypedArray(), + stops = stops.distinctBy { it.tab to it.stopNumber }.toTypedArray(), + timeCodes = timeCodes.distinctBy { Quadruple(it.tab, it.code, it.connNumber, it.termIndex) }.toTypedArray(), + lines = lines.distinctBy { it.tab }.toTypedArray(), + conns = conns.distinctBy { it.tab to it.connNumber }.toTypedArray(), + version = newVersion, + ) } private suspend fun downloadDiagram(schemaRef: StorageReference) = downloadFile(schemaRef, params.diagramFile) From 0e452d604351ef76a1f76f479735869ec2adf137 Mon Sep 17 00:00:00 2001 From: rblaha15 <72446087+rblaha15@users.noreply.github.com> Date: Sun, 21 Apr 2024 11:01:12 +0200 Subject: [PATCH 2/2] Verze 1.6.1-RC.3 (14) --- app/build.gradle.kts | 4 ++-- app/version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2f8d77cd..63b548d6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,8 +15,8 @@ android { applicationId = "cz.jaro.dpmcb" minSdk = 26 targetSdk = 34 - versionCode = 13 - versionName = "1.6.1-RC.2" + versionCode = 14 + versionName = "1.6.1-RC.3" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/version.txt b/app/version.txt index 70efe002..39786d7b 100644 --- a/app/version.txt +++ b/app/version.txt @@ -1 +1 @@ -1.6.1-RC.2 \ No newline at end of file +1.6.1-RC.3 \ No newline at end of file