From f5c22a33ffdde67805b24e4020457ea34c4b3371 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 11 Jul 2019 18:56:50 +0100 Subject: [PATCH] icons --- .../automation/actions/ActionNotification.java | 2 +- .../actions/ActionProfileSwitchPercent.java | 2 +- .../general/automation/triggers/TriggerIob.java | 2 +- .../automation/triggers/TriggerLocation.java | 2 +- .../automation/triggers/TriggerTempTarget.java | 2 +- .../automation/triggers/TriggerWifiSsid.java | 2 +- .../res/drawable-anydpi/ic_keyboard_capslock.xml | 9 +++++++++ .../main/res/drawable-anydpi/ic_keyboard_tab.xml | 9 +++++++++ app/src/main/res/drawable-anydpi/ic_location_on.xml | 9 +++++++++ .../main/res/drawable-anydpi/ic_network_wifi.xml | 13 +++++++++++++ .../main/res/drawable-anydpi/ic_notifications.xml | 9 +++++++++ .../automation/actions/ActionNotificationTest.java | 2 +- .../general/automation/triggers/TriggerIobTest.java | 2 +- .../triggers/TriggerProfilePercentTest.java | 2 +- .../automation/triggers/TriggerTempTargetTest.java | 2 +- .../automation/triggers/TriggerWifiSsidTest.java | 2 +- 16 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_location_on.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_network_wifi.xml create mode 100644 app/src/main/res/drawable-anydpi/ic_notifications.xml diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java index d176f0b10f..88c3a8e574 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.java @@ -46,7 +46,7 @@ public class ActionNotification extends Action { @Override public Optional icon() { - return Optional.of(R.drawable.remove); + return Optional.of(R.drawable.ic_notifications); } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java index 9a2f9ac04d..d7376301a9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchPercent.java @@ -81,6 +81,6 @@ public class ActionProfileSwitchPercent extends Action { @Override public Optional icon() { - return Optional.of(R.drawable.remove); + return Optional.of(R.drawable.icon_actions_profileswitch); } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java index eeb33dd4e5..c4003af861 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.java @@ -112,7 +112,7 @@ public class TriggerIob extends Trigger { @Override public Optional icon() { - return Optional.of(R.drawable.remove); // TODO icon + return Optional.of(R.drawable.ic_keyboard_capslock); } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java index 1ff7572cc1..82fa54133d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.java @@ -127,7 +127,7 @@ public class TriggerLocation extends Trigger { @Override public Optional icon() { - return Optional.of(R.drawable.remove); // TODO icon + return Optional.of(R.drawable.ic_location_on); } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java index bda06ff22f..68655a8490 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.java @@ -103,7 +103,7 @@ public class TriggerTempTarget extends Trigger { @Override public Optional icon() { - return Optional.of(R.drawable.remove); // TODO icon + return Optional.of(R.drawable.ic_keyboard_tab); } @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java index cf48770735..47424ea5a1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.java @@ -115,7 +115,7 @@ public class TriggerWifiSsid extends Trigger { @Override public Optional icon() { - return Optional.of(R.drawable.remove); // TODO icon + return Optional.of(R.drawable.ic_network_wifi); } @Override diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml b/app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml new file mode 100644 index 0000000000..db4409f2b8 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_keyboard_capslock.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml b/app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml new file mode 100644 index 0000000000..03ec6ed69f --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_keyboard_tab.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_location_on.xml b/app/src/main/res/drawable-anydpi/ic_location_on.xml new file mode 100644 index 0000000000..1017cbc8d2 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_location_on.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_network_wifi.xml b/app/src/main/res/drawable-anydpi/ic_network_wifi.xml new file mode 100644 index 0000000000..c5ae21ec89 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_network_wifi.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi/ic_notifications.xml b/app/src/main/res/drawable-anydpi/ic_notifications.xml new file mode 100644 index 0000000000..b655d741e6 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_notifications.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java index 6813a26b36..62447ac717 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.java @@ -48,7 +48,7 @@ public class ActionNotificationTest { @Test public void iconTest() { - Assert.assertEquals(Optional.of(R.drawable.remove), actionNotification.icon()); + Assert.assertEquals(Optional.of(R.drawable.ic_notifications), actionNotification.icon()); } @Test diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java index 23f746dd19..f2deee54a3 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIobTest.java @@ -96,7 +96,7 @@ public class TriggerIobTest { @Test public void iconTest() { - Assert.assertEquals(Optional.of(R.drawable.remove), new TriggerIob().icon()); + Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_capslock), new TriggerIob().icon()); } diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java index 507d2f9bfe..9aea88e141 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercentTest.java @@ -91,7 +91,7 @@ public class TriggerProfilePercentTest { @Test public void iconTest() { - Assert.assertEquals(Optional.of(R.drawable.remove), new TriggerProfilePercent().icon()); + Assert.assertEquals(Optional.of(R.drawable.icon_actions_profileswitch), new TriggerProfilePercent().icon()); } @Test diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java index 70dda8723e..7e42d6ba48 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetTest.java @@ -79,7 +79,7 @@ public class TriggerTempTargetTest { @Test public void iconTest() { - Assert.assertEquals(Optional.of(R.drawable.remove), new TriggerTempTarget().icon()); + Assert.assertEquals(Optional.of(R.drawable.ic_keyboard_tab), new TriggerTempTarget().icon()); } diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java index e0ee555753..dd9da423dd 100644 --- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java +++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsidTest.java @@ -87,7 +87,7 @@ public class TriggerWifiSsidTest { @Test public void iconTest() { - Assert.assertEquals(Optional.of(R.drawable.remove), new TriggerWifiSsid().icon()); + Assert.assertEquals(Optional.of(R.drawable.ic_network_wifi), new TriggerWifiSsid().icon()); } @Test