caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Remove reservoir TextView

Browse source
This commit is contained in:
Nico Schmitz 2018-06-12 23:31:46 +02:00
parent 4ebc149783
commit 5ba6f02b93
2 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -134,7 +134,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
TextView baseBasalView; TextView baseBasalView;
TextView extendedBolusView; TextView extendedBolusView;
TextView activeProfileView; TextView activeProfileView;
TextView reservoirView;
TextView iobView; TextView iobView;
TextView cobView; TextView cobView;
TextView apsModeView; TextView apsModeView;
@ -233,7 +232,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
baseBasalView = (TextView) view.findViewById(R.id.overview_basebasal); baseBasalView = (TextView) view.findViewById(R.id.overview_basebasal);
extendedBolusView = (TextView) view.findViewById(R.id.overview_extendedbolus); extendedBolusView = (TextView) view.findViewById(R.id.overview_extendedbolus);
activeProfileView = (TextView) view.findViewById(R.id.overview_activeprofile); activeProfileView = (TextView) view.findViewById(R.id.overview_activeprofile);
reservoirView = (TextView) view.findViewById(R.id.overview_reservoir);
pumpStatusView = (TextView) view.findViewById(R.id.overview_pumpstatus); pumpStatusView = (TextView) view.findViewById(R.id.overview_pumpstatus);
pumpDeviceStatusView = (TextView) view.findViewById(R.id.overview_pump); pumpDeviceStatusView = (TextView) view.findViewById(R.id.overview_pump);
openapsDeviceStatusView = (TextView) view.findViewById(R.id.overview_openaps); openapsDeviceStatusView = (TextView) view.findViewById(R.id.overview_openaps);
@ -1195,28 +1193,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
activeProfileView.setBackgroundColor(MainApp.gc(R.color.ribbonBgDefault)); activeProfileView.setBackgroundColor(MainApp.gc(R.color.ribbonBgDefault));
activeProfileView.setTextColor(MainApp.gc(R.color.ribbonTextDefault)); activeProfileView.setTextColor(MainApp.gc(R.color.ribbonTextDefault));
if (reservoirView != null) {
boolean showReservoirView = SP.getBoolean(R.string.key_show_reservoirview, false);
int reservoirLevel = pump.isInitialized() ? (int) Math.round(pump.getReservoirLevel()) : -1;
if (showReservoirView && reservoirLevel != -1) {
int levelWarning = SP.getInt(R.string.key_reservoirview_levelwarning, 80);
int levelCritical = SP.getInt(R.string.key_reservoirview_levelcritical, 5);
reservoirView.setText(reservoirLevel + " " + MainApp.sResources.getString(R.string.insulin_unit_shortname));
if (reservoirLevel <= levelCritical) {
reservoirView.setBackgroundColor(MainApp.gc(R.color.ribbonBgCritical));
reservoirView.setTextColor(MainApp.gc(R.color.ribbonTextCritical));
} else if (reservoirLevel <= levelWarning) {
reservoirView.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning));
reservoirView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
} else {
reservoirView.setBackgroundColor(MainApp.gc(R.color.ribbonBgDefault));
reservoirView.setTextColor(MainApp.gc(R.color.ribbonTextDefault));
}
} else {
reservoirView.setVisibility(View.GONE);
}
}
tempTargetView.setOnLongClickListener(view -> { tempTargetView.setOnLongClickListener(view -> {
view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
NewNSTreatmentDialog newTTDialog = new NewNSTreatmentDialog(); NewNSTreatmentDialog newTTDialog = new NewNSTreatmentDialog();

12
app/src/main/res/layout/overview_fragment.xml
View file

@ -47,18 +47,6 @@
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/overview_reservoir"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginRight="5dp"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:text="Reservoir"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingBottom="3dp"
android:paddingTop="3dp"/>
<TextView <TextView
android:id="@+id/overview_activeprofile" android:id="@+id/overview_activeprofile"