From fa18f73d9d363c893dd4966814fe488e7f055740 Mon Sep 17 00:00:00 2001 From: Sergiy Kozyr Date: Thu, 15 Aug 2024 21:15:27 +0300 Subject: [PATCH 1/5] [Android] Fixed always red speedometer in navigation mode Signed-off-by: Sergiy Kozyr --- .../app/src/main/java/app/organicmaps/widget/menu/NavMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java index e6404012ff..763a3c86d1 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java @@ -222,7 +222,7 @@ public class NavMenu else mSpeedValue.setText(speedAndUnits.first); - if (last.getSpeed() > info.speedLimitMps) + if (info.speedLimitMps > 0.0 && last.getSpeed() > info.speedLimitMps) { if (info.isSpeedCamLimitExceeded()) mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary)); -- 2.45.3 From d24eb11dad9dc6be508c1738130c1599f63c6de7 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Thu, 15 Aug 2024 22:46:14 +0200 Subject: [PATCH 2/5] [github] Fixed Obtainium typo Signed-off-by: Alexander Borsuk --- .github/workflows/android-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml index ae13aeecd2..ff18d4b74a 100644 --- a/.github/workflows/android-release.yaml +++ b/.github/workflows/android-release.yaml @@ -149,7 +149,7 @@ jobs: cat ${{ env.RELEASE_NOTES }} echo "" echo "See [a detailed announce](https://organicmaps.app/news/) on our website when app updates are published in all stores." - echo "You can get automatic app updates from GitHub [using Obtanium](https://github.com/organicmaps/organicmaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtanium)." + echo "You can get automatic app updates from GitHub [using Obtainium](https://github.com/organicmaps/organicmaps/wiki/Installing-Organic-Maps-from-GitHub-using-Obtainium)." echo "" echo "sha256sum:" echo -e '\n```' -- 2.45.3 From 36eaad19262c07199318887ca19260e0200f011a Mon Sep 17 00:00:00 2001 From: Nic Pottier Date: Thu, 15 Aug 2024 14:38:13 -0700 Subject: [PATCH 3/5] size vertically based on children, fixes #8600 Signed-off-by: Nic Pottier --- .../res/layout/item_bookmark_category.xml | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml index bc68ef368c..ba18f9fc78 100644 --- a/android/app/src/main/res/layout/item_bookmark_category.xml +++ b/android/app/src/main/res/layout/item_bookmark_category.xml @@ -4,16 +4,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/height_item_edit_bookmark" + android:layout_height="wrap_content" android:background="?clickableBackground"> + android:id="@+id/checkbox" + android:layout_width="@dimen/margin_double_plus" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_quarter" + android:background="@null" + android:button="@drawable/button_visibility_centre_inset" + android:buttonTint="?accentColorSelector" /> + app:tint="?secondary" /> -- 2.45.3 From b811aa5b9ba4851dba742a3cc037dbb287e4da5e Mon Sep 17 00:00:00 2001 From: Nic Pottier Date: Thu, 15 Aug 2024 14:51:35 -0700 Subject: [PATCH 4/5] align to top instead of center Signed-off-by: Nic Pottier --- android/app/src/main/res/layout/item_bookmark_category.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml index ba18f9fc78..8b85f21c05 100644 --- a/android/app/src/main/res/layout/item_bookmark_category.xml +++ b/android/app/src/main/res/layout/item_bookmark_category.xml @@ -10,8 +10,8 @@ android:id="@+id/checkbox" android:layout_width="@dimen/margin_double_plus" android:layout_height="match_parent" - android:layout_centerVertical="true" android:layout_marginStart="@dimen/margin_quarter" + android:layout_marginTop="@dimen/margin_base" android:background="@null" android:button="@drawable/button_visibility_centre_inset" android:buttonTint="?accentColorSelector" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" - android:layout_centerVertical="true" + android:layout_marginTop="@dimen/margin_base" android:background="?selectableItemBackgroundBorderless" android:importantForAccessibility="no" android:paddingHorizontal="@dimen/margin_half" -- 2.45.3 From c18f5d409a7e8578b82e0a6f2f8977b9f5dba4ab Mon Sep 17 00:00:00 2001 From: Nic Pottier Date: Thu, 15 Aug 2024 15:25:57 -0700 Subject: [PATCH 5/5] center all items in bookmark list Signed-off-by: Nic Pottier --- android/app/src/main/res/layout/item_bookmark_button.xml | 5 +++-- android/app/src/main/res/layout/item_bookmark_category.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/res/layout/item_bookmark_button.xml b/android/app/src/main/res/layout/item_bookmark_button.xml index c2089ed6a6..37e31a1b13 100644 --- a/android/app/src/main/res/layout/item_bookmark_button.xml +++ b/android/app/src/main/res/layout/item_bookmark_button.xml @@ -14,8 +14,9 @@ android:id="@+id/image" android:layout_width="@dimen/nav_icon_size" android:layout_height="wrap_content" - tools:srcCompat="@drawable/ic_import" - app:tint="?colorAccent"/> + android:layout_gravity="center_vertical" + app:tint="?colorAccent" + tools:srcCompat="@drawable/ic_import" /> @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_alignParentEnd="true" - android:layout_marginTop="@dimen/margin_base" + android:layout_centerVertical="true" android:background="?selectableItemBackgroundBorderless" android:importantForAccessibility="no" android:paddingHorizontal="@dimen/margin_half" -- 2.45.3