caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Some ComboFragment cleanups.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-11-08 23:31:40 +01:00
parent ff3707d201
commit cc6db3a059
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
4 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -154,7 +154,6 @@ dependencies {
exclude group: 'com.google.android', module: 'android' exclude group: 'com.google.android', module: 'android'
} }
compile 'org.apache.commons:commons-lang3:3.6' compile 'org.apache.commons:commons-lang3:3.6'
compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
compile 'org.slf4j:slf4j-api:1.7.12' compile 'org.slf4j:slf4j-api:1.7.12'
compile 'com.jjoe64:graphview:4.0.1' compile 'com.jjoe64:graphview:4.0.1'
compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.1' compile 'com.joanzapata.iconify:android-iconify-fontawesome:2.1.1'

40
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -24,6 +24,7 @@ import de.jotomo.ruffy.spi.history.Bolus;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.Common.SubscriberFragment;
import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI; import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI;
import info.nightscout.utils.DateUtil;
// TODO clean up time/date formatting once this stabilizes a bit more // TODO clean up time/date formatting once this stabilizes a bit more
public class ComboFragment extends SubscriberFragment implements View.OnClickListener, View.OnLongClickListener { public class ComboFragment extends SubscriberFragment implements View.OnClickListener, View.OnLongClickListener {
@ -39,8 +40,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
private Button refresh; private Button refresh;
private PrettyTime prettyTime = new PrettyTime();
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
@ -96,7 +95,7 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
ComboPlugin plugin = ComboPlugin.getPlugin(); ComboPlugin plugin = ComboPlugin.getPlugin();
// state // state
stateView.setText(plugin.getStateSummary()); stateView.setText(plugin.getStateSummary()); // todo: inline, coupled with colour
PumpState ps = plugin.getPump().state; PumpState ps = plugin.getPump().state;
if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY) { if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY) {
stateView.setTextColor(Color.RED); stateView.setTextColor(Color.RED);
@ -118,9 +117,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
} else if (ps.batteryState == PumpState.LOW) { } else if (ps.batteryState == PumpState.LOW) {
batteryView.setText("{fa-battery-quarter}"); batteryView.setText("{fa-battery-quarter}");
batteryView.setTextColor(Color.YELLOW); batteryView.setTextColor(Color.YELLOW);
} else if (ps.batteryState == PumpState.UNKNOWN) {
batteryView.setText("");
batteryView.setTextColor(Color.YELLOW);
} else { } else {
batteryView.setText("{fa-battery-full}"); batteryView.setText("{fa-battery-full}");
batteryView.setTextColor(Color.WHITE); batteryView.setTextColor(Color.WHITE);
@ -138,19 +134,22 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
} }
// last connection // last connection
String timeAgo = StringUtils.capitalize(prettyTime.format(new Date(plugin.getPump().lastSuccessfulConnection))); String minAgo = DateUtil.minAgo(plugin.getPump().lastSuccessfulConnection);
if (plugin.getPump().lastSuccessfulConnection == 0) { if (plugin.getPump().lastSuccessfulConnection == 0) {
lastConnectionView.setText(R.string.combo_pump_never_connected); lastConnectionView.setText(R.string.combo_pump_never_connected);
lastConnectionView.setTextColor(Color.RED); lastConnectionView.setTextColor(Color.YELLOW);
} else if (plugin.getPump().lastSuccessfulConnection + 60 * 1000 > System.currentTimeMillis()) {
lastConnectionView.setText(R.string.combo_pump_connected_now);
lastConnectionView.setTextColor(Color.WHITE);
} else if (plugin.getPump().lastSuccessfulConnection < System.currentTimeMillis() - 30 * 60 * 1000) { } else if (plugin.getPump().lastSuccessfulConnection < System.currentTimeMillis() - 30 * 60 * 1000) {
// lastConnectionView.setText(getString(R.string.combo_no_pump_connection, minAgo)); lastConnectionView.setText(getString(R.string.combo_no_pump_connection, minAgo));
lastConnectionView.setTextColor(Color.RED); lastConnectionView.setTextColor(Color.RED);
} else if (plugin.getPump().lastConnectionAttempt > plugin.getPump().lastSuccessfulConnection) { } else if (plugin.getPump().lastConnectionAttempt > plugin.getPump().lastSuccessfulConnection) {
String lastFailed = timeAgo + "\n" + getString(R.string.combo_connect_attempt_failed); String lastFailed = minAgo + "\n" + getString(R.string.combo_connect_attempt_failed);
lastConnectionView.setText(lastFailed); lastConnectionView.setText(lastFailed);
lastConnectionView.setTextColor(Color.YELLOW); lastConnectionView.setTextColor(Color.YELLOW);
} else { } else {
lastConnectionView.setText(timeAgo); lastConnectionView.setText(minAgo);
lastConnectionView.setTextColor(Color.WHITE); lastConnectionView.setTextColor(Color.WHITE);
} }
@ -160,12 +159,17 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
long agoMsc = System.currentTimeMillis() - bolus.timestamp; long agoMsc = System.currentTimeMillis() - bolus.timestamp;
double bolusMinAgo = agoMsc / 60d / 1000d; double bolusMinAgo = agoMsc / 60d / 1000d;
double bolusHoursAgo = agoMsc / 60d / 60d / 1000d; double bolusHoursAgo = agoMsc / 60d / 60d / 1000d;
lastBolusView.setText(String.format("%.1f U (", bolus.amount) + prettyTime.format(new Date(bolus.timestamp)) + ")"); if ((agoMsc < 60 * 1000)) {
// lastBolusView.setText(getString(R.string.combo_last_bolus, lastBolusView.setText(String.format("%.1f U (now)", bolus.amount, (int) bolusMinAgo));
// bolus.amount, } else if (bolusMinAgo < 60) {
// bolusMinAgo < 60 ? bolusMinAgo : bolusHoursAgo, lastBolusView.setText(String.format("%.1f U (%d min ago)", bolus.amount, (int) bolusMinAgo));
// bolusMinAgo < 60 ? getString(R.string.minago) : getString(R.string.hoursago), // lastBolusView.setText(getString(R.string.combo_last_bolus, bolus.amount,
// DateUtil.timeString(bolus.timestamp))); // getString(R.string.minago, bolusMinAgo), DateUtil.timeString(bolus.timestamp)));
} else {
lastBolusView.setText(String.format("%.1f U (%.1f h ago)", bolus.amount, bolusHoursAgo));
// lastBolusView.setText(getString(R.string.combo_last_bolus, bolus.amount,
// String.format("%.1f", bolusHoursAgo) + getString(R.string.hoursago), DateUtil.timeString(bolus.timestamp)));
}
} else { } else {
lastBolusView.setText(""); lastBolusView.setText("");
} }
@ -177,8 +181,6 @@ public class ComboFragment extends SubscriberFragment implements View.OnClickLis
long remaining = ps.tbrRemainingDuration - minSinceRead; long remaining = ps.tbrRemainingDuration - minSinceRead;
if (remaining >= 0) { if (remaining >= 0) {
tbrStr = getString(R.string.combo_tbr_remaining, ps.tbrPercent, remaining); tbrStr = getString(R.string.combo_tbr_remaining, ps.tbrPercent, remaining);
tbrStr = ps.tbrPercent + "% (" + prettyTime.formatDuration(new Date(System.currentTimeMillis() + remaining * 60 * 1000)) + " remaining)";
tbrStr = ps.tbrPercent + "% (" + prettyTime.format(new Date(System.currentTimeMillis() + remaining * 60 * 1000)) + " remaining)";
} }
} }
tempBasalText.setText(tbrStr); tempBasalText.setText(tbrStr);

