From 5ef52ea90f676e098ee857e42359cb53b9b3dccd Mon Sep 17 00:00:00 2001 From: Philoul Date: Sat, 13 Jun 2020 17:37:52 +0200 Subject: [PATCH] Some new vector icons again --- .../automation/triggers/TriggerBolusAgo.kt | 2 +- .../general/overview/OverviewFragment.kt | 2 +- .../drawable/ic_actions_cancelextbolus.xml | 12 ++++++----- .../drawable/ic_actions_starttempbasal.xml | 9 ++++++++ app/src/main/res/drawable/ic_cancelbasal.xml | 10 +++++++++ app/src/main/res/drawable/ic_cp_basal_end.xml | 10 +++++++++ .../main/res/drawable/ic_cp_basal_no_tbr.xml | 11 +++++----- .../main/res/drawable/ic_cp_basal_start.xml | 9 ++++++++ .../res/drawable/ic_cp_basal_tbr_high.xml | 11 +++++----- .../main/res/drawable/ic_cp_basal_tbr_low.xml | 11 +++++----- .../res/drawable/ic_cp_bolus_correction.xml | 12 +++++++++++ app/src/main/res/drawable/ic_x_swap_vert.xml | 10 +++++++++ .../drawable/ic_x_swap_vert_48px_green.xml | 9 -------- app/src/main/res/layout/actions_fragment.xml | 4 ++-- .../main/res/layout/careportal_fragment.xml | 8 +++---- app/src/main/res/layout/omnipod_fragment.xml | 2 +- .../triggers/TriggerBolusAgoTest.kt | 2 +- icons/actions_cancelextbolus.svg | 8 +++++-- icons/cp_basal_end.svg | 16 ++++++++++++++ icons/cp_basal_no_tbr.svg | 2 +- icons/cp_basal_tbr_high.svg | 4 ++-- icons/cp_basal_tbr_low.svg | 4 ++-- icons/cp_bolus_correction.svg | 21 +++++++++++++++++++ icons/x_swap_vert.svg | 18 ++++++++++------ 24 files changed, 155 insertions(+), 52 deletions(-) create mode 100644 app/src/main/res/drawable/ic_actions_starttempbasal.xml create mode 100644 app/src/main/res/drawable/ic_cancelbasal.xml create mode 100644 app/src/main/res/drawable/ic_cp_basal_end.xml create mode 100644 app/src/main/res/drawable/ic_cp_basal_start.xml create mode 100644 app/src/main/res/drawable/ic_cp_bolus_correction.xml create mode 100644 app/src/main/res/drawable/ic_x_swap_vert.xml delete mode 100644 app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml create mode 100644 icons/cp_basal_end.svg create mode 100644 icons/cp_bolus_correction.svg 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/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index a5d21ba956..320cf82112 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 @@ -775,7 +775,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/res/drawable/ic_actions_cancelextbolus.xml b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml index da158703a1..913b1b9aeb 100644 --- a/app/src/main/res/drawable/ic_actions_cancelextbolus.xml +++ b/app/src/main/res/drawable/ic_actions_cancelextbolus.xml @@ -1,7 +1,6 @@ - + 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_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_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 index 71abd83757..840a639f9c 100644 --- a/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml +++ b/app/src/main/res/drawable/ic_cp_basal_no_tbr.xml @@ -1,8 +1,9 @@ - - + android:viewportHeight="24"> + 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 index 140ba3ad92..1b7781daed 100644 --- a/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml +++ b/app/src/main/res/drawable/ic_cp_basal_tbr_high.xml @@ -1,8 +1,9 @@ - - + android:viewportHeight="24"> + 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 index 53ce1c5c6c..9f3d94563f 100644 --- a/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml +++ b/app/src/main/res/drawable/ic_cp_basal_tbr_low.xml @@ -1,8 +1,9 @@ - - + android:viewportHeight="24"> + 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_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 9484c2cd6f..0000000000 --- a/app/src/main/res/drawable/ic_x_swap_vert_48px_green.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index ce86d871ea..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" diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml index 1f2da353da..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" @@ -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/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/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/icons/actions_cancelextbolus.svg b/icons/actions_cancelextbolus.svg index 5c5b4070cb..98c7fa503b 100644 --- a/icons/actions_cancelextbolus.svg +++ b/icons/actions_cancelextbolus.svg @@ -15,7 +15,11 @@ c0,0.08,0.029,0.157,0.083,0.217l2.789,3.14c0.058,0.064,0.139,0.104,0.226,0.108c0.006,0.001,0.013,0.001,0.019,0.001 c0.08,0,0.157-0.029,0.217-0.083c0.971-0.866,1.527-2.095,1.527-3.372C20.983,10.85,18.95,8.816,16.45,8.814z"/> - + + + + 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 index 392131c288..198afcf383 100644 --- a/icons/cp_basal_no_tbr.svg +++ b/icons/cp_basal_no_tbr.svg @@ -5,6 +5,6 @@ height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> - + diff --git a/icons/cp_basal_tbr_high.svg b/icons/cp_basal_tbr_high.svg index ab4c194894..eaa4f986ff 100644 --- a/icons/cp_basal_tbr_high.svg +++ b/icons/cp_basal_tbr_high.svg @@ -5,7 +5,7 @@ height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> - + diff --git a/icons/cp_basal_tbr_low.svg b/icons/cp_basal_tbr_low.svg index 4b2fe0df38..d591a1941f 100644 --- a/icons/cp_basal_tbr_low.svg +++ b/icons/cp_basal_tbr_low.svg @@ -5,7 +5,7 @@ height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> - + 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/x_swap_vert.svg b/icons/x_swap_vert.svg index 9a9087c413..6af56d0df4 100644 --- a/icons/x_swap_vert.svg +++ b/icons/x_swap_vert.svg @@ -1,10 +1,16 @@ - - - - + + + + + + + + +