diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c6a9342921..c4f9bcfe04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,6 @@ - - diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index 059bf6a014..496562ab1c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -148,7 +148,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, RecyclerView notificationsView; LinearLayoutManager llm; - LinearLayout cancelTempLayout; LinearLayout acceptTempLayout; Button cancelTempButton; Button treatmentButton; @@ -231,7 +230,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, calibrationButton = (Button) view.findViewById(R.id.overview_calibrationbutton); calibrationButton.setOnClickListener(this); - cancelTempLayout = (LinearLayout) view.findViewById(R.id.overview_canceltemplayout); acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout); showPredictionView = (CheckBox) view.findViewById(R.id.overview_showprediction); @@ -885,12 +883,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, TempBasal activeTemp = pump.getTempBasal(); if (pump.isTempBasalInProgress()) { - cancelTempLayout.setVisibility(View.VISIBLE); - cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString()); + cancelTempButton.setVisibility(View.VISIBLE); + cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + "\n" + activeTemp.toStringShort()); runningTempView.setVisibility(View.VISIBLE); runningTempView.setText(activeTemp.toString()); } else { - cancelTempLayout.setVisibility(View.GONE); + cancelTempButton.setVisibility(View.GONE); runningTempView.setVisibility(View.GONE); } @@ -939,7 +937,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, QuickWizard.QuickWizardEntry quickWizardEntry = getPlugin().quickWizard.getActive(); if (quickWizardEntry != null && lastBG != null && pump.isInitialized() && !pump.isSuspended()) { quickWizardButton.setVisibility(View.VISIBLE); - String text = MainApp.sResources.getString(R.string.bolus) + ": " + quickWizardEntry.buttonText() + " " + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g"; + String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g"; BolusWizard wizard = new BolusWizard(); wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(profile.getUnits()), 0d, true, true, false, false); text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U"; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java index 45dd406eeb..a2c3d8ec42 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java @@ -140,7 +140,7 @@ public class StatuslinePlugin implements PluginBase { Intent intent = new Intent(ACTION_NEW_EXTERNAL_STATUSLINE); intent.putExtras(bundle); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); - ctx.sendBroadcast(intent, RECEIVER_PERMISSION); + ctx.sendBroadcast(intent, null); } @NonNull diff --git a/app/src/main/res/drawable/bread.png b/app/src/main/res/drawable/bread.png deleted file mode 100644 index aa18f4f1d9..0000000000 Binary files a/app/src/main/res/drawable/bread.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_bolus.png b/app/src/main/res/drawable/icon_bolus.png new file mode 100644 index 0000000000..e0d0204a22 Binary files /dev/null and b/app/src/main/res/drawable/icon_bolus.png differ diff --git a/app/src/main/res/drawable/icon_calculator.png b/app/src/main/res/drawable/icon_calculator.png new file mode 100644 index 0000000000..b327e69327 Binary files /dev/null and b/app/src/main/res/drawable/icon_calculator.png differ diff --git a/app/src/main/res/drawable/icon_calibration.png b/app/src/main/res/drawable/icon_calibration.png new file mode 100644 index 0000000000..8a6db6f8d1 Binary files /dev/null and b/app/src/main/res/drawable/icon_calibration.png differ diff --git a/app/src/main/res/drawable/icon_cancelbasal.png b/app/src/main/res/drawable/icon_cancelbasal.png new file mode 100644 index 0000000000..55a39b40e5 Binary files /dev/null and b/app/src/main/res/drawable/icon_cancelbasal.png differ diff --git a/app/src/main/res/drawable/icon_quickwizard.png b/app/src/main/res/drawable/icon_quickwizard.png new file mode 100644 index 0000000000..0487ee2ac1 Binary files /dev/null and b/app/src/main/res/drawable/icon_quickwizard.png differ diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index 3099f4e15c..97fd4bb4e5 100644 --- a/app/src/main/res/layout/actions_fragment.xml +++ b/app/src/main/res/layout/actions_fragment.xml @@ -37,7 +37,7 @@ android:layout_marginTop="3dp" android:layout_weight="0.5" android:text="@string/careportal_temporarytarget" - android:textColor="@color/colorWizardButton" /> + android:textColor="@color/colorCalculatorButton" />