From db71ae697f3572b60272848cce0952fc77458cdb Mon Sep 17 00:00:00 2001
From: Andrey Novikov <novikov@gmail.com>
Date: Mon, 30 Oct 2023 23:37:27 +0300
Subject: [PATCH] Change route instructions layout

---
 .../main/java/mobi/maptrek/MainActivity.java  |  9 ++-
 app/src/main/res/layout/activity_main.xml     | 78 ++++++++++++-------
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/mobi/maptrek/MainActivity.java b/app/src/main/java/mobi/maptrek/MainActivity.java
index bea3f898..4409edfa 100644
--- a/app/src/main/java/mobi/maptrek/MainActivity.java
+++ b/app/src/main/java/mobi/maptrek/MainActivity.java
@@ -2431,26 +2431,27 @@ private void updateNavigationGauges(boolean updateRoutePanels) {
                 mViews.navigationSign.setImageDrawable(signDrawable);
                 int color = getResources().getColor(R.color.panelBackground, getTheme());
                 mViews.routeWaypoint.setBackgroundColor(color);
-                mViews.navigationSign.setBackgroundColor(color);
+                mViews.routeSignBackground.setBackgroundColor(color);
                 mViews.navigationSign.setTag(false);
             }
             mViews.routeWptDistance.setText(StringFormatter.distanceH(mNavigationService.getWptDistance()));
             int ete = mNavigationService.getWptEte();
             if (ete == Integer.MAX_VALUE) {
-                mViews.routeWptEte.setText("-");
+                mViews.routeWptEte.setVisibility(View.GONE);
             } else {
+                mViews.routeWptEte.setVisibility(View.VISIBLE);
                 mViews.routeWptEte.setText(StringFormatter.timeH(ete));
                 if (ete <= 1) {
                     if (!Boolean.TRUE.equals(mViews.navigationSign.getTag())) {
                         int color = getResources().getColor(R.color.panelAccentBackground, getTheme());
                         mViews.routeWaypoint.setBackgroundColor(color);
-                        mViews.navigationSign.setBackgroundColor(color);
+                        mViews.routeSignBackground.setBackgroundColor(color);
                         mViews.navigationSign.setTag(true);
                     }
                 } else if (Boolean.TRUE.equals(mViews.navigationSign.getTag())) {
                     int color = getResources().getColor(R.color.panelBackground, getTheme());
                     mViews.routeWaypoint.setBackgroundColor(color);
-                    mViews.navigationSign.setBackgroundColor(color);
+                    mViews.routeSignBackground.setBackgroundColor(color);
                     mViews.navigationSign.setTag(false);
                 }
             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0f1dd55a..b2f67bec 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -78,60 +78,82 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:visibility="visible">
 
+                <androidx.constraintlayout.widget.Barrier
+                    android:id="@+id/routeSignBarrier"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="start"
+                    app:constraint_referenced_ids="navigationSign,routeWptDistance,routeWptEte" />
+
+                <androidx.constraintlayout.widget.Barrier
+                    android:id="@+id/routeWaypointBarrier"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="routeWaypoint,routeWptEte" />
+
+                <View
+                    android:id="@+id/routeSignBackground"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:background="@color/panelBackground"
+                    app:layout_constraintBottom_toBottomOf="@+id/routeWaypointBarrier"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/routeSignBarrier"
+                    app:layout_constraintTop_toTopOf="parent" />
+
                 <ImageView
                     android:id="@+id/navigationSign"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/panelBackground"
                     android:padding="4dp"
+                    app:layout_constraintStart_toEndOf="@+id/routeSignBarrier"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:tint="@color/actionIconColor"
-                    tools:ignore="ContentDescription" />
-
-                <TextView
-                    android:id="@+id/routeWaypoint"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:background="@color/panelBackground"
-                    android:padding="@dimen/gauge_padding"
-                    android:textAlignment="center"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toStartOf="@+id/navigationSign"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="Route waypoint" />
+                    tools:ignore="ContentDescription"
+                    tools:src="@drawable/instruction_turn_right" />
 
                 <TextView
                     android:id="@+id/routeWptDistance"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/panelBackground"
                     android:paddingBottom="@dimen/gauge_padding"
                     android:paddingHorizontal="@dimen/gauge_padding"
                     android:paddingTop="0dp"
                     android:textAlignment="center"
-                    app:layout_constraintEnd_toStartOf="@+id/routeWptEte"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/routeWaypoint"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/routeSignBarrier"
+                    app:layout_constraintTop_toBottomOf="@+id/navigationSign"
                     tools:text="10 km" />
 
                 <TextView
                     android:id="@+id/routeWptEte"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/panelBackground"
                     android:paddingBottom="@dimen/gauge_padding"
                     android:paddingHorizontal="@dimen/gauge_padding"
                     android:paddingTop="0dp"
                     android:textAlignment="center"
-                    app:layout_constraintEnd_toStartOf="@+id/navigationSign"
-                    app:layout_constraintHorizontal_bias="0.5"
-                    app:layout_constraintStart_toEndOf="@+id/routeWptDistance"
-                    app:layout_constraintTop_toBottomOf="@+id/routeWaypoint"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/routeSignBarrier"
+                    app:layout_constraintTop_toBottomOf="@+id/routeWptDistance"
                     tools:text="12 min" />
+
+                <TextView
+                    android:id="@+id/routeWaypoint"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:background="@color/panelBackground"
+                    android:padding="@dimen/gauge_padding"
+                    android:textAlignment="center"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/routeSignBarrier"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="Route waypoint" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <TextView