1
app/src/main/res/layout/combopump_fragment.xml
View file

@ -95,6 +95,7 @@
android:gravity="start" android:gravity="start"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:text=""
android:textSize="20sp" /> android:textSize="20sp" />
</LinearLayout> </LinearLayout>

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

@ -770,9 +770,9 @@
<string name="combo_pump_activity">Activity</string> <string name="combo_pump_activity">Activity</string>
<string name="combo_no_pump_connection">No connection for %s</string> <string name="combo_no_pump_connection">No connection for %s</string>
<string name="combo_connect_attempt_failed">Last connect attempt failed</string> <string name="combo_connect_attempt_failed">Last connect attempt failed</string>
<string name="combo_last_connection_time">%s (%s)</string> <string name="combo_last_connection_time">%s</string>
<string name="combo_tbr_remaining">%d%% (%d min remaining)</string> <string name="combo_tbr_remaining">%d%% (%d min remaining)</string>
<string name="combo_last_bolus">%.1f U (%.1f %s, %s)</string> <string name="combo_last_bolus">%.1f U (%s, %s)</string>
<string name="combo_pump_state_disconnected">Pump disconnected</string> <string name="combo_pump_state_disconnected">Pump disconnected</string>
<string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string> <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
<string name="combo_pump_state_suspended_by_user">Suspended by user</string> <string name="combo_pump_state_suspended_by_user">Suspended by user</string>
@ -800,5 +800,7 @@
<string name="combo_bolus_bolus_delivery_failed">Bolus delivery failed. A (partial) bolus might have been delivered. Attempting to update history from pump. Please check the Combo page and bolus again as needed.</string> <string name="combo_bolus_bolus_delivery_failed">Bolus delivery failed. A (partial) bolus might have been delivered. Attempting to update history from pump. Please check the Combo page and bolus again as needed.</string>
<string name="combo_force_disabled">Unsafe usage: extended or multiwave boluses have been delivered within the last 6 hours or the selected basal rate is not 1. Loop mode has been disabled until 6 hours after the last unsupported bolus or basal rate profile. Only normal boluses are supported in loop mode with basal rate profile 1.</string> <string name="combo_force_disabled">Unsafe usage: extended or multiwave boluses have been delivered within the last 6 hours or the selected basal rate is not 1. Loop mode has been disabled until 6 hours after the last unsupported bolus or basal rate profile. Only normal boluses are supported in loop mode with basal rate profile 1.</string>
<string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last minute. For safety reasons this is disallowed.</string> <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last minute. For safety reasons this is disallowed.</string>
<string name="combo_pump_state_initializing">Initializing</string>
<string name="combo_pump_connected_now">Now</string>
</resources> </resources>