caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

chore: align plus min item

Browse source
This commit is contained in:
Andries Smit 2022-06-28 09:49:39 +02:00
parent 14d1ba80ab
commit b30daaa2fe
9 changed files with 86 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wear/src/main/java/info/nightscout/androidaps/interaction/utils/EditPlusMinusViewAdapter.kt
View file

@ -36,8 +36,8 @@ class EditPlusMinusViewAdapter(
val editText = val editText =
eD?.editText ?: eDP?.editText ?: eQL?.editText ?: eQLP?.editText ?: eQR?.editText ?: eQRP?.editText ?: eV?.editText eD?.editText ?: eDP?.editText ?: eQL?.editText ?: eQLP?.editText ?: eQR?.editText ?: eQRP?.editText ?: eV?.editText
?: throw IllegalArgumentException("Missing require View Binding parameter display") ?: throw IllegalArgumentException("Missing require View Binding parameter display")
val minusButton = val minButton =
eD?.minusButton ?: eDP?.minusButton ?: eQL?.minusButton ?: eQLP?.minusButton ?: eQR?.minusButton ?: eQRP?.minusButton ?: eV?.minusButton eD?.minButton ?: eDP?.minButton ?: eQL?.minButton ?: eQLP?.minButton ?: eQR?.minButton ?: eQRP?.minButton ?: eV?.minButton
?: throw IllegalArgumentException("Missing require View Binding parameter display") ?: throw IllegalArgumentException("Missing require View Binding parameter display")
val plusButton1 = val plusButton1 =
eD?.plusButton1 ?: eDP?.plusButton1 ?: eQL?.plusButton1 ?: eQLP?.plusButton1 ?: eQR?.plusButton1 ?: eQRP?.plusButton1 ?: eV?.plusButton1 eD?.plusButton1 ?: eDP?.plusButton1 ?: eQL?.plusButton1 ?: eQLP?.plusButton1 ?: eQR?.plusButton1 ?: eQRP?.plusButton1 ?: eV?.plusButton1

6
wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.kt
View file

@ -253,9 +253,9 @@ import java.util.concurrent.TimeUnit
editText.showSoftInputOnFocus = false editText.showSoftInputOnFocus = false
editText.setTextIsSelectable(false) editText.setTextIsSelectable(false)
binding.minusButton.setOnTouchListener(this) binding.minButton.setOnTouchListener(this)
binding.minusButton.setOnKeyListener(this) binding.minButton.setOnKeyListener(this)
binding.minusButton.setOnClickListener(this) binding.minButton.setOnClickListener(this)
binding.plusButton1.setOnTouchListener(this) binding.plusButton1.setOnTouchListener(this)
binding.plusButton1.setOnKeyListener(this) binding.plusButton1.setOnKeyListener(this)
binding.plusButton1.setOnClickListener(this) binding.plusButton1.setOnClickListener(this)

134
wear/src/main/res/layout/action_editplusminus_item.xml
View file

@ -1,131 +1,67 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal">
<View <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/center" android:id="@+id/min_button"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" android:layout_gravity="center"
app:layout_constraintEnd_toEndOf="parent" android:background="@drawable/circle"
app:layout_constraintStart_toStartOf="parent" android:backgroundTint="@color/white"
app:layout_constraintTop_toTopOf="parent" /> android:contentDescription="@string/decrement"
android:src="@drawable/ic_action_minus"
android:tint="@color/white" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<EditText <EditText
android:id="@+id/edit_text" android:id="@+id/edit_text"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-10dp" android:layout_gravity="center"
android:layout_marginHorizontal="10dp"
android:cursorVisible="false" android:cursorVisible="false"
android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="50dp"
android:padding="10dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="40sp" android:textSize="45sp"
android:gravity="center" tools:text="112" />
app:layout_constraintEnd_toEndOf="@+id/value_background"
app:layout_constraintStart_toStartOf="@+id/value_background"
app:layout_constraintTop_toTopOf="@+id/value_background"
tools:text="123" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-8dp" android:layout_gravity="center"
android:layout_below="@+id/edit_text"
android:gravity="center" android:gravity="center"
android:labelFor="@+id/edit_text" android:labelFor="@+id/edit_text"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" android:textSize="25sp"
app:layout_constraintEnd_toEndOf="@+id/edit_text"
app:layout_constraintStart_toStartOf="@+id/edit_text"
app:layout_constraintTop_toBottomOf="@id/edit_text"
tools:ignore="LabelFor" tools:ignore="LabelFor"
tools:text="label" /> tools:text="label" />
<androidx.appcompat.widget.AppCompatImageButton </LinearLayout>
android:id="@+id/minus_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/circle"
android:backgroundTint="@color/white"
android:contentDescription="@string/decrement"
android:src="@drawable/ic_action_minus"
android:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="145"
app:layout_constraintCircleRadius="70dp"
app:layout_constraintLeft_toLeftOf="parent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/plus_button3"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/circle"
android:backgroundTint="@color/white"
android:gravity="center"
android:textColor="@color/white"
android:textSize="25sp"
android:visibility="visible"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="325"
app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="+10" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/plus_button2"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/circle"
android:backgroundTint="@color/white"
android:gravity="center"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintBottom_toTopOf="@+id/plus_button1"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="270"
app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/plus_button3"
tools:text="+5" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/value_background"
android:layout_width="108dp"
android:layout_height="108dp"
android:layout_gravity="center"
android:layout_marginBottom="8dp"
android:background="@drawable/circle"
android:backgroundTint="@color/gray_700"
android:contentDescription="@string/increment"
app:layout_constraintBottom_toTopOf="@+id/minus_button"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="55"
app:layout_constraintCircleRadius="40dp"
app:layout_constraintRight_toLeftOf="@id/plus_button1">
</androidx.appcompat.widget.AppCompatImageView>
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/plus_button1" android:id="@+id/plus_button1"
android:layout_width="48dp" android:layout_width="wrap_content"
android:layout_height="48dp" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="@color/white" android:backgroundTint="@color/white"
android:contentDescription="@string/increment" android:contentDescription="@string/increment"
android:src="@drawable/ic_action_add" android:src="@drawable/ic_action_add"
android:tint="@color/white" android:tint="@color/white" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="215"
app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>

13
wear/src/main/res/layout/action_editplusminus_item_plus.xml
View file

@ -18,13 +18,13 @@
android:id="@+id/edit_text" android:id="@+id/edit_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-6dp"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:layout_marginTop="-6dp"
android:cursorVisible="false" android:cursorVisible="false"
android:gravity="center"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="40sp" android:textSize="40sp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="@+id/value_background" app:layout_constraintEnd_toEndOf="@+id/value_background"
app:layout_constraintStart_toStartOf="@+id/value_background" app:layout_constraintStart_toStartOf="@+id/value_background"
app:layout_constraintTop_toTopOf="@+id/value_background" app:layout_constraintTop_toTopOf="@+id/value_background"
@ -34,8 +34,8 @@
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-10dp"
android:layout_below="@+id/edit_text" android:layout_below="@+id/edit_text"
android:layout_marginTop="-10dp"
android:gravity="center" android:gravity="center"
android:labelFor="@+id/edit_text" android:labelFor="@+id/edit_text"
android:textColor="@color/white" android:textColor="@color/white"
@ -47,7 +47,7 @@
tools:text="label" /> tools:text="label" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/minus_button" android:id="@+id/min_button"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="@drawable/circle" android:background="@drawable/circle"
@ -95,13 +95,10 @@
app:layout_constraintTop_toBottomOf="@+id/plus_button3" app:layout_constraintTop_toBottomOf="@+id/plus_button3"
tools:text="+5" /> tools:text="+5" />
<androidx.appcompat.widget.AppCompatImageView <View
android:id="@+id/value_background" android:id="@+id/value_background"
android:layout_width="108dp" android:layout_width="108dp"
android:layout_height="108dp" android:layout_height="108dp"
android:layout_gravity="center"
android:backgroundTint="@color/gray_700"
android:contentDescription="@string/increment"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

2
wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
View file

@ -62,7 +62,7 @@
tools:text="label" /> tools:text="label" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/minus_button" android:id="@+id/min_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"

33
wear/src/main/res/layout/action_editplusminus_item_quicklefty_plus.xml
View file

@ -47,7 +47,7 @@
tools:text="label" /> tools:text="label" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/minus_button" android:id="@+id/min_button"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="@drawable/circle" android:background="@drawable/circle"
@ -57,8 +57,8 @@
android:tint="@color/white" android:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircle="@+id/center" app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="145" app:layout_constraintCircleAngle="215"
app:layout_constraintCircleRadius="65dp" app:layout_constraintCircleRadius="70dp"
app:layout_constraintLeft_toLeftOf="parent" /> app:layout_constraintLeft_toLeftOf="parent" />
<androidx.appcompat.widget.AppCompatButton <androidx.appcompat.widget.AppCompatButton
@ -72,8 +72,8 @@
android:textSize="25sp" android:textSize="25sp"
android:visibility="visible" android:visibility="visible"
app:layout_constraintCircle="@+id/center" app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="325" app:layout_constraintCircleAngle="35"
app:layout_constraintCircleRadius="65dp" app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="+10" /> tools:text="+10" />
@ -89,26 +89,25 @@
android:textSize="30sp" android:textSize="30sp"
app:layout_constraintBottom_toTopOf="@+id/plus_button1" app:layout_constraintBottom_toTopOf="@+id/plus_button1"
app:layout_constraintCircle="@+id/center" app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="270" app:layout_constraintCircleAngle="90"
app:layout_constraintCircleRadius="65dp" app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/plus_button3" app:layout_constraintTop_toBottomOf="@+id/plus_button3"
tools:text="+5" /> tools:text="+5" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/value_background" android:id="@+id/value_background"
android:layout_width="0dp" android:layout_width="108dp"
android:layout_height="0dp" android:layout_height="108dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="2dp"
android:layout_marginBottom="8dp"
android:background="@drawable/circle" android:background="@drawable/circle"
android:backgroundTint="@color/gray_700" android:backgroundTint="@color/gray_700"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:layout_constraintBottom_toTopOf="@+id/minus_button" app:layout_constraintBottom_toTopOf="@+id/min_button"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintCircle="@+id/center"
app:layout_constraintLeft_toRightOf="@+id/plus_button3" app:layout_constraintCircleAngle="305"
app:layout_constraintTop_toTopOf="@+id/plus_button3" /> app:layout_constraintCircleRadius="40dp"
app:layout_constraintRight_toLeftOf="@id/plus_button1" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/plus_button1" android:id="@+id/plus_button1"
@ -122,8 +121,8 @@
android:tint="@color/white" android:tint="@color/white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintCircle="@+id/center" app:layout_constraintCircle="@+id/center"
app:layout_constraintCircleAngle="215" app:layout_constraintCircleAngle="145"
app:layout_constraintCircleRadius="65dp" app:layout_constraintCircleRadius="70dp"
app:layout_constraintRight_toRightOf="parent" /> app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
View file

@ -42,7 +42,7 @@
tools:text="label" /> tools:text="label" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/minus_button" android:id="@+id/min_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"

18
wear/src/main/res/layout/action_editplusminus_item_quickrighty_plus.xml
View file

@ -18,8 +18,8 @@
android:id="@+id/edit_text" android:id="@+id/edit_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-1dp"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:layout_marginTop="-1dp"
android:cursorVisible="false" android:cursorVisible="false"
android:gravity="center" android:gravity="center"
android:inputType="numberDecimal" android:inputType="numberDecimal"
@ -47,7 +47,7 @@
tools:text="label" /> tools:text="label" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/minus_button" android:id="@+id/min_button"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="@drawable/circle" android:background="@drawable/circle"
@ -101,12 +101,14 @@
android:layout_height="108dp" android:layout_height="108dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:importantForAccessibility="no" android:background="@drawable/circle"
android:backgroundTint="@color/gray_700"
app:layout_constraintBottom_toBottomOf="parent" android:contentDescription="@string/increment"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/min_button"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintCircle="@+id/center"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintCircleAngle="305"
app:layout_constraintCircleRadius="40dp"
app:layout_constraintRight_toLeftOf="@id/plus_button1" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/plus_button1" android:id="@+id/plus_button1"

6
wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
View file

@ -17,7 +17,7 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="25sp" android:textSize="25sp"
tools:ignore="LabelFor" tools:ignore="LabelFor"
tools:text="labelx" /> tools:text="label" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -51,7 +51,7 @@
tools:text="112" /> tools:text="112" />
<androidx.appcompat.widget.AppCompatImageButton <androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/minus_button" android:id="@+id/min_button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal" android:layout_gravity="center_vertical|center_horizontal"
@ -63,5 +63,3 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>