caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #243 from AdrianLxM/xdripstatusline

Browse source 
basal and bolus step in DanaR Fragment
This commit is contained in:
Milos Kozak 2017-05-16 13:28:39 +02:00 committed by GitHub
parent 6fff6f63a4 572e726678
commit 45477f96ee
4 changed files with 105 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRFragment.java
View file

@ -63,6 +63,8 @@ public class DanaRFragment extends Fragment {
TextView reservoirView; TextView reservoirView;
TextView iobView; TextView iobView;
TextView firmwareView; TextView firmwareView;
TextView basalStepView;
TextView bolusStepView;
Button viewProfileButton; Button viewProfileButton;
Button historyButton; Button historyButton;
Button statsButton; Button statsButton;
@ -109,6 +111,8 @@ public class DanaRFragment extends Fragment {
viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile); viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
historyButton = (Button) view.findViewById(R.id.danar_history); historyButton = (Button) view.findViewById(R.id.danar_history);
statsButton = (Button) view.findViewById(R.id.danar_stats); statsButton = (Button) view.findViewById(R.id.danar_stats);
basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
viewProfileButton.setOnClickListener(new View.OnClickListener() { viewProfileButton.setOnClickListener(new View.OnClickListener() {
@ -239,6 +243,9 @@ public class DanaRFragment extends Fragment {
} else { } else {
firmwareView.setText("OLD"); firmwareView.setText("OLD");
} }
basalStepView.setText("" + pump.basalStep);
bolusStepView.setText("" + pump.bolusStep);
} }
}); });

6
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanFragment.java
View file

@ -60,6 +60,8 @@ public class DanaRKoreanFragment extends Fragment {
TextView reservoirView; TextView reservoirView;
TextView iobView; TextView iobView;
TextView firmwareView; TextView firmwareView;
TextView basalStepView;
TextView bolusStepView;
Button viewProfileButton; Button viewProfileButton;
Button historyButton; Button historyButton;
Button statsButton; Button statsButton;
@ -106,6 +108,8 @@ public class DanaRKoreanFragment extends Fragment {
viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile); viewProfileButton = (Button) view.findViewById(R.id.danar_viewprofile);
historyButton = (Button) view.findViewById(R.id.danar_history); historyButton = (Button) view.findViewById(R.id.danar_history);
statsButton = (Button) view.findViewById(R.id.danar_stats); statsButton = (Button) view.findViewById(R.id.danar_stats);
basalStepView = (TextView) view.findViewById(R.id.danar_basalstep);
bolusStepView = (TextView) view.findViewById(R.id.danar_bolusstep);
viewProfileButton.setOnClickListener(new View.OnClickListener() { viewProfileButton.setOnClickListener(new View.OnClickListener() {
@ -237,6 +241,8 @@ public class DanaRKoreanFragment extends Fragment {
} else { } else {
firmwareView.setText("OLD"); firmwareView.setText("OLD");
} }
basalStepView.setText("" + pump.basalStep);
bolusStepView.setText("" + pump.bolusStep);
} }
}); });

90
app/src/main/res/layout/danar_fragment.xml
View file

@ -459,6 +459,96 @@
</LinearLayout> </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"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/basal_step"
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/danar_basalstep"
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"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/bolus_step"
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/danar_bolusstep"
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 <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="2dip" android:layout_height="2dip"

2
app/src/main/res/values/strings.xml
View file

@ -609,4 +609,6 @@
<string name="ns_noupload_summary">All data sent to NS are dropped. AAPS is connected to NS but no change in NS is done</string> <string name="ns_noupload_summary">All data sent to NS are dropped. AAPS is connected to NS but no change in NS is done</string>
<string name="key_ns_upload_only" translatable="false">ns_upload_only</string> <string name="key_ns_upload_only" translatable="false">ns_upload_only</string>
<string name="key_ns_noupload" translatable="false">ns_noupload</string> <string name="key_ns_noupload" translatable="false">ns_noupload</string>
<string name="basal_step">Basal Step</string>
<string name="bolus_step">Bolus Step</string>
</resources> </resources>