caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fixed Pod Management Layout for Updated Bindings (Jetpack changes) and it is now scrollable.

Browse source 
Added Constrained Layout so buttons don't expand full width
Optimized button positions to reduce accidental presses.
This commit is contained in:
Teleriddler 2021-02-20 03:19:38 +01:00
parent 673cb9a362
commit 7af7c1baab
1 changed files with 247 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

264
omnipod-eros/src/main/res/layout/omnipod_pod_management.xml
View file

@ -1,19 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView 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:id="@+id/omnipod_pod_management" android:id="@+id/omnipod_pod_management"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.PodManagementActivity"> tools:context=".ui.PodManagementActivity">
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/omnipod_pod_management_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_weight="0.5"
android:gravity="center" android:gravity="center"
android:text="@string/omnipod_pod_management_title" android:text="@string/omnipod_pod_management_title"
android:textAlignment="center" android:textAlignment="center"
@ -49,76 +56,113 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:paddingStart="15dp" android:paddingStart="15dp"
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/omnipod_pod_management_heading_actions" /> android:text="@string/omnipod_pod_management_heading_actions" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Actions_Row_1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/Actions_Row_1_horizontal_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="10dp" app:layout_constraintGuide_percent="0" />
android:paddingEnd="10dp">
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_activate_pod" android:id="@+id/button_activate_pod"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_activate_pod" android:drawableTop="@drawable/ic_pod_management_activate_pod"
android:text="@string/omnipod_pod_management_button_activate_pod" android:text="@string/omnipod_pod_management_button_activate_pod"
android:textAllCaps="false" /> android:textAllCaps="false"
android:visibility="visible"
app:layout_constrainedHeight="@+id/Actions_Row_1_horizontal_guideline"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_1_vertical_guideline"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/Actions_Col_1_Row_1_vertical_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_deactivate_pod" android:id="@+id/button_deactivate_pod"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_deactivate_pod" android:drawableTop="@drawable/ic_pod_management_deactivate_pod"
android:text="@string/omnipod_pod_management_button_deactivate_pod" android:text="@string/omnipod_pod_management_button_deactivate_pod"
android:textAllCaps="false" /> android:textAllCaps="false"
</LinearLayout> android:visibility="visible"
app:layout_constrainedHeight="@+id/Actions_Row_1_horizontal_guideline"
app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_1_vertical_guideline"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Actions_Row_2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<Button <androidx.constraintlayout.widget.Guideline
android:id="@+id/Actions_Row_2_horizontal_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_play_test_beep" android:id="@+id/button_play_test_beep"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_play_test_beep" android:drawableTop="@drawable/ic_pod_management_play_test_beep"
android:text="@string/omnipod_pod_management_button_play_test_beep" android:text="@string/omnipod_pod_management_button_play_test_beep"
android:textAllCaps="false" /> android:textAllCaps="false"
android:visibility="visible"
app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/Actions_Col_1_Row_2_vertical_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_discard_pod" android:id="@+id/button_discard_pod"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_discard_pod" android:drawableTop="@drawable/ic_pod_management_discard_pod"
android:text="@string/omnipod_pod_management_button_discard_pod" android:text="@string/omnipod_pod_management_button_discard_pod"
android:textAllCaps="false" android:textAllCaps="false"
android:visibility="gone" /> android:visibility="gone"
app:layout_constrainedHeight="@+id/Actions_Row_2_horizontal_guideline"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toRightOf="@+id/Actions_Col_1_Row_2_vertical_guideline"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -128,68 +172,104 @@
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:text="@string/omnipod_pod_management_heading_tools" /> android:text="@string/omnipod_pod_management_heading_tools" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Tools_Row_1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/Tools_Row_1_horizontal_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="10dp" app:layout_constraintGuide_percent="0" />
android:paddingEnd="10dp">
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_pod_history"
style="?android:attr/buttonStyle"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_pod_history"
android:text="@string/omnipod_pod_management_button_pod_history"
android:textAllCaps="false" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_rileylink_stats"
style="?android:attr/buttonStyle"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_rl_stats"
android:text="@string/omnipod_pod_management_button_riley_link_stats"
android:textAllCaps="false"
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<Button
android:id="@+id/button_pulse_log"
style="?android:attr/buttonStyle"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_management_pulse_log"
android:text="@string/omnipod_pod_management_button_read_pulse_log"
android:textAllCaps="false"
android:visibility="gone" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_reset_rileylink_config" android:id="@+id/button_reset_rileylink_config"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_pod_activity_reset_rileylink_config" android:drawableTop="@drawable/ic_pod_activity_reset_rileylink_config"
android:text="@string/omnipod_pod_management_button_reset_riley_link_config" android:text="@string/omnipod_pod_management_button_reset_riley_link_config"
android:textAllCaps="false" /> android:textAllCaps="false"
android:visibility="visible"
app:layout_constrainedHeight="@+id/Tools_Row_1_horizontal_guideline"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/Tools_Col_1_vertical_guideline"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout> <androidx.constraintlayout.widget.Guideline
android:id="@+id/Tools_Col_1_vertical_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_pod_history"
style="?android:attr/buttonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_pod_management_pod_history"
android:text="@string/omnipod_pod_management_button_pod_history"
android:textAllCaps="false"
android:visibility="visible"
app:layout_constrainedHeight="@+id/Tools_Row_1_horizontal_guideline"
app:layout_constraintLeft_toRightOf="@+id/Tools_Col_1_vertical_guideline"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Tools_Row_2"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/Tools_Row_2_horizontal_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_rileylink_stats"
style="?android:attr/buttonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_pod_management_rl_stats"
android:text="@string/omnipod_pod_management_button_riley_link_stats"
android:textAllCaps="false"
android:visibility="visible"
app:layout_constrainedHeight="@+id/Tools_Row_2_horizontal_guideline"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/Tools_Col_1_Row_2_vertical_guideline"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/Tools_Col_1_Row_2_vertical_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/button_pulse_log"
style="?android:attr/buttonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawableTop="@drawable/ic_pod_management_pulse_log"
android:text="@string/omnipod_pod_management_button_read_pulse_log"
android:textAllCaps="false"
android:visibility="gone"
app:layout_constrainedHeight="@+id/Tools_Row_2_horizontal_guideline"
app:layout_constraintLeft_toRightOf="@+id/Tools_Col_1_Row_2_vertical_guideline"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
</ScrollView>