From f65666a996ee13911f5a334d80c18e636b1b0f23 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 18 Nov 2024 11:20:13 +0100
Subject: [PATCH] Improved help & troubleshooting views

---
 .../main/res/layout/help_debug_fragment.xml   | 51 ++++++++++++++-----
 app/src/main/res/layout/help_fragment.xml     |  9 ++++
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index 42a926fc5..dd5a54f2a 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -134,7 +134,6 @@
 
             <ImageView
                 android:id="@+id/app_version_icon"
-                android:onClick="@{appVersionClickListener}"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
@@ -149,7 +148,6 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/header_style"
                 android:id="@+id/app_version_title"
-                android:onClick="@{appVersionClickListener}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -164,20 +162,35 @@
                 style="@style/default_text_style"
                 android:id="@+id/app_version_subtitle"
                 android:onClick="@{appVersionClickListener}"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:text="@{viewModel.appVersion, default=`6.0.0 (master)`}"
                 android:textSize="14sp"
                 android:textColor="?attr/color_main2_600"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintTop_toBottomOf="@id/app_version_title"
                 app:layout_constraintStart_toEndOf="@id/app_version_icon"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toStartOf="@id/app_version_copy_icon" />
+
+            <ImageView
+                android:id="@+id/app_version_copy_icon"
+                android:onClick="@{appVersionClickListener}"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="@dimen/icon_size"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/copy"
+                app:tint="?attr/color_main2_600"
+                app:layout_constraintTop_toTopOf="@id/app_version_subtitle"
+                app:layout_constraintBottom_toBottomOf="@id/app_version_subtitle"
+                app:layout_constraintStart_toEndOf="@id/app_version_subtitle"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
             <ImageView
                 android:id="@+id/sdk_version_icon"
-                android:onClick="@{sdkVersionClickListener}"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
@@ -192,7 +205,6 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/header_style"
                 android:id="@+id/sdk_version_title"
-                android:onClick="@{sdkVersionClickListener}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -207,20 +219,35 @@
                 style="@style/default_text_style"
                 android:id="@+id/sdk_version_subtitle"
                 android:onClick="@{sdkVersionClickListener}"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
                 android:text="@{viewModel.sdkVersion, default=`5.4.0 (master)`}"
                 android:textSize="14sp"
                 android:textColor="?attr/color_main2_600"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintHorizontal_bias="0"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintTop_toBottomOf="@id/sdk_version_title"
                 app:layout_constraintStart_toEndOf="@id/sdk_version_icon"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toStartOf="@id/sdk_version_copy_icon" />
+
+            <ImageView
+                android:id="@+id/sdk_version_copy_icon"
+                android:onClick="@{sdkVersionClickListener}"
+                android:layout_width="@dimen/icon_size"
+                android:layout_height="@dimen/icon_size"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="16dp"
+                android:src="@drawable/copy"
+                app:tint="?attr/color_main2_600"
+                app:layout_constraintTop_toTopOf="@id/sdk_version_subtitle"
+                app:layout_constraintBottom_toBottomOf="@id/sdk_version_subtitle"
+                app:layout_constraintStart_toEndOf="@id/sdk_version_subtitle"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
             <ImageView
                 android:id="@+id/firebase_project_icon"
-                android:onClick="@{sdkVersionClickListener}"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_marginStart="16dp"
@@ -235,7 +262,6 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/header_style"
                 android:id="@+id/firebase_project_title"
-                android:onClick="@{sdkVersionClickListener}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
@@ -249,7 +275,6 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style"
                 android:id="@+id/firebase_project_subtitle"
-                android:onClick="@{sdkVersionClickListener}"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index 6f13c154c..dc0469123 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -98,6 +98,9 @@
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/help_about_privacy_policy_title"
+                android:drawableEnd="@drawable/arrow_square_out"
+                android:drawablePadding="5dp"
+                app:drawableTint="?attr/color_main2_600"
                 app:layout_constraintTop_toBottomOf="@id/about_title"
                 app:layout_constraintStart_toEndOf="@id/privacy_policy_icon"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -213,6 +216,9 @@
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/help_about_open_source_licenses_title"
+                android:drawableEnd="@drawable/arrow_square_out"
+                android:drawablePadding="5dp"
+                app:drawableTint="?attr/color_main2_600"
                 app:layout_constraintTop_toBottomOf="@id/version_flow"
                 app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -256,6 +262,9 @@
                 android:layout_marginEnd="16dp"
                 android:layout_marginTop="24dp"
                 android:text="@string/help_about_contribute_translations_title"
+                android:drawableEnd="@drawable/arrow_square_out"
+                android:drawablePadding="5dp"
+                app:drawableTint="?attr/color_main2_600"
                 app:layout_constraintTop_toBottomOf="@id/open_source_licenses_subtitle"
                 app:layout_constraintStart_toEndOf="@id/translate_icon"
                 app:layout_constraintEnd_toEndOf="parent"/>