diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt index 357e4b462d..fce6bb41c4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt @@ -98,7 +98,7 @@ abstract class Trigger(val injector: HasAndroidInjector) { ) params.gravity = Gravity.CENTER buttonAdd.layoutParams = params - buttonAdd.setImageResource(R.drawable.add) + buttonAdd.setImageResource(R.drawable.ic_add) buttonAdd.contentDescription = resourceHelper.gs(R.string.add_short) buttonAdd.setOnClickListener { scanForActivity(context)?.supportFragmentManager?.let { @@ -124,7 +124,7 @@ abstract class Trigger(val injector: HasAndroidInjector) { ) params.gravity = Gravity.CENTER buttonRemove.layoutParams = params - buttonRemove.setImageResource(R.drawable.remove) + buttonRemove.setImageResource(R.drawable.ic_remove) buttonRemove.contentDescription = resourceHelper.gs(R.string.delete_short) buttonRemove.setOnClickListener { rxBus.send(EventTriggerRemove(trigger)) @@ -141,7 +141,7 @@ abstract class Trigger(val injector: HasAndroidInjector) { ) params.gravity = Gravity.CENTER buttonClone.layoutParams = params - buttonClone.setImageResource(R.drawable.clone) + buttonClone.setImageResource(R.drawable.ic_clone) buttonClone.contentDescription = resourceHelper.gs(R.string.copy_short) buttonClone.setOnClickListener { rxBus.send(EventTriggerClone(trigger)) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt index d6f8a607ff..3b3dbe1f68 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt @@ -68,7 +68,7 @@ class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = resourceHelper.gs(R.string.autosenscompared, resourceHelper.gs(comparator.value.stringRes), autosens.value) - override fun icon(): Optional = Optional.of(R.drawable.`as`) + override fun icon(): Optional = Optional.of(R.drawable.`ic_as`) override fun duplicate(): Trigger = TriggerAutosensValue(injector, this) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt index 4b7a56771a..2e2360daf3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt @@ -77,7 +77,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = resourceHelper.gs(R.string.lastboluscompared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.getMinutes()) - override fun icon(): Optional = Optional.of(R.drawable.icon_bolus) + override fun icon(): Optional = Optional.of(R.drawable.ic_bolus) override fun duplicate(): Trigger = TriggerBolusAgo(injector, this) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt index 82aa8cd6f1..6d07ef1188 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt @@ -77,7 +77,7 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = resourceHelper.gs(R.string.cobcompared, resourceHelper.gs(comparator.value.stringRes), cob.value) - override fun icon(): Optional = Optional.of(R.drawable.icon_cp_bolus_carbs) + override fun icon(): Optional = Optional.of(R.drawable.ic_cp_bolus_carbs) override fun duplicate(): Trigger = TriggerCOB(injector, this) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt index 0a7972461a..78702bb975 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt @@ -108,7 +108,7 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = resourceHelper.gs(R.string.deltacompared, resourceHelper.gs(comparator.value.stringRes), delta.value, resourceHelper.gs(delta.deltaType.stringRes)) - override fun icon(): Optional = Optional.of(R.drawable.icon_auto_delta) + override fun icon(): Optional = Optional.of(R.drawable.ic_auto_delta) override fun duplicate(): Trigger = TriggerDelta(injector, this) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt index 0e2228cf5e..3248269997 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt @@ -77,7 +77,7 @@ class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector override fun friendlyDescription(): String = resourceHelper.gs(R.string.automation_trigger_pump_last_connection_compared, resourceHelper.gs(comparator.value.stringRes), minutesAgo.value) - override fun icon(): Optional = Optional.of(R.drawable.remove) + override fun icon(): Optional = Optional.of(R.drawable.ic_remove) override fun duplicate(): Trigger = TriggerPumpLastConnection(injector, this) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 43095cb86b..4afcc52826 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -600,42 +600,42 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList overview_apsmode?.visibility = View.VISIBLE when { loopPlugin.isEnabled() && loopPlugin.isSuperBolus -> { - overview_apsmode.setImageResource(R.drawable.loop_superbolus) + overview_apsmode.setImageResource(R.drawable.ic_loop_superbolus) overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper) } loopPlugin.isDisconnected -> { - overview_apsmode.setImageResource(R.drawable.loop_disconnected) + overview_apsmode.setImageResource(R.drawable.ic_loop_disconnected) overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper) } loopPlugin.isEnabled() && loopPlugin.isSuspended -> { - overview_apsmode.setImageResource(R.drawable.loop_paused) + overview_apsmode.setImageResource(R.drawable.ic_loop_paused) overview_apsmode_text?.text = DateUtil.age(loopPlugin.minutesToEndOfSuspend() * 60000L, true, resourceHelper) } pump.isSuspended -> { - overview_apsmode.setImageResource(R.drawable.loop_paused) + overview_apsmode.setImageResource(R.drawable.ic_loop_paused) overview_apsmode_text?.text = "" } loopPlugin.isEnabled() && closedLoopEnabled.value() && loopPlugin.isLGS -> { - overview_apsmode.setImageResource(R.drawable.loop_lgs) + overview_apsmode.setImageResource(R.drawable.ic_loop_lgs) overview_apsmode_text?.text = "" } loopPlugin.isEnabled() && closedLoopEnabled.value() -> { - overview_apsmode.setImageResource(R.drawable.loop_closed) + overview_apsmode.setImageResource(R.drawable.ic_loop_closed) overview_apsmode_text?.text = "" } loopPlugin.isEnabled() && !closedLoopEnabled.value() -> { - overview_apsmode.setImageResource(R.drawable.loop_open) + overview_apsmode.setImageResource(R.drawable.ic_loop_open) overview_apsmode_text?.text = "" } else -> { - overview_apsmode.setImageResource(R.drawable.loop_disabled) + overview_apsmode.setImageResource(R.drawable.ic_loop_disabled) overview_apsmode_text?.text = "" } } @@ -681,9 +681,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList ?: resourceHelper.gc(R.color.defaulttextcolor)) if (activeTemp != null) - overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low) + overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.ic_cp_basal_tbr_high else R.drawable.ic_cp_basal_tbr_low) else - overview_basebasal_icon.setImageResource(R.drawable.icon_cp_basal_no_tbr) + overview_basebasal_icon.setImageResource(R.drawable.ic_cp_basal_no_tbr) // Extended bolus val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis()) @@ -777,7 +777,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (sp.getBoolean(R.string.key_openapsama_useautosens, false) && constraintChecker.isAutosensModeEnabled().value()) { overview_sensitivity_icon.setImageResource(R.drawable.ic_swap_vert_black_48dp_green) } else { - overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert_48px_green) + overview_sensitivity_icon.setImageResource(R.drawable.ic_x_swap_vert) } overview_sensitivity?.text = diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java index 3386dd9235..7010a82c12 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java +++ b/app/src/main/java/info/nightscout/androidaps/utils/TimeListEdit.java @@ -111,7 +111,7 @@ public class TimeListEdit { // last "plus" to append new interval float factor = layout.getContext().getResources().getDisplayMetrics().density; finalAdd = new ImageView(context); - finalAdd.setImageResource(R.drawable.add); + finalAdd.setImageResource(R.drawable.ic_add); LinearLayout.LayoutParams illp = new LinearLayout.LayoutParams((int) (35d * factor), (int) (35 * factor)); illp.setMargins(0, 25, 0, 25); // llp.setMargins(left, top, right, bottom); illp.gravity = Gravity.CENTER; diff --git a/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png deleted file mode 100644 index 95761084a9..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_actions_cancelextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png deleted file mode 100644 index a67d52838c..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_actions_startextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png deleted file mode 100644 index 8772df62a4..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_actions_starttempbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_bolus.png b/app/src/main/res/drawable-hdpi/icon_bolus.png deleted file mode 100644 index b212194219..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_bolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_calculator.png b/app/src/main/res/drawable-hdpi/icon_calculator.png deleted file mode 100644 index 2eb2a3b96c..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_calculator.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_calibration.png b/app/src/main/res/drawable-hdpi/icon_calibration.png deleted file mode 100644 index 605635f41d..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_calibration.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cancelbasal.png b/app/src/main/res/drawable-hdpi/icon_cancelbasal.png deleted file mode 100644 index 91803a3f3c..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cancelbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png deleted file mode 100644 index b9cdf5cc1f..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_basal_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png deleted file mode 100644 index b94fac2986..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png deleted file mode 100644 index d79ca15f86..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_basal_start.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png deleted file mode 100644 index a213f1955f..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png deleted file mode 100644 index 23aeee14d4..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png deleted file mode 100644 index ed6be099aa..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png deleted file mode 100644 index f5f02cc242..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bolus_carbs_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png deleted file mode 100644 index 8ad7864406..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_cp_bolus_correction.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_quickwizard.png b/app/src/main/res/drawable-hdpi/icon_quickwizard.png deleted file mode 100644 index 67a020c05e..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_quickwizard.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/icon_xdrip.png b/app/src/main/res/drawable-hdpi/icon_xdrip.png deleted file mode 100644 index bda51738e7..0000000000 Binary files a/app/src/main/res/drawable-hdpi/icon_xdrip.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_closed.png b/app/src/main/res/drawable-hdpi/loop_closed.png deleted file mode 100644 index 066dd4c26a..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_closed.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_disabled.png b/app/src/main/res/drawable-hdpi/loop_disabled.png deleted file mode 100644 index 268a9bc76b..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_disabled.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_disconnected.png b/app/src/main/res/drawable-hdpi/loop_disconnected.png deleted file mode 100644 index bfff44ea1e..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_disconnected.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_lgs.png b/app/src/main/res/drawable-hdpi/loop_lgs.png deleted file mode 100644 index e45fda615b..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_lgs.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_open.png b/app/src/main/res/drawable-hdpi/loop_open.png deleted file mode 100644 index cdefc55ce8..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_open.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_pause.png b/app/src/main/res/drawable-hdpi/loop_pause.png deleted file mode 100644 index bb97008a07..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_pause.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/loop_superbolus.png b/app/src/main/res/drawable-hdpi/loop_superbolus.png deleted file mode 100644 index d9cec8f047..0000000000 Binary files a/app/src/main/res/drawable-hdpi/loop_superbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png deleted file mode 100644 index 4ad378e374..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_actions_cancelextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png deleted file mode 100644 index 338df773c2..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_actions_startextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png deleted file mode 100644 index 18fbd8c111..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_actions_starttempbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_bolus.png b/app/src/main/res/drawable-mdpi/icon_bolus.png deleted file mode 100644 index c083219b45..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_bolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_calculator.png b/app/src/main/res/drawable-mdpi/icon_calculator.png deleted file mode 100644 index 056722a440..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_calculator.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_calibration.png b/app/src/main/res/drawable-mdpi/icon_calibration.png deleted file mode 100644 index 0929d3690d..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_calibration.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cancelbasal.png b/app/src/main/res/drawable-mdpi/icon_cancelbasal.png deleted file mode 100644 index c48a20792d..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cancelbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png deleted file mode 100644 index be8474f002..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_basal_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png deleted file mode 100644 index a9d84303f6..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png deleted file mode 100644 index 34cd31f14b..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_basal_start.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png deleted file mode 100644 index ece4bd4cc0..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png deleted file mode 100644 index 0479c1a3af..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png deleted file mode 100644 index 561703fb06..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png deleted file mode 100644 index 19534dfdfb..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bolus_carbs_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png deleted file mode 100644 index 582472dc92..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_cp_bolus_correction.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_quickwizard.png b/app/src/main/res/drawable-mdpi/icon_quickwizard.png deleted file mode 100644 index d65347f235..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_quickwizard.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon_xdrip.png b/app/src/main/res/drawable-mdpi/icon_xdrip.png deleted file mode 100644 index 700e274f5b..0000000000 Binary files a/app/src/main/res/drawable-mdpi/icon_xdrip.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_closed.png b/app/src/main/res/drawable-mdpi/loop_closed.png deleted file mode 100644 index ba4283035b..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_closed.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_disabled.png b/app/src/main/res/drawable-mdpi/loop_disabled.png deleted file mode 100644 index e4650ec0ac..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_disabled.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_disconnected.png b/app/src/main/res/drawable-mdpi/loop_disconnected.png deleted file mode 100644 index 0bc9949349..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_disconnected.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_lgs.png b/app/src/main/res/drawable-mdpi/loop_lgs.png deleted file mode 100644 index a49229d4d8..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_lgs.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_open.png b/app/src/main/res/drawable-mdpi/loop_open.png deleted file mode 100644 index f82346f739..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_open.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_paused.png b/app/src/main/res/drawable-mdpi/loop_paused.png deleted file mode 100644 index 7258615f66..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_paused.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/loop_superbolus.png b/app/src/main/res/drawable-mdpi/loop_superbolus.png deleted file mode 100644 index 34a61c1bf3..0000000000 Binary files a/app/src/main/res/drawable-mdpi/loop_superbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png deleted file mode 100644 index 8c4ee82d1e..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_actions_cancelextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png deleted file mode 100644 index 0e59f6ec36..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_actions_startextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png deleted file mode 100644 index 1deb6f3ca8..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_actions_starttempbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_bolus.png b/app/src/main/res/drawable-xhdpi/icon_bolus.png deleted file mode 100644 index a472289d6b..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_bolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_calculator.png b/app/src/main/res/drawable-xhdpi/icon_calculator.png deleted file mode 100644 index 9352f7b2a7..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_calculator.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_calibration.png b/app/src/main/res/drawable-xhdpi/icon_calibration.png deleted file mode 100644 index 98a24e4c78..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_calibration.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cancelbasal.png b/app/src/main/res/drawable-xhdpi/icon_cancelbasal.png deleted file mode 100644 index a6eb55c6cb..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cancelbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png deleted file mode 100644 index c92af22df3..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_basal_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png deleted file mode 100644 index c448cadbdb..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png deleted file mode 100644 index 5e694ba89c..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_basal_start.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png deleted file mode 100644 index b89fd99246..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png deleted file mode 100644 index 5bb1a0b982..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png deleted file mode 100644 index 64815bc8f0..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png deleted file mode 100644 index 521b5ede82..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_carbs_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png deleted file mode 100644 index 0fe89d5f8b..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_cp_bolus_correction.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_quickwizard.png b/app/src/main/res/drawable-xhdpi/icon_quickwizard.png deleted file mode 100644 index b937f1448f..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_quickwizard.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_xdrip.png b/app/src/main/res/drawable-xhdpi/icon_xdrip.png deleted file mode 100644 index ae4c77b1a8..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_xdrip.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_closed.png b/app/src/main/res/drawable-xhdpi/loop_closed.png deleted file mode 100644 index f7548add59..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_closed.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_disabled.png b/app/src/main/res/drawable-xhdpi/loop_disabled.png deleted file mode 100644 index 0f7db5d681..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_disabled.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_disconnected.png b/app/src/main/res/drawable-xhdpi/loop_disconnected.png deleted file mode 100644 index 7db5047b9f..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_disconnected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_lgs.png b/app/src/main/res/drawable-xhdpi/loop_lgs.png deleted file mode 100644 index baa073ac8c..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_lgs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_open.png b/app/src/main/res/drawable-xhdpi/loop_open.png deleted file mode 100644 index 55726849d0..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_open.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_paused.png b/app/src/main/res/drawable-xhdpi/loop_paused.png deleted file mode 100644 index 399ec449bc..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_paused.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/loop_superbolus.png b/app/src/main/res/drawable-xhdpi/loop_superbolus.png deleted file mode 100644 index 8bcf96248b..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/loop_superbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png deleted file mode 100644 index d223d16d8f..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_actions_cancelextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png deleted file mode 100644 index e33b5e0a64..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_actions_startextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png deleted file mode 100644 index 9e4aca67e2..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_actions_starttempbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_bolus.png b/app/src/main/res/drawable-xxhdpi/icon_bolus.png deleted file mode 100644 index efa063d54d..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_bolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_calculator.png b/app/src/main/res/drawable-xxhdpi/icon_calculator.png deleted file mode 100644 index 18ab99e92b..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_calculator.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_calibration.png b/app/src/main/res/drawable-xxhdpi/icon_calibration.png deleted file mode 100644 index 3fd492a623..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_calibration.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cancelbasal.png b/app/src/main/res/drawable-xxhdpi/icon_cancelbasal.png deleted file mode 100644 index 2bb5d6df09..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cancelbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png deleted file mode 100644 index 08acae3012..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png deleted file mode 100644 index 0c7597c5ea..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png deleted file mode 100644 index 1b6d970b95..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_start.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png deleted file mode 100644 index fa25d872c7..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png deleted file mode 100644 index b7df0c266a..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png deleted file mode 100644 index a110276120..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png deleted file mode 100644 index 2b831ffd84..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_carbs_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png deleted file mode 100644 index d0c7a40613..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_cp_bolus_correction.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_quickwizard.png b/app/src/main/res/drawable-xxhdpi/icon_quickwizard.png deleted file mode 100644 index 9f2c9c9350..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_quickwizard.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_xdrip.png b/app/src/main/res/drawable-xxhdpi/icon_xdrip.png deleted file mode 100644 index c375417b1c..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_xdrip.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_closed.png b/app/src/main/res/drawable-xxhdpi/loop_closed.png deleted file mode 100644 index 5418ef1e7e..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_closed.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_disabled.png b/app/src/main/res/drawable-xxhdpi/loop_disabled.png deleted file mode 100644 index 580dc5a5f5..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_disabled.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_disconnected.png b/app/src/main/res/drawable-xxhdpi/loop_disconnected.png deleted file mode 100644 index 6e991f8ebf..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_disconnected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_lgs.png b/app/src/main/res/drawable-xxhdpi/loop_lgs.png deleted file mode 100644 index 86b4910f33..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_lgs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_open.png b/app/src/main/res/drawable-xxhdpi/loop_open.png deleted file mode 100644 index 1d35a9c987..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_open.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_paused.png b/app/src/main/res/drawable-xxhdpi/loop_paused.png deleted file mode 100644 index 6db561b858..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_paused.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/loop_superbolus.png b/app/src/main/res/drawable-xxhdpi/loop_superbolus.png deleted file mode 100644 index c5187cf95d..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/loop_superbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png deleted file mode 100644 index f5b57a9bc9..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_actions_cancelextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png deleted file mode 100644 index 89b44ea201..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_actions_startextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png deleted file mode 100644 index 7be2e32dfe..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_actions_starttempbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_bolus.png b/app/src/main/res/drawable-xxxhdpi/icon_bolus.png deleted file mode 100644 index b4c4fb8559..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_bolus.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_calculator.png b/app/src/main/res/drawable-xxxhdpi/icon_calculator.png deleted file mode 100644 index 90c8fab919..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_calculator.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_calibration.png b/app/src/main/res/drawable-xxxhdpi/icon_calibration.png deleted file mode 100644 index 82eb93205e..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_calibration.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cancelbasal.png b/app/src/main/res/drawable-xxxhdpi/icon_cancelbasal.png deleted file mode 100644 index cd66d14c4f..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cancelbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png deleted file mode 100644 index a57ceb3b8a..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_end.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png deleted file mode 100644 index a6750042e8..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png deleted file mode 100644 index d36b0b711c..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_start.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png deleted file mode 100644 index 1aaf00fd61..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png deleted file mode 100644 index 67c74252c2..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png deleted file mode 100644 index 4dab75558b..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png deleted file mode 100644 index 95df9af00c..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_carbs_red.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png b/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png deleted file mode 100644 index ccc3d0e39c..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_cp_bolus_correction.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_quickwizard.png b/app/src/main/res/drawable-xxxhdpi/icon_quickwizard.png deleted file mode 100644 index 314b8a98de..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_quickwizard.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/icon_xdrip.png b/app/src/main/res/drawable-xxxhdpi/icon_xdrip.png deleted file mode 100644 index 2b4b8323b8..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/icon_xdrip.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_closed.png b/app/src/main/res/drawable-xxxhdpi/loop_closed.png deleted file mode 100644 index bd78239462..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_closed.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_disabled.png b/app/src/main/res/drawable-xxxhdpi/loop_disabled.png deleted file mode 100644 index 824d6b9db1..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_disabled.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_disconnected.png b/app/src/main/res/drawable-xxxhdpi/loop_disconnected.png deleted file mode 100644 index 9c451cca88..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_disconnected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_lgs.png b/app/src/main/res/drawable-xxxhdpi/loop_lgs.png deleted file mode 100644 index 80848ff60a..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_lgs.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_open.png b/app/src/main/res/drawable-xxxhdpi/loop_open.png deleted file mode 100644 index f010399a53..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_open.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_paused.png b/app/src/main/res/drawable-xxxhdpi/loop_paused.png deleted file mode 100644 index 36f9bcb5a5..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_paused.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/loop_superbolus.png b/app/src/main/res/drawable-xxxhdpi/loop_superbolus.png deleted file mode 100644 index 018bf70188..0000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/loop_superbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable/add.png b/app/src/main/res/drawable/add.png deleted file mode 100644 index b25da64672..0000000000 Binary files a/app/src/main/res/drawable/add.png and /dev/null differ diff --git a/app/src/main/res/drawable/anim_carbs.xml b/app/src/main/res/drawable/anim_carbs.xml index 28ae262b46..f3b7c5cc7f 100644 --- a/app/src/main/res/drawable/anim_carbs.xml +++ b/app/src/main/res/drawable/anim_carbs.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/as.png b/app/src/main/res/drawable/as.png deleted file mode 100644 index a37e4c3465..0000000000 Binary files a/app/src/main/res/drawable/as.png and /dev/null differ diff --git a/app/src/main/res/drawable/clone.png b/app/src/main/res/drawable/clone.png deleted file mode 100644 index 82fd90cca8..0000000000 Binary files a/app/src/main/res/drawable/clone.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml new file mode 100644 index 0000000000..913b1b9aeb --- /dev/null +++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_actions_startextbolus.xml b/app/src/main/res/drawable/ic_actions_startextbolus.xml new file mode 100644 index 0000000000..6436cad1d7 --- /dev/null +++ b/app/src/main/res/drawable/ic_actions_startextbolus.xml @@ -0,0 +1,9 @@ + + + + diff --git a/app/src/main/res/drawable/ic_actions_starttempbasal.xml b/app/src/main/res/drawable/ic_actions_starttempbasal.xml new file mode 100644 index 0000000000..1b7781daed --- /dev/null +++ b/app/src/main/res/drawable/ic_actions_starttempbasal.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 0000000000..d9bfc40f83 --- /dev/null +++ b/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_as.xml b/app/src/main/res/drawable/ic_as.xml new file mode 100644 index 0000000000..152a314c2d --- /dev/null +++ b/app/src/main/res/drawable/ic_as.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_auto_delta.xml b/app/src/main/res/drawable/ic_auto_delta.xml new file mode 100644 index 0000000000..9e9eaafd0e --- /dev/null +++ b/app/src/main/res/drawable/ic_auto_delta.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_bolus.xml b/app/src/main/res/drawable/ic_bolus.xml new file mode 100644 index 0000000000..752e99ce35 --- /dev/null +++ b/app/src/main/res/drawable/ic_bolus.xml @@ -0,0 +1,8 @@ + + + diff --git a/app/src/main/res/drawable/ic_calculator.xml b/app/src/main/res/drawable/ic_calculator.xml new file mode 100644 index 0000000000..300e971bf4 --- /dev/null +++ b/app/src/main/res/drawable/ic_calculator.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_calibration.xml b/app/src/main/res/drawable/ic_calibration.xml new file mode 100644 index 0000000000..26511d7cbf --- /dev/null +++ b/app/src/main/res/drawable/ic_calibration.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_cancelbasal.xml b/app/src/main/res/drawable/ic_cancelbasal.xml new file mode 100644 index 0000000000..76640a4534 --- /dev/null +++ b/app/src/main/res/drawable/ic_cancelbasal.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_clone.xml b/app/src/main/res/drawable/ic_clone.xml new file mode 100644 index 0000000000..fa8c8e0c51 --- /dev/null +++ b/app/src/main/res/drawable/ic_clone.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_basal_end.xml b/app/src/main/res/drawable/ic_cp_basal_end.xml new file mode 100644 index 0000000000..76640a4534 --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_basal_end.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml new file mode 100644 index 0000000000..840a639f9c --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_basal_start.xml b/app/src/main/res/drawable/ic_cp_basal_start.xml new file mode 100644 index 0000000000..1b7781daed --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_basal_start.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml new file mode 100644 index 0000000000..1b7781daed --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml new file mode 100644 index 0000000000..9f3d94563f --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_bolus_carbs.xml b/app/src/main/res/drawable/ic_cp_bolus_carbs.xml new file mode 100644 index 0000000000..e21b236b4e --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_bolus_carbs.xml @@ -0,0 +1,8 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml b/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml new file mode 100644 index 0000000000..c6206204cf --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_bolus_carbs_red.xml @@ -0,0 +1,8 @@ + + + diff --git a/app/src/main/res/drawable/ic_cp_bolus_correction.xml b/app/src/main/res/drawable/ic_cp_bolus_correction.xml new file mode 100644 index 0000000000..e14bb7c14f --- /dev/null +++ b/app/src/main/res/drawable/ic_cp_bolus_correction.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_loop_closed.xml b/app/src/main/res/drawable/ic_loop_closed.xml new file mode 100644 index 0000000000..1cb9278a1a --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_closed.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_loop_disabled.xml b/app/src/main/res/drawable/ic_loop_disabled.xml new file mode 100644 index 0000000000..ed79c96429 --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_disabled.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_loop_disconnected.xml b/app/src/main/res/drawable/ic_loop_disconnected.xml new file mode 100644 index 0000000000..81450ade17 --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_disconnected.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_loop_lgs.xml b/app/src/main/res/drawable/ic_loop_lgs.xml new file mode 100644 index 0000000000..c7b5dcd0b8 --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_lgs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_loop_open.xml b/app/src/main/res/drawable/ic_loop_open.xml new file mode 100644 index 0000000000..3f00a12c23 --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_open.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_loop_paused.xml b/app/src/main/res/drawable/ic_loop_paused.xml new file mode 100644 index 0000000000..4b7951d4d0 --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_paused.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_loop_superbolus.xml b/app/src/main/res/drawable/ic_loop_superbolus.xml new file mode 100644 index 0000000000..2f94edf2c4 --- /dev/null +++ b/app/src/main/res/drawable/ic_loop_superbolus.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_quickwizard.xml b/app/src/main/res/drawable/ic_quickwizard.xml new file mode 100644 index 0000000000..b2d1f2569b --- /dev/null +++ b/app/src/main/res/drawable/ic_quickwizard.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/drawable/ic_remove.xml b/app/src/main/res/drawable/ic_remove.xml new file mode 100644 index 0000000000..e5b9715945 --- /dev/null +++ b/app/src/main/res/drawable/ic_remove.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_x_swap_vert.xml b/app/src/main/res/drawable/ic_x_swap_vert.xml new file mode 100644 index 0000000000..f5182fe7b4 --- /dev/null +++ b/app/src/main/res/drawable/ic_x_swap_vert.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml b/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml deleted file mode 100644 index b094d56057..0000000000 --- a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_xdrip.xml b/app/src/main/res/drawable/ic_xdrip.xml new file mode 100644 index 0000000000..54f88823ba --- /dev/null +++ b/app/src/main/res/drawable/ic_xdrip.xml @@ -0,0 +1,8 @@ + + + diff --git a/app/src/main/res/drawable/icon_actions_cancelextbolus.png b/app/src/main/res/drawable/icon_actions_cancelextbolus.png deleted file mode 100644 index 4ad378e374..0000000000 Binary files a/app/src/main/res/drawable/icon_actions_cancelextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_actions_startextbolus.png b/app/src/main/res/drawable/icon_actions_startextbolus.png deleted file mode 100644 index 338df773c2..0000000000 Binary files a/app/src/main/res/drawable/icon_actions_startextbolus.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_actions_starttempbasal.png b/app/src/main/res/drawable/icon_actions_starttempbasal.png deleted file mode 100644 index 18fbd8c111..0000000000 Binary files a/app/src/main/res/drawable/icon_actions_starttempbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_auto_delta.png b/app/src/main/res/drawable/icon_auto_delta.png deleted file mode 100644 index ddb0930b0b..0000000000 Binary files a/app/src/main/res/drawable/icon_auto_delta.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 deleted file mode 100644 index c083219b45..0000000000 Binary files a/app/src/main/res/drawable/icon_bolus.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_calculator.png b/app/src/main/res/drawable/icon_calculator.png deleted file mode 100644 index 056722a440..0000000000 Binary files a/app/src/main/res/drawable/icon_calculator.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_calibration.png b/app/src/main/res/drawable/icon_calibration.png deleted file mode 100644 index 0929d3690d..0000000000 Binary files a/app/src/main/res/drawable/icon_calibration.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cancelbasal.png b/app/src/main/res/drawable/icon_cancelbasal.png deleted file mode 100644 index c48a20792d..0000000000 Binary files a/app/src/main/res/drawable/icon_cancelbasal.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_basal_end.png b/app/src/main/res/drawable/icon_cp_basal_end.png deleted file mode 100644 index be8474f002..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_basal_end.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_basal_no_tbr.png b/app/src/main/res/drawable/icon_cp_basal_no_tbr.png deleted file mode 100644 index a9d84303f6..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_basal_no_tbr.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_basal_start.png b/app/src/main/res/drawable/icon_cp_basal_start.png deleted file mode 100644 index 34cd31f14b..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_basal_start.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_high.png b/app/src/main/res/drawable/icon_cp_basal_tbr_high.png deleted file mode 100644 index ece4bd4cc0..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_basal_tbr_high.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_basal_tbr_low.png b/app/src/main/res/drawable/icon_cp_basal_tbr_low.png deleted file mode 100644 index 0479c1a3af..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_basal_tbr_low.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_bolus_carbs.png b/app/src/main/res/drawable/icon_cp_bolus_carbs.png deleted file mode 100644 index 561703fb06..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_bolus_carbs.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png b/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png deleted file mode 100644 index 19534dfdfb..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_bolus_carbs_red.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_cp_bolus_correction.png b/app/src/main/res/drawable/icon_cp_bolus_correction.png deleted file mode 100644 index 582472dc92..0000000000 Binary files a/app/src/main/res/drawable/icon_cp_bolus_correction.png and /dev/null differ diff --git a/app/src/main/res/drawable/icon_insulin_carbs.xml b/app/src/main/res/drawable/icon_insulin_carbs.xml index 6dcd511598..5268a2eb70 100644 --- a/app/src/main/res/drawable/icon_insulin_carbs.xml +++ b/app/src/main/res/drawable/icon_insulin_carbs.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_quickwizard.png b/app/src/main/res/drawable/icon_quickwizard.png deleted file mode 100644 index d65347f235..0000000000 Binary files a/app/src/main/res/drawable/icon_quickwizard.png and /dev/null differ diff --git a/app/src/main/res/drawable/remove.png b/app/src/main/res/drawable/remove.png deleted file mode 100644 index 835575cea2..0000000000 Binary files a/app/src/main/res/drawable/remove.png and /dev/null differ diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index 0290c1cf8a..9b126fb8d1 100644 --- a/app/src/main/res/layout/actions_fragment.xml +++ b/app/src/main/res/layout/actions_fragment.xml @@ -60,7 +60,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_actions_starttempbasal" + android:drawableTop="@drawable/ic_actions_starttempbasal" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/overview_tempbasal_button" @@ -75,7 +75,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_cancelbasal" + android:drawableTop="@drawable/ic_cancelbasal" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/canceltemp" @@ -91,7 +91,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_actions_startextbolus" + android:drawableTop="@drawable/ic_actions_startextbolus" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/overview_extendedbolus_button" @@ -106,7 +106,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_actions_cancelextbolus" + android:drawableTop="@drawable/ic_actions_cancelextbolus" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/overview_extendedbolus_cancel_button" diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml index d4f79965a5..44d5f957f0 100644 --- a/app/src/main/res/layout/careportal_fragment.xml +++ b/app/src/main/res/layout/careportal_fragment.xml @@ -138,7 +138,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bolus_correction" + android:drawableTop="@drawable/ic_cp_bolus_correction" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_correctionbolus" @@ -152,7 +152,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bolus_carbs" + android:drawableTop="@drawable/ic_cp_bolus_carbs" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_carbscorrection" @@ -166,7 +166,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bolus_correction" + android:drawableTop="@drawable/ic_cp_bolus_correction" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_combobolus" @@ -180,7 +180,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_basal_start" + android:drawableTop="@drawable/ic_cp_basal_start" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_tempbasalstart" @@ -194,7 +194,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_basal_end" + android:drawableTop="@drawable/ic_cp_basal_end" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_tempbasalend" diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml index 1dbd83bd40..5cf87640eb 100644 --- a/app/src/main/res/layout/dialog_calibration.xml +++ b/app/src/main/res/layout/dialog_calibration.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/overview_calibration" - android:src="@drawable/icon_calibration" /> + android:src="@drawable/ic_calibration" /> + android:src="@drawable/ic_cp_bolus_carbs" /> + android:src="@drawable/ic_actions_startextbolus" /> + android:src="@drawable/ic_bolus" /> + android:src="@drawable/ic_cp_basal_start" /> + android:src="@drawable/ic_bolus" /> + android:src="@drawable/ic_calculator" /> + android:src="@drawable/ic_calculator" /> + android:src="@drawable/ic_add" /> + android:src="@drawable/ic_clone" /> + android:scaleX="1" + android:scaleY="1" + android:src="@drawable/ic_remove" /> diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/app/src/main/res/layout/omnipod_fragment.xml index e5e450c141..f6d13171ce 100644 --- a/app/src/main/res/layout/omnipod_fragment.xml +++ b/app/src/main/res/layout/omnipod_fragment.xml @@ -618,7 +618,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_cp_bolus_correction" + android:drawableTop="@drawable/ic_cp_bolus_correction" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/omnipod_read_pulse_log_short" diff --git a/app/src/main/res/layout/overview_buttons_layout.xml b/app/src/main/res/layout/overview_buttons_layout.xml index 5c97104159..f16ab04176 100644 --- a/app/src/main/res/layout/overview_buttons_layout.xml +++ b/app/src/main/res/layout/overview_buttons_layout.xml @@ -45,7 +45,7 @@ android:layout_height="fill_parent" android:layout_marginEnd="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_bolus" + android:drawableTop="@drawable/ic_bolus" android:text="@string/overview_insulin_label" android:textColor="@color/colorInsulinButton" android:textSize="10sp" /> @@ -57,7 +57,7 @@ android:layout_height="fill_parent" android:layout_marginEnd="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_cp_bolus_carbs" + android:drawableTop="@drawable/ic_cp_bolus_carbs" android:text="@string/overview_carbs_label" android:textColor="@color/colorCarbsButton" android:textSize="10sp" /> @@ -69,7 +69,7 @@ android:layout_height="fill_parent" android:layout_marginEnd="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_calculator" + android:drawableTop="@drawable/ic_calculator" android:text="@string/overview_calculator_label" android:textColor="@color/colorCalculatorButton" android:textSize="10sp" /> @@ -81,7 +81,7 @@ android:layout_height="fill_parent" android:layout_marginEnd="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_calibration" + android:drawableTop="@drawable/ic_calibration" android:text="@string/overview_calibration" android:textColor="@color/colorCalibrationButton" android:textSize="10sp" @@ -94,7 +94,7 @@ android:layout_height="fill_parent" android:layout_marginEnd="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_xdrip" + android:drawableTop="@drawable/ic_xdrip" android:text="@string/overview_cgm" android:textColor="@color/colorCalibrationButton" android:textSize="10sp" @@ -107,7 +107,7 @@ android:layout_height="fill_parent" android:layout_marginEnd="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_quickwizard" + android:drawableTop="@drawable/ic_quickwizard" android:text="@string/quickwizard" android:textColor="@color/colorQuickWizardButton" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml index 5c4340eea6..5f56623663 100644 --- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml +++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml @@ -497,7 +497,7 @@ android:layout_height="fill_parent" android:layout_marginRight="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_bolus" + android:drawableTop="@drawable/ic_bolus" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/overview_insulin_label" @@ -512,7 +512,7 @@ android:layout_height="fill_parent" android:layout_marginRight="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_cp_bolus_carbs" + android:drawableTop="@drawable/ic_cp_bolus_carbs" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/overview_carbs_label" @@ -527,7 +527,7 @@ android:layout_height="fill_parent" android:layout_marginRight="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_calculator" + android:drawableTop="@drawable/ic_calculator" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/overview_calculator_label" @@ -542,7 +542,7 @@ android:layout_height="fill_parent" android:layout_marginRight="-4dp" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_quickwizard" + android:drawableTop="@drawable/ic_quickwizard" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="Quick wizard" diff --git a/app/src/main/res/layout/overview_info_layout.xml b/app/src/main/res/layout/overview_info_layout.xml index 2d1adfc257..9794abeaff 100644 --- a/app/src/main/res/layout/overview_info_layout.xml +++ b/app/src/main/res/layout/overview_info_layout.xml @@ -83,7 +83,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginBottom="-4dp" - android:src="@drawable/loop_closed" /> + android:src="@drawable/ic_loop_closed" /> + android:src="@drawable/ic_bolus" /> + android:src="@drawable/ic_cp_basal_no_tbr" /> + android:src="@drawable/ic_actions_startextbolus" /> + card_view:srcCompat="@drawable/ic_quickwizard" /> + android:src="@drawable/ic_add" /> + android:src="@drawable/ic_remove" /> diff --git a/app/src/main/res/layout/timelistedit_element_vertical.xml b/app/src/main/res/layout/timelistedit_element_vertical.xml index 7a92b77221..7ecb7d7956 100644 --- a/app/src/main/res/layout/timelistedit_element_vertical.xml +++ b/app/src/main/res/layout/timelistedit_element_vertical.xml @@ -37,7 +37,7 @@ android:layout_height="35dp" android:layout_gravity="center_vertical" android:layout_marginLeft="15dp" - android:src="@drawable/add" /> + android:src="@drawable/ic_add" /> + android:src="@drawable/ic_remove" /> diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt index 27b042afa1..54c4381923 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValueTest.kt @@ -110,7 +110,7 @@ class TriggerAutosensValueTest : TriggerTestBase() { } @Test fun iconTest() { - Assert.assertEquals(Optional.of(R.drawable.`as`), TriggerAutosensValue(injector).icon()) + Assert.assertEquals(Optional.of(R.drawable.`ic_as`), TriggerAutosensValue(injector).icon()) } @Before diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt index a1400ae55f..b1aefd5b3a 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt @@ -79,6 +79,6 @@ class TriggerBolusAgoTest : TriggerTestBase() { } @Test fun iconTest() { - Assert.assertEquals(Optional.of(R.drawable.icon_bolus), TriggerBolusAgo(injector).icon()) + Assert.assertEquals(Optional.of(R.drawable.ic_bolus), TriggerBolusAgo(injector).icon()) } } \ No newline at end of file diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt index b864e0aed8..0c2a942a3e 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOBTest.kt @@ -70,7 +70,7 @@ class TriggerCOBTest : TriggerTestBase() { } @Test fun iconTest() { - Assert.assertEquals(Optional.of(R.drawable.icon_cp_bolus_carbs), TriggerCOB(injector).icon()) + Assert.assertEquals(Optional.of(R.drawable.ic_cp_bolus_carbs), TriggerCOB(injector).icon()) } fun generateCobInfo(): CobInfo { diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt index 97c26dbcd0..acbc3bb5dd 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDeltaTest.kt @@ -93,7 +93,7 @@ class TriggerDeltaTest : TriggerTestBase() { } @Test fun iconTest() { - Assert.assertEquals(Optional.of(R.drawable.icon_auto_delta), TriggerDelta(injector).icon()) + Assert.assertEquals(Optional.of(R.drawable.ic_auto_delta), TriggerDelta(injector).icon()) } @Test fun initializerTest() { diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt index d834fcd642..692143d7e2 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnectionTest.kt @@ -73,7 +73,7 @@ class TriggerPumpLastConnectionTest : TriggerTestBase() { } @Test fun iconTest() { - Assert.assertEquals(Optional.of(R.drawable.remove), TriggerPumpLastConnection(injector).icon()) + Assert.assertEquals(Optional.of(R.drawable.ic_remove), TriggerPumpLastConnection(injector).icon()) } @Test fun friendlyNameTest() { diff --git a/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg new file mode 100644 index 0000000000..98c7fa503b --- /dev/null +++ b/icons/actions_cancelextbolus.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/icons/actions_startextbolus.svg b/icons/actions_startextbolus.svg new file mode 100644 index 0000000000..0c5d79384a --- /dev/null +++ b/icons/actions_startextbolus.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/icons/add.svg b/icons/add.svg new file mode 100644 index 0000000000..ee6825ecad --- /dev/null +++ b/icons/add.svg @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/icons/as.svg b/icons/as.svg new file mode 100644 index 0000000000..0ea0090571 --- /dev/null +++ b/icons/as.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/icons/auto_delta.svg b/icons/auto_delta.svg new file mode 100644 index 0000000000..ce90280726 --- /dev/null +++ b/icons/auto_delta.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/icons/bolus.svg b/icons/bolus.svg new file mode 100644 index 0000000000..24108f0e2e --- /dev/null +++ b/icons/bolus.svg @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/icons/calculator.svg b/icons/calculator.svg new file mode 100644 index 0000000000..5a8b336a61 --- /dev/null +++ b/icons/calculator.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + diff --git a/icons/calibration.svg b/icons/calibration.svg new file mode 100644 index 0000000000..8db9f88fe9 --- /dev/null +++ b/icons/calibration.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/icons/clone.svg b/icons/clone.svg new file mode 100644 index 0000000000..16226c69c9 --- /dev/null +++ b/icons/clone.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/icons/cp_basal_end.svg b/icons/cp_basal_end.svg new file mode 100644 index 0000000000..f510137ad0 --- /dev/null +++ b/icons/cp_basal_end.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/icons/cp_basal_no_tbr.svg b/icons/cp_basal_no_tbr.svg new file mode 100644 index 0000000000..198afcf383 --- /dev/null +++ b/icons/cp_basal_no_tbr.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg new file mode 100644 index 0000000000..eaa4f986ff --- /dev/null +++ b/icons/cp_basal_tbr_high.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg new file mode 100644 index 0000000000..d591a1941f --- /dev/null +++ b/icons/cp_basal_tbr_low.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/icons/cp_bolus_carbs.svg b/icons/cp_bolus_carbs.svg new file mode 100644 index 0000000000..b62b07c538 --- /dev/null +++ b/icons/cp_bolus_carbs.svg @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/icons/cp_bolus_correction.svg b/icons/cp_bolus_correction.svg new file mode 100644 index 0000000000..1ccec87132 --- /dev/null +++ b/icons/cp_bolus_correction.svg @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/icons/loop_closed.svg b/icons/loop_closed.svg new file mode 100644 index 0000000000..2621c3348b --- /dev/null +++ b/icons/loop_closed.svg @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/icons/loop_disabled.svg b/icons/loop_disabled.svg new file mode 100644 index 0000000000..d5b8858159 --- /dev/null +++ b/icons/loop_disabled.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/icons/loop_disconnected.svg b/icons/loop_disconnected.svg new file mode 100644 index 0000000000..27f651704e --- /dev/null +++ b/icons/loop_disconnected.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/icons/loop_lgs.svg b/icons/loop_lgs.svg new file mode 100644 index 0000000000..6e0754a490 --- /dev/null +++ b/icons/loop_lgs.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + diff --git a/icons/loop_open.svg b/icons/loop_open.svg new file mode 100644 index 0000000000..73aeaff092 --- /dev/null +++ b/icons/loop_open.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/icons/loop_paused.svg b/icons/loop_paused.svg new file mode 100644 index 0000000000..8056c4e66b --- /dev/null +++ b/icons/loop_paused.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/icons/loop_superbolus.svg b/icons/loop_superbolus.svg new file mode 100644 index 0000000000..99baf408a4 --- /dev/null +++ b/icons/loop_superbolus.svg @@ -0,0 +1,34 @@ + + + + + + + + + diff --git a/icons/quickwizard.svg b/icons/quickwizard.svg new file mode 100644 index 0000000000..bdfab6bdd9 --- /dev/null +++ b/icons/quickwizard.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/icons/remove.svg b/icons/remove.svg new file mode 100644 index 0000000000..cf47d09ad1 --- /dev/null +++ b/icons/remove.svg @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/icons/x_swap_vert.svg b/icons/x_swap_vert.svg index a09d1324a4..6af56d0df4 100644 --- a/icons/x_swap_vert.svg +++ b/icons/x_swap_vert.svg @@ -1,12 +1,16 @@ - - - - - + + + + + + + + + diff --git a/icons/xdrip.svg b/icons/xdrip.svg new file mode 100644 index 0000000000..6d9cdefd0d --- /dev/null +++ b/icons/xdrip.svg @@ -0,0 +1,13 @@ + + + + + + + + +