caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Update Layout and code with new icons

Browse source
This commit is contained in:
Philoul 2020-06-19 13:59:39 +02:00
parent da7fae4cdb
commit d55c9d9ff6
30 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
View file

@ -83,13 +83,13 @@ class CareDialog : DialogFragmentWithDate() {
} }
actions_care_icon.setImageResource(when (options) { actions_care_icon.setImageResource(when (options) {
EventType.BGCHECK -> R.drawable.icon_cp_bgcheck EventType.BGCHECK -> R.drawable.ic_cp_bgcheck
EventType.SENSOR_INSERT -> R.drawable.icon_cp_cgm_insert EventType.SENSOR_INSERT -> R.drawable.ic_cp_cgm_insert
EventType.BATTERY_CHANGE -> R.drawable.icon_cp_pump_battery EventType.BATTERY_CHANGE -> R.drawable.ic_cp_pump_battery
EventType.NOTE -> R.drawable.icon_cp_note EventType.NOTE -> R.drawable.ic_cp_note
EventType.EXERCISE -> R.drawable.icon_cp_exercise EventType.EXERCISE -> R.drawable.ic_cp_exercise
EventType.QUESTION -> R.drawable.icon_cp_question EventType.QUESTION -> R.drawable.ic_cp_question
EventType.ANNOUNCEMENT -> R.drawable.icon_cp_announcement EventType.ANNOUNCEMENT -> R.drawable.ic_cp_announcement
}) })
actions_care_title.text = resourceHelper.gs(when (options) { actions_care_title.text = resourceHelper.gs(when (options) {
EventType.BGCHECK -> R.string.careportal_bgcheck EventType.BGCHECK -> R.string.careportal_bgcheck

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitch.kt
View file

@ -27,7 +27,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) {
override fun friendlyName(): Int = R.string.profilename override fun friendlyName(): Int = R.string.profilename
override fun shortDescription(): String = resourceHelper.gs(R.string.changengetoprofilename, inputProfileName.value) 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) { override fun doAction(callback: Callback) {
val activeProfileName = profileFunction.getProfileName() val activeProfileName = profileFunction.getProfileName()

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.kt
View file

@ -30,7 +30,7 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector
if (duration.value == 0) resourceHelper.gs(R.string.startprofileforever, pct.value.toInt()) if (duration.value == 0) resourceHelper.gs(R.string.startprofileforever, pct.value.toInt())
else resourceHelper.gs(R.string.startprofile, pct.value.toInt(), duration.value) 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 { init {
precondition = TriggerProfilePercent(injector, 100.0, Comparator.Compare.IS_EQUAL) precondition = TriggerProfilePercent(injector, 100.0, Comparator.Compare.IS_EQUAL)

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
View file

@ -37,7 +37,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
override fun friendlyName(): Int = R.string.starttemptarget override fun friendlyName(): Int = R.string.starttemptarget
override fun shortDescription(): String = resourceHelper.gs(R.string.starttemptarget) + ": " + tt().friendlyDescription(value.units, resourceHelper) 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) { override fun doAction(callback: Callback) {
activePlugin.activeTreatments.addToHistoryTempTarget(tt()) activePlugin.activeTreatments.addToHistoryTempTarget(tt())

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
View file

@ -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) 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<Int?> = Optional.of(R.drawable.icon_cp_bgcheck) override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bgcheck)
override fun duplicate(): Trigger = TriggerBg(injector, this) override fun duplicate(): Trigger = TriggerBg(injector, this)

2
app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
View file

@ -77,7 +77,7 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String = override fun friendlyDescription(): String =
resourceHelper.gs(R.string.percentagecompared, resourceHelper.gs(comparator.value.stringRes), pct.value.toInt()) resourceHelper.gs(R.string.percentagecompared, resourceHelper.gs(comparator.value.stringRes), pct.value.toInt())
override fun icon(): Optional<Int?> = Optional.of(R.drawable.icon_actions_profileswitch) override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_actions_profileswitch)
override fun duplicate(): Trigger = TriggerProfilePercent(injector, this) override fun duplicate(): Trigger = TriggerProfilePercent(injector, this)

24
app/src/main/res/layout/actions_fragment.xml
View file

@ -30,7 +30,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableTop="@drawable/icon_actions_profileswitch" android:drawableTop="@drawable/ic_actions_profileswitch"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_profileswitch" android:text="@string/careportal_profileswitch"
@ -45,7 +45,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableTop="@drawable/icon_actions_temptarget" android:drawableTop="@drawable/ic_actions_temptarget"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_temporarytarget" android:text="@string/careportal_temporarytarget"
@ -144,7 +144,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bgcheck" android:drawableTop="@drawable/ic_cp_bgcheck"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_bgcheck" android:text="@string/careportal_bgcheck"
@ -159,7 +159,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableTop="@drawable/icon_cp_pump_canula" android:drawableTop="@drawable/ic_cp_pump_canula"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/primefill" android:text="@string/primefill"
@ -174,7 +174,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_insert" android:drawableTop="@drawable/ic_cp_cgm_insert"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_cgmsensorinsert" android:text="@string/careportal_cgmsensorinsert"
@ -188,7 +188,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_pump_battery" android:drawableTop="@drawable/ic_cp_pump_battery"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_pumpbatterychange" android:text="@string/careportal_pumpbatterychange"
@ -202,7 +202,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_note" android:drawableTop="@drawable/ic_cp_note"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_note" android:text="@string/careportal_note"
@ -216,7 +216,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_exercise" android:drawableTop="@drawable/ic_cp_exercise"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_exercise" android:text="@string/careportal_exercise"
@ -230,7 +230,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_announcement" android:drawableTop="@drawable/ic_cp_announcement"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_announcement" android:text="@string/careportal_announcement"
@ -244,7 +244,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_question" android:drawableTop="@drawable/ic_cp_question"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_question" android:text="@string/careportal_question"
@ -273,7 +273,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/ic_danarhistory"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/nav_historybrowser" android:text="@string/nav_historybrowser"
@ -287,7 +287,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/ic_cp_stats"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/tdd" android:text="@string/tdd"

30
app/src/main/res/layout/careportal_fragment.xml
View file

@ -50,7 +50,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bgcheck" android:drawableTop="@drawable/ic_cp_bgcheck"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_bgcheck" android:text="@string/careportal_bgcheck"
@ -65,7 +65,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_exercise" android:drawableTop="@drawable/ic_cp_exercise"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_exercise" android:text="@string/careportal_exercise"
@ -79,7 +79,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_target" android:drawableTop="@drawable/ic_cp_cgm_target"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_temporarytarget" android:text="@string/careportal_temporarytarget"
@ -110,7 +110,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_snack" android:drawableTop="@drawable/ic_cp_bolus_snack"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_snackbolus" android:text="@string/careportal_snackbolus"
@ -124,7 +124,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bolus_meal" android:drawableTop="@drawable/ic_cp_bolus_meal"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_mealbolus" android:text="@string/careportal_mealbolus"
@ -224,7 +224,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_start" android:drawableTop="@drawable/ic_cp_cgm_start"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_cgmsensorstart" android:text="@string/careportal_cgmsensorstart"
@ -239,7 +239,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_insert" android:drawableTop="@drawable/ic_cp_cgm_insert"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_cgmsensorinsert" android:text="@string/careportal_cgmsensorinsert"
@ -254,7 +254,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_aaps_offline" android:drawableTop="@drawable/ic_cp_aaps_offline"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_openapsoffline" android:text="@string/careportal_openapsoffline"
@ -269,7 +269,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_announcement" android:drawableTop="@drawable/ic_cp_announcement"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_announcement" android:text="@string/careportal_announcement"
@ -283,7 +283,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_question" android:drawableTop="@drawable/ic_cp_question"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_question" android:text="@string/careportal_question"
@ -297,7 +297,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_note" android:drawableTop="@drawable/ic_cp_note"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_note" android:text="@string/careportal_note"
@ -326,7 +326,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_pump_canula" android:drawableTop="@drawable/ic_cp_pump_canula"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_pumpsitechange" android:text="@string/careportal_pumpsitechange"
@ -340,7 +340,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_pump_cartridge" android:drawableTop="@drawable/ic_cp_pump_cartridge"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_insulincartridgechange" android:text="@string/careportal_insulincartridgechange"
@ -354,7 +354,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_profile" android:drawableTop="@drawable/ic_cp_cgm_profile"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_profileswitch" android:text="@string/careportal_profileswitch"
@ -369,7 +369,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_pump_battery" android:drawableTop="@drawable/ic_cp_pump_battery"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_pumpbatterychange" android:text="@string/careportal_pumpbatterychange"

8
app/src/main/res/layout/careportal_stats_fragment.xml
View file

@ -21,7 +21,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_sensor" android:drawableLeft="@drawable/ic_cp_age_sensor"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingStart="15dp" android:paddingStart="15dp"
android:text="@string/careportal_sensorage_label" android:text="@string/careportal_sensorage_label"
@ -68,7 +68,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_insulin" android:drawableLeft="@drawable/ic_cp_age_insulin"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingStart="15dp" android:paddingStart="15dp"
android:text="@string/careportal_insulinage_label" android:text="@string/careportal_insulinage_label"
@ -115,7 +115,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_canula" android:drawableLeft="@drawable/ic_cp_age_canula"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingStart="15dp" android:paddingStart="15dp"
android:text="@string/careportal_canulaage_label" android:text="@string/careportal_canulaage_label"
@ -162,7 +162,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_battery" android:drawableLeft="@drawable/ic_cp_age_battery"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingStart="15dp" android:paddingStart="15dp"
android:text="@string/careportal_pbage_label" android:text="@string/careportal_pbage_label"

2
app/src/main/res/layout/combopump_fragment.xml
View file

@ -494,7 +494,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="0.5"
android:layout_marginRight="-4dp" android:layout_marginRight="-4dp"
android:drawableTop="@drawable/icon_actions_refill" android:drawableTop="@drawable/ic_actions_refill"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/combo_refresh" /> android:text="@string/combo_refresh" />

2
app/src/main/res/layout/dialog_care.xml
View file

@ -26,7 +26,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/careportal_profileswitch" android:contentDescription="@string/careportal_profileswitch"
android:src="@drawable/icon_actions_profileswitch" /> android:src="@drawable/ic_actions_profileswitch" />
<TextView <TextView
android:id="@+id/actions_care_title" android:id="@+id/actions_care_title"

2
app/src/main/res/layout/dialog_fill.xml
View file

@ -25,7 +25,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/primefill" android:contentDescription="@string/primefill"
android:src="@drawable/icon_cp_pump_canula" /> android:src="@drawable/ic_cp_pump_canula" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/dialog_profileswitch.xml
View file

@ -25,7 +25,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/careportal_profileswitch" android:contentDescription="@string/careportal_profileswitch"
android:src="@drawable/icon_actions_profileswitch" /> android:src="@drawable/ic_actions_profileswitch" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/dialog_temptarget.xml
View file

@ -25,7 +25,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/careportal_temporarytarget" android:contentDescription="@string/careportal_temporarytarget"
android:src="@drawable/icon_actions_temptarget" /> android:src="@drawable/ic_actions_temptarget" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

6
app/src/main/res/layout/localprofile_fragment.xml
View file

@ -260,7 +260,7 @@
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/activate_profile" android:text="@string/activate_profile"
android:drawableStart="@drawable/icon_local_activate" /> android:drawableStart="@drawable/ic_local_activate" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -279,7 +279,7 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:layout_weight="1" android:layout_weight="1"
android:drawableStart="@drawable/icon_local_reset" android:drawableStart="@drawable/ic_local_reset"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/reset" /> android:text="@string/reset" />
@ -295,7 +295,7 @@
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:layout_weight="1" android:layout_weight="1"
android:drawableStart="@drawable/icon_local_save" android:drawableStart="@drawable/ic_local_save"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:text="@string/save" /> android:text="@string/save" />

6
app/src/main/res/layout/medtronic_fragment.xml
View file

@ -496,7 +496,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_actions_refill" android:drawableTop="@drawable/ic_actions_refill"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/combo_refresh" /> android:text="@string/combo_refresh" />
@ -508,7 +508,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/ic_danarhistory"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/pumphistory" /> android:text="@string/pumphistory" />
@ -519,7 +519,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/ic_danarstats"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="RL Stats" /> android:text="RL Stats" />

8
app/src/main/res/layout/omnipod_fragment.xml
View file

@ -573,7 +573,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_actions_refill" android:drawableTop="@drawable/ic_actions_refill"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/combo_refresh" /> android:text="@string/combo_refresh" />
@ -585,7 +585,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/ic_danarhistory"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/omnipod_pod_mgmt" /> android:text="@string/omnipod_pod_mgmt" />
@ -596,7 +596,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_cp_aaps_offline" android:drawableTop="@drawable/ic_cp_aaps_offline"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/omnipod_ack_short" /> android:text="@string/omnipod_ack_short" />
@ -607,7 +607,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/ic_danarstats"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/omnipod_rl_stats" /> android:text="@string/omnipod_rl_stats" />

2
app/src/main/res/layout/omnipod_initpod_init_action.xml
View file

@ -58,7 +58,7 @@
android:layout_marginRight="15dp" android:layout_marginRight="15dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:drawableTop="@drawable/icon_actions_refill" android:drawableTop="@drawable/ic_actions_refill"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>

8
app/src/main/res/layout/omnipod_pod_mgmt.xml
View file

@ -40,7 +40,7 @@
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:textAllCaps="false" android:textAllCaps="false"
android:layout_weight="0.5" 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" /> android:text="@string/omnipod_cmd_init_pod" />
<TextView <TextView
@ -61,7 +61,7 @@
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:textAllCaps="false" android:textAllCaps="false"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/icon_actions_temptarget" android:drawableTop="@drawable/ic_actions_temptarget"
android:text="@string/omnipod_cmd_deactivate_pod" /> android:text="@string/omnipod_cmd_deactivate_pod" />
<TextView <TextView
@ -82,7 +82,7 @@
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:textAllCaps="false" android:textAllCaps="false"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/icon_cp_pump_canula" android:drawableTop="@drawable/ic_cp_pump_canula"
android:text="@string/omnipod_cmd_reset_pod" /> android:text="@string/omnipod_cmd_reset_pod" />
<TextView <TextView
@ -104,7 +104,7 @@
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:textAllCaps="false" android:textAllCaps="false"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/ic_danarhistory"
android:text="@string/omnipod_cmd_pod_history" /> android:text="@string/omnipod_cmd_pod_history" />

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

@ -18,7 +18,7 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:scaleX="2" android:scaleX="2"
android:scaleY="2" android:scaleY="2"
android:src="@drawable/icon_cp_age_canula" /> android:src="@drawable/ic_cp_age_canula" />
<TextView <TextView
android:id="@+id/careportal_canulaage" android:id="@+id/careportal_canulaage"
@ -35,9 +35,9 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:scaleType="centerInside" android:scaleType="centerInside"
android:scaleX="2" android:scaleX="1.8"
android:scaleY="2" android:scaleY="1.8"
android:src="@drawable/icon_cp_age_insulin" /> android:src="@drawable/ic_cp_age_insulin" />
<TextView <TextView
android:id="@+id/careportal_insulinage" android:id="@+id/careportal_insulinage"
@ -63,7 +63,7 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:scaleX="2" android:scaleX="2"
android:scaleY="2" android:scaleY="2"
android:src="@drawable/icon_cp_age_sensor" /> android:src="@drawable/ic_cp_age_sensor" />
<TextView <TextView
android:id="@+id/careportal_sensorage" android:id="@+id/careportal_sensorage"
@ -82,7 +82,7 @@
android:scaleType="centerInside" android:scaleType="centerInside"
android:scaleX="2" android:scaleX="2"
android:scaleY="2" android:scaleY="2"
android:src="@drawable/icon_cp_age_battery" /> android:src="@drawable/ic_cp_age_battery" />
<TextView <TextView
android:id="@+id/careportal_pbage" android:id="@+id/careportal_pbage"

2
app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercentTest.kt
View file

@ -38,7 +38,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() {
} }
@Test fun iconTest() { @Test fun iconTest() {
Assert.assertEquals(R.drawable.icon_actions_profileswitch, sut.icon()) Assert.assertEquals(R.drawable.ic_actions_profileswitch, sut.icon())
} }
@Test fun doActionTest() { @Test fun doActionTest() {

2
app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt
View file

@ -116,6 +116,6 @@ class ActionProfileSwitchTest : ActionsTestBase() {
} }
@Test fun iconTest() { @Test fun iconTest() {
Assert.assertEquals(R.drawable.icon_actions_profileswitch, sut.icon()) Assert.assertEquals(R.drawable.ic_actions_profileswitch, sut.icon())
} }
} }

2
app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt
View file

@ -42,7 +42,7 @@ class ActionStartTempTargetTest : ActionsTestBase() {
} }
@Test fun iconTest() { @Test fun iconTest() {
Assert.assertEquals(R.drawable.icon_cp_cgm_target, sut.icon()) Assert.assertEquals(R.drawable.ic_cp_cgm_target, sut.icon())
} }
@Test fun doActionTest() { @Test fun doActionTest() {

2
app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBgTest.kt
View file

@ -90,7 +90,7 @@ class TriggerBgTest : TriggerTestBase() {
@Test @Test
fun iconTest() { fun iconTest() {
Assert.assertEquals(Optional.of(R.drawable.icon_cp_bgcheck), TriggerBg(injector).icon()) Assert.assertEquals(Optional.of(R.drawable.ic_cp_bgcheck), TriggerBg(injector).icon())
} }
private fun generateOneCurrentRecordBgData(): List<BgReading> { private fun generateOneCurrentRecordBgData(): List<BgReading> {

2
app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.kt
View file

@ -69,7 +69,7 @@ class TriggerProfilePercentTest : TriggerTestBase() {
} }
@Test fun iconTest() { @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() { @Test fun friendlyNameTest() {

4
core/src/main/java/info/nightscout/androidaps/plugins/general/actions/defs/CustomAction.kt
View file

@ -2,9 +2,9 @@ package info.nightscout.androidaps.plugins.general.actions.defs
import info.nightscout.androidaps.core.R 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) : 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)
} }

2
core/src/main/res/layout/dialog_profileviewer.xml
View file

@ -24,7 +24,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/carbs" android:contentDescription="@string/carbs"
android:src="@drawable/icon_home_profile" /> android:src="@drawable/ic_home_profile" />
<TextView <TextView
android:id="@+id/profileview_activeprofile" android:id="@+id/profileview_activeprofile"

8
dana/src/main/res/layout/danar_fragment.xml
View file

@ -704,7 +704,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarprofile" android:drawableTop="@drawable/ic_danarprofile"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/viewprofile" /> android:text="@string/viewprofile" />
@ -716,7 +716,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/ic_danarhistory"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/pumphistory" /> android:text="@string/pumphistory" />
@ -727,7 +727,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/ic_danarstats"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/stats" /> android:text="@string/stats" />
@ -738,7 +738,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danar_useropt" android:drawableTop="@drawable/ic_danar_useropt"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/danar_useroptions" /> android:text="@string/danar_useroptions" />

4
dana/src/main/res/layout/danar_historyactivity.xml
View file

@ -20,7 +20,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/pumphistory" android:contentDescription="@string/pumphistory"
android:src="@drawable/icon_danarhistory" /> android:src="@drawable/ic_danarhistory" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -87,7 +87,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:drawableStart="@drawable/icon_actions_refill" android:drawableStart="@drawable/ic_actions_refill"
android:text="@string/reload" /> android:text="@string/reload" />
</RelativeLayout> </RelativeLayout>

4
dana/src/main/res/layout/danar_user_options_activity.xml
View file

@ -26,7 +26,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/danar_pump_settings" android:contentDescription="@string/danar_pump_settings"
android:src="@drawable/icon_danar_useropt" /> android:src="@drawable/ic_danar_useropt" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -320,7 +320,7 @@
style="@style/Widget.AppCompat.Button" style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableStart="@drawable/icon_local_save" android:drawableStart="@drawable/ic_local_save"
android:text="@string/danar_saveuseroptions" /> android:text="@string/danar_saveuseroptions" />
</LinearLayout> </LinearLayout>