caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Revert "Combo: show pump id in UI."

Browse source 
This reverts commit 76568cac
This commit is contained in:
Johannes Mockenhaupt 2021-04-29 22:00:50 +02:00
parent 84622a30a0
commit 1fed867eb3
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
3 changed files with 0 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java
View file

@ -54,7 +54,6 @@ public class ComboFragment extends DaggerFragment {
private Button refreshButton; private Button refreshButton;
private TextView bolusCount; private TextView bolusCount;
private TextView tbrCount; private TextView tbrCount;
private TextView serialNumber;
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@ -71,7 +70,6 @@ public class ComboFragment extends DaggerFragment {
tempBasalText = view.findViewById(R.id.combo_temp_basal); tempBasalText = view.findViewById(R.id.combo_temp_basal);
bolusCount = view.findViewById(R.id.combo_bolus_count); bolusCount = view.findViewById(R.id.combo_bolus_count);
tbrCount = view.findViewById(R.id.combo_tbr_count); tbrCount = view.findViewById(R.id.combo_tbr_count);
serialNumber= view.findViewById(R.id.combo_serial_number);
refreshButton = view.findViewById(R.id.combo_refresh_button); refreshButton = view.findViewById(R.id.combo_refresh_button);
refreshButton.setOnClickListener(v -> { refreshButton.setOnClickListener(v -> {
@ -244,7 +242,6 @@ public class ComboFragment extends DaggerFragment {
// stats // stats
bolusCount.setText(String.valueOf(comboPlugin.getBolusesDelivered())); bolusCount.setText(String.valueOf(comboPlugin.getBolusesDelivered()));
tbrCount.setText(String.valueOf(comboPlugin.getTbrsSet())); tbrCount.setText(String.valueOf(comboPlugin.getTbrsSet()));
serialNumber.setText(comboPlugin.serialNumber());
} }
} }
} }

45
combo/src/main/res/layout/combopump_fragment.xml
View file

@ -462,51 +462,6 @@
</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/list_delimiter" />
<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_serial_number"
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_serial_number"
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"

1
combo/src/main/res/values/strings.xml
View file

@ -54,7 +54,6 @@
<string name="combo_tbr_count">TBR count</string> <string name="combo_tbr_count">TBR count</string>
<string name="bolusstopped">Bolus stopped</string> <string name="bolusstopped">Bolus stopped</string>
<string name="bolusstopping">Stopping bolus</string> <string name="bolusstopping">Stopping bolus</string>
<string name="combo_serial_number">Pump identifier</string>
<string name="combo_pump_serial" translatable="false">combo_pump_serial</string> <string name="combo_pump_serial" translatable="false">combo_pump_serial</string>
<string name="combo_tbrs_set" translatable="false">combo_tbrs_set</string> <string name="combo_tbrs_set" translatable="false">combo_tbrs_set</string>
<string name="combo_boluses_delivered" translatable="false">combo_boluses_delivered</string> <string name="combo_boluses_delivered" translatable="false">combo_boluses_delivered</string>