Bimba.git

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bfd4ec93b4b65c1300f9b52db2b030b3b9da8d40..7e205e91cb1687496ebb21e320a553a0466f0788 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -30,6 +30,14 @@ * reduce flickering of search results
 * 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
 ====================
 




diff --git a/app/build.gradle b/app/build.gradle
index 52183c0ca0ccd8b96da5adcab6272e8878ade326..053942d2c3516a112b36037739800223883f06f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@     defaultConfig {
         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 @@     implementation 'androidx.appcompat:appcompat:1.0.2'
     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'




diff --git a/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt
index 2e0129cd1f3e89e7c1bfcc7cc0eee5458afab98c..425c9d04d2798f49ec0fd81ec4b72cb41e13554a 100644
--- a/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt
+++ b/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt
@@ -99,10 +99,10 @@             providerProxy.getVmMessage(stopCode) { message ->
                 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




diff --git a/app/src/main/play/en-GB/whatsnew b/app/src/main/play/en-GB/whatsnew
index 2711cf52072e0e086d72852c4247777f0af58830..f51e399bb993cfc28ffdb3b04ec6ee640f43bd2c 100644
--- a/app/src/main/play/en-GB/whatsnew
+++ b/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
 ====================
 




diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew
index 79177dfb4eeeed900bfa36a5abeca61bb5059b17..720cbfab9b37820534cd0d2878ab82129fcae1be 100644
--- a/app/src/main/play/pl-PL/whatsnew
+++ b/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
 ====================
 




diff --git a/build.gradle b/build.gradle
index e5729f321efad6941c9845ff6b39ad453a9f9ae0..2db418dde841cfe37dc15e0d5f1cd140f603dfa2 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.20'
+    ext.kotlin_version = '1.3.21'
     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.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