5 Commits a477232b32 ... ef9c50aed3

Author SHA1 Message Date
  Adam Pioterek ef9c50aed3 Merge branch 'v2.2.2' 5 years ago
  Adam Pioterek 80a69f427c Merge branch 'develop' into v2.2.2 5 years ago
  Adam Pioterek 8ecff583fa changelog 2.2.2 5 years ago
  Adam Pioterek d74977517b material version 5 years ago
  Adam Pioterek 4bb5b3d491 PEKA messages without html 5 years ago

+ 8 - 0
CHANGELOG.rst

@@ -30,6 +30,14 @@ Changed
 * VM messages appear also in favourites (if it contains 1 stop only)
 * ‘no connectivity’ warning only when offline timetable is not present
 
+[2.2.2] – 2019-03-11
+====================
+
+Changed
+-------
+
+* drop HTML formatting in PEKA messages
+
 [2.2.1] – 2019-03-04
 ====================
 

+ 3 - 3
app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "ml.adamsprogs.bimba"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 18
-        versionName "2.2.1"
+        versionCode 19
+        versionName "2.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -31,7 +31,7 @@ dependencies {
     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-alpha03'
+    implementation 'com.google.android.material:material:1.1.0-alpha04'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.27.0-eap13'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.27.0-eap13'

+ 2 - 2
app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt

@@ -99,10 +99,10 @@ class StopActivity : AppCompatActivity(), MessageReceiver.OnTimetableDownloadLis
                 if (message != null) {
                     val rendered =
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                                Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY)
+                                Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY).toString()
                             } else {
                                 @Suppress("DEPRECATION")
-                                Html.fromHtml(message)
+                                Html.fromHtml(message).toString()
                             }
 
                     banner.visibility = View.VISIBLE

+ 16 - 0
app/src/main/play/en-GB/whatsnew

@@ -1,3 +1,19 @@
+[2.2.2] – 2019-03-11
+====================
+
+Changed
+-------
+
+* drop HTML formatting in PEKA messages
+
+[2.2.1] – 2019-03-04
+====================
+
+Changed
+-------
+
+* white icons (low floor, tickets) in night mode
+
 [2.2.0] – 2019-02-26
 ====================
 

+ 16 - 0
app/src/main/play/pl-PL/whatsnew

@@ -1,3 +1,19 @@
+[2.2.2] – 2019-03-11
+====================
+
+Changed
+-------
+
+* porzucenie formatowania HTML w wiadomościach PEKA
+
+[2.2.1] – 2019-03-04
+====================
+
+Changed
+-------
+
+* białe ikony (niskopodłogowy, bilety) w trybie nocnym
+
 [2.2.0] – 2019-02-26
 ====================
 

+ 2 - 2
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.20'
+    ext.kotlin_version = '1.3.21'
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong