diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
index 2b7ab18128..576e04e436 100644
--- a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
+++ b/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
@@ -48,11 +48,9 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
TextView lastUsedFrequency;
TextView lastDeviceContact;
TextView firmwareVersion;
- TextView batteryLevel;
boolean first = false;
-
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.rileylink_status_general, container, false);
@@ -76,14 +74,12 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
this.lastUsedFrequency = getActivity().findViewById(R.id.rls_t1_last_used_frequency);
this.lastDeviceContact = getActivity().findViewById(R.id.rls_t1_last_device_contact);
this.firmwareVersion = getActivity().findViewById(R.id.rls_t1_firmware_version);
- this.batteryLevel = getActivity().findViewById(R.id.rls_t1_battery_level);
if (!first) {
// 7-14
int[] ids = {R.id.rls_t1_tv02, R.id.rls_t1_tv03, R.id.rls_t1_tv04, R.id.rls_t1_tv05, R.id.rls_t1_tv07, //
- R.id.rls_t1_tv08, R.id.rls_t1_tv09, R.id.rls_t1_tv10, R.id.rls_t1_tv11, R.id.rls_t1_tv12, R.id.rls_t1_tv13,
- R.id.rls_t1_tv14};
+ R.id.rls_t1_tv08, R.id.rls_t1_tv09, R.id.rls_t1_tv10, R.id.rls_t1_tv11, R.id.rls_t1_tv12, R.id.rls_t1_tv13};
for (int id : ids) {
@@ -116,13 +112,6 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
this.firmwareVersion.setText("BLE113: " + rileyLinkServiceData.versionBLE113 +
"\nCC110: " + rileyLinkServiceData.versionCC110);
}
- Integer batteryLevel = rileyLinkServiceData.batteryLevel;
- if (batteryLevel == null) {
- this.batteryLevel.setText("???");
- } else {
- this.batteryLevel.setText(batteryLevel + "%");
- }
-
}
RileyLinkPumpDevice pumpPlugin = (RileyLinkPumpDevice) activePlugin.getActivePump();
diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml
index a3625e2f65..38048a2e42 100644
--- a/rileylink/src/main/res/layout/rileylink_status_general.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_general.xml
@@ -49,9 +49,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
+ android:text=" "
+ android:textAlignment="center" />
@@ -102,9 +102,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
@@ -129,35 +129,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
-
-
-
-
-
-
-
+ android:text=" "
+ android:textAlignment="center" />
+ android:text=" "
+ android:textAlignment="center" />
@@ -222,9 +196,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
@@ -249,9 +223,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
@@ -276,9 +250,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
@@ -303,9 +277,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
+ android:text=" "
+ android:textAlignment="center" />
@@ -356,9 +330,9 @@
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_weight="65"
- android:textAlignment="center"
android:gravity="center_vertical"
- android:text=" " />
+ android:text=" "
+ android:textAlignment="center" />
diff --git a/rileylink/src/main/res/values/strings.xml b/rileylink/src/main/res/values/strings.xml
index e745275387..7483d77152 100644
--- a/rileylink/src/main/res/values/strings.xml
+++ b/rileylink/src/main/res/values/strings.xml
@@ -30,7 +30,6 @@
Last used frequency
Last device contact
Firmware
- Battery level