Skip to content

Commit

Permalink
fix parameter response ui alignment issue
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonLiuZhuoCheng committed Nov 4, 2021
1 parent 13471a8 commit 993110b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
33 changes: 24 additions & 9 deletions src/android/CHIPTool/app/src/main/res/layout/callback_item.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,44 @@

<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"
android:orientation="horizontal">

<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>
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>
34 changes: 24 additions & 10 deletions src/android/CHIPTool/app/src/main/res/layout/parameter_item.xml
Original file line number Diff line number Diff line change
@@ -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>
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>

0 comments on commit 993110b

Please sign in to comment.