From 572e5b6b9aa9e6c23a38ba839c2ca0c4a511b7d9 Mon Sep 17 00:00:00 2001 From: Philoul Date: Thu, 7 Sep 2023 19:41:49 +0200 Subject: [PATCH] Wear Update Icons for menu --- _docs/icons/ic_complication.svg | 16 ++++ _docs/icons/ic_display.svg | 86 +++++++++++++++++++ _docs/icons/ic_graph.svg | 82 ++++++++++++++++++ _docs/icons/ic_interface.svg | 37 ++++++++ _docs/icons/ic_others.svg | 31 +++++++ _docs/icons/ic_profile.svg | 14 +++ _docs/icons/ic_status.svg | 19 ++++ .../interaction/menus/MainMenuActivity.kt | 2 +- .../menus/PreferenceMenuActivity.kt | 10 +-- .../src/main/res/drawable/ic_complication.xml | 9 ++ wear/src/main/res/drawable/ic_display.xml | 51 +++++++++++ wear/src/main/res/drawable/ic_graph.xml | 26 ++++++ wear/src/main/res/drawable/ic_interface.xml | 16 ++++ wear/src/main/res/drawable/ic_others.xml | 7 ++ wear/src/main/res/drawable/ic_profile.xml | 5 ++ wear/src/main/res/drawable/ic_status.xml | 18 ++-- wear/src/main/res/xml/others_preferences.xml | 16 ++-- 17 files changed, 425 insertions(+), 20 deletions(-) create mode 100644 _docs/icons/ic_complication.svg create mode 100644 _docs/icons/ic_display.svg create mode 100644 _docs/icons/ic_graph.svg create mode 100644 _docs/icons/ic_interface.svg create mode 100644 _docs/icons/ic_others.svg create mode 100644 _docs/icons/ic_profile.svg create mode 100644 _docs/icons/ic_status.svg create mode 100644 wear/src/main/res/drawable/ic_complication.xml create mode 100644 wear/src/main/res/drawable/ic_display.xml create mode 100644 wear/src/main/res/drawable/ic_graph.xml create mode 100644 wear/src/main/res/drawable/ic_interface.xml create mode 100644 wear/src/main/res/drawable/ic_others.xml create mode 100644 wear/src/main/res/drawable/ic_profile.xml diff --git a/_docs/icons/ic_complication.svg b/_docs/icons/ic_complication.svg new file mode 100644 index 0000000000..50d44cf896 --- /dev/null +++ b/_docs/icons/ic_complication.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + diff --git a/_docs/icons/ic_display.svg b/_docs/icons/ic_display.svg new file mode 100644 index 0000000000..b7148cb224 --- /dev/null +++ b/_docs/icons/ic_display.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_docs/icons/ic_graph.svg b/_docs/icons/ic_graph.svg new file mode 100644 index 0000000000..1f37dc82cf --- /dev/null +++ b/_docs/icons/ic_graph.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_docs/icons/ic_interface.svg b/_docs/icons/ic_interface.svg new file mode 100644 index 0000000000..e41c38d0eb --- /dev/null +++ b/_docs/icons/ic_interface.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_docs/icons/ic_others.svg b/_docs/icons/ic_others.svg new file mode 100644 index 0000000000..bc5efd650d --- /dev/null +++ b/_docs/icons/ic_others.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/_docs/icons/ic_profile.svg b/_docs/icons/ic_profile.svg new file mode 100644 index 0000000000..c9caf6be94 --- /dev/null +++ b/_docs/icons/ic_profile.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/_docs/icons/ic_status.svg b/_docs/icons/ic_status.svg new file mode 100644 index 0000000000..3db1defbba --- /dev/null +++ b/_docs/icons/ic_status.svg @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.kt index 88eec11e1e..da9f97097d 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/MainMenuActivity.kt @@ -32,7 +32,7 @@ class MainMenuActivity : MenuListActivity() { add(MenuItem(R.drawable.ic_e_carbs, getString(R.string.menu_ecarb))) add(MenuItem(R.drawable.ic_treatment, getString(R.string.menu_treatment))) add(MenuItem(R.drawable.ic_temptarget, getString(R.string.menu_tempt))) - add(MenuItem(R.drawable.ic_status, getString(R.string.status_profile_switch))) + add(MenuItem(R.drawable.ic_profile, getString(R.string.status_profile_switch))) add(MenuItem(R.drawable.ic_settings, getString(R.string.menu_settings))) add(MenuItem(R.drawable.ic_status, getString(R.string.menu_status))) if (sp.getBoolean(R.string.key_prime_fill, false)) diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/PreferenceMenuActivity.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/PreferenceMenuActivity.kt index c0e19ad06f..8607645d06 100644 --- a/wear/src/main/java/info/nightscout/androidaps/interaction/menus/PreferenceMenuActivity.kt +++ b/wear/src/main/java/info/nightscout/androidaps/interaction/menus/PreferenceMenuActivity.kt @@ -15,11 +15,11 @@ class PreferenceMenuActivity : MenuListActivity() { override fun provideElements(): List = ArrayList().apply { - add(MenuItem(R.drawable.ic_settings, getString(R.string.pref_display_settings))) - add(MenuItem(R.drawable.ic_settings, getString(R.string.pref_graph_settings))) - add(MenuItem(R.drawable.ic_settings, getString(R.string.pref_interface_settings))) - add(MenuItem(R.drawable.ic_settings, getString(R.string.pref_complication_settings))) - add(MenuItem(R.drawable.ic_settings, getString(R.string.pref_others_settings))) + add(MenuItem(R.drawable.ic_display, getString(R.string.pref_display_settings))) + add(MenuItem(R.drawable.ic_graph, getString(R.string.pref_graph_settings))) + add(MenuItem(R.drawable.ic_interface, getString(R.string.pref_interface_settings))) + add(MenuItem(R.drawable.ic_complication, getString(R.string.pref_complication_settings))) + add(MenuItem(R.drawable.ic_others, getString(R.string.pref_others_settings))) } override fun doAction(position: String) { diff --git a/wear/src/main/res/drawable/ic_complication.xml b/wear/src/main/res/drawable/ic_complication.xml new file mode 100644 index 0000000000..d876ada581 --- /dev/null +++ b/wear/src/main/res/drawable/ic_complication.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/wear/src/main/res/drawable/ic_display.xml b/wear/src/main/res/drawable/ic_display.xml new file mode 100644 index 0000000000..69f4e3dae2 --- /dev/null +++ b/wear/src/main/res/drawable/ic_display.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/drawable/ic_graph.xml b/wear/src/main/res/drawable/ic_graph.xml new file mode 100644 index 0000000000..27daa79221 --- /dev/null +++ b/wear/src/main/res/drawable/ic_graph.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/drawable/ic_interface.xml b/wear/src/main/res/drawable/ic_interface.xml new file mode 100644 index 0000000000..55553696d5 --- /dev/null +++ b/wear/src/main/res/drawable/ic_interface.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/wear/src/main/res/drawable/ic_others.xml b/wear/src/main/res/drawable/ic_others.xml new file mode 100644 index 0000000000..efdf7689f9 --- /dev/null +++ b/wear/src/main/res/drawable/ic_others.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/wear/src/main/res/drawable/ic_profile.xml b/wear/src/main/res/drawable/ic_profile.xml new file mode 100644 index 0000000000..62c72e746f --- /dev/null +++ b/wear/src/main/res/drawable/ic_profile.xml @@ -0,0 +1,5 @@ + + + + diff --git a/wear/src/main/res/drawable/ic_status.xml b/wear/src/main/res/drawable/ic_status.xml index 53cfc991f7..12a0c820fc 100644 --- a/wear/src/main/res/drawable/ic_status.xml +++ b/wear/src/main/res/drawable/ic_status.xml @@ -1,9 +1,15 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0" + android:fillColor="@android:color/white"/> + + diff --git a/wear/src/main/res/xml/others_preferences.xml b/wear/src/main/res/xml/others_preferences.xml index 381cb5fd10..64d8b2d8fb 100644 --- a/wear/src/main/res/xml/others_preferences.xml +++ b/wear/src/main/res/xml/others_preferences.xml @@ -2,14 +2,6 @@ - - + +