design of virtual pump

This commit is contained in:
Milos Kozak 2016-07-15 21:06:39 +02:00
parent 7f661b7fa6
commit cd86476d6a
2 changed files with 71 additions and 37 deletions

View file

@ -98,6 +98,7 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI
ArrayList<PluginBase> pluginList; ArrayList<PluginBase> pluginList;
// TODO: sorting // TODO: sorting
// TODO: Toast and sound when command failed
public ConfigBuilderFragment() { public ConfigBuilderFragment() {
super(); super();

View file

@ -5,122 +5,155 @@
tools:context=".plugins.VirtualPump.VirtualPumpFragment"> tools:context=".plugins.VirtualPump.VirtualPumpFragment">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/vitualpump_label"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="20dp" /> android:layout_marginTop="20dp"
android:text="@string/vitualpump_label"
android:textAppearance="?android:attr/textAppearanceLarge" />
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"> android:layout_marginTop="20dp"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_basebasalrate_label" android:text="@string/virtualpump_basebasalrate_label"
android:singleLine="true" android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" android:textColor="@color/colorPumpLabel"
android:layout_marginRight="15dp" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/virtualpump_basabasalrate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/virtualpump_basabasalrate" /> android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"> android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_tempbasal_label" android:text="@string/virtualpump_tempbasal_label"
android:singleLine="true" android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" android:textColor="@color/colorPumpLabel"
android:layout_marginRight="15dp" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/virtualpump_tempbasal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/virtualpump_tempbasal" /> android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_marginTop="10dp"
android:layout_marginTop="10dp"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/virtualpump_extendedbolus_label" android:text="@string/virtualpump_extendedbolus_label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" android:textColor="@color/colorPumpLabel"
android:layout_marginRight="15dp" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/virtualpump_extendedbolus" android:id="@+id/virtualpump_extendedbolus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_marginTop="10dp"
android:layout_marginTop="10dp"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/virtualpump_battery_label" android:text="@string/virtualpump_battery_label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" android:textColor="@color/colorPumpLabel"
android:layout_marginRight="15dp" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/virtualpump_battery" android:id="@+id/virtualpump_battery"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_marginTop="10dp"
android:layout_marginTop="10dp"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true" android:singleLine="true"
android:text="@string/virtualpump_reservoir_label" android:text="@string/virtualpump_reservoir_label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" android:textColor="@color/colorPumpLabel"
android:layout_marginRight="15dp" /> android:textStyle="bold" />
<TextView <TextView
android:id="@+id/virtualpump_reservoir" android:id="@+id/virtualpump_reservoir"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>