caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity
AndroidAPS/app/src/main/res/layout/combopump_fragment.xml

515 lines
20 KiB
XML
Raw Normal View History

combo plugin skeleton
2017-05-24 18:24:23 +02:00
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
Update combopump_fragment.xml
2018-06-08 19:05:34 +02:00
android:paddingTop="5dp"
pumps package refactor
2019-02-26 20:38:27 +01:00
tools:context=".plugins.pump.combo.ComboFragment">
combo plugin skeleton
2017-05-24 18:24:23 +02:00
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
combo plugin skeleton
2017-05-24 18:24:23 +02:00
<ScrollView
UI for pump state.
2017-07-16 03:28:11 +02:00
android:id="@+id/scrollView"
combo plugin skeleton
2017-05-24 18:24:23 +02:00
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:layout_height="wrap_content"
combo plugin skeleton
2017-05-24 18:24:23 +02:00
android:orientation="vertical">
UI for pump state.
2017-07-16 03:28:11 +02:00
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
combo plugin skeleton
2017-05-24 18:24:23 +02:00
UI for pump state.
2017-07-16 03:28:11 +02:00
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:layout_weight="1.5"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:gravity="end"
android:paddingRight="5dp"
Combo i18n.
2017-10-27 11:52:35 +02:00
android:text="@string/combo_pump_state_label"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
wip
2017-10-27 00:03:01 +02:00
android:id="@+id/combo_state"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:layout_weight="1.5"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:gravity="end"
android:paddingRight="5dp"
Clean up string resources.
2017-11-22 11:27:49 +01:00
android:text="@string/combo_pump_activity_label"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
Pump needs rest. (cherry picked from commit 2e88fb9)
2018-01-31 00:30:53 +01:00
<com.joanzapata.iconify.widget.IconTextView
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
android:id="@+id/combo_activity"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
Combo Fragment misc.
2017-10-19 23:01:27 +02:00
android:layout_weight="1"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:gravity="start"
Combo Fragment misc.
2017-10-19 23:01:27 +02:00
android:paddingLeft="5dp"
android:textColor="@android:color/white"
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
android:textSize="14sp" />
UI for pump state.
2017-07-16 03:28:11 +02:00
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
UI for pump state.
2017-07-16 03:28:11 +02:00
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:layout_weight="1.5"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:gravity="end"
android:paddingRight="5dp"
final dana renaming
2020-05-11 16:58:59 +02:00
android:text="@string/battery_label"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
<com.joanzapata.iconify.widget.IconTextView
android:id="@+id/combo_pumpstate_battery"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
android:text=""
ComboFragment: hack to make battery display look pretty before init.
2017-11-11 16:13:06 +01:00
android:textSize="14sp" />
UI for pump state.
2017-07-16 03:28:11 +02:00
</LinearLayout>
wip
2017-10-27 00:03:01 +02:00
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:paddingRight="5dp"
final dana renaming
2020-05-11 16:58:59 +02:00
android:text="@string/reservoir_label"
wip
2017-10-27 00:03:01 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
Reorder items in fragments.
2017-11-10 02:23:21 +01:00
android:id="@+id/combo_insulinstate"
wip
2017-10-27 00:03:01 +02:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
UI for pump state.
2017-07-16 03:28:11 +02:00
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
Misc improvements: * Make command execution (RuffyScripter/ComoboPlugin.runCommand) more robust (I still suck at threading). * Return all possible states in PumpState * Add absolute TBR to PumpState * Add NoOpCommand to fetch state data from pump * Display returned pump state in Combo fragment/tab.
2017-07-15 18:40:01 +02:00
UI for pump state.
2017-07-16 03:28:11 +02:00
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:layout_weight="1.5"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:gravity="end"
android:paddingRight="5dp"
final dana renaming
2020-05-11 16:58:59 +02:00
android:text="@string/lastconnection_label"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:id="@+id/combo_lastconnection"
UI for pump state.
2017-07-16 03:28:11 +02:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
Add "pump error (message)" as a field in Combo fragement.
2017-07-19 12:37:16 +02:00
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
Add (back) last bolus to ComboFragment.
2017-10-20 00:57:14 +02:00
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:paddingRight="5dp"
final dana renaming
2020-05-11 16:58:59 +02:00
android:text="@string/lastbolus_label"
Add (back) last bolus to ComboFragment.
2017-10-20 00:57:14 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_last_bolus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
Add "pump error (message)" as a field in Combo fragement.
2017-07-19 12:37:16 +02:00
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
Add back TBR to ComboFragment.
2017-10-20 00:28:49 +02:00
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
Combo: add 'base basal rate' to fragment. (cherry picked from commit 2873da5)
2018-01-23 01:58:49 +01:00
android:gravity="end"
android:paddingRight="5dp"
final dana renaming
2020-05-11 16:58:59 +02:00
android:text="@string/basebasalrate_label"
Combo: add 'base basal rate' to fragment. (cherry picked from commit 2873da5)
2018-01-23 01:58:49 +01:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_base_basal_rate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
Add back TBR to ComboFragment.
2017-10-20 00:28:49 +02:00
android:gravity="end"
android:paddingRight="5dp"
final dana renaming
2020-05-11 16:58:59 +02:00
android:text="@string/tempbasal_label"
Add back TBR to ComboFragment.
2017-10-20 00:28:49 +02:00
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_temp_basal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
* Fix stale data in Combo tab after error * Add info about last command ran to the Combo tab * Don't refresh data more than once a minute. * Specify not only error, but also command that raised the error in alert notification
2017-07-17 14:54:47 +02:00
android:background="@color/listdelimiter" />
Combo: Show count of boluses delivered and TBRs set on pump.
2018-03-15 20:42:32 +01:00
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/combo_bolus_count"
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_bolus_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1.5"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/combo_tbr_count"
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/combo_tbr_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
SVG Icons for pumps fragment tab
2020-12-05 12:21:22 +01:00
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableTop="@drawable/ic_combo"
android:paddingTop="10dp" />
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
</LinearLayout>
* Fix stale data in Combo tab after error * Add info about last command ran to the Combo tab * Don't refresh data more than once a minute. * Specify not only error, but also command that raised the error in alert notification
2017-07-17 14:54:47 +02:00
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
</ScrollView>
UI for pump state.
2017-07-16 03:28:11 +02:00
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
Combo: fragment spacing fix.
2018-03-17 22:12:19 +01:00
android:paddingRight="4dp"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:orientation="vertical">
UI for pump state.
2017-07-16 03:28:11 +02:00
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
Show connection, execution time in combo fragment. (cherry picked from commit 4078c23)
2017-08-27 12:10:42 +02:00
Move SingleClickButton to core SingleClickButton is a utility used in a number of modules and such should be in core. While the app seems to built with the button in app, this wrong structure should be fixed. As the button is a UI element, the patch also moves the class to the package info.nightscout.androidaps.utils.ui.
2020-08-18 15:09:14 +02:00
<info.nightscout.androidaps.utils.ui.SingleClickButton
ComboFragment: always show refresh button. To allow force starting a conecting attempt if the pump is still in disconnected state.
2017-12-09 22:08:38 +01:00
android:id="@+id/combo_refresh_button"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
style="@style/ButtonSmallFontStyle"
Show connection, execution time in combo fragment. (cherry picked from commit 4078c23)
2017-08-27 12:10:42 +02:00
android:layout_width="match_parent"
android:layout_height="wrap_content"
Combo: update button spacing to match overview.
2018-03-17 12:08:32 +01:00
android:layout_weight="0.5"
android:layout_marginRight="-4dp"
Update Layout and code with new icons
2020-06-19 13:59:39 +02:00
android:drawableTop="@drawable/ic_actions_refill"
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/combo_refresh" />
</LinearLayout>
tbr capability in ComboFragment
2017-07-26 22:16:35 +02:00
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
</LinearLayout>
UI for pump state.
2017-07-16 03:28:11 +02:00
Support pump suspend status (and misc other ...).
2017-10-19 19:08:48 +02:00
</RelativeLayout>
UI for pump state.
2017-07-16 03:28:11 +02:00
combo plugin skeleton
2017-05-24 18:24:23 +02:00
</FrameLayout>
Copy permalink