Bimba.git

commit ef9823686b2c4302faa07a0c0e40d87ff3f02f84

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

wrap headsign in favourite

 CHANGELOG.rst | 13 +
 app/build.gradle | 4 
 app/src/main/java/ml/adamsprogs/bimba/datasources/VmService.kt | 1 
 app/src/main/play/en-GB/whatsnew | 14 -
 app/src/main/play/pl-PL/whatsnew | 18 -
 app/src/main/res/layout/row_favourite.xml | 30 +--


diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e8b4d3b6abaf9763cb998eb01d51790d5e3803ce..3d64861ae65149ca3666173a4bbb019e346e1684 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -30,6 +30,19 @@ * 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.0] – 2019-02-26
+====================
+
+Added
+-----
+
++ showing low floor and ticket checkouts in VM departures
+
+Changed
+-------
+
+* departures empty state is semi-transparent
+
 [2.1] – 2019-02-04
 ==================
 




diff --git a/app/build.gradle b/app/build.gradle
index d64c8c46783f4a26569e48e5965496db8726142e..34dc3217a5c10b76b709b79ca4922efd0b57a6c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@     defaultConfig {
         applicationId "ml.adamsprogs.bimba"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 16
-        versionName "2.1"
+        versionCode 17
+        versionName "2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }




diff --git a/app/src/main/java/ml/adamsprogs/bimba/datasources/VmService.kt b/app/src/main/java/ml/adamsprogs/bimba/datasources/VmService.kt
index 856ad8efe316e522ee30732c26d9e02a85f0545f..72340432b5fe1edc2821048998f5cac1ab93aa20 100644
--- a/app/src/main/java/ml/adamsprogs/bimba/datasources/VmService.kt
+++ b/app/src/main/java/ml/adamsprogs/bimba/datasources/VmService.kt
@@ -107,6 +107,7 @@
     override fun onDestroy() {
     }
 
+    @Synchronized
     private suspend fun downloadVM() {
         vms.forEach {
             downloadVM(it.key)




diff --git a/app/src/main/play/en-GB/whatsnew b/app/src/main/play/en-GB/whatsnew
index b1a3873c409b3d24b23061f36dd6b9f68865cfa4..2711cf52072e0e086d72852c4247777f0af58830 100644
--- a/app/src/main/play/en-GB/whatsnew
+++ b/app/src/main/play/en-GB/whatsnew
@@ -1,18 +1,12 @@
-[2.1] – 2019-02-04
-==================
+[2.2.0] – 2019-02-26
+====================
 
 Added
 -----
 
-+ showing empty search result
-+ loading in shed selection and stop screen
-+ VM messages
++ showing low floor and ticket checkouts in VM departures
 
 Changed
 -------
 
-* search bar
-* empty departures state
-* ‘now’ departure is ‘in a moment’ if the vehicle is not on-stop
-* sorting departures: on-stop at the top
-* sorting search results by similarity
+* departures empty state is semi-transparent




diff --git a/app/src/main/play/pl-PL/whatsnew b/app/src/main/play/pl-PL/whatsnew
index c05c1080da3ee49f68c365e7a9b2a62ef913c946..79177dfb4eeeed900bfa36a5abeca61bb5059b17 100644
--- a/app/src/main/play/pl-PL/whatsnew
+++ b/app/src/main/play/pl-PL/whatsnew
@@ -1,18 +1,12 @@
-[2.1] – 2019-02-04
-==================
+[2.2.0] – 2019-02-26
+====================
 
 Dodane
------
+------
 
-+ pokazywanie braku wynków wyszukiwania
-+ ładowanie w ekranie wyboru wiaty i ekranie przystanku
-+ wiadomości WM
++ oznaczanie odjazdów WM niskopodłogowych i z możliwością kupna biletów
 
 Zmienione
--------
+---------
 
-* pasek wyszukiwania
-* stan braku odjazdów
-* ‘teraz’ odjazd jest ‘za moment’ jeżeli pojazd nie jest na przystanku
-* sortowanie odjazdów: na przystanku są na górze
-* sortowanie wyników wyszukiwania wg podobieństwa
+* pusty stan odjazdów jest półprzezroczysty




diff --git a/app/src/main/res/layout/row_favourite.xml b/app/src/main/res/layout/row_favourite.xml
index 755603b55160822dfd2e436e7d0c124f4db38493..55f434bf6bf45f264e38c57fcacc3713a855de5a 100644
--- a/app/src/main/res/layout/row_favourite.xml
+++ b/app/src/main/res/layout/row_favourite.xml
@@ -37,33 +37,33 @@                      android:id="@+id/favourite_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
             android:text="@string/loading"
             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
             app:layout_constraintStart_toStartOf="@+id/favourite_line"
-            app:layout_constraintTop_toBottomOf="@+id/favourite_name"
-            tools:layout_editor_absoluteX="16dp"
-            tools:layout_editor_absoluteY="46dp" />
+            app:layout_constraintTop_toBottomOf="@+id/favourite_name" />
 
         <TextView
             android:id="@+id/favourite_line"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
             android:layout_marginBottom="16dp"
+            android:ellipsize="end"
             android:text=""
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/ticketMachineIcon"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/favourite_time"
-            tools:layout_editor_absoluteX="16dp"
-            tools:layout_editor_absoluteY="78dp" />
+            app:layout_constraintTop_toBottomOf="@+id/favourite_time" />
 
         <ImageView
             android:id="@+id/departureTypeIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
             android:contentDescription="@string/departure_type_icon_description"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
@@ -73,7 +73,7 @@             android:id="@+id/departureFloorIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="8dp"
             android:contentDescription="@string/departure_floor"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -85,7 +85,7 @@             android:id="@+id/ticketMachineIcon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="8dp"
             android:contentDescription="@string/ticket_machine_icon"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -95,14 +95,12 @@                      android:id="@+id/favourite_more_button"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
             android:contentDescription="@string/favourite_row_more_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_more"
-            tools:layout_editor_absoluteX="328dp"
-            tools:layout_editor_absoluteY="16dp" />
+            app:srcCompat="@drawable/ic_more" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file