caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Improve display of Firmware version in Omnipod fragment

Browse source
This commit is contained in:
Bart Sopers 2020-08-18 00:12:42 +02:00
parent 8c5683faaa
commit 69da89b19b
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodFragment.kt
View file

@ -248,7 +248,7 @@ class OmnipodFragment : DaggerFragment() {
}
omnipod_pod_lot.text = "-"
omnipod_pod_tid.text = "-"
omnipod_pod_fw_version.text = "-"
omnipod_pod_firmware_version.text = "-"
omnipod_pod_expiry.text = "-"
omnipod_basabasalrate.text = "-"
omnipod_reservoir.text = "-"
@ -264,7 +264,7 @@ class OmnipodFragment : DaggerFragment() {
omnipod_pod_address.text = podStateManager.address.toString()
omnipod_pod_lot.text = podStateManager.lot.toString()
omnipod_pod_tid.text = podStateManager.tid.toString()
omnipod_pod_fw_version.text = podStateManager.pmVersion.toString() + " / " + podStateManager.piVersion.toString()
omnipod_pod_firmware_version.text = resourceHelper.gs(R.string.omnipod_pod_firmware_version_value, podStateManager.pmVersion.toString(), podStateManager.piVersion.toString())
omnipod_pod_expiry.text = podStateManager.expiryDateAsString
val stateText: String

4
omnipod/src/main/res/layout/omnipod_fragment.xml
View file

@ -219,7 +219,7 @@
android:layout_weight="1.5"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/omnipod_pod_fw_version"
android:text="@string/omnipod_pod_firmware_version"
android:textSize="14sp" />
<TextView
@ -233,7 +233,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/omnipod_pod_fw_version"
android:id="@+id/omnipod_pod_firmware_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"

3
omnipod/src/main/res/values/strings.xml
View file

@ -139,7 +139,8 @@
<string name="omnipod_read_pulse_log_short">Pulse Log</string>
<string name="omnipod_pod_lot">LOT</string>
<string name="omnipod_pod_tid">TID</string>
<string name="omnipod_pod_fw_version">PM / PI version</string>
<string name="omnipod_pod_firmware_version">Firmware version</string>
<string name="omnipod_pod_firmware_version_value" translatable="false">PM %1$s / PI %2$s</string>
<string name="omnipod_errors">Errors</string>
<string name="omnipod_cmd_basal_profile_not_set_is_same">Basal profile is the same, so it will not be set again.</string>
<string name="omnipod_custom_action_reset_rileylink">Reset RileyLink Config</string>