From 993110be2b1416551838843583adee63e06471ed Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 3 Nov 2021 22:07:46 -0400
Subject: [PATCH] fix parameter response ui alignment issue

---
 .../ClusterDetailFragment.kt                  |  5 +--
 .../app/src/main/res/layout/callback_item.xml | 33 +++++++++++++-----
 .../src/main/res/layout/parameter_item.xml    | 34 +++++++++++++------
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
index a782a50628df89..e04673ca7fa293 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -11,6 +11,7 @@ import android.widget.ArrayAdapter
 import android.widget.AutoCompleteTextView
 import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.forEach
 import androidx.fragment.app.Fragment
 import chip.clusterinfo.ClusterCommandCallback
@@ -161,7 +162,7 @@ class ClusterDetailFragment : Fragment() {
   private fun populateCommandParameter(inflater: LayoutInflater, parameterList: LinearLayout) {
 
     selectedCommandInfo.commandParameters.forEach { (paramName, paramInfo) ->
-      val param = inflater.inflate(R.layout.parameter_item, null, false) as LinearLayout
+      val param = inflater.inflate(R.layout.parameter_item, null, false) as ConstraintLayout
       param.parameterName.text = "${paramName}"
       param.parameterType.text = "${paramInfo.type}"
       parameterList.addView(param)
@@ -174,7 +175,7 @@ class ClusterDetailFragment : Fragment() {
     callbackList: LinearLayout
   ) {
     responseValues.forEach { (variableNameType, response) ->
-      val callback = inflater.inflate(R.layout.callback_item, null, false) as LinearLayout
+      val callback = inflater.inflate(R.layout.callback_item, null, false) as ConstraintLayout
       callback.callbackName.text = variableNameType.name
       callback.callbackData.text = response.toString()
       callback.callbackType.text = variableNameType.type
diff --git a/src/android/CHIPTool/app/src/main/res/layout/callback_item.xml b/src/android/CHIPTool/app/src/main/res/layout/callback_item.xml
index db460903cfd5db..d17648f4108c95 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/callback_item.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/callback_item.xml
@@ -1,6 +1,6 @@
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/callbackRow"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -8,22 +8,37 @@
 
   <TextView
       android:id="@+id/callbackName"
-      android:layout_width="wrap_content"
+      android:layout_width="80dp"
       android:layout_height="wrap_content"
+      android:layout_marginHorizontal="10dp"
+      android:minWidth="48dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintEnd_toStartOf="@id/callbackData"
       android:padding="16dp" />
 
   <TextView
       android:id="@+id/callbackData"
-      android:textStyle="bold"
-      android:layout_width="wrap_content"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:padding="16dp" />
+      android:padding="16dp"
+      android:singleLine="false"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@id/callbackType"
+      app:layout_constraintStart_toEndOf="@id/callbackName"
+      app:layout_constraintTop_toTopOf="parent" />
 
 
   <TextView
       android:id="@+id/callbackType"
       android:textStyle="bold"
-      android:layout_width="wrap_content"
+      android:layout_width="100dp"
       android:layout_height="wrap_content"
-      android:padding="16dp" />
-</LinearLayout>
\ No newline at end of file
+      android:padding="16dp"
+      android:singleLine="false"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toEndOf="@id/callbackData"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"  />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/parameter_item.xml b/src/android/CHIPTool/app/src/main/res/layout/parameter_item.xml
index a2b819ba2b3615..60b585894e9d06 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/parameter_item.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/parameter_item.xml
@@ -1,31 +1,45 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/parameterRow"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:layout_height="wrap_content">
 
   <EditText
       android:id="@+id/parameterData"
-      android:layout_width="wrap_content"
+      android:layout_width="80dp"
       android:layout_height="wrap_content"
       android:layout_marginHorizontal="10dp"
       android:padding="16dp"
       android:inputType="text"
       android:minWidth="48dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintEnd_toStartOf="@id/parameterName"
       tools:ignore="SpeakableTextPresentCheck" />
 
   <TextView
       android:id="@+id/parameterName"
-      android:layout_width="wrap_content"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:padding="16dp" />
-
+      android:padding="16dp"
+      android:singleLine="false"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@id/parameterType"
+      app:layout_constraintStart_toEndOf="@id/parameterData"
+      app:layout_constraintTop_toTopOf="parent" />
 
   <TextView
       android:id="@+id/parameterType"
       android:textStyle="bold"
-      android:layout_width="wrap_content"
+      android:layout_width="100dp"
       android:layout_height="wrap_content"
-      android:padding="16dp" />
-</LinearLayout>
\ No newline at end of file
+      android:padding="16dp"
+      android:singleLine="false"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toEndOf="@id/parameterName"
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file