caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix ActionCarePortalEvent strings

Browse source
This commit is contained in:
Milos Kozak 2021-10-09 13:35:09 +02:00
parent 65a14c8eca
commit a8895668bd
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ class ActionCarePortalEvent(injector: HasAndroidInjector) : Action(injector) {
} }
override fun friendlyName(): Int = R.string.careportal override fun friendlyName(): Int = R.string.careportal
override fun shortDescription(): String = resourceHelper.gs(cpEvent.value.stringRes, note.value) override fun shortDescription(): String = resourceHelper.gs(cpEvent.value.stringResWithValue, note.value)
@DrawableRes override fun icon(): Int = cpEvent.value.drawableRes @DrawableRes override fun icon(): Int = cpEvent.value.drawableRes

9
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/elements/InputCarePortalMenu.kt
View file

@ -22,7 +22,7 @@ class InputCarePortalMenu(private val resourceHelper: ResourceHelper) : Element(
QUESTION (TherapyEvent.Type.QUESTION), QUESTION (TherapyEvent.Type.QUESTION),
ANNOUNCEMENT (TherapyEvent.Type.ANNOUNCEMENT); ANNOUNCEMENT (TherapyEvent.Type.ANNOUNCEMENT);
@get:StringRes val stringRes: Int @get:StringRes val stringResWithValue: Int
get() = when (this) { get() = when (this) {
NOTE -> R.string.careportal_note_message NOTE -> R.string.careportal_note_message
EXERCISE -> R.string.careportal_exercise_message EXERCISE -> R.string.careportal_exercise_message
@ -30,6 +30,13 @@ class InputCarePortalMenu(private val resourceHelper: ResourceHelper) : Element(
ANNOUNCEMENT -> R.string.careportal_announcement_message ANNOUNCEMENT -> R.string.careportal_announcement_message
} }
@get:StringRes val stringRes: Int
get() = when (this) {
NOTE -> R.string.careportal_note
EXERCISE -> R.string.careportal_exercise
QUESTION -> R.string.careportal_question
ANNOUNCEMENT -> R.string.careportal_announcement
}
@get:DrawableRes val drawableRes: Int @get:DrawableRes val drawableRes: Int
get() = when (this) { get() = when (this) {
NOTE -> R.drawable.ic_cp_note NOTE -> R.drawable.ic_cp_note