From 4aea2e626cb5d4e8e984b0ec21246d22f23bb4e0 Mon Sep 17 00:00:00 2001 From: TaaviE Date: Tue, 1 Sep 2020 21:27:07 +0200 Subject: [PATCH] Improve icon size consistency in ControlCenterv2 (#2000) Tinted the ic_delete_forever.xml correctly Updated the default icon to look consistent with the rest Due to being used in FABs, made ic_add white by-default and tinted ic_block properly Adjusted Amazfit Bip and the ic_no_watch drawables to look more uniform with the rest Re-imported the Amazfit Bip icon to fit the rest Re-imported all material.io icons with the same DPI, renamed to original names, optimized and tinted every icon the same way Updated the ic_switch_left icon to look better on smaller screens scale refresh in control center to match the rest Improved the icon size consistency in ControlCenter Co-authored-by: TaaviE Co-authored-by: vanous Reviewed-on: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2000 --- .../freeyourgadget/gadgetbridge/util/GB.java | 2 +- .../main/res/drawable/gadgetbridge_img.xml | 2 +- .../main/res/drawable/ic_access_alarms.xml | 10 ++++++++ app/src/main/res/drawable/ic_access_time.xml | 10 ++++---- .../ic_action_fetch_activity_data.xml | 9 ------- app/src/main/res/drawable/ic_add.xml | 13 +++++----- app/src/main/res/drawable/ic_arrow_upward.xml | 10 ++++---- .../{ic_block_black.xml => ic_block.xml} | 9 ++++--- app/src/main/res/drawable/ic_brightness_2.xml | 12 ++++----- app/src/main/res/drawable/ic_calculate.xml | 16 ++++++------ .../main/res/drawable/ic_calendar_sync.xml | 15 +++++------ .../main/res/drawable/ic_calendar_today.xml | 13 +++++----- app/src/main/res/drawable/ic_create.xml | 10 ++++++++ .../res/drawable/ic_database_management.xml | 9 ------- app/src/main/res/drawable/ic_debug.xml | 9 ------- app/src/main/res/drawable/ic_delete.xml | 10 ++++++++ app/src/main/res/drawable/ic_delete_cross.xml | 9 ------- .../main/res/drawable/ic_delete_forever.xml | 10 ++++++++ .../res/drawable/ic_device_amazfit_bip.xml | 24 ++++++++++-------- .../ic_device_amazfit_bip_disabled.xml | 25 +++++++++++-------- .../main/res/drawable/ic_device_default.xml | 21 ++++++++-------- .../drawable/ic_device_default_disabled.xml | 22 ++++++++-------- .../res/drawable/ic_device_set_alarms.xml | 9 ------- .../main/res/drawable/ic_devices_other.xml | 10 ++++++++ .../main/res/drawable/ic_do_not_disturb.xml | 10 -------- app/src/main/res/drawable/ic_drag_handle.xml | 10 ++++++++ .../drawable/ic_drag_handle_black_24dp.xml | 9 ------- app/src/main/res/drawable/ic_edit.xml | 9 ------- app/src/main/res/drawable/ic_extension.xml | 13 +++++----- app/src/main/res/drawable/ic_filter.xml | 9 ------- .../main/res/drawable/ic_filter_9_plus.xml | 10 ++++++++ app/src/main/res/drawable/ic_filter_alt.xml | 10 ++++++++ .../main/res/drawable/ic_find_lost_phone.xml | 21 ---------------- .../main/res/drawable/ic_font_download.xml | 12 ++++----- app/src/main/res/drawable/ic_history.xml | 10 ++++++++ .../main/res/drawable/ic_history_black.xml | 9 ------- app/src/main/res/drawable/ic_info.xml | 10 ++++++++ app/src/main/res/drawable/ic_info_black.xml | 9 ------- app/src/main/res/drawable/ic_language.xml | 12 ++++----- app/src/main/res/drawable/ic_lock_open.xml | 12 ++++----- app/src/main/res/drawable/ic_menu.xml | 12 ++++----- app/src/main/res/drawable/ic_more_vert.xml | 11 ++++---- app/src/main/res/drawable/ic_nights_stay.xml | 16 ++++++------ app/src/main/res/drawable/ic_no_watch.xml | 14 +++++------ .../res/drawable/ic_outline_filter_9_plus.xml | 10 -------- app/src/main/res/drawable/ic_pageview.xml | 10 ++++++++ .../res/drawable/ic_power_settings_new.xml | 10 ++++++++ app/src/main/res/drawable/ic_quit.xml | 9 ------- app/src/main/res/drawable/ic_radio.xml | 13 +++++----- app/src/main/res/drawable/ic_refresh.xml | 10 ++++++++ .../main/res/drawable/ic_remove_device.xml | 9 ------- app/src/main/res/drawable/ic_reset.xml | 10 -------- app/src/main/res/drawable/ic_rotate_left.xml | 12 ++++----- app/src/main/res/drawable/ic_screenshot.xml | 8 +++--- app/src/main/res/drawable/ic_select_all.xml | 13 +++++----- app/src/main/res/drawable/ic_settings.xml | 9 ++++--- .../main/res/drawable/ic_settings_remote.xml | 16 ++++++------ app/src/main/res/drawable/ic_share.xml | 13 +++++----- ...l_cellular_connected_no_internet_0_bar.xml | 14 ----------- ...l_cellular_connected_no_internet_4_bar.xml | 10 ++++++++ app/src/main/res/drawable/ic_smart_button.xml | 13 +++++----- app/src/main/res/drawable/ic_sunny.xml | 10 -------- app/src/main/res/drawable/ic_switch_left.xml | 13 +++++----- app/src/main/res/drawable/ic_vibration.xml | 10 ++++++++ app/src/main/res/drawable/ic_vpn_key.xml | 12 ++++----- app/src/main/res/drawable/ic_wb_sunny.xml | 10 ++++++++ app/src/main/res/drawable/ic_widgets.xml | 12 ++++----- app/src/main/res/layout/activity_list.xml | 2 +- .../res/layout/activity_summary_details.xml | 2 +- app/src/main/res/layout/device_itemv2.xml | 8 +++--- .../main/res/layout/item_pebble_watchapp.xml | 2 +- .../activity_controlcenterv2_main_drawer.xml | 13 +++++----- .../res/menu/activity_list_context_menu.xml | 2 +- app/src/main/res/menu/activity_list_menu.xml | 4 +-- .../res/xml/devicesettings_device_actions.xml | 2 +- .../devicesettings_disconnectnotification.xml | 2 +- ...settings_disconnectnotification_noshed.xml | 2 +- .../devicesettings_donotdisturb_no_auto.xml | 2 +- .../devicesettings_donotdisturb_withauto.xml | 2 +- .../res/xml/devicesettings_find_phone.xml | 2 +- .../res/xml/devicesettings_power_mode.xml | 2 +- .../res/xml/devicesettings_watchxplus.xml | 2 +- 82 files changed, 406 insertions(+), 416 deletions(-) create mode 100644 app/src/main/res/drawable/ic_access_alarms.xml delete mode 100644 app/src/main/res/drawable/ic_action_fetch_activity_data.xml rename app/src/main/res/drawable/{ic_block_black.xml => ic_block.xml} (73%) create mode 100644 app/src/main/res/drawable/ic_create.xml delete mode 100644 app/src/main/res/drawable/ic_database_management.xml delete mode 100644 app/src/main/res/drawable/ic_debug.xml create mode 100644 app/src/main/res/drawable/ic_delete.xml delete mode 100644 app/src/main/res/drawable/ic_delete_cross.xml create mode 100644 app/src/main/res/drawable/ic_delete_forever.xml delete mode 100644 app/src/main/res/drawable/ic_device_set_alarms.xml create mode 100644 app/src/main/res/drawable/ic_devices_other.xml delete mode 100644 app/src/main/res/drawable/ic_do_not_disturb.xml create mode 100644 app/src/main/res/drawable/ic_drag_handle.xml delete mode 100644 app/src/main/res/drawable/ic_drag_handle_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_edit.xml delete mode 100644 app/src/main/res/drawable/ic_filter.xml create mode 100644 app/src/main/res/drawable/ic_filter_9_plus.xml create mode 100644 app/src/main/res/drawable/ic_filter_alt.xml delete mode 100644 app/src/main/res/drawable/ic_find_lost_phone.xml create mode 100644 app/src/main/res/drawable/ic_history.xml delete mode 100644 app/src/main/res/drawable/ic_history_black.xml create mode 100644 app/src/main/res/drawable/ic_info.xml delete mode 100644 app/src/main/res/drawable/ic_info_black.xml delete mode 100644 app/src/main/res/drawable/ic_outline_filter_9_plus.xml create mode 100644 app/src/main/res/drawable/ic_pageview.xml create mode 100644 app/src/main/res/drawable/ic_power_settings_new.xml delete mode 100644 app/src/main/res/drawable/ic_quit.xml create mode 100644 app/src/main/res/drawable/ic_refresh.xml delete mode 100644 app/src/main/res/drawable/ic_remove_device.xml delete mode 100644 app/src/main/res/drawable/ic_reset.xml delete mode 100644 app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml create mode 100644 app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml delete mode 100644 app/src/main/res/drawable/ic_sunny.xml create mode 100644 app/src/main/res/drawable/ic_vibration.xml create mode 100644 app/src/main/res/drawable/ic_wb_sunny.xml diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java index b911dc9ba..247d8ccb2 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java @@ -116,7 +116,7 @@ public class GB { deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_FETCH_RECORDED_DATA); deviceCommunicationServiceIntent.putExtra(EXTRA_RECORDED_DATA_TYPES, ActivityKind.TYPE_ACTIVITY); PendingIntent fetchPendingIntent = PendingIntent.getService(context, 1, deviceCommunicationServiceIntent, PendingIntent.FLAG_ONE_SHOT); - builder.addAction(R.drawable.ic_action_fetch_activity_data, context.getString(R.string.controlcenter_fetch_activity_data), fetchPendingIntent); + builder.addAction(R.drawable.ic_refresh, context.getString(R.string.controlcenter_fetch_activity_data), fetchPendingIntent); } } else if (device.getState().equals(GBDevice.State.WAITING_FOR_RECONNECT) || device.getState().equals(GBDevice.State.NOT_CONNECTED)) { deviceCommunicationServiceIntent.setAction(DeviceService.ACTION_CONNECT); diff --git a/app/src/main/res/drawable/gadgetbridge_img.xml b/app/src/main/res/drawable/gadgetbridge_img.xml index d066b98f8..757c33ef6 100644 --- a/app/src/main/res/drawable/gadgetbridge_img.xml +++ b/app/src/main/res/drawable/gadgetbridge_img.xml @@ -2,8 +2,8 @@ + + diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml index ec835af0c..cfe3228e7 100644 --- a/app/src/main/res/drawable/ic_access_time.xml +++ b/app/src/main/res/drawable/ic_access_time.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zM11.78 7h-0.06C11.32 7 11 7.32 11 7.72v4.72c0 0.35 0.18 0.68 0.49 0.86l4.15 2.49c0.34 0.2 0.78 0.1 0.98-0.24 0.21-0.34 0.1-0.79-0.25-0.99l-3.87-2.3V7.72c0-0.4-0.32-0.72-0.72-0.72z" /> diff --git a/app/src/main/res/drawable/ic_action_fetch_activity_data.xml b/app/src/main/res/drawable/ic_action_fetch_activity_data.xml deleted file mode 100644 index 265a5f0dc..000000000 --- a/app/src/main/res/drawable/ic_action_fetch_activity_data.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index aa4154e27..70c233aa8 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M18 13h-5v5c0 0.55-0.45 1-1 1s-1-0.45-1-1v-5H6c-0.55 0-1-0.45-1-1s0.45-1 1-1h5V6c0-0.55 0.45-1 1-1s1 0.45 1 1v5h5c0.55 0 1 0.45 1 1s-0.45 1-1 1z" /> diff --git a/app/src/main/res/drawable/ic_arrow_upward.xml b/app/src/main/res/drawable/ic_arrow_upward.xml index 23a90b893..ed082cc04 100644 --- a/app/src/main/res/drawable/ic_arrow_upward.xml +++ b/app/src/main/res/drawable/ic_arrow_upward.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M13 19V7.83l4.88 4.88c0.39 0.39 1.03 0.39 1.42 0 0.39-0.39 0.39-1.02 0-1.41l-6.59-6.59c-0.39-0.39-1.02-0.39-1.41 0l-6.6 6.58c-0.39 0.39-0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L11 7.83V19c0 0.55 0.45 1 1 1s1-0.45 1-1z" /> diff --git a/app/src/main/res/drawable/ic_block_black.xml b/app/src/main/res/drawable/ic_block.xml similarity index 73% rename from app/src/main/res/drawable/ic_block_black.xml rename to app/src/main/res/drawable/ic_block.xml index ce9e6df8b..c0443c9c5 100644 --- a/app/src/main/res/drawable/ic_block_black.xml +++ b/app/src/main/res/drawable/ic_block.xml @@ -1,8 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_brightness_2.xml b/app/src/main/res/drawable/ic_brightness_2.xml index 24e69dbbf..cab8d9202 100644 --- a/app/src/main/res/drawable/ic_brightness_2.xml +++ b/app/src/main/res/drawable/ic_brightness_2.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M12.43 2.3C10.05 1.71 7.75 2.03 5.8 2.94 5.45 3.1 5.39 3.58 5.7 3.8 8.3 5.6 10 8.6 10 12c0 3.4-1.7 6.4-4.3 8.2-0.32 0.22-0.26 0.7 0.09 0.86C7.07 21.66 8.5 22 10 22c6.05 0 10.85-5.38 9.87-11.6-0.61-3.92-3.59-7.16-7.44-8.1z" /> diff --git a/app/src/main/res/drawable/ic_calculate.xml b/app/src/main/res/drawable/ic_calculate.xml index 0ea041b2c..8be4fa2a2 100644 --- a/app/src/main/res/drawable/ic_calculate.xml +++ b/app/src/main/res/drawable/ic_calculate.xml @@ -1,12 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> - + android:fillColor="#000000" + android:pathData="M19 3H5C3.9 3 3 3.9 3 5v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-5.44 3.53c0.29-0.29 0.77-0.29 1.06 0l0.88 0.88 0.88-0.88c0.29-0.29 0.77-0.29 1.06 0 0.29 0.29 0.29 0.77 0 1.06l-0.88 0.88 0.88 0.88c0.29 0.29 0.29 0.77 0 1.06-0.29 0.29-0.77 0.29-1.06 0L15.5 9.54l-0.88 0.88c-0.29 0.29-0.77 0.29-1.06 0-0.29-0.29-0.29-0.77 0-1.06l0.88-0.88-0.88-0.88c-0.3-0.3-0.3-0.78 0-1.07zM7 7.72h3.5c0.41 0 0.75 0.34 0.75 0.75s-0.34 0.75-0.75 0.75H7c-0.41 0-0.75-0.34-0.75-0.75S6.59 7.72 7 7.72zM10.75 16H9.5v1.25C9.5 17.66 9.16 18 8.75 18S8 17.66 8 17.25V16H6.75C6.34 16 6 15.66 6 15.25s0.34-0.75 0.75-0.75H8v-1.25c0-0.41 0.34-0.75 0.75-0.75s0.75 0.34 0.75 0.75v1.25h1.25c0.41 0 0.75 0.34 0.75 0.75S11.16 16 10.75 16zm6.5 1.25h-3.5c-0.41 0-0.75-0.34-0.75-0.75s0.34-0.75 0.75-0.75h3.5c0.41 0 0.75 0.34 0.75 0.75s-0.34 0.75-0.75 0.75zm0-2.5h-3.5C13.34 14.75 13 14.41 13 14s0.34-0.75 0.75-0.75h3.5c0.41 0 0.75 0.34 0.75 0.75s-0.34 0.75-0.75 0.75z" /> diff --git a/app/src/main/res/drawable/ic_calendar_sync.xml b/app/src/main/res/drawable/ic_calendar_sync.xml index 757143cd9..f25dd4d8a 100644 --- a/app/src/main/res/drawable/ic_calendar_sync.xml +++ b/app/src/main/res/drawable/ic_calendar_sync.xml @@ -1,13 +1,14 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:strokeWidth="1" /> diff --git a/app/src/main/res/drawable/ic_calendar_today.xml b/app/src/main/res/drawable/ic_calendar_today.xml index 7b9dcc34b..197339a90 100644 --- a/app/src/main/res/drawable/ic_calendar_today.xml +++ b/app/src/main/res/drawable/ic_calendar_today.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M20 3h-1V2c0-0.55-0.45-1-1-1s-1 0.45-1 1v1H7V2c0-0.55-0.45-1-1-1S5 1.45 5 2v1H4C2.9 3 2 3.9 2 5v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-1 18H5c-0.55 0-1-0.45-1-1V8h16v12c0 0.55-0.45 1-1 1z" /> diff --git a/app/src/main/res/drawable/ic_create.xml b/app/src/main/res/drawable/ic_create.xml new file mode 100644 index 000000000..9224b250c --- /dev/null +++ b/app/src/main/res/drawable/ic_create.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_database_management.xml b/app/src/main/res/drawable/ic_database_management.xml deleted file mode 100644 index 91f5419e1..000000000 --- a/app/src/main/res/drawable/ic_database_management.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_debug.xml b/app/src/main/res/drawable/ic_debug.xml deleted file mode 100644 index 8a78a7220..000000000 --- a/app/src/main/res/drawable/ic_debug.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 000000000..20ead7e53 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_cross.xml b/app/src/main/res/drawable/ic_delete_cross.xml deleted file mode 100644 index e82e3680a..000000000 --- a/app/src/main/res/drawable/ic_delete_cross.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_forever.xml b/app/src/main/res/drawable/ic_delete_forever.xml new file mode 100644 index 000000000..cfcbaa76d --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_forever.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip.xml b/app/src/main/res/drawable/ic_device_amazfit_bip.xml index 098e7cf06..832edacd8 100644 --- a/app/src/main/res/drawable/ic_device_amazfit_bip.xml +++ b/app/src/main/res/drawable/ic_device_amazfit_bip.xml @@ -4,19 +4,23 @@ android:viewportWidth="30" android:viewportHeight="30"> + android:fillColor="#1f7fdb" + android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" + android:strokeWidth="3.57115173" /> + android:fillColor="#4dabf5" + android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" + android:strokeWidth="3.57115173" /> + android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" + android:strokeWidth="3.57115173" /> + android:fillColor="#ffffff" + android:pathData="M11.407 7.52c-0.814-0.016-0.908 0.156-0.885 0.967-0.72 0.126-1.342 1.159-1.325 2.124l0.005 7.825c0.093 0.883 0.625 1.487 1.32 1.867 0 0.813 0.077 0.99 0.885 0.99h5.81c0.847 0 0.826-0.236 0.805-0.99 0.872-0.416 1.21-0.892 1.295-1.867l0.002-3.437c0.123-0.205 0.15-0.028 0.219 0.05 0.094 0.11 0.214 0.063 0.267-0.09l0.003-1.14c-0.055-0.114-0.1-0.213-0.25-0.117-0.078 0.049-0.11 0.22-0.24 0.085v-3.444c-0.087-0.903-0.473-1.51-1.295-1.838 0.007-0.945-0.06-0.991-0.806-0.98zm0.05 1.428L17.234 9c0.805 0.007 1.47 0.828 1.47 1.343l-0.028 7.942c-0.003 0.832-0.717 1.512-1.443 1.512h-5.925c-0.536 0-1.498-0.65-1.492-1.426l0.062-7.878c0.008-0.957 0.76-1.554 1.58-1.546z" /> + android:fillAlpha="0.731" + android:fillColor="#ffffff" + android:pathData="M11.457 8.948c-0.82-0.007-1.572 0.59-1.58 1.547l-0.062 7.877c-0.006 0.776 0.956 1.425 1.492 1.425h5.924c0.725 0 1.44-0.68 1.443-1.512l0.027-7.942C18.703 9.828 18.037 9.007 17.23 9zm-0.482 1.812h6.567v6.696h-6.568z" + android:strokeAlpha="0.731" /> diff --git a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml index 43e36d861..84730f7a6 100644 --- a/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml +++ b/app/src/main/res/drawable/ic_device_amazfit_bip_disabled.xml @@ -4,20 +4,23 @@ android:viewportWidth="30" android:viewportHeight="30"> + android:fillColor="#7a7a7a" + android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" + android:strokeWidth="3.57115173" /> + android:fillColor="#9f9f9f" + android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" + android:strokeWidth="3.57115173" /> + android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" + android:strokeWidth="3.57115173" /> + android:fillColor="#ffffff" + android:pathData="M11.342 7.48c-0.814-0.017-0.908 0.155-0.885 0.966-0.72 0.126-1.342 1.159-1.325 2.124l0.005 7.825c0.093 0.883 0.625 1.487 1.32 1.867 0 0.813 0.077 0.99 0.885 0.99h5.81c0.847 0 0.826-0.236 0.805-0.99 0.872-0.416 1.21-0.892 1.295-1.867l0.002-3.437c0.123-0.205 0.151-0.028 0.22 0.05 0.093 0.11 0.213 0.063 0.266-0.09l0.003-1.14c-0.055-0.114-0.1-0.213-0.25-0.117-0.078 0.049-0.11 0.22-0.24 0.085v-3.444c-0.087-0.903-0.473-1.51-1.295-1.838 0.007-0.945-0.06-0.991-0.806-0.98zm0.051 1.427l5.775 0.052c0.805 0.007 1.471 0.828 1.47 1.343l-0.028 7.942c-0.003 0.832-0.717 1.512-1.443 1.512h-5.925c-0.536 0-1.498-0.65-1.492-1.426l0.062-7.878c0.008-0.957 0.761-1.554 1.58-1.546z" /> + android:fillAlpha="0.731" + android:fillColor="#ffffff" + android:pathData="M11.392 8.907c-0.819-0.007-1.572 0.59-1.58 1.547L9.75 18.33c-0.006 0.776 0.956 1.425 1.492 1.425h5.924c0.725 0 1.44-0.68 1.443-1.512l0.027-7.942c0.002-0.515-0.664-1.336-1.469-1.343zm-0.482 1.812h6.567v6.696H10.91z" + android:strokeAlpha="0.731" /> diff --git a/app/src/main/res/drawable/ic_device_default.xml b/app/src/main/res/drawable/ic_device_default.xml index e8f7c7207..f5aa60b2f 100644 --- a/app/src/main/res/drawable/ic_device_default.xml +++ b/app/src/main/res/drawable/ic_device_default.xml @@ -4,22 +4,21 @@ android:viewportWidth="30" android:viewportHeight="30"> + android:fillColor="#1f7fdb" + android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" + android:strokeWidth="3.57" /> + android:fillColor="#4dabf5" + android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" + android:strokeWidth="3.57" /> + android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" + android:strokeWidth="3.57" /> + android:pathData="M12 9.955h4.575a0.507 0.567 0 0 1 0.507 0.567v7.836a0.507 0.567 0 0 1-0.507 0.567h-4.577a0.507 0.567 0 0 1-0.507-0.567v-7.836a0.507 0.567 0 0 1 0.507-0.567zm0.581 9.735h3.382v1.45h-3.382zM12.554 7.693h3.382v1.45h-3.382z" /> + android:pathData="M12.363 10.948h3.907v6.978h-3.907z" /> diff --git a/app/src/main/res/drawable/ic_device_default_disabled.xml b/app/src/main/res/drawable/ic_device_default_disabled.xml index 295b92713..d1f118eb1 100644 --- a/app/src/main/res/drawable/ic_device_default_disabled.xml +++ b/app/src/main/res/drawable/ic_device_default_disabled.xml @@ -4,23 +4,21 @@ android:viewportWidth="30" android:viewportHeight="30"> + android:fillColor="#7a7a7a" + android:pathData="M3.871 3.877h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.824a0.947 0.947 0 0 1 0.947-0.947z" + android:strokeWidth="3.57" /> + android:fillColor="#9f9f9f" + android:pathData="M3.879 3.035h20.925a0.947 0.947 0 0 1 0.947 0.947v20.01a0.947 0.947 0 0 1-0.947 0.948H3.88a0.947 0.947 0 0 1-0.947-0.948V3.982A0.947 0.947 0 0 1 3.88 3.035z" + android:strokeWidth="3.57" /> + android:pathData="M3.871 3.413h20.925a0.947 0.947 0 0 1 0.948 0.947v20.01a0.947 0.947 0 0 1-0.948 0.948H3.871a0.947 0.947 0 0 1-0.947-0.948V4.36A0.947 0.947 0 0 1 3.87 3.413z" + android:strokeWidth="3.57" /> + android:pathData="M12.15 9.904h4.576a0.507 0.567 0 0 1 0.507 0.567v7.836a0.507 0.567 0 0 1-0.507 0.567h-4.577a0.507 0.567 0 0 1-0.507-0.567V10.47a0.507 0.567 0 0 1 0.507-0.567zm0.582 9.735h3.382v1.45h-3.382zM12.705 7.642h3.382v1.45h-3.382z" /> + android:pathData="M12.483 10.865h3.907v6.978h-3.907z" /> diff --git a/app/src/main/res/drawable/ic_device_set_alarms.xml b/app/src/main/res/drawable/ic_device_set_alarms.xml deleted file mode 100644 index f713c4dc1..000000000 --- a/app/src/main/res/drawable/ic_device_set_alarms.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_devices_other.xml b/app/src/main/res/drawable/ic_devices_other.xml new file mode 100644 index 000000000..46b697e4e --- /dev/null +++ b/app/src/main/res/drawable/ic_devices_other.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_do_not_disturb.xml b/app/src/main/res/drawable/ic_do_not_disturb.xml deleted file mode 100644 index 8c19b3367..000000000 --- a/app/src/main/res/drawable/ic_do_not_disturb.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml new file mode 100644 index 000000000..1177cb38f --- /dev/null +++ b/app/src/main/res/drawable/ic_drag_handle.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml deleted file mode 100644 index 1f23f1570..000000000 --- a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml deleted file mode 100644 index 6583ee016..000000000 --- a/app/src/main/res/drawable/ic_edit.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_extension.xml b/app/src/main/res/drawable/ic_extension.xml index e8428b97f..2839222ab 100644 --- a/app/src/main/res/drawable/ic_extension.xml +++ b/app/src/main/res/drawable/ic_extension.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M20.5 11H19V7c0-1.1-0.9-2-2-2h-4V3.5C13 2.12 11.88 1 10.5 1S8 2.12 8 3.5V5H4C2.9 5 2.01 5.9 2.01 7v3.8H3.5c1.49 0 2.7 1.21 2.7 2.7s-1.21 2.7-2.7 2.7H2V20c0 1.1 0.9 2 2 2h3.8v-1.5c0-1.49 1.21-2.7 2.7-2.7s2.7 1.21 2.7 2.7V22H17c1.1 0 2-0.9 2-2v-4h1.5c1.38 0 2.5-1.12 2.5-2.5S21.88 11 20.5 11z" /> diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml deleted file mode 100644 index e66f184e2..000000000 --- a/app/src/main/res/drawable/ic_filter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_filter_9_plus.xml b/app/src/main/res/drawable/ic_filter_9_plus.xml new file mode 100644 index 000000000..7f6b1783f --- /dev/null +++ b/app/src/main/res/drawable/ic_filter_9_plus.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_filter_alt.xml b/app/src/main/res/drawable/ic_filter_alt.xml new file mode 100644 index 000000000..113833ab0 --- /dev/null +++ b/app/src/main/res/drawable/ic_filter_alt.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_find_lost_phone.xml b/app/src/main/res/drawable/ic_find_lost_phone.xml deleted file mode 100644 index f131683df..000000000 --- a/app/src/main/res/drawable/ic_find_lost_phone.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_font_download.xml b/app/src/main/res/drawable/ic_font_download.xml index a8ad28e11..22b1354ec 100644 --- a/app/src/main/res/drawable/ic_font_download.xml +++ b/app/src/main/res/drawable/ic_font_download.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M9.93 13.5h4.14L12 7.98 9.93 13.5zM20 2H4C2.9 2 2 2.9 2 4v16c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-4.29 15.88l-0.9-2.38H9.17l-0.89 2.37c-0.14 0.38-0.5 0.63-0.91 0.63-0.68 0-1.15-0.69-0.9-1.32l4.25-10.81C10.94 5.84 11.44 5.5 12 5.5s1.06 0.34 1.27 0.87l4.25 10.81c0.25 0.63-0.22 1.32-0.9 1.32-0.4 0-0.76-0.25-0.91-0.62z" /> diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml new file mode 100644 index 000000000..3f533c012 --- /dev/null +++ b/app/src/main/res/drawable/ic_history.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_history_black.xml b/app/src/main/res/drawable/ic_history_black.xml deleted file mode 100644 index f7941d3b2..000000000 --- a/app/src/main/res/drawable/ic_history_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml new file mode 100644 index 000000000..7cc3a6a3a --- /dev/null +++ b/app/src/main/res/drawable/ic_info.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_info_black.xml b/app/src/main/res/drawable/ic_info_black.xml deleted file mode 100644 index 4fcb7bf6a..000000000 --- a/app/src/main/res/drawable/ic_info_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml index 8505c73a5..e9a732e61 100644 --- a/app/src/main/res/drawable/ic_language.xml +++ b/app/src/main/res/drawable/ic_language.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-0.32-1.25-0.78-2.45-1.38-3.56 1.84 0.63 3.37 1.91 4.33 3.56zM12 4.04c0.83 1.2 1.48 2.53 1.91 3.96h-3.82c0.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s0.1-1.36 0.26-2h3.38c-0.08 0.66-0.14 1.32-0.14 2s0.06 1.34 0.14 2H4.26zm0.82 2h2.95c0.32 1.25 0.78 2.45 1.38 3.56-1.84-0.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c0.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-0.83-1.2-1.48-2.53-1.91-3.96h3.82c-0.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-0.09-0.66-0.16-1.32-0.16-2s0.07-1.35 0.16-2h4.68c0.09 0.65 0.16 1.32 0.16 2s-0.07 1.34-0.16 2zm0.25 5.56c0.6-1.11 1.06-2.31 1.38-3.56h2.95c-0.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c0.08-0.66 0.14-1.32 0.14-2s-0.06-1.34-0.14-2h3.38C19.9 10.64 20 11.31 20 12s-0.1 1.36-0.26 2h-3.38z" /> diff --git a/app/src/main/res/drawable/ic_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml index a3036eb4b..917091a2f 100644 --- a/app/src/main/res/drawable/ic_lock_open.xml +++ b/app/src/main/res/drawable/ic_lock_open.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M12 13c-1.1 0-2 0.9-2 2s0.9 2 2 2 2-0.9 2-2-0.9-2-2-2zm6-5h-1V6c0-2.76-2.24-5-5-5-2.28 0-4.27 1.54-4.84 3.75-0.14 0.54 0.18 1.08 0.72 1.22 0.53 0.14 1.08-0.18 1.22-0.72C9.44 3.93 10.63 3 12 3c1.65 0 3 1.35 3 3v2H6c-1.1 0-2 0.9-2 2v10c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V10c0-1.1-0.9-2-2-2zm0 11c0 0.55-0.45 1-1 1H7c-0.55 0-1-0.45-1-1v-8c0-0.55 0.45-1 1-1h10c0.55 0 1 0.45 1 1v8z" /> diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml index 2911b0719..66c96a6fb 100644 --- a/app/src/main/res/drawable/ic_menu.xml +++ b/app/src/main/res/drawable/ic_menu.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M4 18h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zm0-5h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM3 7c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4C3.45 6 3 6.45 3 7z" /> diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml index a1d8763ca..d348540fd 100644 --- a/app/src/main/res/drawable/ic_more_vert.xml +++ b/app/src/main/res/drawable/ic_more_vert.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_nights_stay.xml b/app/src/main/res/drawable/ic_nights_stay.xml index 2a4b4fc54..fdb1bfe6a 100644 --- a/app/src/main/res/drawable/ic_nights_stay.xml +++ b/app/src/main/res/drawable/ic_nights_stay.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M11.1 12.08c-2-3.88-0.92-7.36 0.07-9.27 0.19-0.36-0.12-0.77-0.53-0.72-5.02 0.68-8.86 5.07-8.65 10.32 0.01 0 0.01 0 0.01 0.01C2.62 12.15 3.29 12 4 12c1.66 0 3.18 0.83 4.1 2.15C9.77 14.63 11 16.17 11 18c0 1.52-0.87 2.83-2.12 3.51 0.98 0.32 2.03 0.5 3.11 0.5 3.13 0 5.92-1.44 7.76-3.69 0.26-0.32 0.04-0.79-0.37-0.82-2.49-0.13-6.28-1.53-8.28-5.42z" /> diff --git a/app/src/main/res/drawable/ic_no_watch.xml b/app/src/main/res/drawable/ic_no_watch.xml index 4e492c976..2d3efea22 100644 --- a/app/src/main/res/drawable/ic_no_watch.xml +++ b/app/src/main/res/drawable/ic_no_watch.xml @@ -1,15 +1,15 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:strokeColor="#000000" /> diff --git a/app/src/main/res/drawable/ic_outline_filter_9_plus.xml b/app/src/main/res/drawable/ic_outline_filter_9_plus.xml deleted file mode 100644 index 8112e1cdd..000000000 --- a/app/src/main/res/drawable/ic_outline_filter_9_plus.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pageview.xml b/app/src/main/res/drawable/ic_pageview.xml new file mode 100644 index 000000000..d0a505c8e --- /dev/null +++ b/app/src/main/res/drawable/ic_pageview.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_power_settings_new.xml b/app/src/main/res/drawable/ic_power_settings_new.xml new file mode 100644 index 000000000..af6eb5e9c --- /dev/null +++ b/app/src/main/res/drawable/ic_power_settings_new.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_quit.xml b/app/src/main/res/drawable/ic_quit.xml deleted file mode 100644 index bbc219767..000000000 --- a/app/src/main/res/drawable/ic_quit.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_radio.xml b/app/src/main/res/drawable/ic_radio.xml index bd0dc9cf2..228588f6c 100644 --- a/app/src/main/res/drawable/ic_radio.xml +++ b/app/src/main/res/drawable/ic_radio.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M3.24 6.15C2.51 6.43 2 7.17 2 8v12c0 1.1 0.9 2 2 2h16c1.11 0 2-0.9 2-2V8c0-1.1-0.9-2-2-2H8.3l7.43-3c0.46-0.19 0.68-0.71 0.49-1.17-0.19-0.46-0.71-0.68-1.17-0.49L3.24 6.15zM7 20c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm13-8h-2v-1c0-0.55-0.45-1-1-1s-1 0.45-1 1v1H4V9c0-0.55 0.45-1 1-1h14c0.55 0 1 0.45 1 1v3z" /> diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml new file mode 100644 index 000000000..0a5320acb --- /dev/null +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_remove_device.xml b/app/src/main/res/drawable/ic_remove_device.xml deleted file mode 100644 index dd11ad06f..000000000 --- a/app/src/main/res/drawable/ic_remove_device.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_reset.xml b/app/src/main/res/drawable/ic_reset.xml deleted file mode 100644 index b3ac0c496..000000000 --- a/app/src/main/res/drawable/ic_reset.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_rotate_left.xml b/app/src/main/res/drawable/ic_rotate_left.xml index 007266b97..f7104e06f 100644 --- a/app/src/main/res/drawable/ic_rotate_left.xml +++ b/app/src/main/res/drawable/ic_rotate_left.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M6.56 7.98C6.1 7.52 5.31 7.6 5 8.17 4.72 8.68 4.5 9.2 4.33 9.75 4.14 10.38 4.64 11 5.29 11H5.3c0.43 0 0.82-0.28 0.94-0.7 0.12-0.4 0.28-0.79 0.48-1.17 0.22-0.37 0.15-0.84-0.16-1.15zM5.31 13H5.29c-0.65 0-1.15 0.62-0.96 1.25 0.16 0.54 0.38 1.07 0.66 1.58 0.31 0.57 1.11 0.66 1.57 0.2 0.3-0.31 0.38-0.77 0.17-1.15-0.2-0.37-0.36-0.76-0.48-1.16C6.13 13.28 5.74 13 5.31 13zm2.85 6.02c0.51 0.28 1.04 0.5 1.59 0.66 0.62 0.18 1.24-0.32 1.24-0.96v-0.03c0-0.43-0.28-0.82-0.7-0.94-0.4-0.12-0.78-0.28-1.15-0.48-0.38-0.21-0.86-0.14-1.16 0.17l-0.03 0.03c-0.45 0.45-0.36 1.24 0.21 1.55zM13 4.07V3.41c0-0.89-1.08-1.34-1.71-0.71L9.17 4.83c-0.4 0.4-0.4 1.04 0 1.43l2.13 2.08C11.93 8.96 13 8.51 13 7.62V6.09c2.84 0.48 5 2.94 5 5.91 0 2.73-1.82 5.02-4.32 5.75-0.41 0.12-0.68 0.51-0.68 0.94v0.02c0 0.65 0.61 1.14 1.23 0.96C17.57 18.71 20 15.64 20 12c0-4.08-3.05-7.44-7-7.93z" /> diff --git a/app/src/main/res/drawable/ic_screenshot.xml b/app/src/main/res/drawable/ic_screenshot.xml index 614e6d9dd..d3b09022f 100644 --- a/app/src/main/res/drawable/ic_screenshot.xml +++ b/app/src/main/res/drawable/ic_screenshot.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml index 1822790d9..d9e5e2842 100644 --- a/app/src/main/res/drawable/ic_select_all.xml +++ b/app/src/main/res/drawable/ic_select_all.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M3 5h2V3C3.9 3 3 3.9 3 5zm0 8h2v-2H3v2zm4 8h2v-2H7v2zM3 9h2V7H3v2zm10-6h-2v2h2V3zm6 0v2h2c0-1.1-0.9-2-2-2zM5 21v-2H3c0 1.1 0.9 2 2 2zm-2-4h2v-2H3v2zM9 3H7v2h2V3zm2 18h2v-2h-2v2zm8-8h2v-2h-2v2zm0 8c1.1 0 2-0.9 2-2h-2v2zm0-12h2V7h-2v2zm0 8h2v-2h-2v2zm-4 4h2v-2h-2v2zm0-16h2V3h-2v2zM8 17h8c0.55 0 1-0.45 1-1V8c0-0.55-0.45-1-1-1H8C7.45 7 7 7.45 7 8v8c0 0.55 0.45 1 1 1zm1-8h6v6H9V9z" /> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 06c5623d0..3731428f7 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,8 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_settings_remote.xml b/app/src/main/res/drawable/ic_settings_remote.xml index b2c50df19..44587f808 100644 --- a/app/src/main/res/drawable/ic_settings_remote.xml +++ b/app/src/main/res/drawable/ic_settings_remote.xml @@ -1,12 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> - + android:fillColor="#000000" + android:pathData="M15 9H9c-0.55 0-1 0.45-1 1v12c0 0.55 0.45 1 1 1h6c0.55 0 1-0.45 1-1V10c0-0.55-0.45-1-1-1zm-3 6c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2zM7.82 6.82c0.35 0.35 0.9 0.38 1.3 0.1C9.93 6.34 10.93 6 12 6s2.07 0.34 2.88 0.91c0.4 0.28 0.95 0.26 1.3-0.09 0.43-0.43 0.39-1.14-0.09-1.5C14.94 4.49 13.53 4 12 4S9.06 4.49 7.91 5.32c-0.49 0.35-0.52 1.07-0.09 1.5zM12 0C9.36 0 6.94 0.93 5.05 2.47c-0.46 0.38-0.5 1.07-0.08 1.49 0.36 0.36 0.93 0.39 1.32 0.07C7.84 2.77 9.83 2 12 2s4.16 0.77 5.7 2.04c0.39 0.32 0.96 0.29 1.32-0.07 0.42-0.42 0.38-1.11-0.08-1.49C17.06 0.93 14.64 0 12 0z" /> diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml index b8f981a23..7c8369abf 100644 --- a/app/src/main/res/drawable/ic_share.xml +++ b/app/src/main/res/drawable/ic_share.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M18 16.08c-0.76 0-1.44 0.3-1.96 0.77L8.91 12.7C8.96 12.47 9 12.24 9 12s-0.04-0.47-0.09-0.7l7.05-4.11C16.5 7.69 17.21 8 18 8c1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 0.24 0.04 0.47 0.09 0.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c0.79 0 1.5-0.31 2.04-0.81l7.12 4.16c-0.05 0.21-0.08 0.43-0.08 0.65 0 1.61 1.31 2.92 2.92 2.92s2.92-1.31 2.92-2.92-1.31-2.92-2.92-2.92z" /> diff --git a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml deleted file mode 100644 index a49d48387..000000000 --- a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_0_bar.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml new file mode 100644 index 000000000..ca121b7cb --- /dev/null +++ b/app/src/main/res/drawable/ic_signal_cellular_connected_no_internet_4_bar.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_smart_button.xml b/app/src/main/res/drawable/ic_smart_button.xml index 22ea0df32..6de309be2 100644 --- a/app/src/main/res/drawable/ic_smart_button.xml +++ b/app/src/main/res/drawable/ic_smart_button.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M22 9v6c0 1.1-0.9 2-2 2h-1v-2h1V9H4v6h6v2H4c-1.1 0-2-0.9-2-2V9c0-1.1 0.9-2 2-2h16c1.1 0 2 0.9 2 2zm-7.96 8.99c0.18 0.39 0.73 0.39 0.91 0l0.63-1.4 1.4-0.63c0.39-0.18 0.39-0.73 0-0.91l-1.4-0.63-0.63-1.4c-0.18-0.39-0.73-0.39-0.91 0l-0.63 1.4-1.4 0.63c-0.39 0.18-0.39 0.73 0 0.91l1.4 0.63 0.63 1.4zm2.7-4.56c0.1 0.22 0.42 0.22 0.52 0l0.36-0.8 0.8-0.36c0.22-0.1 0.22-0.42 0-0.52l-0.8-0.36-0.36-0.8c-0.1-0.22-0.42-0.22-0.52 0l-0.36 0.8-0.8 0.36c-0.22 0.1-0.22 0.42 0 0.52l0.8 0.36 0.36 0.8z" /> diff --git a/app/src/main/res/drawable/ic_sunny.xml b/app/src/main/res/drawable/ic_sunny.xml deleted file mode 100644 index ac71831ca..000000000 --- a/app/src/main/res/drawable/ic_sunny.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_switch_left.xml b/app/src/main/res/drawable/ic_switch_left.xml index 901181350..095c9aaab 100644 --- a/app/src/main/res/drawable/ic_switch_left.xml +++ b/app/src/main/res/drawable/ic_switch_left.xml @@ -1,9 +1,10 @@ + android:width="24dp" + android:height="24dp" + android:tint="#7E7E7E" + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M8.5 8.62v6.76L5.12 12 8.5 8.62m-4.79 2.67c-0.39 0.39-0.39 1.02 0 1.41l4.59 4.59c0.62 0.63 1.7 0.19 1.7-0.7V7.41c0-0.89-1.08-1.34-1.71-0.71l-4.58 4.59zM14 7.41v9.17c0 0.89 1.08 1.34 1.71 0.71l4.59-4.59c0.39-0.39 0.39-1.02 0-1.41L15.71 6.7C15.08 6.08 14 6.52 14 7.41z" /> diff --git a/app/src/main/res/drawable/ic_vibration.xml b/app/src/main/res/drawable/ic_vibration.xml new file mode 100644 index 000000000..eab11f490 --- /dev/null +++ b/app/src/main/res/drawable/ic_vibration.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_vpn_key.xml b/app/src/main/res/drawable/ic_vpn_key.xml index 8f50c18e6..6afa96cdd 100644 --- a/app/src/main/res/drawable/ic_vpn_key.xml +++ b/app/src/main/res/drawable/ic_vpn_key.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M12.65 10C11.7 7.31 8.9 5.5 5.77 6.12 3.48 6.58 1.62 8.41 1.14 10.7 0.32 14.57 3.26 18 7 18c2.61 0 4.83-1.67 5.65-4H17v2c0 1.1 0.9 2 2 2s2-0.9 2-2v-2c1.1 0 2-0.9 2-2s-0.9-2-2-2h-8.35zM7 14c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" /> diff --git a/app/src/main/res/drawable/ic_wb_sunny.xml b/app/src/main/res/drawable/ic_wb_sunny.xml new file mode 100644 index 000000000..74e908546 --- /dev/null +++ b/app/src/main/res/drawable/ic_wb_sunny.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_widgets.xml b/app/src/main/res/drawable/ic_widgets.xml index 5939cad64..de857d6eb 100644 --- a/app/src/main/res/drawable/ic_widgets.xml +++ b/app/src/main/res/drawable/ic_widgets.xml @@ -1,10 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#000000" + android:pathData="M13 14v6c0 0.55 0.45 1 1 1h6c0.55 0 1-0.45 1-1v-6c0-0.55-0.45-1-1-1h-6c-0.55 0-1 0.45-1 1zm-9 7h6c0.55 0 1-0.45 1-1v-6c0-0.55-0.45-1-1-1H4c-0.55 0-1 0.45-1 1v6c0 0.55 0.45 1 1 1zM3 4v6c0 0.55 0.45 1 1 1h6c0.55 0 1-0.45 1-1V4c0-0.55-0.45-1-1-1H4C3.45 3 3 3.45 3 4zm12.95-1.6L11.7 6.64c-0.39 0.39-0.39 1.02 0 1.41l4.25 4.25c0.39 0.39 1.02 0.39 1.41 0l4.25-4.25c0.39-0.39 0.39-1.02 0-1.41L17.37 2.4c-0.39-0.39-1.03-0.39-1.42 0z" /> diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index 75721b465..56b6d99e1 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -39,7 +39,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" android:layout_gravity="bottom|end" - app:srcCompat="@drawable/ic_action_fetch_activity_data" + app:srcCompat="@drawable/ic_refresh" android:tint="@android:color/white" android:layout_margin="16dp" /> diff --git a/app/src/main/res/layout/activity_summary_details.xml b/app/src/main/res/layout/activity_summary_details.xml index c5c5a7b18..82c008d1b 100644 --- a/app/src/main/res/layout/activity_summary_details.xml +++ b/app/src/main/res/layout/activity_summary_details.xml @@ -63,7 +63,7 @@ android:layout_gravity="right" android:layout_weight="0.1" android:scaleType="fitEnd" - app:srcCompat="@drawable/ic_edit" /> + app:srcCompat="@drawable/ic_create" /> + card_view:srcCompat="@drawable/ic_create" /> + card_view:srcCompat="@drawable/ic_delete" /> + app:srcCompat="@drawable/ic_drag_handle" /> \ No newline at end of file diff --git a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml index 897c277da..6c3ba2af3 100644 --- a/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml +++ b/app/src/main/res/menu/activity_controlcenterv2_main_drawer.xml @@ -9,20 +9,21 @@ android:icon="@drawable/ic_settings" /> + android:icon="@drawable/ic_devices_other" /> + android:icon="@drawable/ic_pageview" /> + android:icon="@drawable/ic_block" /> + android:icon="@drawable/ic_power_settings_new" /> + android:icon="@drawable/ic_history" /> diff --git a/app/src/main/res/menu/activity_list_context_menu.xml b/app/src/main/res/menu/activity_list_context_menu.xml index 17b30864a..170760f5c 100644 --- a/app/src/main/res/menu/activity_list_context_menu.xml +++ b/app/src/main/res/menu/activity_list_context_menu.xml @@ -17,7 +17,7 @@ diff --git a/app/src/main/res/menu/activity_list_menu.xml b/app/src/main/res/menu/activity_list_menu.xml index 5a959b948..dbefb0960 100644 --- a/app/src/main/res/menu/activity_list_menu.xml +++ b/app/src/main/res/menu/activity_list_menu.xml @@ -4,12 +4,12 @@ diff --git a/app/src/main/res/xml/devicesettings_device_actions.xml b/app/src/main/res/xml/devicesettings_device_actions.xml index 5172a57ad..4f197f7ed 100644 --- a/app/src/main/res/xml/devicesettings_device_actions.xml +++ b/app/src/main/res/xml/devicesettings_device_actions.xml @@ -26,7 +26,7 @@ + android:icon="@drawable/ic_wb_sunny"> diff --git a/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml b/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml index c4d384e03..317b37252 100644 --- a/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml +++ b/app/src/main/res/xml/devicesettings_disconnectnotification_noshed.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml b/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml index f30f0ec42..7043596b7 100644 --- a/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml +++ b/app/src/main/res/xml/devicesettings_donotdisturb_no_auto.xml @@ -1,7 +1,7 @@