Bimba.git

commit 417ac23db4903f0710f4e79025841505a69d7a2b

Author: Adam Pioterek <adam.pioterek@protonmail.ch>

fix sorting in stop specify — line ‘T1’ is not int

%!v(PANIC=String method: strings: negative Repeat count)


diff --git a/app/build.gradle b/app/build.gradle
index 9b2a0d619270e2dfd70a67742dd62c2110e55579..9f6a6b964105042c95a524f3c0a68db85a71081e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
 
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
+    implementation 'com.google.android.material:material:1.1.0-alpha03'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.27.0-eap13'




diff --git a/app/src/main/java/ml/adamsprogs/bimba/activities/StopSpecifyActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/activities/StopSpecifyActivity.kt
index b7a279927b507576117d428dc6d82df19d2645ea..e2db35f26607e62e800fa323755b65b7bab5d34e 100644
--- a/app/src/main/java/ml/adamsprogs/bimba/activities/StopSpecifyActivity.kt
+++ b/app/src/main/java/ml/adamsprogs/bimba/activities/StopSpecifyActivity.kt
@@ -63,7 +63,7 @@                 context.startActivity(intent)
             }
             holder.stopCode.text = values.keys.sorted()[position]
             holder.stopHeadlines.text = values.entries.sortedBy { it.key }[position].value
-                    .sortedBy { it.split(" → ")[0].toInt() }
+                    .sortedBy { it.split(" → ")[0].padStart(4, '0') }
                     .joinToString()
         }
 




diff --git a/build.gradle b/build.gradle
index fb7d4191ee180c74779189e71f769cd79d86d2c3..2313461cc53c3b34ee89c97a99a6eb9f8a776232 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext.kotlin_version = '1.3.20'
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
@@ -9,7 +9,7 @@         //maven { url 'https://dl.bintray.com/guardian/android' } // TooLargeTool
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong




diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b080dbe6b48f4fdd74ab4acaa120378f4bce0355..0a09c6d65a64c76aa4d5b2cb098701791d95d346 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip




diff --git a/todo b/todo
index b8c438175b716a4362618432f428639bac5214f0..5c7be496093f80354c8a4ec93be87fcd0494c742 100644
--- a/todo
+++ b/todo
@@ -15,3 +15,5 @@ v departures sort (timeTill, onStop) : StopActivity
 v sort and limit search results
 T PEKA info
 - check update (only in APK builds)
+- settings day/night
+- ‘no conn…’ only w/o timetable