Author: Adam Pioterek <adam.pioterek@protonmail.ch>
Merge branch 'v2.2' into develop
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/drawable/ic_traffic.xml | 2 app/src/main/res/layout/activity_dash.xml | 5 app/src/main/res/layout/activity_edit_favourite.xml | 3 app/src/main/res/layout/activity_stop.xml | 11 + app/src/main/res/layout/activity_stop_specify.xml | 4 app/src/main/res/layout/row_favourite.xml | 30 +-- app/src/main/res/values-night/colors.xml | 4 app/src/main/res/values-notnight/colors.xml | 4 app/src/main/res/values/colors.xml | 4
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/drawable/ic_traffic.xml b/app/src/main/res/drawable/ic_traffic.xml index 081757364d3c63690943ab9b31d5c4109f420e2b..bf022cdda4939866e398ea8f7cd71e8015f188ab 100644 --- a/app/src/main/res/drawable/ic_traffic.xml +++ b/app/src/main/res/drawable/ic_traffic.xml @@ -4,6 +4,6 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="@color/textDark" + android:fillColor="#ffffff" android:pathData="M20,10h-3L17,8.86c1.72,-0.45 3,-2 3,-3.86h-3L17,4c0,-0.55 -0.45,-1 -1,-1L8,3c-0.55,0 -1,0.45 -1,1v1L4,5c0,1.86 1.28,3.41 3,3.86L7,10L4,10c0,1.86 1.28,3.41 3,3.86L7,15L4,15c0,1.86 1.28,3.41 3,3.86L7,20c0,0.55 0.45,1 1,1h8c0.55,0 1,-0.45 1,-1v-1.14c1.72,-0.45 3,-2 3,-3.86h-3v-1.14c1.72,-0.45 3,-2 3,-3.86zM12,19c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,14c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,9c-1.11,0 -2,-0.9 -2,-2 0,-1.11 0.89,-2 2,-2 1.1,0 2,0.89 2,2 0,1.1 -0.89,2 -2,2z"/> </vector> diff --git a/app/src/main/res/layout/activity_dash.xml b/app/src/main/res/layout/activity_dash.xml index ee61d3aafc6658f882403f31ff3fa60cb9e2631a..beab223ec802c3d476e8b6cb3854326a13508063 100644 --- a/app/src/main/res/layout/activity_dash.xml +++ b/app/src/main/res/layout/activity_dash.xml @@ -18,7 +18,8 @@ android:layout_height="wrap_content" android:background="@color/colorAccentDark" android:paddingTop="@dimen/appbar_padding_top" android:theme="@style/AppTheme.AppBarOverlay" - android:visibility="invisible"> + android:visibility="invisible" + app:layout_constraintTop_toTopOf="parent"> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" @@ -44,7 +45,6 @@ <com.mancj.materialsearchbar.MaterialSearchBar android:id="@+id/search_view" style="@style/SearchBarTheme" - app:mt_searchBarColor="@color/cardColor" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="8dp" @@ -58,6 +58,7 @@ app:mt_hint="@string/search_placeholder" app:mt_navIconEnabled="true" app:mt_placeholder="@string/search_placeholder" app:mt_roundedSearchBarEnabled="true" + app:mt_searchBarColor="@color/cardColor" app:mt_speechMode="false" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_edit_favourite.xml b/app/src/main/res/layout/activity_edit_favourite.xml index 0fecff28a7bc950d101cefc5544d96a09a7652db..68b83202b85739fae328d3d5a44d2e7c371e9565 100644 --- a/app/src/main/res/layout/activity_edit_favourite.xml +++ b/app/src/main/res/layout/activity_edit_favourite.xml @@ -12,7 +12,8 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="@dimen/appbar_padding_top" - android:theme="@style/AppTheme.AppBarOverlay"> + android:theme="@style/AppTheme.AppBarOverlay" + app:layout_constraintTop_toTopOf="parent"> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" diff --git a/app/src/main/res/layout/activity_stop.xml b/app/src/main/res/layout/activity_stop.xml index b3f8038ef17369a5e258300fb6a1f6ce48168dad..e3edb3af00ca28936faa18d73db9c50a732294c0 100644 --- a/app/src/main/res/layout/activity_stop.xml +++ b/app/src/main/res/layout/activity_stop.xml @@ -12,8 +12,10 @@android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="0dp" android:paddingTop="@dimen/appbar_padding_top" - android:theme="@style/AppTheme.AppBarOverlay"> + android:theme="@style/AppTheme.AppBarOverlay" + app:layout_constraintTop_toTopOf="parent"> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" @@ -52,13 +54,14 @@ app:layout_constraintTop_toBottomOf="@id/appbar" /> <ImageView android:id="@+id/emptyStateIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" android:contentDescription="@string/departures_empty_state_icon" + android:tint="@color/textDarkMedium" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -74,6 +77,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:text="@string/no_departures" + android:textColor="@color/textDarkMedium" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -88,6 +92,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_stop_specify.xml b/app/src/main/res/layout/activity_stop_specify.xml index 681d5a0a455e1c500a1ccbe98080f8a3f6585d71..c71d7141f81900a26b50ef6fbf0d56a6eec10c20 100644 --- a/app/src/main/res/layout/activity_stop_specify.xml +++ b/app/src/main/res/layout/activity_stop_specify.xml @@ -21,9 +21,9 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="@dimen/appbar_padding_top" - android:theme="@style/AppTheme.AppBarOverlay"> + android:theme="@style/AppTheme.AppBarOverlay" + app:layout_constraintTop_toTopOf="parent"> - <!--suppress AndroidDomInspection --> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" 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 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 06523ae87b1d3d5e0ca0bf98a16847c862b5a204..1837105e06b078e212608ec54f3543aeacafedb1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,8 @@ #00adef <color name="bus">#c4212a</color> <color name="text_on_toolbar">#ffffff</color> - <color name="textDark">#141415</color> + <color name="textDark">#de000000</color> + <color name="textDarkMedium">#99000000</color> + <color name="textDarkDisabled">#45000000</color> <color name="cardColor">#ffffff</color> </resources> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 8e119ee3098433568eb49ff01bb88d7ddaa2ea10..a17e646959c11a4b4716bb7b800264a91cb92e80 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="textDark">#ffffff</color> + <color name="textDark">#deffffff</color> + <color name="textDarkMedium">#99ffffff</color> + <color name="textDarkDisabled">#45ffffff</color> <color name="cardColor">#424242</color> </resources> \ No newline at end of file diff --git a/app/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml index 224b4ca09a92f2c1d20e77c508f1c06a425aafde..2dbc91375d0d6af1a61b7634050086b1e5a1c301 100644 --- a/app/src/main/res/values-notnight/colors.xml +++ b/app/src/main/res/values-notnight/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="textDark">#141415</color> + <color name="textDark">#de000000</color> + <color name="textDarkMedium">#99000000</color> + <color name="textDarkDisabled">#45000000</color> <color name="cardColor">#ffffff</color> </resources> \ No newline at end of file