diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java index 0595c2f84d..e6df495c40 100644 --- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java +++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java @@ -398,7 +398,7 @@ public class Profile { public String getIsfList() { if (isf_v == null) isf_v = convertToSparseArray(isf); - return getValuesList(isf_v, null, new DecimalFormat("0.0"), getUnits() + "/U"); + return getValuesList(isf_v, null, new DecimalFormat("0.0"), getUnits() + MainApp.gs(R.string.profile_per_unit)); } public double getIc() { @@ -418,7 +418,7 @@ public class Profile { public String getIcList() { if (ic_v == null) ic_v = convertToSparseArray(ic); - return getValuesList(ic_v, null, new DecimalFormat("0.0"), "g/U"); + return getValuesList(ic_v, null, new DecimalFormat("0.0"), MainApp.gs(R.string.profile_carbs_per_unit)); } public double getBasal() { @@ -439,7 +439,7 @@ public class Profile { public String getBasalList() { if (basal_v == null) basal_v = convertToSparseArray(basal); - return getValuesList(basal_v, null, new DecimalFormat("0.00"), "U/h"); + return getValuesList(basal_v, null, new DecimalFormat("0.00"), MainApp.gs(R.string.profile_ins_units_per_hout)); } public class BasalValue { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java index fc45928f89..0445ef3402 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileLocal/LocalProfileFragment.java @@ -156,7 +156,7 @@ public class LocalProfileFragment extends SubscriberFragment { public String getSumLabel() { ProfileStore profile = LocalProfilePlugin.getPlugin().createProfileStore(); if (profile != null) - return " ∑" + DecimalFormatter.to2Decimal(profile.getDefaultProfile().baseBasalSum()) + "U"; + return " ∑" + DecimalFormatter.to2Decimal(profile.getDefaultProfile().baseBasalSum()) + MainApp.gs(R.string.insulin_unit_shortname); else return MainApp.gs(R.string.localprofile); } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java index e3aeca0c45..4edaef1761 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfileFragment.java @@ -52,6 +52,8 @@ public class NSProfileFragment extends SubscriberFragment { TextView isf; @BindView(R.id.profileview_basal) TextView basal; + @BindView(R.id.profileview_basaltotal) + TextView basaltotal; @BindView(R.id.profileview_target) TextView target; @BindView(R.id.basal_graph) @@ -116,6 +118,7 @@ public class NSProfileFragment extends SubscriberFragment { ic.setText(profile.getIcList()); isf.setText(profile.getIsfList()); basal.setText(profile.getBasalList()); + basaltotal.setText(String.format(MainApp.gs(R.string.profile_total), DecimalFormatter.to2Decimal(profile.baseBasalSum()))); target.setText(profile.getTargetList()); basalGraph.show(profile); } @@ -141,6 +144,7 @@ public class NSProfileFragment extends SubscriberFragment { ic.setText(""); isf.setText(""); basal.setText(""); + basaltotal.setText(""); target.setText(""); activateButton.setVisibility(View.GONE); } diff --git a/app/src/main/res/layout/profileviewer_fragment.xml b/app/src/main/res/layout/profileviewer_fragment.xml index 7019c306ea..a9f2aae644 100644 --- a/app/src/main/res/layout/profileviewer_fragment.xml +++ b/app/src/main/res/layout/profileviewer_fragment.xml @@ -345,6 +345,42 @@ + + + + + + + + + + short_tabtitles Please pair your pump with your phone! + == ∑ %1$s U + U/h + g/U + /U + %1$d day %1$d days