From d55c9d9ff6905c979cce4661add8283d50d1a73d Mon Sep 17 00:00:00 2001 From: Philoul Date: Fri, 19 Jun 2020 13:59:39 +0200 Subject: [PATCH] Update Layout and code with new icons --- .../androidaps/dialogs/CareDialog.kt | 14 ++++----- .../automation/actions/ActionProfileSwitch.kt | 2 +- .../actions/ActionProfileSwitchPercent.kt | 2 +- .../actions/ActionStartTempTarget.kt | 2 +- .../general/automation/triggers/TriggerBg.kt | 2 +- .../triggers/TriggerProfilePercent.kt | 2 +- app/src/main/res/layout/actions_fragment.xml | 24 +++++++-------- .../main/res/layout/careportal_fragment.xml | 30 +++++++++---------- .../res/layout/careportal_stats_fragment.xml | 8 ++--- .../main/res/layout/combopump_fragment.xml | 2 +- app/src/main/res/layout/dialog_care.xml | 2 +- app/src/main/res/layout/dialog_fill.xml | 2 +- .../main/res/layout/dialog_profileswitch.xml | 2 +- app/src/main/res/layout/dialog_temptarget.xml | 2 +- .../main/res/layout/localprofile_fragment.xml | 6 ++-- .../main/res/layout/medtronic_fragment.xml | 6 ++-- app/src/main/res/layout/omnipod_fragment.xml | 8 ++--- .../layout/omnipod_initpod_init_action.xml | 2 +- app/src/main/res/layout/omnipod_pod_mgmt.xml | 8 ++--- .../layout/overview_statuslights_layout.xml | 12 ++++---- .../actions/ActionProfileSwitchPercentTest.kt | 2 +- .../actions/ActionProfileSwitchTest.kt | 2 +- .../actions/ActionStartTempTargetTest.kt | 2 +- .../automation/triggers/TriggerBgTest.kt | 2 +- .../triggers/TriggerProfilePercentTest.kt | 2 +- .../general/actions/defs/CustomAction.kt | 4 +-- .../main/res/layout/dialog_profileviewer.xml | 2 +- dana/src/main/res/layout/danar_fragment.xml | 8 ++--- .../main/res/layout/danar_historyactivity.xml | 4 +-- .../layout/danar_user_options_activity.xml | 4 +-- 30 files changed, 85 insertions(+), 85 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt index ed2b96d1e7..d52e3d26e6 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt @@ -83,13 +83,13 @@ class CareDialog : DialogFragmentWithDate() { } actions_care_icon.setImageResource(when (options) { - EventType.BGCHECK -> R.drawable.icon_cp_bgcheck - EventType.SENSOR_INSERT -> R.drawable.icon_cp_cgm_insert - EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery - EventType.NOTE -> R.drawable.icon_cp_note - EventType.EXERCISE -> R.drawable.icon_cp_exercise - EventType.QUESTION -> R.drawable.icon_cp_question - EventType.ANNOUNCEMENT -> R.drawable.icon_cp_announcement + EventType.BGCHECK -> R.drawable.ic_cp_bgcheck + EventType.SENSOR_INSERT -> R.drawable.ic_cp_cgm_insert + EventType.BATTERY_CHANGE -> R.drawable.ic_cp_pump_battery + EventType.NOTE -> R.drawable.ic_cp_note + EventType.EXERCISE -> R.drawable.ic_cp_exercise + EventType.QUESTION -> R.drawable.ic_cp_question + EventType.ANNOUNCEMENT -> R.drawable.ic_cp_announcement }) actions_care_title.text = resourceHelper.gs(when (options) { EventType.BGCHECK -> R.string.careportal_bgcheck diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt index a46796b59d..9d4bc5f81d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt @@ -27,7 +27,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) { override fun friendlyName(): Int = R.string.profilename override fun shortDescription(): String = resourceHelper.gs(R.string.changengetoprofilename, inputProfileName.value) - @DrawableRes override fun icon(): Int = R.drawable.icon_actions_profileswitch + @DrawableRes override fun icon(): Int = R.drawable.ic_actions_profileswitch override fun doAction(callback: Callback) { val activeProfileName = profileFunction.getProfileName() diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt index f45e8d19e9..b0cb5f555f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt @@ -30,7 +30,7 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector if (duration.value == 0) resourceHelper.gs(R.string.startprofileforever, pct.value.toInt()) else resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value) - @DrawableRes override fun icon(): Int = R.drawable.icon_actions_profileswitch + @DrawableRes override fun icon(): Int = R.drawable.ic_actions_profileswitch init { precondition = TriggerProfilePercent(injector, 100.0, Comparator.Compare.IS_EQUAL) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt index d0cb6b09e7..812a572df9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt @@ -37,7 +37,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) { override fun friendlyName(): Int = R.string.starttemptarget override fun shortDescription(): String = resourceHelper.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units, resourceHelper) - @DrawableRes override fun icon(): Int = R.drawable.icon_cp_cgm_target + @DrawableRes override fun icon(): Int = R.drawable.ic_cp_cgm_target override fun doAction(callback: Callback) { activePlugin.activeTreatments.addToHistoryTempTarget(tt()) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt index 75b30edb3b..558bc9ac4f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt @@ -91,7 +91,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) { resourceHelper.gs(if (bg.units == Constants.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, resourceHelper.gs(comparator.value.stringRes), bg.value, bg.units) } - override fun icon(): Optional = Optional.of(R.drawable.icon_cp_bgcheck) + override fun icon(): Optional = Optional.of(R.drawable.ic_cp_bgcheck) override fun duplicate(): Trigger = TriggerBg(injector, this) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt index 1dea3cd15f..9a13ebedeb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt @@ -77,7 +77,7 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = resourceHelper.gs(R.string.percentagecompared, resourceHelper.gs(comparator.value.stringRes), pct.value.toInt()) - override fun icon(): Optional = Optional.of(R.drawable.icon_actions_profileswitch) + override fun icon(): Optional = Optional.of(R.drawable.ic_actions_profileswitch) override fun duplicate(): Trigger = TriggerProfilePercent(injector, this) diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index 9b126fb8d1..ebb517dcb7 100644 --- a/app/src/main/res/layout/actions_fragment.xml +++ b/app/src/main/res/layout/actions_fragment.xml @@ -30,7 +30,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_actions_profileswitch" + android:drawableTop="@drawable/ic_actions_profileswitch" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_profileswitch" @@ -45,7 +45,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_actions_temptarget" + android:drawableTop="@drawable/ic_actions_temptarget" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_temporarytarget" @@ -144,7 +144,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bgcheck" + android:drawableTop="@drawable/ic_cp_bgcheck" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_bgcheck" @@ -159,7 +159,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_cp_pump_canula" + android:drawableTop="@drawable/ic_cp_pump_canula" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/primefill" @@ -174,7 +174,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_cgm_insert" + android:drawableTop="@drawable/ic_cp_cgm_insert" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_cgmsensorinsert" @@ -188,7 +188,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_pump_battery" + android:drawableTop="@drawable/ic_cp_pump_battery" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_pumpbatterychange" @@ -202,7 +202,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_note" + android:drawableTop="@drawable/ic_cp_note" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_note" @@ -216,7 +216,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_exercise" + android:drawableTop="@drawable/ic_cp_exercise" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_exercise" @@ -230,7 +230,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_announcement" + android:drawableTop="@drawable/ic_cp_announcement" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_announcement" @@ -244,7 +244,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_question" + android:drawableTop="@drawable/ic_cp_question" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_question" @@ -273,7 +273,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_danarhistory" + android:drawableTop="@drawable/ic_danarhistory" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/nav_historybrowser" @@ -287,7 +287,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="wrap_content" - android:drawableTop="@drawable/icon_danarstats" + android:drawableTop="@drawable/ic_cp_stats" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/tdd" diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml index 44d5f957f0..6d6da91bc3 100644 --- a/app/src/main/res/layout/careportal_fragment.xml +++ b/app/src/main/res/layout/careportal_fragment.xml @@ -50,7 +50,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0px" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bgcheck" + android:drawableTop="@drawable/ic_cp_bgcheck" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_bgcheck" @@ -65,7 +65,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_exercise" + android:drawableTop="@drawable/ic_cp_exercise" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_exercise" @@ -79,7 +79,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_cgm_target" + android:drawableTop="@drawable/ic_cp_cgm_target" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_temporarytarget" @@ -110,7 +110,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bolus_snack" + android:drawableTop="@drawable/ic_cp_bolus_snack" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_snackbolus" @@ -124,7 +124,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_bolus_meal" + android:drawableTop="@drawable/ic_cp_bolus_meal" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_mealbolus" @@ -224,7 +224,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_cgm_start" + android:drawableTop="@drawable/ic_cp_cgm_start" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_cgmsensorstart" @@ -239,7 +239,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_cgm_insert" + android:drawableTop="@drawable/ic_cp_cgm_insert" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_cgmsensorinsert" @@ -254,7 +254,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_aaps_offline" + android:drawableTop="@drawable/ic_cp_aaps_offline" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_openapsoffline" @@ -269,7 +269,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_announcement" + android:drawableTop="@drawable/ic_cp_announcement" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_announcement" @@ -283,7 +283,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_question" + android:drawableTop="@drawable/ic_cp_question" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_question" @@ -297,7 +297,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_note" + android:drawableTop="@drawable/ic_cp_note" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_note" @@ -326,7 +326,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_pump_canula" + android:drawableTop="@drawable/ic_cp_pump_canula" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_pumpsitechange" @@ -340,7 +340,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_pump_cartridge" + android:drawableTop="@drawable/ic_cp_pump_cartridge" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_insulincartridgechange" @@ -354,7 +354,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_cgm_profile" + android:drawableTop="@drawable/ic_cp_cgm_profile" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_profileswitch" @@ -369,7 +369,7 @@ style="@style/ButtonSmallFontStyle" android:layout_width="0dp" android:layout_height="fill_parent" - android:drawableTop="@drawable/icon_cp_pump_battery" + android:drawableTop="@drawable/ic_cp_pump_battery" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/careportal_pumpbatterychange" diff --git a/app/src/main/res/layout/careportal_stats_fragment.xml b/app/src/main/res/layout/careportal_stats_fragment.xml index 2532a6f198..bcd7f38f21 100644 --- a/app/src/main/res/layout/careportal_stats_fragment.xml +++ b/app/src/main/res/layout/careportal_stats_fragment.xml @@ -21,7 +21,7 @@ android:layout_height="fill_parent" android:layout_weight="1" android:gravity="center_vertical" - android:drawableLeft="@drawable/icon_cp_age_sensor" + android:drawableLeft="@drawable/ic_cp_age_sensor" android:paddingRight="5dp" android:paddingStart="15dp" android:text="@string/careportal_sensorage_label" @@ -68,7 +68,7 @@ android:layout_height="fill_parent" android:layout_weight="1" android:gravity="center_vertical" - android:drawableLeft="@drawable/icon_cp_age_insulin" + android:drawableLeft="@drawable/ic_cp_age_insulin" android:paddingRight="5dp" android:paddingStart="15dp" android:text="@string/careportal_insulinage_label" @@ -115,7 +115,7 @@ android:layout_height="fill_parent" android:layout_weight="1" android:gravity="center_vertical" - android:drawableLeft="@drawable/icon_cp_age_canula" + android:drawableLeft="@drawable/ic_cp_age_canula" android:paddingRight="5dp" android:paddingStart="15dp" android:text="@string/careportal_canulaage_label" @@ -162,7 +162,7 @@ android:layout_height="fill_parent" android:layout_weight="1" android:gravity="center_vertical" - android:drawableLeft="@drawable/icon_cp_age_battery" + android:drawableLeft="@drawable/ic_cp_age_battery" android:paddingRight="5dp" android:paddingStart="15dp" android:text="@string/careportal_pbage_label" diff --git a/app/src/main/res/layout/combopump_fragment.xml b/app/src/main/res/layout/combopump_fragment.xml index c4a65feb36..1a60481875 100644 --- a/app/src/main/res/layout/combopump_fragment.xml +++ b/app/src/main/res/layout/combopump_fragment.xml @@ -494,7 +494,7 @@ android:layout_height="wrap_content" android:layout_weight="0.5" android:layout_marginRight="-4dp" - android:drawableTop="@drawable/icon_actions_refill" + android:drawableTop="@drawable/ic_actions_refill" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/combo_refresh" /> diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml index 500b118afa..c4c5ad59ca 100644 --- a/app/src/main/res/layout/dialog_care.xml +++ b/app/src/main/res/layout/dialog_care.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/careportal_profileswitch" - android:src="@drawable/icon_actions_profileswitch" /> + android:src="@drawable/ic_actions_profileswitch" /> + android:src="@drawable/ic_cp_pump_canula" /> + android:src="@drawable/ic_actions_profileswitch" /> + android:src="@drawable/ic_actions_temptarget" /> + android:drawableStart="@drawable/ic_local_activate" /> @@ -295,7 +295,7 @@ android:layout_marginRight="10dp" android:layout_marginBottom="3dp" android:layout_weight="1" - android:drawableStart="@drawable/icon_local_save" + android:drawableStart="@drawable/ic_local_save" android:paddingLeft="10dp" android:paddingRight="10dp" android:text="@string/save" /> diff --git a/app/src/main/res/layout/medtronic_fragment.xml b/app/src/main/res/layout/medtronic_fragment.xml index af16dd26cb..b6c52f76cb 100644 --- a/app/src/main/res/layout/medtronic_fragment.xml +++ b/app/src/main/res/layout/medtronic_fragment.xml @@ -496,7 +496,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_actions_refill" + android:drawableTop="@drawable/ic_actions_refill" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/combo_refresh" /> @@ -508,7 +508,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_danarhistory" + android:drawableTop="@drawable/ic_danarhistory" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/pumphistory" /> @@ -519,7 +519,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_danarstats" + android:drawableTop="@drawable/ic_danarstats" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="RL Stats" /> diff --git a/app/src/main/res/layout/omnipod_fragment.xml b/app/src/main/res/layout/omnipod_fragment.xml index f6d13171ce..912d975168 100644 --- a/app/src/main/res/layout/omnipod_fragment.xml +++ b/app/src/main/res/layout/omnipod_fragment.xml @@ -573,7 +573,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_actions_refill" + android:drawableTop="@drawable/ic_actions_refill" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/combo_refresh" /> @@ -585,7 +585,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_danarhistory" + android:drawableTop="@drawable/ic_danarhistory" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/omnipod_pod_mgmt" /> @@ -596,7 +596,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_cp_aaps_offline" + android:drawableTop="@drawable/ic_cp_aaps_offline" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/omnipod_ack_short" /> @@ -607,7 +607,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableTop="@drawable/icon_danarstats" + android:drawableTop="@drawable/ic_danarstats" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/omnipod_rl_stats" /> diff --git a/app/src/main/res/layout/omnipod_initpod_init_action.xml b/app/src/main/res/layout/omnipod_initpod_init_action.xml index 7fb6863405..012b87f71b 100644 --- a/app/src/main/res/layout/omnipod_initpod_init_action.xml +++ b/app/src/main/res/layout/omnipod_initpod_init_action.xml @@ -58,7 +58,7 @@ android:layout_marginRight="15dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:drawableTop="@drawable/icon_actions_refill" + android:drawableTop="@drawable/ic_actions_refill" android:visibility="gone" /> diff --git a/app/src/main/res/layout/omnipod_pod_mgmt.xml b/app/src/main/res/layout/omnipod_pod_mgmt.xml index 13862757eb..778757e314 100644 --- a/app/src/main/res/layout/omnipod_pod_mgmt.xml +++ b/app/src/main/res/layout/omnipod_pod_mgmt.xml @@ -40,7 +40,7 @@ android:layout_marginTop="3dp" android:textAllCaps="false" android:layout_weight="0.5" - android:drawableTop="@drawable/icon_cp_pump_canula" + android:drawableTop="@drawable/ic_cp_pump_canula" android:text="@string/omnipod_cmd_init_pod" /> diff --git a/app/src/main/res/layout/overview_statuslights_layout.xml b/app/src/main/res/layout/overview_statuslights_layout.xml index 13b9fd1815..2d318f900d 100644 --- a/app/src/main/res/layout/overview_statuslights_layout.xml +++ b/app/src/main/res/layout/overview_statuslights_layout.xml @@ -18,7 +18,7 @@ android:scaleType="centerInside" android:scaleX="2" android:scaleY="2" - android:src="@drawable/icon_cp_age_canula" /> + android:src="@drawable/ic_cp_age_canula" /> + android:scaleX="1.8" + android:scaleY="1.8" + android:src="@drawable/ic_cp_age_insulin" /> + android:src="@drawable/ic_cp_age_sensor" /> + android:src="@drawable/ic_cp_age_battery" /> { diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt index 9a03087c4e..eccbf1a3e2 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt @@ -69,7 +69,7 @@ class TriggerProfilePercentTest : TriggerTestBase() { } @Test fun iconTest() { - Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), TriggerProfilePercent(injector).icon()) + Assert.assertEquals(Optional.of(R.drawable.ic_actions_profileswitch), TriggerProfilePercent(injector).icon()) } @Test fun friendlyNameTest() { diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt index b276bae9b1..be5e30496a 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt @@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.general.actions.defs import info.nightscout.androidaps.core.R -class CustomAction @JvmOverloads constructor(val name: Int, val customActionType: CustomActionType?, val iconResourceId: Int = R.drawable.icon_actions_profileswitch, var isEnabled: Boolean = true) { +class CustomAction @JvmOverloads constructor(val name: Int, val customActionType: CustomActionType?, val iconResourceId: Int = R.drawable.ic_actions_profileswitch, var isEnabled: Boolean = true) { constructor(nameResourceId: Int, actionType: CustomActionType?, enabled: Boolean) : - this(nameResourceId, actionType, R.drawable.icon_actions_profileswitch, enabled) + this(nameResourceId, actionType, R.drawable.ic_actions_profileswitch, enabled) } \ No newline at end of file diff --git a/core/src/main/res/layout/dialog_profileviewer.xml b/core/src/main/res/layout/dialog_profileviewer.xml index 9434d828f0..feec6a1163 100644 --- a/core/src/main/res/layout/dialog_profileviewer.xml +++ b/core/src/main/res/layout/dialog_profileviewer.xml @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/carbs" - android:src="@drawable/icon_home_profile" /> + android:src="@drawable/ic_home_profile" /> @@ -716,7 +716,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:drawableTop="@drawable/icon_danarhistory" + android:drawableTop="@drawable/ic_danarhistory" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/pumphistory" /> @@ -727,7 +727,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:drawableTop="@drawable/icon_danarstats" + android:drawableTop="@drawable/ic_danarstats" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/stats" /> @@ -738,7 +738,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:drawableTop="@drawable/icon_danar_useropt" + android:drawableTop="@drawable/ic_danar_useropt" android:paddingLeft="0dp" android:paddingRight="0dp" android:text="@string/danar_useroptions" /> diff --git a/dana/src/main/res/layout/danar_historyactivity.xml b/dana/src/main/res/layout/danar_historyactivity.xml index 5f723d56ed..3d1771dde4 100644 --- a/dana/src/main/res/layout/danar_historyactivity.xml +++ b/dana/src/main/res/layout/danar_historyactivity.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/pumphistory" - android:src="@drawable/icon_danarhistory" /> + android:src="@drawable/ic_danarhistory" /> diff --git a/dana/src/main/res/layout/danar_user_options_activity.xml b/dana/src/main/res/layout/danar_user_options_activity.xml index d9078576e7..9996fa93d0 100644 --- a/dana/src/main/res/layout/danar_user_options_activity.xml +++ b/dana/src/main/res/layout/danar_user_options_activity.xml @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/danar_pump_settings" - android:src="@drawable/icon_danar_useropt" /> + android:src="@drawable/ic_danar_useropt" />