From c998e4bb8306dff4a4681c1eb8fdcd5e19082d0a Mon Sep 17 00:00:00 2001
From: Nathan Varner <nathanmvarner@protonmail.com>
Date: Sat, 18 Mar 2023 01:58:17 -0400
Subject: [PATCH] [android] Scale turn lane assistance by device height

The Android UI scales the turn lane assistance proportionally to the
height of the device, depending on the device's orientation. This
allows for a better fit on large and small devices by adapting to their
size.

Needed for: #1404

Signed-off-by: Nathan Varner <nathanmvarner@protonmail.com>
---
 android/res/layout/layout_nav_top.xml  | 4 +++-
 android/res/layout/nav_lanes.xml       | 6 +++---
 android/res/layout/nav_single_lane.xml | 6 ++++--
 android/res/values-land/fractions.xml  | 4 ++++
 android/res/values/dimens.xml          | 1 -
 android/res/values/fractions.xml       | 4 ++++
 6 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 android/res/values-land/fractions.xml
 create mode 100644 android/res/values/fractions.xml

diff --git a/android/res/layout/layout_nav_top.xml b/android/res/layout/layout_nav_top.xml
index e04a4b412c..2b8a9c0e90 100644
--- a/android/res/layout/layout_nav_top.xml
+++ b/android/res/layout/layout_nav_top.xml
@@ -108,8 +108,10 @@
   <FrameLayout
     android:id="@+id/lanes_frame"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_height="0dp"
     android:layout_marginTop="@dimen/margin_half"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintHeight_percent="@fraction/nav_lane_height"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toEndOf="@+id/nav_next_turn_container"
     app:layout_constraintTop_toBottomOf="@+id/street_frame"
diff --git a/android/res/layout/nav_lanes.xml b/android/res/layout/nav_lanes.xml
index 9db6f67607..bf0e378f34 100644
--- a/android/res/layout/nav_lanes.xml
+++ b/android/res/layout/nav_lanes.xml
@@ -4,14 +4,14 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
+  android:layout_height="match_parent"
   app:cardBackgroundColor="?navLanesCardBackgroundColor"
   tools:showIn="@layout/layout_nav_top">
 
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/lanes"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
     android:layout_margin="@dimen/margin_quarter"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     android:orientation="horizontal"
diff --git a/android/res/layout/nav_single_lane.xml b/android/res/layout/nav_single_lane.xml
index 02943a6ad6..719d7b6ec9 100644
--- a/android/res/layout/nav_single_lane.xml
+++ b/android/res/layout/nav_single_lane.xml
@@ -4,8 +4,10 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/lane_image"
-  android:layout_width="@dimen/nav_lane"
-  android:layout_height="@dimen/nav_lane"
+  android:layout_width="wrap_content"
+  android:layout_height="match_parent"
+  android:adjustViewBounds="true"
+  android:scaleType="fitCenter"
   android:theme="?navigationTheme"
   app:tint="?iconTint"
   app:srcCompat="@drawable/ic_then_right"
diff --git a/android/res/values-land/fractions.xml b/android/res/values-land/fractions.xml
new file mode 100644
index 0000000000..0b103cea4a
--- /dev/null
+++ b/android/res/values-land/fractions.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <fraction name="nav_lane_height">0.15</fraction>
+</resources>
\ No newline at end of file
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index e408417873..cb2367285b 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -114,7 +114,6 @@
   <dimen name="nav_menu_height">70sp</dimen>
   <dimen name="nav_menu_content_height">64dp</dimen>
   <dimen name="nav_menu_landscape_width">360dp</dimen>
-  <dimen name="nav_lane">48dp</dimen>
 
   <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
   <dimen name="zoom_buttons_margin">64dp</dimen>
diff --git a/android/res/values/fractions.xml b/android/res/values/fractions.xml
new file mode 100644
index 0000000000..9afc01d472
--- /dev/null
+++ b/android/res/values/fractions.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <fraction name="nav_lane_height">0.08</fraction>
+</resources>
\ No newline at end of file