diff --git a/art/phone/application_call/call_add_W_M.png b/art/phone/application_call/call_add_W_M.png new file mode 100644 index 000000000..6966174cf Binary files /dev/null and b/art/phone/application_call/call_add_W_M.png differ diff --git a/art/phone/application_call/call_message.png b/art/phone/application_call/call_message.png deleted file mode 100644 index 54040a8fb..000000000 Binary files a/art/phone/application_call/call_message.png and /dev/null differ diff --git a/art/phone/application_call/call_message_W_M.png b/art/phone/application_call/call_message_W_M.png new file mode 100644 index 000000000..e19f8f0d1 Binary files /dev/null and b/art/phone/application_call/call_message_W_M.png differ diff --git a/art/phone/application_call/calllog_empty_128_W_G.png b/art/phone/application_call/calllog_empty_128_W_G.png new file mode 100644 index 000000000..cbdef563a Binary files /dev/null and b/art/phone/application_call/calllog_empty_128_W_G.png differ diff --git a/art/phone/application_call/callog_empty_W_G.png b/art/phone/application_call/callog_empty_W_G.png deleted file mode 100644 index 27326ffa0..000000000 Binary files a/art/phone/application_call/callog_empty_W_G.png and /dev/null differ diff --git a/art/phone/application_call/circle.svg b/art/phone/application_call/circle.svg deleted file mode 100644 index 40a505833..000000000 --- a/art/phone/application_call/circle.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/art/phone/application_call/error_W_G.png b/art/phone/application_call/error_W_G.png deleted file mode 100644 index 2be6be191..000000000 Binary files a/art/phone/application_call/error_W_G.png and /dev/null differ diff --git a/art/phone/application_desktop/menu/charging_battery_W_G.png b/art/phone/application_desktop/menu/charging_battery_W_G.png deleted file mode 100644 index 56a34cd60..000000000 Binary files a/art/phone/application_desktop/menu/charging_battery_W_G.png and /dev/null differ diff --git a/art/phone/application_desktop/menu/dead_battery_W_G.png b/art/phone/application_desktop/menu/dead_battery_W_G.png deleted file mode 100644 index 65b9f0b42..000000000 Binary files a/art/phone/application_desktop/menu/dead_battery_W_G.png and /dev/null differ diff --git a/art/phone/application_desktop/menu/menu_alarm_disabled_W_G.png b/art/phone/application_desktop/menu/menu_alarm_disabled_W_G.png new file mode 100644 index 000000000..e4ec0ec96 Binary files /dev/null and b/art/phone/application_desktop/menu/menu_alarm_disabled_W_G.png differ diff --git a/art/phone/application_desktop/menu/menu_calendar_W_G.png b/art/phone/application_desktop/menu/menu_calendar_W_G.png index 84fef6124..db1b17b3f 100644 Binary files a/art/phone/application_desktop/menu/menu_calendar_W_G.png and b/art/phone/application_desktop/menu/menu_calendar_W_G.png differ diff --git a/art/phone/application_desktop/menu/menu_meditation_W_G.png b/art/phone/application_desktop/menu/menu_meditation_W_G.png index 6c9c1010b..2fb67f8c3 100644 Binary files a/art/phone/application_desktop/menu/menu_meditation_W_G.png and b/art/phone/application_desktop/menu/menu_meditation_W_G.png differ diff --git a/art/phone/application_desktop/menu/menu_tools_torch_W_G.png b/art/phone/application_desktop/menu/menu_tools_torch_W_G.png new file mode 100644 index 000000000..c2a06a2fa Binary files /dev/null and b/art/phone/application_desktop/menu/menu_tools_torch_W_G.png differ diff --git a/art/phone/application_desktop/menu/turn_off_W_G.png b/art/phone/application_desktop/menu/turn_off_W_G.png deleted file mode 100644 index cf2c78fc9..000000000 Binary files a/art/phone/application_desktop/menu/turn_off_W_G.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery1_W_M.png b/art/phone/application_desktop/topbar/battery/battery1_W_M.png deleted file mode 100644 index a261c9f43..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery1_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery2_W_M.png b/art/phone/application_desktop/topbar/battery/battery2_W_M.png deleted file mode 100644 index 0b1d6d7cc..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery2_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery3_W_M.png b/art/phone/application_desktop/topbar/battery/battery3_W_M.png deleted file mode 100644 index 101b44a15..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery3_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery4_W_M.png b/art/phone/application_desktop/topbar/battery/battery4_W_M.png deleted file mode 100644 index e08d20864..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery4_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery5_W_M.png b/art/phone/application_desktop/topbar/battery/battery5_W_M.png deleted file mode 100644 index c163c99a4..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery5_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery_charging_W_M.png b/art/phone/application_desktop/topbar/battery/battery_charging_W_M.png deleted file mode 100644 index df545a246..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery_charging_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery_charging_ready_W_M.png b/art/phone/application_desktop/topbar/battery/battery_charging_ready_W_M.png deleted file mode 100644 index 8c4827806..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery_charging_ready_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/battery/battery_low_W_M.png b/art/phone/application_desktop/topbar/battery/battery_low_W_M.png deleted file mode 100644 index 05347c2f3..000000000 Binary files a/art/phone/application_desktop/topbar/battery/battery_low_W_M.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal0.png b/art/phone/application_desktop/topbar/signal/signal0.png deleted file mode 100644 index 9ca0fd270..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal0.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal0_roaming.png b/art/phone/application_desktop/topbar/signal/signal0_roaming.png deleted file mode 100644 index 5138d3d7b..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal0_roaming.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal1.png b/art/phone/application_desktop/topbar/signal/signal1.png deleted file mode 100644 index 9254d5af8..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal1.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal1_roaming.png b/art/phone/application_desktop/topbar/signal/signal1_roaming.png deleted file mode 100644 index 82fbcb696..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal1_roaming.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal2.png b/art/phone/application_desktop/topbar/signal/signal2.png deleted file mode 100644 index 26e3ed894..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal2.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal2_roaming.png b/art/phone/application_desktop/topbar/signal/signal2_roaming.png deleted file mode 100644 index f0e73a302..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal2_roaming.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal3.png b/art/phone/application_desktop/topbar/signal/signal3.png deleted file mode 100644 index 0560f5c17..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal3.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal3_roaming.png b/art/phone/application_desktop/topbar/signal/signal3_roaming.png deleted file mode 100644 index 622d4c34a..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal3_roaming.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal4.png b/art/phone/application_desktop/topbar/signal/signal4.png deleted file mode 100644 index 0e0687626..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal4.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal4_roaming.png b/art/phone/application_desktop/topbar/signal/signal4_roaming.png deleted file mode 100644 index 2a600c580..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal4_roaming.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/signal/signal_noconn.png b/art/phone/application_desktop/topbar/signal/signal_noconn.png deleted file mode 100644 index 88756da18..000000000 Binary files a/art/phone/application_desktop/topbar/signal/signal_noconn.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/sim/sim1.png b/art/phone/application_desktop/topbar/sim/sim1.png deleted file mode 100644 index 25e298385..000000000 Binary files a/art/phone/application_desktop/topbar/sim/sim1.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/sim/sim2.png b/art/phone/application_desktop/topbar/sim/sim2.png deleted file mode 100644 index 10c89a5a6..000000000 Binary files a/art/phone/application_desktop/topbar/sim/sim2.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/sim/sim_all.xcf b/art/phone/application_desktop/topbar/sim/sim_all.xcf deleted file mode 100644 index acd67818b..000000000 Binary files a/art/phone/application_desktop/topbar/sim/sim_all.xcf and /dev/null differ diff --git a/art/phone/application_desktop/topbar/sim/simfail.png b/art/phone/application_desktop/topbar/sim/simfail.png deleted file mode 100644 index 2e4c0d6b8..000000000 Binary files a/art/phone/application_desktop/topbar/sim/simfail.png and /dev/null differ diff --git a/art/phone/application_desktop/topbar/sim/simunknown.png b/art/phone/application_desktop/topbar/sim/simunknown.png deleted file mode 100644 index 21ddc1f94..000000000 Binary files a/art/phone/application_desktop/topbar/sim/simunknown.png and /dev/null differ diff --git a/art/phone/application_messages/messages_error_W_G.png b/art/phone/application_messages/messages_error_32px_W_G.png similarity index 100% rename from art/phone/application_messages/messages_error_W_G.png rename to art/phone/application_messages/messages_error_32px_W_G.png diff --git a/art/phone/application_messages/messages_error_W_M.png b/art/phone/application_messages/messages_error_32px_W_M.png similarity index 100% rename from art/phone/application_messages/messages_error_W_M.png rename to art/phone/application_messages/messages_error_32px_W_M.png diff --git a/art/phone/application_messages/messages_reply.png b/art/phone/application_messages/messages_reply_32px_W_M.png similarity index 100% rename from art/phone/application_messages/messages_reply.png rename to art/phone/application_messages/messages_reply_32px_W_M.png diff --git a/art/phone/application_messages/phonebook_empty_grey_circle_W_G.png b/art/phone/application_messages/phonebook_empty_grey_circle_W_G.png deleted file mode 100644 index 6b54bed91..000000000 Binary files a/art/phone/application_messages/phonebook_empty_grey_circle_W_G.png and /dev/null differ diff --git a/art/phone/application_onboarding/Info.png b/art/phone/application_onboarding/Info.png deleted file mode 100644 index ab0d6081e..000000000 Binary files a/art/phone/application_onboarding/Info.png and /dev/null differ diff --git a/art/phone/application_onboarding/Success.png b/art/phone/application_onboarding/Success.png deleted file mode 100644 index 2020e4ea1..000000000 Binary files a/art/phone/application_onboarding/Success.png and /dev/null differ diff --git a/art/phone/application_onboarding/Update.png b/art/phone/application_onboarding/Update.png deleted file mode 100644 index 346d13eb7..000000000 Binary files a/art/phone/application_onboarding/Update.png and /dev/null differ diff --git a/art/phone/application_onboarding/sim1_option.png b/art/phone/application_onboarding/sim1_option_32px_W_G.png similarity index 100% rename from art/phone/application_onboarding/sim1_option.png rename to art/phone/application_onboarding/sim1_option_32px_W_G.png diff --git a/art/phone/application_onboarding/sim2_option.png b/art/phone/application_onboarding/sim2_option_32px_W_G.png similarity index 100% rename from art/phone/application_onboarding/sim2_option.png rename to art/phone/application_onboarding/sim2_option_32px_W_G.png diff --git a/art/phone/application_phonebook/phonebook_arrow_left.png b/art/phone/application_phonebook/phonebook_arrow_left.png deleted file mode 100644 index 6a3ce62d0..000000000 Binary files a/art/phone/application_phonebook/phonebook_arrow_left.png and /dev/null differ diff --git a/art/phone/application_phonebook/phonebook_arrow_left.svg b/art/phone/application_phonebook/phonebook_arrow_left.svg deleted file mode 100644 index ae5525768..000000000 --- a/art/phone/application_phonebook/phonebook_arrow_left.svg +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/art/phone/application_phonebook/phonebook_arrow_right.png b/art/phone/application_phonebook/phonebook_arrow_right.png deleted file mode 100644 index f59f4afa0..000000000 Binary files a/art/phone/application_phonebook/phonebook_arrow_right.png and /dev/null differ diff --git a/art/phone/application_phonebook/phonebook_arrow_right.svg b/art/phone/application_phonebook/phonebook_arrow_right.svg deleted file mode 100644 index 202b45962..000000000 --- a/art/phone/application_phonebook/phonebook_arrow_right.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/art/phone/application_phonebook/phonebook_blocked_32px_W_G.png b/art/phone/application_phonebook/phonebook_blocked_32px_W_G.png new file mode 100644 index 000000000..99341c755 Binary files /dev/null and b/art/phone/application_phonebook/phonebook_blocked_32px_W_G.png differ diff --git a/art/phone/application_phonebook/phonebook_cross.png b/art/phone/application_phonebook/phonebook_cross.png deleted file mode 100644 index d750c5725..000000000 Binary files a/art/phone/application_phonebook/phonebook_cross.png and /dev/null differ diff --git a/art/phone/application_phonebook/phonebook_cross.svg b/art/phone/application_phonebook/phonebook_cross.svg deleted file mode 100644 index 277c5d4ec..000000000 --- a/art/phone/application_phonebook/phonebook_cross.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/art/phone/application_phonebook/small_heart_W_M.png b/art/phone/application_phonebook/phonebook_heart_32px_W_M.png similarity index 100% rename from art/phone/application_phonebook/small_heart_W_M.png rename to art/phone/application_phonebook/phonebook_heart_32px_W_M.png diff --git a/art/phone/application_phonebook/phonebook_search.png b/art/phone/application_phonebook/phonebook_search.png deleted file mode 100644 index 95eedc11d..000000000 Binary files a/art/phone/application_phonebook/phonebook_search.png and /dev/null differ diff --git a/art/phone/application_phonebook/phonebook_search.svg b/art/phone/application_phonebook/phonebook_search.svg deleted file mode 100644 index a0ddf7fec..000000000 --- a/art/phone/application_phonebook/phonebook_search.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/art/phone/application_phonebook/phonebook_small.png b/art/phone/application_phonebook/phonebook_small.png deleted file mode 100644 index bf97c61b2..000000000 Binary files a/art/phone/application_phonebook/phonebook_small.png and /dev/null differ diff --git a/art/phone/application_phonebook/phonebook_speed_dial_32px_W_G.png b/art/phone/application_phonebook/phonebook_speed_dial_32px_W_G.png new file mode 100644 index 000000000..464cca10d Binary files /dev/null and b/art/phone/application_phonebook/phonebook_speed_dial_32px_W_G.png differ diff --git a/art/phone/application_phonebook/small_circle.png b/art/phone/application_phonebook/small_circle.png deleted file mode 100644 index cebc31526..000000000 Binary files a/art/phone/application_phonebook/small_circle.png and /dev/null differ diff --git a/art/phone/application_phonebook/small_circle.svg b/art/phone/application_phonebook/small_circle.svg deleted file mode 100644 index a313e131e..000000000 --- a/art/phone/application_phonebook/small_circle.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/art/phone/application_phonebook/small_heart.svg b/art/phone/application_phonebook/small_heart.svg deleted file mode 100644 index 7d62a93e7..000000000 --- a/art/phone/application_phonebook/small_heart.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/art/phone/application_phonebook/small_tick.svg b/art/phone/application_phonebook/small_tick.svg deleted file mode 100644 index 2ad4eacd9..000000000 --- a/art/phone/application_phonebook/small_tick.svg +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/art/phone/application_phonebook/speed_dial_empty_W_G.png b/art/phone/application_phonebook/speed_dial_empty_W_G.png deleted file mode 100644 index 5d0903a73..000000000 Binary files a/art/phone/application_phonebook/speed_dial_empty_W_G.png and /dev/null differ diff --git a/art/phone/application_phonebook/speed_dial_empty_W_M.png b/art/phone/application_phonebook/speed_dial_empty_W_M.png deleted file mode 100644 index a159aa0e3..000000000 Binary files a/art/phone/application_phonebook/speed_dial_empty_W_M.png and /dev/null differ diff --git a/art/phone/common/call_32px_W_G.png b/art/phone/common/call_32px_W_G.png new file mode 100644 index 000000000..1d4e1386d Binary files /dev/null and b/art/phone/common/call_32px_W_G.png differ diff --git a/art/phone/random/enter_icon_alpha_W_M.png b/art/phone/common/enter_icon_alpha_W_M.png similarity index 100% rename from art/phone/random/enter_icon_alpha_W_M.png rename to art/phone/common/enter_icon_alpha_W_M.png diff --git a/art/phone/common/ice_32px_W_G.png b/art/phone/common/ice_32px_W_G.png new file mode 100644 index 000000000..c4c84dcdc Binary files /dev/null and b/art/phone/common/ice_32px_W_G.png differ diff --git a/art/phone/common/info_big_circle_W_G.png b/art/phone/common/info_big_circle_W_G.png deleted file mode 100644 index 4bb4a9130..000000000 Binary files a/art/phone/common/info_big_circle_W_G.png and /dev/null differ diff --git a/art/phone/common/info_icon_W_G.png b/art/phone/common/info_icon_W_G.png deleted file mode 100644 index ab0d6081e..000000000 Binary files a/art/phone/common/info_icon_W_G.png and /dev/null differ diff --git a/art/phone/common/left_label_arrow.svg b/art/phone/common/left_label_arrow.svg deleted file mode 100644 index e240d72b0..000000000 --- a/art/phone/common/left_label_arrow.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/art/phone/common/messages_32px_W_G.png b/art/phone/common/messages_32px_W_G.png new file mode 100644 index 000000000..46e593c31 Binary files /dev/null and b/art/phone/common/messages_32px_W_G.png differ diff --git a/art/phone/common/phonebook_32px_W_G.png b/art/phone/common/phonebook_32px_W_G.png new file mode 100644 index 000000000..46df20767 Binary files /dev/null and b/art/phone/common/phonebook_32px_W_G.png differ diff --git a/art/phone/common/plus_32px_W_M.png b/art/phone/common/plus_32px_W_M.png new file mode 100644 index 000000000..f4ad3ed95 Binary files /dev/null and b/art/phone/common/plus_32px_W_M.png differ diff --git a/art/phone/common/png/btn_off.png b/art/phone/common/png/btn_off.png deleted file mode 100644 index ec80f2eb7..000000000 Binary files a/art/phone/common/png/btn_off.png and /dev/null differ diff --git a/art/phone/common/png/btn_on.png b/art/phone/common/png/btn_on.png deleted file mode 100644 index 006e6276d..000000000 Binary files a/art/phone/common/png/btn_on.png and /dev/null differ diff --git a/art/phone/common/png/left_label_arrow.png b/art/phone/common/png/left_label_arrow.png deleted file mode 100644 index a8c6d2c35..000000000 Binary files a/art/phone/common/png/left_label_arrow.png and /dev/null differ diff --git a/art/phone/common/png/right_label_arrow.png b/art/phone/common/png/right_label_arrow.png deleted file mode 100644 index e06df9d8c..000000000 Binary files a/art/phone/common/png/right_label_arrow.png and /dev/null differ diff --git a/art/phone/common/png/right_label_arrow_border.png b/art/phone/common/png/right_label_arrow_border.png deleted file mode 100644 index 7b695f33a..000000000 Binary files a/art/phone/common/png/right_label_arrow_border.png and /dev/null differ diff --git a/art/phone/common/right_label_arrow.svg b/art/phone/common/right_label_arrow.svg deleted file mode 100644 index 14d3a2952..000000000 --- a/art/phone/common/right_label_arrow.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/art/phone/common/search_32px_W_G.png b/art/phone/common/search_32px_W_G.png index e8e49c4e4..e83339494 100644 Binary files a/art/phone/common/search_32px_W_G.png and b/art/phone/common/search_32px_W_G.png differ diff --git a/art/phone/common/sim_card_W_G.png b/art/phone/common/sim_card_W_G.png deleted file mode 100644 index fcaaded06..000000000 Binary files a/art/phone/common/sim_card_W_G.png and /dev/null differ diff --git a/art/phone/application_phonebook/small_tick_W_G.png b/art/phone/common/small_tick_W_G.png similarity index 100% rename from art/phone/application_phonebook/small_tick_W_G.png rename to art/phone/common/small_tick_W_G.png diff --git a/art/phone/application_phonebook/small_tick_W_M.png b/art/phone/common/small_tick_W_M.png similarity index 100% rename from art/phone/application_phonebook/small_tick_W_M.png rename to art/phone/common/small_tick_W_M.png diff --git a/art/phone/common/unlock_icon_W_G.png b/art/phone/common/unlock_icon_W_G.png deleted file mode 100644 index 0a878726b..000000000 Binary files a/art/phone/common/unlock_icon_W_G.png and /dev/null differ diff --git a/art/phone/home_notifications/._Icon_ b/art/phone/home_notifications/._Icon_ deleted file mode 100644 index 148fcf3b5..000000000 Binary files a/art/phone/home_notifications/._Icon_ and /dev/null differ diff --git a/art/phone/home_notifications/alarm_notification_icon.png b/art/phone/home_notifications/alarm_notification_icon_W_G.png similarity index 100% rename from art/phone/home_notifications/alarm_notification_icon.png rename to art/phone/home_notifications/alarm_notification_icon_W_G.png diff --git a/art/phone/home_notifications/calls_notification_icon.png b/art/phone/home_notifications/calls_notification_icon_W_G.png similarity index 100% rename from art/phone/home_notifications/calls_notification_icon.png rename to art/phone/home_notifications/calls_notification_icon_W_G.png diff --git a/art/phone/home_notifications/messages_notification_icon.png b/art/phone/home_notifications/messages_notification_icon_W_G.png similarity index 100% rename from art/phone/home_notifications/messages_notification_icon.png rename to art/phone/home_notifications/messages_notification_icon_W_G.png diff --git a/art/phone/home_notifications/now_playing_notification_icon.png b/art/phone/home_notifications/now_playing_notification_icon_W_G.png similarity index 100% rename from art/phone/home_notifications/now_playing_notification_icon.png rename to art/phone/home_notifications/now_playing_notification_icon_W_G.png diff --git a/art/phone/home_notifications/tethering_notification_icon.png b/art/phone/home_notifications/tethering_notification_icon_W_G.png similarity index 100% rename from art/phone/home_notifications/tethering_notification_icon.png rename to art/phone/home_notifications/tethering_notification_icon_W_G.png diff --git a/art/phone/notifications/block_128px_W_G.png b/art/phone/notifications/block_128px_W_G.png new file mode 100644 index 000000000..c3ac368fe Binary files /dev/null and b/art/phone/notifications/block_128px_W_G.png differ diff --git a/art/phone/notifications/bluetooth_128px_W_G.png b/art/phone/notifications/bluetooth_128px_W_G.png new file mode 100644 index 000000000..94878c680 Binary files /dev/null and b/art/phone/notifications/bluetooth_128px_W_G.png differ diff --git a/art/phone/notifications/delete_128px_W_G.png b/art/phone/notifications/delete_128px_W_G.png new file mode 100644 index 000000000..fcdddc4e4 Binary files /dev/null and b/art/phone/notifications/delete_128px_W_G.png differ diff --git a/art/phone/notifications/error_128px_W_G.png b/art/phone/notifications/error_128px_W_G.png new file mode 100644 index 000000000..b56523e5e Binary files /dev/null and b/art/phone/notifications/error_128px_W_G.png differ diff --git a/art/phone/notifications/fail_128px_W_G.png b/art/phone/notifications/fail_128px_W_G.png new file mode 100644 index 000000000..f1ca29d52 Binary files /dev/null and b/art/phone/notifications/fail_128px_W_G.png differ diff --git a/art/phone/notifications/info_128px_W_G.png b/art/phone/notifications/info_128px_W_G.png new file mode 100644 index 000000000..09080f429 Binary files /dev/null and b/art/phone/notifications/info_128px_W_G.png differ diff --git a/art/phone/notifications/lock_128px_W_G.png b/art/phone/notifications/lock_128px_W_G.png new file mode 100644 index 000000000..c4bfa6e46 Binary files /dev/null and b/art/phone/notifications/lock_128px_W_G.png differ diff --git a/art/phone/notifications/progress_128px_W_G.png b/art/phone/notifications/progress_128px_W_G.png new file mode 100644 index 000000000..c1922b15d Binary files /dev/null and b/art/phone/notifications/progress_128px_W_G.png differ diff --git a/art/phone/notifications/search_128px_W_G.png b/art/phone/notifications/search_128px_W_G.png new file mode 100644 index 000000000..f5e264cd4 Binary files /dev/null and b/art/phone/notifications/search_128px_W_G.png differ diff --git a/art/phone/notifications/sim_128px_W_G.png b/art/phone/notifications/sim_128px_W_G.png new file mode 100644 index 000000000..b12094f97 Binary files /dev/null and b/art/phone/notifications/sim_128px_W_G.png differ diff --git a/art/phone/notifications/success_128px_W_G.png b/art/phone/notifications/success_128px_W_G.png new file mode 100644 index 000000000..cb1f4674f Binary files /dev/null and b/art/phone/notifications/success_128px_W_G.png differ diff --git a/art/phone/notifications/tethering_128px_W_G.png b/art/phone/notifications/tethering_128px_W_G.png new file mode 100644 index 000000000..b9b0bc495 Binary files /dev/null and b/art/phone/notifications/tethering_128px_W_G.png differ diff --git a/art/phone/notifications/turn_off_128px_W_G.png b/art/phone/notifications/turn_off_128px_W_G.png new file mode 100644 index 000000000..180788de8 Binary files /dev/null and b/art/phone/notifications/turn_off_128px_W_G.png differ diff --git a/art/phone/speaker_off.svg b/art/phone/speaker_off.svg deleted file mode 100644 index 1bdebd49d..000000000 --- a/art/phone/speaker_off.svg +++ /dev/null @@ -1,1323 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/art/phone/speaker_on.svg b/art/phone/speaker_on.svg deleted file mode 100644 index 481e24e49..000000000 --- a/art/phone/speaker_on.svg +++ /dev/null @@ -1,1323 +0,0 @@ - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/image/assets/images/snooze_icon_W_G.vpi b/image/assets/images/alarm/snooze_icon_W_G.vpi similarity index 100% rename from image/assets/images/snooze_icon_W_G.vpi rename to image/assets/images/alarm/snooze_icon_W_G.vpi diff --git a/image/assets/images/vertical_arcs_W_G.vpi b/image/assets/images/alarm/vertical_arcs_W_G.vpi similarity index 100% rename from image/assets/images/vertical_arcs_W_G.vpi rename to image/assets/images/alarm/vertical_arcs_W_G.vpi diff --git a/image/assets/images/arrow_left.vpi b/image/assets/images/arrow_left_20px_W_M.vpi similarity index 100% rename from image/assets/images/arrow_left.vpi rename to image/assets/images/arrow_left_20px_W_M.vpi diff --git a/image/assets/images/arrow_right.vpi b/image/assets/images/arrow_right_20px_W_M.vpi similarity index 100% rename from image/assets/images/arrow_right.vpi rename to image/assets/images/arrow_right_20px_W_M.vpi diff --git a/image/assets/images/battery1_W_M.vpi b/image/assets/images/battery1_W_M.vpi deleted file mode 100644 index c678451b6..000000000 Binary files a/image/assets/images/battery1_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery2_W_M.vpi b/image/assets/images/battery2_W_M.vpi deleted file mode 100644 index eb1368cdd..000000000 Binary files a/image/assets/images/battery2_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery3_W_M.vpi b/image/assets/images/battery3_W_M.vpi deleted file mode 100644 index 620cc6cbc..000000000 Binary files a/image/assets/images/battery3_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery4_W_M.vpi b/image/assets/images/battery4_W_M.vpi deleted file mode 100644 index 34d0b2eac..000000000 Binary files a/image/assets/images/battery4_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery5_W_M.vpi b/image/assets/images/battery5_W_M.vpi deleted file mode 100644 index 81b6f112e..000000000 Binary files a/image/assets/images/battery5_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery_charging_W_M.vpi b/image/assets/images/battery_charging_W_M.vpi deleted file mode 100644 index 0e9d5c1bd..000000000 Binary files a/image/assets/images/battery_charging_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery_charging_ready_W_M.vpi b/image/assets/images/battery_charging_ready_W_M.vpi deleted file mode 100644 index 975c59fe2..000000000 Binary files a/image/assets/images/battery_charging_ready_W_M.vpi and /dev/null differ diff --git a/image/assets/images/battery_low_W_M.vpi b/image/assets/images/battery_low_W_M.vpi deleted file mode 100644 index 274a214ab..000000000 Binary files a/image/assets/images/battery_low_W_M.vpi and /dev/null differ diff --git a/image/assets/images/circle_success_big.vpi b/image/assets/images/bell/circle_success_big.vpi similarity index 100% rename from image/assets/images/circle_success_big.vpi rename to image/assets/images/bell/circle_success_big.vpi diff --git a/image/assets/images/block.mpi b/image/assets/images/block.mpi deleted file mode 100644 index b8e0e2913..000000000 Binary files a/image/assets/images/block.mpi and /dev/null differ diff --git a/image/assets/images/block_W_G.vpi b/image/assets/images/block_W_G.vpi deleted file mode 100644 index 7dab005b1..000000000 Binary files a/image/assets/images/block_W_G.vpi and /dev/null differ diff --git a/image/assets/images/Bluetooth_small.vpi b/image/assets/images/bluetooth_32px_W_M.vpi similarity index 100% rename from image/assets/images/Bluetooth_small.vpi rename to image/assets/images/bluetooth_32px_W_M.vpi diff --git a/image/assets/images/bluetooth_W_G.vpi b/image/assets/images/bluetooth_W_G.vpi deleted file mode 100644 index 72261dd60..000000000 Binary files a/image/assets/images/bluetooth_W_G.vpi and /dev/null differ diff --git a/image/assets/images/btn_off.vpi b/image/assets/images/btn_off.vpi deleted file mode 100644 index 93d5642fa..000000000 Binary files a/image/assets/images/btn_off.vpi and /dev/null differ diff --git a/image/assets/images/btn_on.vpi b/image/assets/images/btn_on.vpi deleted file mode 100644 index 269feb506..000000000 Binary files a/image/assets/images/btn_on.vpi and /dev/null differ diff --git a/image/assets/images/event_dot.vpi b/image/assets/images/calendar_event_dot.vpi similarity index 100% rename from image/assets/images/event_dot.vpi rename to image/assets/images/calendar_event_dot.vpi diff --git a/image/assets/images/call/call_add_W_M.vpi b/image/assets/images/call/call_add_W_M.vpi new file mode 100644 index 000000000..1c6350367 Binary files /dev/null and b/image/assets/images/call/call_add_W_M.vpi differ diff --git a/image/assets/images/call_message_W_M.vpi b/image/assets/images/call/call_message_W_M.vpi similarity index 100% rename from image/assets/images/call_message_W_M.vpi rename to image/assets/images/call/call_message_W_M.vpi diff --git a/image/assets/images/call_mute_W_M.vpi b/image/assets/images/call/call_mute_W_M.vpi similarity index 100% rename from image/assets/images/call_mute_W_M.vpi rename to image/assets/images/call/call_mute_W_M.vpi diff --git a/image/assets/images/call_mute_on_W_M.vpi b/image/assets/images/call/call_mute_on_W_M.vpi similarity index 100% rename from image/assets/images/call_mute_on_W_M.vpi rename to image/assets/images/call/call_mute_on_W_M.vpi diff --git a/image/assets/images/call_speaker_W_M.vpi b/image/assets/images/call/call_speaker_W_M.vpi similarity index 100% rename from image/assets/images/call_speaker_W_M.vpi rename to image/assets/images/call/call_speaker_W_M.vpi diff --git a/image/assets/images/call_speaker_on_W_M.vpi b/image/assets/images/call/call_speaker_on_W_M.vpi similarity index 100% rename from image/assets/images/call_speaker_on_W_M.vpi rename to image/assets/images/call/call_speaker_on_W_M.vpi diff --git a/image/assets/images/circle_bottom.mpi b/image/assets/images/call/circle_bottom.mpi similarity index 100% rename from image/assets/images/circle_bottom.mpi rename to image/assets/images/call/circle_bottom.mpi diff --git a/image/assets/images/circle_top.mpi b/image/assets/images/call/circle_top.mpi similarity index 100% rename from image/assets/images/circle_top.mpi rename to image/assets/images/call/circle_top.mpi diff --git a/image/assets/images/call_32px_W_G.vpi b/image/assets/images/call_32px_W_G.vpi new file mode 100644 index 000000000..ea04581fc Binary files /dev/null and b/image/assets/images/call_32px_W_G.vpi differ diff --git a/image/assets/images/call_message.vpi b/image/assets/images/call_message.vpi deleted file mode 100644 index 4dc675b6e..000000000 Binary files a/image/assets/images/call_message.vpi and /dev/null differ diff --git a/image/assets/images/calllog_arrow_den_W_G.vpi b/image/assets/images/calllog/calllog_arrow_den_W_G.vpi similarity index 100% rename from image/assets/images/calllog_arrow_den_W_G.vpi rename to image/assets/images/calllog/calllog_arrow_den_W_G.vpi diff --git a/image/assets/images/calllog_arrow_den_W_M.vpi b/image/assets/images/calllog/calllog_arrow_den_W_M.vpi similarity index 100% rename from image/assets/images/calllog_arrow_den_W_M.vpi rename to image/assets/images/calllog/calllog_arrow_den_W_M.vpi diff --git a/image/assets/images/calllog_arrow_in_W_G.vpi b/image/assets/images/calllog/calllog_arrow_in_W_G.vpi similarity index 100% rename from image/assets/images/calllog_arrow_in_W_G.vpi rename to image/assets/images/calllog/calllog_arrow_in_W_G.vpi diff --git a/image/assets/images/calllog_arrow_in_W_M.vpi b/image/assets/images/calllog/calllog_arrow_in_W_M.vpi similarity index 100% rename from image/assets/images/calllog_arrow_in_W_M.vpi rename to image/assets/images/calllog/calllog_arrow_in_W_M.vpi diff --git a/image/assets/images/calllog_arrow_out_W_G.vpi b/image/assets/images/calllog/calllog_arrow_out_W_G.vpi similarity index 100% rename from image/assets/images/calllog_arrow_out_W_G.vpi rename to image/assets/images/calllog/calllog_arrow_out_W_G.vpi diff --git a/image/assets/images/calllog_arrow_out_W_M.vpi b/image/assets/images/calllog/calllog_arrow_out_W_M.vpi similarity index 100% rename from image/assets/images/calllog_arrow_out_W_M.vpi rename to image/assets/images/calllog/calllog_arrow_out_W_M.vpi diff --git a/image/assets/images/calllog/calllog_empty_128px_W_G.vpi b/image/assets/images/calllog/calllog_empty_128px_W_G.vpi new file mode 100644 index 000000000..f0fa95993 Binary files /dev/null and b/image/assets/images/calllog/calllog_empty_128px_W_G.vpi differ diff --git a/image/assets/images/callog_empty_W_G.vpi b/image/assets/images/callog_empty_W_G.vpi deleted file mode 100644 index 3291d5455..000000000 Binary files a/image/assets/images/callog_empty_W_G.vpi and /dev/null differ diff --git a/image/assets/images/circle_success.vpi b/image/assets/images/circle_success.vpi deleted file mode 100644 index eac7e76dc..000000000 Binary files a/image/assets/images/circle_success.vpi and /dev/null differ diff --git a/image/assets/images/circle_update.vpi b/image/assets/images/circle_update.vpi deleted file mode 100644 index d7feae64e..000000000 Binary files a/image/assets/images/circle_update.vpi and /dev/null differ diff --git a/image/assets/images/cross.vpi b/image/assets/images/cross.vpi deleted file mode 100644 index 9a34ec482..000000000 Binary files a/image/assets/images/cross.vpi and /dev/null differ diff --git a/image/assets/images/cross_W_M.vpi b/image/assets/images/cross_W_M.vpi deleted file mode 100644 index 9a34ec482..000000000 Binary files a/image/assets/images/cross_W_M.vpi and /dev/null differ diff --git a/image/assets/images/menu_alarm_W_G.vpi b/image/assets/images/desktop-menu/menu_alarm_W_G.vpi similarity index 100% rename from image/assets/images/menu_alarm_W_G.vpi rename to image/assets/images/desktop-menu/menu_alarm_W_G.vpi diff --git a/image/assets/images/alarm_icon_disabled.vpi b/image/assets/images/desktop-menu/menu_alarm_disabled_W_G.vpi similarity index 100% rename from image/assets/images/alarm_icon_disabled.vpi rename to image/assets/images/desktop-menu/menu_alarm_disabled_W_G.vpi diff --git a/image/assets/images/menu_calendar_W_G.vpi b/image/assets/images/desktop-menu/menu_calendar_W_G.vpi similarity index 100% rename from image/assets/images/menu_calendar_W_G.vpi rename to image/assets/images/desktop-menu/menu_calendar_W_G.vpi diff --git a/image/assets/images/menu_contacts_W_G.vpi b/image/assets/images/desktop-menu/menu_contacts_W_G.vpi similarity index 100% rename from image/assets/images/menu_contacts_W_G.vpi rename to image/assets/images/desktop-menu/menu_contacts_W_G.vpi diff --git a/image/assets/images/menu_meditation_W_G.vpi b/image/assets/images/desktop-menu/menu_meditation_W_G.vpi similarity index 100% rename from image/assets/images/menu_meditation_W_G.vpi rename to image/assets/images/desktop-menu/menu_meditation_W_G.vpi diff --git a/image/assets/images/menu_messages_W_G.vpi b/image/assets/images/desktop-menu/menu_messages_W_G.vpi similarity index 100% rename from image/assets/images/menu_messages_W_G.vpi rename to image/assets/images/desktop-menu/menu_messages_W_G.vpi diff --git a/image/assets/images/menu_music_player_W_G.vpi b/image/assets/images/desktop-menu/menu_music_player_W_G.vpi similarity index 100% rename from image/assets/images/menu_music_player_W_G.vpi rename to image/assets/images/desktop-menu/menu_music_player_W_G.vpi diff --git a/image/assets/images/menu_phone_W_G.vpi b/image/assets/images/desktop-menu/menu_phone_W_G.vpi similarity index 100% rename from image/assets/images/menu_phone_W_G.vpi rename to image/assets/images/desktop-menu/menu_phone_W_G.vpi diff --git a/image/assets/images/menu_settings_W_G.vpi b/image/assets/images/desktop-menu/menu_settings_W_G.vpi similarity index 100% rename from image/assets/images/menu_settings_W_G.vpi rename to image/assets/images/desktop-menu/menu_settings_W_G.vpi diff --git a/image/assets/images/menu_tools_W_G.vpi b/image/assets/images/desktop-menu/menu_tools_W_G.vpi similarity index 100% rename from image/assets/images/menu_tools_W_G.vpi rename to image/assets/images/desktop-menu/menu_tools_W_G.vpi diff --git a/image/assets/images/menu_tools_calculator_W_G.vpi b/image/assets/images/desktop-menu/menu_tools_calculator_W_G.vpi similarity index 100% rename from image/assets/images/menu_tools_calculator_W_G.vpi rename to image/assets/images/desktop-menu/menu_tools_calculator_W_G.vpi diff --git a/image/assets/images/menu_tools_notes_W_G.vpi b/image/assets/images/desktop-menu/menu_tools_notes_W_G.vpi similarity index 100% rename from image/assets/images/menu_tools_notes_W_G.vpi rename to image/assets/images/desktop-menu/menu_tools_notes_W_G.vpi diff --git a/image/assets/images/menu_tools_recorder_W_G.vpi b/image/assets/images/desktop-menu/menu_tools_recorder_W_G.vpi similarity index 100% rename from image/assets/images/menu_tools_recorder_W_G.vpi rename to image/assets/images/desktop-menu/menu_tools_recorder_W_G.vpi diff --git a/image/assets/images/desktop-menu/menu_tools_torch_W_G.vpi b/image/assets/images/desktop-menu/menu_tools_torch_W_G.vpi new file mode 100644 index 000000000..ff2536727 Binary files /dev/null and b/image/assets/images/desktop-menu/menu_tools_torch_W_G.vpi differ diff --git a/image/assets/images/alarm_notification_icon.vpi b/image/assets/images/desktop-notifications/alarm_notification_icon_W_G.vpi similarity index 100% rename from image/assets/images/alarm_notification_icon.vpi rename to image/assets/images/desktop-notifications/alarm_notification_icon_W_G.vpi diff --git a/image/assets/images/calls_notification_icon.vpi b/image/assets/images/desktop-notifications/calls_notification_icon_W_G.vpi similarity index 100% rename from image/assets/images/calls_notification_icon.vpi rename to image/assets/images/desktop-notifications/calls_notification_icon_W_G.vpi diff --git a/image/assets/images/lock_notification_icon_W_G.vpi b/image/assets/images/desktop-notifications/lock_notification_icon_W_G.vpi similarity index 100% rename from image/assets/images/lock_notification_icon_W_G.vpi rename to image/assets/images/desktop-notifications/lock_notification_icon_W_G.vpi diff --git a/image/assets/images/messages_notification_icon.vpi b/image/assets/images/desktop-notifications/messages_notification_icon_W_G.vpi similarity index 100% rename from image/assets/images/messages_notification_icon.vpi rename to image/assets/images/desktop-notifications/messages_notification_icon_W_G.vpi diff --git a/image/assets/images/now_playing_notification_icon.vpi b/image/assets/images/desktop-notifications/now_playing_notification_icon_W_G.vpi similarity index 100% rename from image/assets/images/now_playing_notification_icon.vpi rename to image/assets/images/desktop-notifications/now_playing_notification_icon_W_G.vpi diff --git a/image/assets/images/tethering_notification_icon.vpi b/image/assets/images/desktop-notifications/tethering_notification_icon_W_G.vpi similarity index 100% rename from image/assets/images/tethering_notification_icon.vpi rename to image/assets/images/desktop-notifications/tethering_notification_icon_W_G.vpi diff --git a/image/assets/images/error_W_G.vpi b/image/assets/images/error_W_G.vpi deleted file mode 100644 index 2ad368ba9..000000000 Binary files a/image/assets/images/error_W_G.vpi and /dev/null differ diff --git a/image/assets/images/homescreen-locked.vpi b/image/assets/images/homescreen-locked.vpi deleted file mode 100644 index 7480f36c1..000000000 Binary files a/image/assets/images/homescreen-locked.vpi and /dev/null differ diff --git a/image/assets/images/homescreen_lock.mpi b/image/assets/images/homescreen_lock.mpi deleted file mode 100644 index 8e8b0dc00..000000000 Binary files a/image/assets/images/homescreen_lock.mpi and /dev/null differ diff --git a/image/assets/images/ice.vpi b/image/assets/images/ice.vpi deleted file mode 100644 index e7b69da89..000000000 Binary files a/image/assets/images/ice.vpi and /dev/null differ diff --git a/image/assets/images/ice_32px_W_G.vpi b/image/assets/images/ice_32px_W_G.vpi new file mode 100644 index 000000000..32a557a27 Binary files /dev/null and b/image/assets/images/ice_32px_W_G.vpi differ diff --git a/image/assets/images/info_big_circle_W_G.vpi b/image/assets/images/info_big_circle_W_G.vpi deleted file mode 100644 index 149c9c7a3..000000000 Binary files a/image/assets/images/info_big_circle_W_G.vpi and /dev/null differ diff --git a/image/assets/images/info_icon_W_G.vpi b/image/assets/images/info_icon_W_G.vpi deleted file mode 100644 index 8d1db4ff2..000000000 Binary files a/image/assets/images/info_icon_W_G.vpi and /dev/null differ diff --git a/image/assets/images/Rectangle.vpi b/image/assets/images/label_rectangle_W_M.vpi similarity index 100% rename from image/assets/images/Rectangle.vpi rename to image/assets/images/label_rectangle_W_M.vpi diff --git a/image/assets/images/left_label_arrow.vpi b/image/assets/images/left_label_arrow.vpi deleted file mode 100644 index 0da2cce7c..000000000 Binary files a/image/assets/images/left_label_arrow.vpi and /dev/null differ diff --git a/image/assets/images/lock.vpi b/image/assets/images/lock.vpi deleted file mode 100644 index 85b9f4470..000000000 Binary files a/image/assets/images/lock.vpi and /dev/null differ diff --git a/image/assets/images/logo.vpi b/image/assets/images/logo.vpi deleted file mode 100644 index 57aeb1609..000000000 Binary files a/image/assets/images/logo.vpi and /dev/null differ diff --git a/image/assets/images/messages_error_W_M.vpi b/image/assets/images/messages/messages_error_32px_W_M.vpi similarity index 100% rename from image/assets/images/messages_error_W_M.vpi rename to image/assets/images/messages/messages_error_32px_W_M.vpi diff --git a/image/assets/images/messages_reply.vpi b/image/assets/images/messages/messages_reply_32px_W_M.vpi similarity index 100% rename from image/assets/images/messages_reply.vpi rename to image/assets/images/messages/messages_reply_32px_W_M.vpi diff --git a/image/assets/images/messages_32px_W_G.vpi b/image/assets/images/messages_32px_W_G.vpi new file mode 100644 index 000000000..e5bb70c85 Binary files /dev/null and b/image/assets/images/messages_32px_W_G.vpi differ diff --git a/image/assets/images/notifications/block_128px_W_G.vpi b/image/assets/images/notifications/block_128px_W_G.vpi new file mode 100644 index 000000000..53df65b46 Binary files /dev/null and b/image/assets/images/notifications/block_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/bluetooth_128px_W_G.vpi b/image/assets/images/notifications/bluetooth_128px_W_G.vpi new file mode 100644 index 000000000..5514bbb05 Binary files /dev/null and b/image/assets/images/notifications/bluetooth_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/delete_128px_W_G.vpi b/image/assets/images/notifications/delete_128px_W_G.vpi new file mode 100644 index 000000000..821b96a25 Binary files /dev/null and b/image/assets/images/notifications/delete_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/error_128px_W_G.vpi b/image/assets/images/notifications/error_128px_W_G.vpi new file mode 100644 index 000000000..701e46edc Binary files /dev/null and b/image/assets/images/notifications/error_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/fail_128px_W_G.vpi b/image/assets/images/notifications/fail_128px_W_G.vpi new file mode 100644 index 000000000..ecb5132ba Binary files /dev/null and b/image/assets/images/notifications/fail_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/info_128px_W_G.vpi b/image/assets/images/notifications/info_128px_W_G.vpi new file mode 100644 index 000000000..ba719a417 Binary files /dev/null and b/image/assets/images/notifications/info_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/lock_128px_W_G.vpi b/image/assets/images/notifications/lock_128px_W_G.vpi new file mode 100644 index 000000000..add2e51a3 Binary files /dev/null and b/image/assets/images/notifications/lock_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/progress_128px_W_G.vpi b/image/assets/images/notifications/progress_128px_W_G.vpi new file mode 100644 index 000000000..e1a91c64f Binary files /dev/null and b/image/assets/images/notifications/progress_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/search_128px_W_G.vpi b/image/assets/images/notifications/search_128px_W_G.vpi new file mode 100644 index 000000000..bf9af8f42 Binary files /dev/null and b/image/assets/images/notifications/search_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/sim_128px_W_G.vpi b/image/assets/images/notifications/sim_128px_W_G.vpi new file mode 100644 index 000000000..daa5c5e24 Binary files /dev/null and b/image/assets/images/notifications/sim_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/success_128px_W_G.vpi b/image/assets/images/notifications/success_128px_W_G.vpi new file mode 100644 index 000000000..ad9de8da3 Binary files /dev/null and b/image/assets/images/notifications/success_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/tethering_128px_W_G.vpi b/image/assets/images/notifications/tethering_128px_W_G.vpi new file mode 100644 index 000000000..f5bb0a6b3 Binary files /dev/null and b/image/assets/images/notifications/tethering_128px_W_G.vpi differ diff --git a/image/assets/images/notifications/turn_off_128px_W_G.vpi b/image/assets/images/notifications/turn_off_128px_W_G.vpi new file mode 100644 index 000000000..32e34ca73 Binary files /dev/null and b/image/assets/images/notifications/turn_off_128px_W_G.vpi differ diff --git a/image/assets/images/phonebook/phonebook_blocked_32px_W_G.vpi b/image/assets/images/phonebook/phonebook_blocked_32px_W_G.vpi new file mode 100644 index 000000000..22bd982f3 Binary files /dev/null and b/image/assets/images/phonebook/phonebook_blocked_32px_W_G.vpi differ diff --git a/image/assets/images/phonebook_empty_grey_circle_speed_dial.vpi b/image/assets/images/phonebook/phonebook_empty_grey_circle_speed_dial.vpi similarity index 100% rename from image/assets/images/phonebook_empty_grey_circle_speed_dial.vpi rename to image/assets/images/phonebook/phonebook_empty_grey_circle_speed_dial.vpi diff --git a/image/assets/images/small_heart_W_M.vpi b/image/assets/images/phonebook/phonebook_heart_32px_W_M.vpi similarity index 100% rename from image/assets/images/small_heart_W_M.vpi rename to image/assets/images/phonebook/phonebook_heart_32px_W_M.vpi diff --git a/image/assets/images/phonebook/phonebook_speed_dial_32px_W_G.vpi b/image/assets/images/phonebook/phonebook_speed_dial_32px_W_G.vpi new file mode 100644 index 000000000..50ec6bc12 Binary files /dev/null and b/image/assets/images/phonebook/phonebook_speed_dial_32px_W_G.vpi differ diff --git a/image/assets/images/phonebook_32px_W_G.vpi b/image/assets/images/phonebook_32px_W_G.vpi new file mode 100644 index 000000000..87c97b173 Binary files /dev/null and b/image/assets/images/phonebook_32px_W_G.vpi differ diff --git a/image/assets/images/phonebook_blocked_large.mpi b/image/assets/images/phonebook_blocked_large.mpi deleted file mode 100644 index 73c221eec..000000000 Binary files a/image/assets/images/phonebook_blocked_large.mpi and /dev/null differ diff --git a/image/assets/images/phonebook_blocked_large.vpi b/image/assets/images/phonebook_blocked_large.vpi deleted file mode 100644 index db46b810b..000000000 Binary files a/image/assets/images/phonebook_blocked_large.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_contact_delete_trashcan.vpi b/image/assets/images/phonebook_contact_delete_trashcan.vpi deleted file mode 100644 index 80aff2460..000000000 Binary files a/image/assets/images/phonebook_contact_delete_trashcan.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_info.vpi b/image/assets/images/phonebook_info.vpi deleted file mode 100644 index 1ec127657..000000000 Binary files a/image/assets/images/phonebook_info.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_phone_ringing.vpi b/image/assets/images/phonebook_phone_ringing.vpi deleted file mode 100644 index c8d25426d..000000000 Binary files a/image/assets/images/phonebook_phone_ringing.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_search_arrow_down_grey.vpi b/image/assets/images/phonebook_search_arrow_down_grey.vpi deleted file mode 100644 index 8d47c901a..000000000 Binary files a/image/assets/images/phonebook_search_arrow_down_grey.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_search_arrow_grey.vpi b/image/assets/images/phonebook_search_arrow_grey.vpi deleted file mode 100644 index 331e1dadf..000000000 Binary files a/image/assets/images/phonebook_search_arrow_grey.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_search_glass_grey.vpi b/image/assets/images/phonebook_search_glass_grey.vpi deleted file mode 100644 index 2837f31c4..000000000 Binary files a/image/assets/images/phonebook_search_glass_grey.vpi and /dev/null differ diff --git a/image/assets/images/phonebook_small.vpi b/image/assets/images/phonebook_small.vpi deleted file mode 100644 index b92298144..000000000 Binary files a/image/assets/images/phonebook_small.vpi and /dev/null differ diff --git a/image/assets/images/pin_lock.vpi b/image/assets/images/pin_lock.vpi deleted file mode 100644 index 2cf53a2f4..000000000 Binary files a/image/assets/images/pin_lock.vpi and /dev/null differ diff --git a/image/assets/images/plus_32px_W_M.vpi b/image/assets/images/plus_32px_W_M.vpi new file mode 100644 index 000000000..4f1226f0d Binary files /dev/null and b/image/assets/images/plus_32px_W_M.vpi differ diff --git a/image/assets/images/previous.vpi b/image/assets/images/previous.vpi deleted file mode 100644 index 16f01a62f..000000000 Binary files a/image/assets/images/previous.vpi and /dev/null differ diff --git a/image/assets/images/puse.vpi b/image/assets/images/puse.vpi deleted file mode 100644 index 43b336db3..000000000 Binary files a/image/assets/images/puse.vpi and /dev/null differ diff --git a/image/assets/images/right_label_arrow.vpi b/image/assets/images/right_label_arrow.vpi deleted file mode 100644 index 392e361a6..000000000 Binary files a/image/assets/images/right_label_arrow.vpi and /dev/null differ diff --git a/image/assets/images/right_label_arrow_border.vpi b/image/assets/images/right_label_arrow_border.vpi deleted file mode 100644 index c3abd0884..000000000 Binary files a/image/assets/images/right_label_arrow_border.vpi and /dev/null differ diff --git a/image/assets/images/search.vpi b/image/assets/images/search.vpi deleted file mode 100644 index bf6ffdd39..000000000 Binary files a/image/assets/images/search.vpi and /dev/null differ diff --git a/image/assets/images/search_32px_W_G.vpi b/image/assets/images/search_32px_W_G.vpi index a1ad623d5..01e2334bd 100644 Binary files a/image/assets/images/search_32px_W_G.vpi and b/image/assets/images/search_32px_W_G.vpi differ diff --git a/image/assets/images/search_big.mpi b/image/assets/images/search_big.mpi deleted file mode 100644 index bce053ffd..000000000 Binary files a/image/assets/images/search_big.mpi and /dev/null differ diff --git a/image/assets/images/settings_certification_Australia.vpi b/image/assets/images/settings/settings_certification_Australia.vpi similarity index 100% rename from image/assets/images/settings_certification_Australia.vpi rename to image/assets/images/settings/settings_certification_Australia.vpi diff --git a/image/assets/images/settings_certification_Canada.vpi b/image/assets/images/settings/settings_certification_Canada.vpi similarity index 100% rename from image/assets/images/settings_certification_Canada.vpi rename to image/assets/images/settings/settings_certification_Canada.vpi diff --git a/image/assets/images/settings_certification_Eurlope.vpi b/image/assets/images/settings/settings_certification_Eurlope.vpi similarity index 100% rename from image/assets/images/settings_certification_Eurlope.vpi rename to image/assets/images/settings/settings_certification_Eurlope.vpi diff --git a/image/assets/images/settings_certification_UKCA.vpi b/image/assets/images/settings/settings_certification_UKCA.vpi similarity index 100% rename from image/assets/images/settings_certification_UKCA.vpi rename to image/assets/images/settings/settings_certification_UKCA.vpi diff --git a/image/assets/images/settings_certification_US.vpi b/image/assets/images/settings/settings_certification_US.vpi similarity index 100% rename from image/assets/images/settings_certification_US.vpi rename to image/assets/images/settings/settings_certification_US.vpi diff --git a/image/assets/images/settings_certification_ce.vpi b/image/assets/images/settings/settings_certification_ce.vpi similarity index 100% rename from image/assets/images/settings_certification_ce.vpi rename to image/assets/images/settings/settings_certification_ce.vpi diff --git a/image/assets/images/settings_certification_fc.vpi b/image/assets/images/settings/settings_certification_fc.vpi similarity index 100% rename from image/assets/images/settings_certification_fc.vpi rename to image/assets/images/settings/settings_certification_fc.vpi diff --git a/image/assets/images/settings_certification_ic.vpi b/image/assets/images/settings/settings_certification_ic.vpi similarity index 100% rename from image/assets/images/settings_certification_ic.vpi rename to image/assets/images/settings/settings_certification_ic.vpi diff --git a/image/assets/images/signal5.vpi b/image/assets/images/signal5.vpi deleted file mode 100644 index 3157790fd..000000000 Binary files a/image/assets/images/signal5.vpi and /dev/null differ diff --git a/image/assets/images/sim1_option.vpi b/image/assets/images/sim1_option_32px_W_G.vpi similarity index 100% rename from image/assets/images/sim1_option.vpi rename to image/assets/images/sim1_option_32px_W_G.vpi diff --git a/image/assets/images/sim1_status.vpi b/image/assets/images/sim1_status.vpi deleted file mode 100644 index f8417f6d2..000000000 Binary files a/image/assets/images/sim1_status.vpi and /dev/null differ diff --git a/image/assets/images/sim2_option.vpi b/image/assets/images/sim2_option_32px_W_G.vpi similarity index 100% rename from image/assets/images/sim2_option.vpi rename to image/assets/images/sim2_option_32px_W_G.vpi diff --git a/image/assets/images/sim2_status.vpi b/image/assets/images/sim2_status.vpi deleted file mode 100644 index 406af4a6d..000000000 Binary files a/image/assets/images/sim2_status.vpi and /dev/null differ diff --git a/image/assets/images/sim_card_W_G.vpi b/image/assets/images/sim_card_W_G.vpi deleted file mode 100644 index 7f998580b..000000000 Binary files a/image/assets/images/sim_card_W_G.vpi and /dev/null differ diff --git a/image/assets/images/simfail.vpi b/image/assets/images/simfail.vpi deleted file mode 100644 index 0d676f719..000000000 Binary files a/image/assets/images/simfail.vpi and /dev/null differ diff --git a/image/assets/images/simunknown.vpi b/image/assets/images/simunknown.vpi deleted file mode 100644 index 46cb24c15..000000000 Binary files a/image/assets/images/simunknown.vpi and /dev/null differ diff --git a/image/assets/images/small_circle.vpi b/image/assets/images/small_circle.vpi deleted file mode 100644 index 73ded7be5..000000000 Binary files a/image/assets/images/small_circle.vpi and /dev/null differ diff --git a/image/assets/images/small_tick_W_M.vpi b/image/assets/images/small_tick_32px_W_M.vpi similarity index 100% rename from image/assets/images/small_tick_W_M.vpi rename to image/assets/images/small_tick_32px_W_M.vpi diff --git a/image/assets/images/speed_dial_empty_W_M.vpi b/image/assets/images/speed_dial_empty_W_M.vpi deleted file mode 100644 index 193bde1ac..000000000 Binary files a/image/assets/images/speed_dial_empty_W_M.vpi and /dev/null differ diff --git a/image/assets/images/stop.vpi b/image/assets/images/stop.vpi deleted file mode 100644 index 419ceb614..000000000 Binary files a/image/assets/images/stop.vpi and /dev/null differ diff --git a/image/assets/images/success_icon_W_G.vpi b/image/assets/images/success_icon_W_G.vpi deleted file mode 100644 index eac7e76dc..000000000 Binary files a/image/assets/images/success_icon_W_G.vpi and /dev/null differ diff --git a/image/assets/images/tethering_icon.vpi b/image/assets/images/tethering_icon.vpi deleted file mode 100644 index 459be6b9e..000000000 Binary files a/image/assets/images/tethering_icon.vpi and /dev/null differ diff --git a/image/assets/images/turn_off_W_G.vpi b/image/assets/images/turn_off_W_G.vpi deleted file mode 100644 index 8c79a44b6..000000000 Binary files a/image/assets/images/turn_off_W_G.vpi and /dev/null differ diff --git a/image/assets/images/unlock_icon_W_G.vpi b/image/assets/images/unlock_icon_W_G.vpi deleted file mode 100644 index 722abb82f..000000000 Binary files a/image/assets/images/unlock_icon_W_G.vpi and /dev/null differ diff --git a/image/assets/images/update_icon_W_G.vpi b/image/assets/images/update_icon_W_G.vpi deleted file mode 100644 index d7feae64e..000000000 Binary files a/image/assets/images/update_icon_W_G.vpi and /dev/null differ diff --git a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp index 3dbe8d1d9..52e3461b9 100644 --- a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp +++ b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp @@ -25,7 +25,7 @@ namespace app::alarmClock { auto metaData = std::make_unique( gui::DialogMetadata{utils::translate("app_alarm_clock_title_main"), - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_alarm_clock_delete_confirmation"), "", [record, application, &alarmsRepository] { diff --git a/module-apps/application-calendar/widgets/DayLabel.cpp b/module-apps/application-calendar/widgets/DayLabel.cpp index aeb6db803..ea51695e1 100644 --- a/module-apps/application-calendar/widgets/DayLabel.cpp +++ b/module-apps/application-calendar/widgets/DayLabel.cpp @@ -34,7 +34,7 @@ namespace gui this->dayNumber->setMargins(gui::Margins(0, 11, 0, 0)); this->dayNumber->activeItem = false; - this->dotImage = new gui::Image(this, width / 2 - 3, height - 12, 0, 0, "event_dot"); + this->dotImage = new gui::Image(this, width / 2 - 3, height - 12, 0, 0, "calendar_event_dot"); this->dotImage->setMinimumSize(11, 11); this->dotImage->setAlignment( gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center)); diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp index a5ebfb63f..7fb7fc07e 100644 --- a/module-apps/application-call/ApplicationCall.cpp +++ b/module-apps/application-call/ApplicationCall.cpp @@ -54,7 +54,7 @@ namespace app returnToPreviousWindow(); return true; }; - constexpr auto iconNoEmergency = "error_W_G"; + constexpr auto iconNoEmergency = "fail_128px_W_G"; auto textNoEmergency = utils::translate("app_call_wrong_emergency"); utils::findAndReplaceAll(textNoEmergency, "$NUMBER", data->getDescription()); showNotification(buttonAction, iconNoEmergency, textNoEmergency); @@ -65,7 +65,7 @@ namespace app returnToPreviousWindow(); return true; }; - constexpr auto iconNoSim = "info_big_circle_W_G"; + constexpr auto iconNoSim = "info_128px_W_G"; const auto textNoSim = utils::translate("app_call_no_sim"); showNotification(buttonAction, iconNoSim, textNoSim); return actionHandled(); @@ -75,7 +75,7 @@ namespace app app::manager::Controller::switchBack(this); return true; }; - constexpr auto icon = "info_big_circle_W_G"; + constexpr auto icon = "info_128px_W_G"; const auto textOffline = utils::translate("app_call_offline"); showNotification(buttonAction, icon, textOffline); return actionHandled(); diff --git a/module-apps/application-call/widgets/StateIcons.cpp b/module-apps/application-call/widgets/StateIcons.cpp index f642dd70d..a728f5a76 100644 --- a/module-apps/application-call/widgets/StateIcons.cpp +++ b/module-apps/application-call/widgets/StateIcons.cpp @@ -8,7 +8,7 @@ namespace gui { namespace { - constexpr auto crossImg = "cross"; + constexpr auto crossImg = "call_add"; constexpr auto addContactStr = "app_call_contact"; constexpr auto messageImg = "call_message"; constexpr auto sendSmstStr = "app_call_message"; diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp index 94999bb12..0d7ef52a1 100644 --- a/module-apps/application-calllog/ApplicationCallLog.cpp +++ b/module-apps/application-calllog/ApplicationCallLog.cpp @@ -115,7 +115,7 @@ namespace app LOG_DEBUG("Removing CalllogRecord: %" PRIu32, record.ID); auto metaData = std::make_unique( gui::DialogMetadata{record.name, - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_calllog_delete_call_confirmation"), "", [=]() -> bool { diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.cpp b/module-apps/application-calllog/windows/CallLogMainWindow.cpp index f0dc925a4..051feee31 100644 --- a/module-apps/application-calllog/windows/CallLogMainWindow.cpp +++ b/module-apps/application-calllog/windows/CallLogMainWindow.cpp @@ -92,7 +92,7 @@ namespace gui noCallsBottom->setMargins(gui::Margins(0, MyStyle::bottomBoxMargin, 0, 0)); noCallsBottom->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center)); - ImageBox *noCallsImg = new ImageBox(noCallsBottom, new Image("callog_empty_W_G")); + ImageBox *noCallsImg = new ImageBox(noCallsBottom, new Image("calllog_empty_128px_W_G")); noCallsImg->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center)); noCallsImg->setMinimumSizeToFitImage(); noCallsImg->setMargins(Margins(MyStyle::infoIconMargin, 0, 0, 0)); diff --git a/module-apps/application-desktop/widgets/DesktopInputWidget.cpp b/module-apps/application-desktop/widgets/DesktopInputWidget.cpp index fbfef7f39..6ee5607ee 100644 --- a/module-apps/application-desktop/widgets/DesktopInputWidget.cpp +++ b/module-apps/application-desktop/widgets/DesktopInputWidget.cpp @@ -71,7 +71,7 @@ namespace gui return true; }; - replyImage = new Image(body, 0, 0, "messages_reply"); + replyImage = new Image(body, 0, 0, "messages_reply_32px_W_M"); replyImage->setAlignment(Alignment(gui::Alignment::Vertical::Center)); replyImage->setMargins(Margins(0, 0, 0, 0)); replyImage->activeItem = false; diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp index 9c466df5d..df07849e8 100644 --- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp +++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp @@ -220,7 +220,7 @@ namespace gui bool DesktopMainWindow::showInformationPopup(std::function action, const std::string ¬ification) { DialogMetadata meta; - meta.icon = "info_big_circle_W_G"; + meta.icon = "info_128px_W_G"; meta.text = notification; meta.action = std::move(action); auto switchData = std::make_unique(std::move(meta)); diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp index ca8bd697a..4fe0128a1 100644 --- a/module-apps/application-desktop/windows/MenuWindow.cpp +++ b/module-apps/application-desktop/windows/MenuWindow.cpp @@ -180,8 +180,7 @@ namespace gui std::make_unique("ApplicationAlarmClock")); }), #else - createDisabledApplicationTile("alarm_icon_disabled", - "app_desktop_menu_alarm"), + createDisabledApplicationTile("menu_alarm_disabled_W_G", "app_desktop_menu_alarm"), #endif createApplicationTile("menu_calendar_W_G", "app_desktop_menu_calendar", diff --git a/module-apps/application-desktop/windows/MmiPushWindow.cpp b/module-apps/application-desktop/windows/MmiPushWindow.cpp index ca9002f63..ac3b5f703 100644 --- a/module-apps/application-desktop/windows/MmiPushWindow.cpp +++ b/module-apps/application-desktop/windows/MmiPushWindow.cpp @@ -38,7 +38,7 @@ MmiPushWindow::MmiPushWindow(app::ApplicationCommon *app, const std::string &nam style::window::default_vertical_pos, style::window::default_body_width, style::window::default_body_height, - "info_big_circle_W_G", + "info_128px_W_G", ""); icon->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Top)); icon->image->setMargins(Margins(0, icon::image_top_margin, 0, icon::image_bottom_margin)); diff --git a/module-apps/application-meditation/widgets/IntervalBox.cpp b/module-apps/application-meditation/widgets/IntervalBox.cpp index 89cf10b81..eb7f22a56 100644 --- a/module-apps/application-meditation/widgets/IntervalBox.cpp +++ b/module-apps/application-meditation/widgets/IntervalBox.cpp @@ -55,13 +55,13 @@ void IntervalBox::build() boxStyle::arrow::Y, boxStyle::arrow::Width, boxStyle::arrow::Height, - "left_label_arrow"); + "arrow_left_20px_W_M"); rightSwitchArrow = new gui::Image(bottomLabel, boxStyle::arrow::RightX, boxStyle::arrow::Y, boxStyle::arrow::Width, boxStyle::arrow::Height, - "right_label_arrow"); + "arrow_right_20px_W_M"); updateIntervals(ChimeIntervalList::Direction::Next); leftSwitchArrow->setVisible(false); diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp index 0b1dfd734..ecbaaeec6 100644 --- a/module-apps/application-messages/ApplicationMessages.cpp +++ b/module-apps/application-messages/ApplicationMessages.cpp @@ -202,7 +202,7 @@ namespace app const auto &contact = result->getResult(); auto metaData = std::make_unique( gui::DialogMetadata{contact.getFormattedName(), - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_messages_thread_delete_confirmation"), "", [this, record]() { return onRemoveSmsThreadConfirmed(*record); }}); @@ -240,7 +240,7 @@ namespace app LOG_DEBUG("Removing sms: %" PRIu32, record.ID); auto metaData = std::make_unique( gui::DialogMetadata{record.body, - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_messages_message_delete_confirmation"), "", [this, record] { return onRemoveSmsConfirmed(record); }}); @@ -289,7 +289,7 @@ namespace app bool ApplicationMessages::searchEmpty(const std::string &query) { gui::DialogMetadata meta; - meta.icon = "search_big"; + meta.icon = "search_128px_W_G"; meta.text = utils::translate("app_messages_thread_no_result"); meta.title = utils::translate("common_results_prefix") + query; auto data = std::make_unique(meta); @@ -310,7 +310,7 @@ namespace app bool ignoreCurrentWindowOnStack) { gui::DialogMetadata meta; - meta.icon = "info_big_circle_W_G"; + meta.icon = "info_128px_W_G"; meta.text = notification; meta.action = std::move(action); auto switchData = std::make_unique(meta); diff --git a/module-apps/application-messages/widgets/SMSInputWidget.cpp b/module-apps/application-messages/widgets/SMSInputWidget.cpp index 3552429e5..d26b5c99f 100644 --- a/module-apps/application-messages/widgets/SMSInputWidget.cpp +++ b/module-apps/application-messages/widgets/SMSInputWidget.cpp @@ -41,7 +41,7 @@ namespace gui inputText->setPenWidth(style::window::default_border_focus_w); inputText->setEdges(gui::RectangleEdge::None); - replyImage = new Image(body, 0, 0, "messages_reply"); + replyImage = new Image(body, 0, 0, "messages_reply_32px_W_M"); replyImage->setAlignment(Alignment(gui::Alignment::Vertical::Bottom)); replyImage->setMargins(Margins(0, 0, 0, style::messages::smsInput::reply_bottom_margin)); replyImage->activeItem = false; diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp index 09d494806..e11e5a143 100644 --- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp +++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp @@ -136,7 +136,7 @@ namespace gui void SMSOutputWidget::errorIconBuild() { - errorIcon = new gui::Image("messages_error_W_M"); + errorIcon = new gui::Image("messages_error_32px_W_M"); errorIcon->setAlignment(Alignment(Alignment::Vertical::Center)); errorIcon->activeItem = false; errorIcon->setMargins(Margins(style::messages::smsOutput::sms_error_icon_left_margin, diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp index 72d55cef6..659f901e3 100644 --- a/module-apps/application-messages/windows/NewMessage.cpp +++ b/module-apps/application-messages/windows/NewMessage.cpp @@ -234,7 +234,7 @@ namespace gui updateNavBar(); }); - auto img = new gui::Image(recipientHBox, 0, 0, 0, 0, "phonebook_small"); + auto img = new gui::Image(recipientHBox, 0, 0, 0, 0, "phonebook_32px_W_G"); img->activeItem = false; auto labelMessage = new Label(body, 0, 0, body->getWidth(), msgStyle::messageLabel::h); diff --git a/module-apps/application-messages/windows/SearchStart.cpp b/module-apps/application-messages/windows/SearchStart.cpp index ee7e0dd93..a2dd6cab0 100644 --- a/module-apps/application-messages/windows/SearchStart.cpp +++ b/module-apps/application-messages/windows/SearchStart.cpp @@ -23,7 +23,7 @@ namespace gui body = new gui::Item(); body->setBoundingBox(bodySize()); addWidget(body); - auto text = inputBox(this, utils::translate("common_search_uc"), "search"); + auto text = inputBox(this, utils::translate("common_search_uc"), "search_32px_W_G"); text->setInputMode(new InputMode( {InputMode::ABC, InputMode::abc, InputMode::digit}, [=](const UTF8 &Text) { application->getCurrentWindow()->navBarTemporaryMode(Text); }, diff --git a/module-apps/application-notes/windows/NotesOptions.cpp b/module-apps/application-notes/windows/NotesOptions.cpp index 382853870..9f202abe5 100644 --- a/module-apps/application-notes/windows/NotesOptions.cpp +++ b/module-apps/application-notes/windows/NotesOptions.cpp @@ -30,7 +30,7 @@ namespace app::notes { auto metaData = std::make_unique( gui::DialogMetadata{record.snippet, - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_notes_note_delete_confirmation"), "", [record, application, ¬esRepository] { diff --git a/module-apps/application-notes/windows/SearchEngineWindow.cpp b/module-apps/application-notes/windows/SearchEngineWindow.cpp index eb9a7e0b2..02b77cb77 100644 --- a/module-apps/application-notes/windows/SearchEngineWindow.cpp +++ b/module-apps/application-notes/windows/SearchEngineWindow.cpp @@ -34,7 +34,7 @@ namespace app::notes navBar->setActive(gui::nav_bar::Side::Right, true); navBar->setText(gui::nav_bar::Side::Right, utils::translate(style::strings::common::back)); - input = gui::inputBox(this, utils::translate("common_search_uc"), "search"); + input = gui::inputBox(this, utils::translate("common_search_uc"), "search_32px_W_G"); setFocusItem(input); } diff --git a/module-apps/application-notes/windows/SearchResultsWindow.cpp b/module-apps/application-notes/windows/SearchResultsWindow.cpp index 606c35c16..62089c08b 100644 --- a/module-apps/application-notes/windows/SearchResultsWindow.cpp +++ b/module-apps/application-notes/windows/SearchResultsWindow.cpp @@ -63,7 +63,7 @@ namespace app::notes void SearchResultsWindow::onNothingFound(const std::string &searchText) { gui::DialogMetadata meta{utils::translate("common_results_prefix") + searchText, - "search_big", + "search_128px_W_G", utils::translate("app_notes_search_no_results")}; auto data = std::make_unique(meta); data->ignoreCurrentWindowOnStack = true; diff --git a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp index c4e7174dc..8aa64fb97 100644 --- a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp +++ b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp @@ -42,7 +42,7 @@ namespace app::onBoarding else if (inputEvent.isShortRelease(gui::KeyCode::KEY_ENTER)) { auto metaData = std::make_unique( gui::DialogMetadata{utils::translate("app_onboarding_title_configuration"), - "success_icon_W_G", + "success_128px_W_G", utils::translate("app_onboarding_configuration_successful"), "", [=]() -> bool { return true; }}); diff --git a/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp index 26a306e93..3858db5d9 100644 --- a/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp +++ b/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp @@ -73,13 +73,13 @@ namespace app::onBoarding if (inputEvent.isShortRelease(gui::KeyCode::KEY_LF)) { auto metaData = std::make_unique(gui::DialogMetadata{ utils::translate("app_onboarding_title"), - "info_icon_W_G", + "info_128px_W_G", utils::translate("app_onboarding_skip_confirm"), "", [=]() -> bool { auto metaData = std::make_unique( gui::DialogMetadata{utils::translate("app_onboarding_no_sim_selected_title"), - "sim_card_W_G", + "sim_128px_W_G", utils::translate("app_onboarding_no_sim_selected_description"), "", [=]() -> bool { return true; }}); diff --git a/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp b/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp index 7f84c942d..eb2fcb268 100644 --- a/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp +++ b/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp @@ -74,13 +74,13 @@ namespace app::onBoarding auto metaData = std::make_unique(gui::DialogMetadata{ utils::translate("app_onboarding_title"), - "info_icon_W_G", + "info_128px_W_G", utils::translate("app_onboarding_skip_confirm"), "", [=]() -> bool { auto metaData = std::make_unique( gui::DialogMetadata{utils::translate("app_onboarding_title_configuration"), - "info_icon_W_G", + "info_128px_W_G", utils::translate("app_onboarding_no_configuration"), "", [=]() -> bool { return true; }}); diff --git a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp index fd6cb60e4..6befa945d 100644 --- a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp +++ b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp @@ -24,7 +24,7 @@ namespace app::onBoarding void UpdateDialogWindow::onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) { setTitle(utils::translate("app_onboarding_title_update_info")); - icon->image->set("update_icon_W_G"); + icon->image->set("progress_128px_W_G"); icon->text->setRichText(utils::translate("app_onboarding_update_info"), {{"$VERSION", std::string(VERSION)}}); } diff --git a/module-apps/application-phonebook/ApplicationPhonebook.cpp b/module-apps/application-phonebook/ApplicationPhonebook.cpp index a97868f00..c73c974b5 100644 --- a/module-apps/application-phonebook/ApplicationPhonebook.cpp +++ b/module-apps/application-phonebook/ApplicationPhonebook.cpp @@ -181,7 +181,7 @@ namespace app bool ApplicationPhonebook::searchEmpty(const std::string &query) { gui::DialogMetadata meta; - meta.icon = "search_big"; + meta.icon = "search_128px_W_G"; meta.text = utils::translate("app_phonebook_search_no_results"); meta.title = utils::translate("common_results_prefix") + "\"" + query + "\""; auto data = std::make_unique(meta); diff --git a/module-apps/application-phonebook/models/NewContactModel.cpp b/module-apps/application-phonebook/models/NewContactModel.cpp index 153259764..79bd1a791 100644 --- a/module-apps/application-phonebook/models/NewContactModel.cpp +++ b/module-apps/application-phonebook/models/NewContactModel.cpp @@ -128,7 +128,7 @@ bool NewContactModel::verifyData() if (!item->onVerifyCallback(errorMessage)) { auto metaData = std::make_unique( gui::DialogMetadata{errorMessage, - "error_W_G", + "fail_128px_W_G", utils::translate("app_phonebook_new_contact_invalid_number"), "", [=]() -> bool { diff --git a/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp b/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp index adc1e3716..505e045c3 100644 --- a/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp +++ b/module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp @@ -65,12 +65,13 @@ namespace gui void ContactFlagsWidget::initGUIIcons() { - favouritesIcon = - new ContactFlagIconWidget("small_heart_W_M", utils::translate("app_phonebook_contact_flag_fav"), this); + favouritesIcon = new ContactFlagIconWidget( + "phonebook_heart_32px_W_M", utils::translate("app_phonebook_contact_flag_fav"), this); speedDialIcon = new ContactFlagIconWidget(speedDialPos, utils::translate("app_phonebook_contact_flag_speed_dial"), this); - iceIcon = new ContactFlagIconWidget("ice", utils::translate("app_phonebook_contact_flag_ice"), this); - blockedIcon = new ContactFlagIconWidget("block", utils::translate("app_phonebook_contact_flag_blocked"), this); + iceIcon = new ContactFlagIconWidget("ice_32px_W_G", utils::translate("app_phonebook_contact_flag_ice"), this); + blockedIcon = new ContactFlagIconWidget( + "phonebook_blocked_32px_W_G", utils::translate("app_phonebook_contact_flag_blocked"), this); } void ContactFlagsWidget::buildWidget() @@ -106,7 +107,6 @@ namespace gui if (speedDial) { speedDialIcon->setVisible(true); } - } hideIfNoFlags(); mainBox->resizeItems(); diff --git a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp index 02f6b1a5e..01284a1c6 100644 --- a/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp +++ b/module-apps/application-phonebook/widgets/InputBoxWithLabelAndIconWidget.cpp @@ -95,7 +95,7 @@ namespace gui void InputBoxWithLabelAndIconWidget::speedDialKeyHandler() { descriptionLabel->setText(utils::translate("app_phonebook_new_speed_dial_key")); - iconImage->set("speed_dial_empty_W_M"); + iconImage->set("phonebook_speed_dial_32px_W_G"); focusChangedCallback = [&](gui::Item &item) { if (focus) { @@ -131,8 +131,8 @@ namespace gui void InputBoxWithLabelAndIconWidget::addToFavouritesHandler() { descriptionLabel->setText(utils::translate("app_phonebook_new_add_to_fav")); - iconImage->set("small_heart_W_M"); - tickImage->set("small_tick_W_M"); + iconImage->set("phonebook_heart_32px_W_M"); + tickImage->set("small_tick_32px_W_M"); focusChangedCallback = [&](gui::Item &item) { if (focus) { @@ -176,8 +176,8 @@ namespace gui void InputBoxWithLabelAndIconWidget::addToICEHandler() { descriptionLabel->setText(utils::translate("app_phonebook_new_add_to_ice")); - iconImage->set("ice"); - tickImage->set("small_tick_W_M"); + iconImage->set("ice_32px_W_G"); + tickImage->set("small_tick_32px_W_M"); focusChangedCallback = [&](gui::Item &item) { if (focus) { diff --git a/module-apps/application-phonebook/widgets/PhonebookItem.cpp b/module-apps/application-phonebook/widgets/PhonebookItem.cpp index 6109fe774..668685f64 100644 --- a/module-apps/application-phonebook/widgets/PhonebookItem.cpp +++ b/module-apps/application-phonebook/widgets/PhonebookItem.cpp @@ -78,7 +78,7 @@ namespace gui void PhonebookItem::markBlocked(bool val) { if (val) { - auto blockedIcon = new Image(hBox, 0, 0, "block"); + auto blockedIcon = new Image(hBox, 0, 0, "phonebook_blocked_32px_W_G"); blockedIcon->setAlignment(Alignment(gui::Alignment::Vertical::Center)); blockedIcon->setMargins(Margins(0, 0, phonebookStyle::contactItem::blocked_right_margin, 0)); } diff --git a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp index e96a2cb9e..75d34ea60 100644 --- a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp +++ b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp @@ -74,7 +74,7 @@ namespace gui auto metaData = std::make_unique( gui::DialogMetadata{cont.getFormattedName(), - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_phonebook_options_delete_confirm"), "", [=]() -> bool { @@ -108,7 +108,7 @@ namespace gui auto metaData = std::make_unique(gui::DialogMetadata{ contact->getFormattedName(ContactRecord::NameFormatType::Title), - "info_big_circle_W_G", + "info_128px_W_G", dialogText, "", [=]() -> bool { diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp index cca13a7fb..81cd676ac 100644 --- a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp +++ b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp @@ -190,7 +190,7 @@ namespace gui auto oldContactRecord = (matchedContact != nullptr) ? *matchedContact : ContactRecord{}; auto metaData = std::make_unique( gui::DialogMetadata{duplicatedNumber.getFormatted(), - "info_big_circle_W_G", + "info_128px_W_G", text::RichTextParser() .parse(utils::translate("app_phonebook_duplicate_numbers"), nullptr, diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.cpp b/module-apps/application-phonebook/windows/PhonebookSearch.cpp index 1cc217e71..6e1aae845 100644 --- a/module-apps/application-phonebook/windows/PhonebookSearch.cpp +++ b/module-apps/application-phonebook/windows/PhonebookSearch.cpp @@ -19,7 +19,7 @@ namespace gui setTitle(utils::translate("app_phonebook_title_main")); - inputField = inputBox(this, utils::translate("common_search_uc"), "search"); + inputField = inputBox(this, utils::translate("common_search_uc"), "search_32px_W_G"); inputField->setInputMode(new InputMode( {InputMode::ABC, InputMode::abc, InputMode::digit}, [=](const UTF8 &Text) { application->getCurrentWindow()->navBarTemporaryMode(Text); }, diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp index 8c92bf1e0..fff91b26d 100644 --- a/module-apps/application-settings/ApplicationSettings.cpp +++ b/module-apps/application-settings/ApplicationSettings.cpp @@ -268,7 +268,7 @@ namespace app gui::ShowMode::GUI_SHOW_INIT, std::make_unique( gui::DialogMetadata{utils::translate("app_settings_bt"), - "error_W_G", + "fail_128px_W_G", utils::translate("app_settings_bluetooth_init_error_message"), "", [=]() -> bool { @@ -753,7 +753,7 @@ namespace app gui::ShowMode::GUI_SHOW_INIT, std::make_unique( gui::DialogMetadata{utils::translate("app_settings_bt"), - "error_W_G", + "fail_128px_W_G", utils::translate(errorMsg), "", [this, message{std::move(msg)}]() -> bool { diff --git a/module-apps/application-settings/widgets/apps/SettingsSoundItem.cpp b/module-apps/application-settings/widgets/apps/SettingsSoundItem.cpp index 96cd82fd9..dfd0c82dc 100644 --- a/module-apps/application-settings/widgets/apps/SettingsSoundItem.cpp +++ b/module-apps/application-settings/widgets/apps/SettingsSoundItem.cpp @@ -27,7 +27,7 @@ namespace gui soundTitle->setText(soundName); // setRichText?? if (selected) { - mIsSelected = new gui::Image(mMainBox, 0, 0, 0, 0, "small_tick_W_M"); + mIsSelected = new gui::Image(mMainBox, 0, 0, 0, 0, "small_tick_32px_W_M"); mIsSelected->setMargins(Margins(style::margins::big, 0, 0, 0)); } diff --git a/module-apps/application-settings/widgets/display-keypad/CategoryWidget.cpp b/module-apps/application-settings/widgets/display-keypad/CategoryWidget.cpp index 89820121e..2b42df2d7 100644 --- a/module-apps/application-settings/widgets/display-keypad/CategoryWidget.cpp +++ b/module-apps/application-settings/widgets/display-keypad/CategoryWidget.cpp @@ -61,7 +61,7 @@ namespace gui // Not ideal -> best solution would be to create separate widget with image inside box. tickImage->setMargins(gui::Margins( style::quotes::widget::tick_image_left_margin, 0, style::quotes::widget::tick_image_right_margin, 0)); - tickImage->set("small_tick_W_M"); + tickImage->set("small_tick_32px_W_M"); tickImage->setVisible(category.enabled); tickImage->activeItem = false; diff --git a/module-apps/application-settings/widgets/display-keypad/QuoteWidget.cpp b/module-apps/application-settings/widgets/display-keypad/QuoteWidget.cpp index eb1ad30a5..afce7245a 100644 --- a/module-apps/application-settings/widgets/display-keypad/QuoteWidget.cpp +++ b/module-apps/application-settings/widgets/display-keypad/QuoteWidget.cpp @@ -48,8 +48,8 @@ namespace gui hBox->setPenFocusWidth(style::window::default_border_focus_w); hBox->setPenWidth(style::window::default_border_rect_no_focus); - tickImage = - new ImageBox(hBox, 0, 0, style::widgets::iconsSize, style::widgets::iconsSize, new Image("small_tick_W_M")); + tickImage = new ImageBox( + hBox, 0, 0, style::widgets::iconsSize, style::widgets::iconsSize, new Image("small_tick_32px_W_M")); tickImage->setVisible(true); tickImage->showImage(quote.enabled); tickImage->setEdges(RectangleEdge::Bottom); diff --git a/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp b/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp index 025152f05..a322e6760 100644 --- a/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp +++ b/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp @@ -63,7 +63,7 @@ namespace gui gui::ShowMode::GUI_SHOW_INIT, std::make_unique(gui::DialogMetadata{ utils::translate("app_settings_bluetooth_add_device"), - "search_big", + "search_128px_W_G", utils::translate("app_settings_bluetooth_searching_devices")})); return true; } diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp index 4ee2e3fc9..4b56e8c51 100644 --- a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp +++ b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp @@ -35,7 +35,7 @@ namespace gui navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::confirm)); navBar->setText(nav_bar::Side::Right, utils::translate(style::strings::common::back)); - image = new Image(this, passkey_style::image::x, passkey_style::image::y, 0, 0, "bluetooth_W_G"); + image = new Image(this, passkey_style::image::x, passkey_style::image::y, 0, 0, "bluetooth_128px_W_G"); label = new Label(this, passkey_style::label::x, diff --git a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp index bf4db4d78..3bb324feb 100644 --- a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp +++ b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp @@ -43,7 +43,7 @@ namespace gui [=](gui::Item &item) { auto metaData = std::make_unique( gui::DialogMetadata{quote.quote, - "phonebook_contact_delete_trashcan", + "delete_128px_W_G", utils::translate("app_settings_display_wallpaper_quotes_delete_confirmation"), "", [this]() { diff --git a/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp b/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp index 7c9b5b7d6..2f5d08138 100644 --- a/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp +++ b/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp @@ -40,7 +40,7 @@ namespace gui ::style::window::default_vertical_pos, ::style::window::default_body_width, ::style::window::default_body_height, - "info_icon_W_G", + "info_128px_W_G", utils::translate("app_settings_network_import_contacts_from_sim_card_reading")); emptyListIcon->setAlignment(Alignment::Horizontal::Center); emptyListIcon->setVisible(false); @@ -55,7 +55,7 @@ namespace gui { emptyListIcon->text->setRichText( utils::translate("app_settings_network_import_contacts_from_sim_card_reading")); - emptyListIcon->image->set("update_icon_W_G"); + emptyListIcon->image->set("progress_128px_W_G"); navBar->setActive(nav_bar::Side::Right, true); navBar->setActive(nav_bar::Side::Center, false); navBar->setActive(nav_bar::Side::Left, false); @@ -107,7 +107,7 @@ namespace gui navBar->setActive(nav_bar::Side::Center, false); emptyListIcon->text->setRichText( utils::translate("app_settings_network_import_contacts_from_sim_card_no_contacts")); - emptyListIcon->image->set("info_icon_W_G"); + emptyListIcon->image->set("info_128px_W_G"); } else { setTitle(utils::translate("app_settings_network_import_contacts_from_sim_card")); @@ -126,7 +126,7 @@ namespace gui emptyListIcon->text->setRichText( utils::translate("app_settings_network_import_contacts_from_sim_card_duplicates"), {{"$DUPLICATES", std::to_string(duplicatesCount)}}); - emptyListIcon->image->set("info_icon_W_G"); + emptyListIcon->image->set("info_128px_W_G"); navBar->setActive(nav_bar::Side::Right, true); navBar->setText(gui::nav_bar::Side::Center, utils::translate(::style::strings::common::show)); navBar->setText(gui::nav_bar::Side::Left, utils::translate(::style::strings::common::skip)); @@ -160,7 +160,7 @@ namespace gui setTitle(utils::translate("app_settings_network_import_contacts_from_sim_card")); emptyListIcon->text->setRichText( utils::translate("app_settings_network_import_contacts_from_sim_card_success")); - emptyListIcon->image->set("success_icon_W_G"); + emptyListIcon->image->set("success_128px_W_G"); navBar->setActive(nav_bar::Side::Right, false); navBar->setText(gui::nav_bar::Side::Center, utils::translate(::style::strings::common::ok)); navBar->setText(gui::nav_bar::Side::Left, utils::translate(::style::strings::common::contacts)); @@ -177,7 +177,7 @@ namespace gui list->emptyListCallback(); emptyListIcon->text->setRichText( utils::translate("app_settings_network_import_contacts_from_sim_card_reading")); - emptyListIcon->image->set("update_icon_W_G"); + emptyListIcon->image->set("progress_128px_W_G"); navBar->setActive(nav_bar::Side::Right, false); navBar->setActive(nav_bar::Side::Center, false); navBar->setActive(nav_bar::Side::Left, false); diff --git a/module-apps/application-settings/windows/system/SystemMainWindow.cpp b/module-apps/application-settings/windows/system/SystemMainWindow.cpp index a78b098de..d3a21dcad 100644 --- a/module-apps/application-settings/windows/system/SystemMainWindow.cpp +++ b/module-apps/application-settings/windows/system/SystemMainWindow.cpp @@ -39,7 +39,7 @@ namespace gui [=](Item &item) { auto metaData = std::make_unique( gui::DialogMetadata{utils::translate("app_settings_factory_reset"), - "info_big_circle_W_G", + "info_128px_W_G", utils::translate("app_settings_display_factory_reset_confirmation"), "", [this]() { diff --git a/module-apps/apps-common/locks/widgets/PhoneLockBox.cpp b/module-apps/apps-common/locks/widgets/PhoneLockBox.cpp index 7ef019b39..7d342ed1d 100644 --- a/module-apps/apps-common/locks/widgets/PhoneLockBox.cpp +++ b/module-apps/apps-common/locks/widgets/PhoneLockBox.cpp @@ -54,7 +54,7 @@ namespace gui LockWindow->setText("phone_lock_blocked_information", LockInputWindow::TextType::Primary, {{LockWindow->getToken(LockInputWindow::Token::Time), formattedTime}}); - LockWindow->setImage("error_W_G"); + LockWindow->setImage("fail_128px_W_G"); LockWindow->setNavBarWidgetsActive(false, true, false); LockWindow->setNavBarText(utils::translate(style::strings::common::ok), nav_bar::Side::Center); } @@ -82,7 +82,7 @@ namespace gui break; } - LockWindow->setImage("unlock_icon_W_G"); + LockWindow->setImage("lock_128px_W_G"); LockWindow->setNavBarWidgetsActive(leftNavBarState, false, true); } @@ -103,7 +103,7 @@ namespace gui {{LockWindow->getToken(LockInputWindow::Token::Attempts), static_cast(value)}}); break; } - LockWindow->setImage("info_icon_W_G"); + LockWindow->setImage("info_128px_W_G"); LockWindow->setNavBarWidgetsActive(false, true, false); LockWindow->setNavBarText(utils::translate(style::strings::common::ok), nav_bar::Side::Center); } diff --git a/module-apps/apps-common/locks/widgets/SimLockBox.cpp b/module-apps/apps-common/locks/widgets/SimLockBox.cpp index c9434c095..5151310dd 100644 --- a/module-apps/apps-common/locks/widgets/SimLockBox.cpp +++ b/module-apps/apps-common/locks/widgets/SimLockBox.cpp @@ -63,7 +63,7 @@ namespace gui break; } - LockWindow->setImage("sim_card_W_G"); + LockWindow->setImage("sim_128px_W_G"); LockWindow->setNavBarWidgetsActive(false, false, true); } @@ -86,14 +86,14 @@ namespace gui LockWindow->setText("sim_wrong_pin_confirmation", LockInputWindow::TextType::Primary); break; } - LockWindow->setImage("info_icon_W_G"); + LockWindow->setImage("info_128px_W_G"); LockWindow->setNavBarWidgetsActive(false, true, true); } void SimLockBox::setVisibleStateBlocked(const std::string &formattedTime) { LockWindow->setText("sim_puk_blocked", LockInputWindow::TextType::Primary); - LockWindow->setImage("sim_card_W_G"); + LockWindow->setImage("sim_128px_W_G"); LockWindow->setNavBarWidgetsActive(false, false, true); } @@ -102,7 +102,7 @@ namespace gui LockWindow->setText("sim_cme_error", LockInputWindow::TextType::Primary, {{LockWindow->getToken(LockInputWindow::Token::CmeCode), static_cast(errorCode)}}); - LockWindow->setImage("info_icon_W_G"); + LockWindow->setImage("info_128px_W_G"); LockWindow->setNavBarWidgetsActive(false, false, true); } } // namespace gui diff --git a/module-apps/apps-common/notifications/NotificationListItem.cpp b/module-apps/apps-common/notifications/NotificationListItem.cpp index 960071fbf..d12e5bbea 100644 --- a/module-apps/apps-common/notifications/NotificationListItem.cpp +++ b/module-apps/apps-common/notifications/NotificationListItem.cpp @@ -85,10 +85,10 @@ namespace } std::map typeToIcon{ - {notifications::NotificationType::NotSeenSms, "messages_notification_icon"}, - {notifications::NotificationType::NotSeenCall, "calls_notification_icon"}, - {notifications::NotificationType::Tethering, "tethering_notification_icon"}, - {notifications::NotificationType::AlarmSnooze, "alarm_notification_icon"}, + {notifications::NotificationType::NotSeenSms, "messages_notification_icon_W_G"}, + {notifications::NotificationType::NotSeenCall, "calls_notification_icon_W_G"}, + {notifications::NotificationType::Tethering, "tethering_notification_icon_W_G"}, + {notifications::NotificationType::AlarmSnooze, "alarm_notification_icon_W_G"}, {notifications::NotificationType::PhoneLock, "lock_notification_icon_W_G"}}; } // namespace diff --git a/module-apps/apps-common/options/type/OptionSetting.cpp b/module-apps/apps-common/options/type/OptionSetting.cpp index 1204e2e72..ee83f763f 100644 --- a/module-apps/apps-common/options/type/OptionSetting.cpp +++ b/module-apps/apps-common/options/type/OptionSetting.cpp @@ -51,16 +51,16 @@ namespace gui::option button = new ButtonOnOff(optionBodyHBox, ButtonState::Off); break; case SettingRightItem::Bt: - imageName = "Bluetooth_small"; + imageName = "bluetooth_32px_W_M"; break; case SettingRightItem::Checked: - imageName = "small_tick_W_M"; + imageName = "small_tick_32px_W_M"; break; case SettingRightItem::SIM1: - imageName = "sim1_option"; + imageName = "sim1_option_32px_W_G"; break; case SettingRightItem::SIM2: - imageName = "sim2_option"; + imageName = "sim2_option_32px_W_G"; break; case SettingRightItem::Text: { auto optionTextRight = new TextFixedSize(optionBodyHBox, 0, 0, 0, 0); diff --git a/module-apps/apps-common/popups/PowerOffWindow.cpp b/module-apps/apps-common/popups/PowerOffWindow.cpp index 64da3690a..10a986cc9 100644 --- a/module-apps/apps-common/popups/PowerOffWindow.cpp +++ b/module-apps/apps-common/popups/PowerOffWindow.cpp @@ -25,7 +25,7 @@ namespace gui }; metadata.title = utils::translate("app_desktop_poweroff_title"); metadata.text = utils::translate("app_desktop_poweroff_question"); - metadata.icon = "turn_off_W_G"; + metadata.icon = "turn_off_128px_W_G"; auto msg = std::make_unique(std::move(metadata)); DialogYesNo::onBeforeShow(mode, msg.get()); } diff --git a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp index 29baf6574..8d7c6431e 100644 --- a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp +++ b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp @@ -19,7 +19,7 @@ namespace gui DialogMetadata metadata; metadata.title = utils::translate("tethering"); metadata.text = utils::translate("tethering_enable_question"); - metadata.icon = "tethering_icon"; + metadata.icon = "tethering_128px_W_G"; metadata.action = [this]() { application->bus.sendUnicast(std::make_shared(), service::name::system_manager); diff --git a/module-apps/apps-common/popups/TetheringOffPopup.cpp b/module-apps/apps-common/popups/TetheringOffPopup.cpp index 95f744124..c8f13472d 100644 --- a/module-apps/apps-common/popups/TetheringOffPopup.cpp +++ b/module-apps/apps-common/popups/TetheringOffPopup.cpp @@ -37,7 +37,7 @@ namespace gui }; metadata.title = utils::translate("tethering"); metadata.text = utils::translate("tethering_turn_off_question"); - metadata.icon = "tethering_icon"; + metadata.icon = "tethering_128px_W_G"; auto msg = std::make_unique(std::move(metadata)); DialogYesNo::onBeforeShow(mode, msg.get()); } diff --git a/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp b/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp index 829b475c1..4dbb98788 100644 --- a/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp +++ b/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp @@ -18,7 +18,7 @@ namespace gui DialogMetadata metadata; metadata.title = ""; metadata.text = utils::translate("tethering_phone_mode_change_prohibited"); - metadata.icon = "info_big_circle_W_G"; + metadata.icon = "info_128px_W_G"; metadata.action = [this]() { auto params = std::make_unique(gui::popup::ID::TetheringPhoneModeChangeProhibited); app::manager::Controller::sendAction(application, app::manager::actions::AbortPopup, std::move(params)); diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp index b4bb4afe1..ccb4a8924 100644 --- a/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp +++ b/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp @@ -45,7 +45,7 @@ void PhoneLockChangeInfoWindow::buildInterface() style::window::default_vertical_pos, style::window::default_body_width, style::window::default_body_height, - "success_icon_W_G", + "success_128px_W_G", ""); infoIcon->setAlignment(Alignment::Horizontal::Center); } diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp index 6510c0e8c..7af71fd01 100644 --- a/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp +++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp @@ -117,7 +117,7 @@ void PhoneLockedInfoWindow::buildInterface() style::window::default_vertical_pos, style::window::default_body_width, style::window::default_body_height, - "unlock_icon_W_G", + "lock_128px_W_G", utils::translate("app_desktop_press_to_unlock")); infoIcon->setAlignment(Alignment::Horizontal::Center); diff --git a/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp b/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp index 204abc63f..a227b2c1c 100644 --- a/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp +++ b/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp @@ -50,7 +50,7 @@ void SimInfoWindow::onBeforeShow(ShowMode mode, SwitchData *data) setTitle(utils::translate("app_settings_net")); infoIcon->text->setRichText(utils::translate("sim_card_cant_connect"), {{"$SIM", infoData->getLock().getLockName()}}); - infoIcon->image->set("sim_card_W_G"); + infoIcon->image->set("sim_128px_W_G"); break; default: break; @@ -69,7 +69,7 @@ void SimInfoWindow::buildInterface() style::window::default_vertical_pos, style::window::default_body_width, style::window::default_body_height, - "success_icon_W_G", + "success_128px_W_G", utils::translate("sim_pin_changed_successfully")); infoIcon->setAlignment(Alignment::Horizontal::Center); } diff --git a/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp b/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp index 35ef976f7..e844dec2c 100644 --- a/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp +++ b/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp @@ -41,7 +41,7 @@ void SimNotReadyWindow::buildInterface() style::window::default_vertical_pos, style::window::default_body_width, style::window::default_body_height, - "sim_card_W_G", + "sim_128px_W_G", utils::translate("sim_card_not_ready")); infoIcon->setAlignment(Alignment::Horizontal::Center); } diff --git a/module-apps/apps-common/widgets/ActiveIconFactory.cpp b/module-apps/apps-common/widgets/ActiveIconFactory.cpp index 891d6af28..f4bffdfce 100644 --- a/module-apps/apps-common/widgets/ActiveIconFactory.cpp +++ b/module-apps/apps-common/widgets/ActiveIconFactory.cpp @@ -40,7 +40,7 @@ auto ActiveIconFactory::makeCustomIcon(const UTF8 &image, auto ActiveIconFactory::makeSMSIcon(const utils::PhoneNumber::View &number) -> ImageBox * { return makeCustomIcon( - "messages_notification_icon", + "messages_32px_W_G", [application = app, number](gui::Item &item) { auto data = std::make_unique(number, std::string{}); data->ignoreCurrentWindowOnStack = true; @@ -55,7 +55,7 @@ auto ActiveIconFactory::makeSMSIcon(const utils::PhoneNumber::View &number) -> I auto ActiveIconFactory::makeCallIcon(const utils::PhoneNumber::View &number) -> ImageBox * { return makeCustomIcon( - "phonebook_phone_ringing", + "call_32px_W_G", [application = app, number](gui::Item &item) { return app::manager::Controller::sendAction(application, app::manager::actions::Call, @@ -68,7 +68,7 @@ auto ActiveIconFactory::makeCallIcon(const utils::PhoneNumber::View &number) -> auto ActiveIconFactory::makeAddContactIcon(const std::shared_ptr &contact) -> ImageBox * { return makeCustomIcon( - "cross", + "plus_32px_W_G", [application = app, contact](gui::Item &item) { return app::manager::Controller::sendAction(application, app::manager::actions::EditContact, diff --git a/module-apps/apps-common/widgets/BrightnessBox.cpp b/module-apps/apps-common/widgets/BrightnessBox.cpp index 267253190..e65b63271 100644 --- a/module-apps/apps-common/widgets/BrightnessBox.cpp +++ b/module-apps/apps-common/widgets/BrightnessBox.cpp @@ -10,9 +10,9 @@ namespace gui : HBox(parent, x, y, style::window::brightness::title::width, style::window::brightness::title::height) { setEdges(RectangleEdge::None); - addArrow("arrow_left", Alignment::Horizontal::Left); + addArrow("arrow_left_20px_W_M", Alignment::Horizontal::Left); addBrightnessTitle(this, utils::translate(style::window::brightness::title_key)); - addArrow("arrow_right", Alignment::Horizontal::Right); + addArrow("arrow_right_20px_W_M", Alignment::Horizontal::Right); resizeItems(); } diff --git a/module-apps/apps-common/widgets/InputBox.cpp b/module-apps/apps-common/widgets/InputBox.cpp index 4fc380b7f..87e40d3a9 100644 --- a/module-apps/apps-common/widgets/InputBox.cpp +++ b/module-apps/apps-common/widgets/InputBox.cpp @@ -25,7 +25,7 @@ namespace gui constexpr uint32_t x = style::window::default_left_margin; constexpr uint32_t y = 153; constexpr uint32_t w = default_w; - constexpr uint32_t h = 33; + constexpr uint32_t h = 34; constexpr uint32_t penWidth = 2; namespace searchTop { diff --git a/module-apps/apps-common/widgets/SpinBox.cpp b/module-apps/apps-common/widgets/SpinBox.cpp index 51b4ce42d..88a95490b 100644 --- a/module-apps/apps-common/widgets/SpinBox.cpp +++ b/module-apps/apps-common/widgets/SpinBox.cpp @@ -29,8 +29,8 @@ namespace gui setEdges(gui::RectangleEdge::Top | gui::RectangleEdge::Bottom); titleLabel = addTitle(this, title); - leftArrow = addArrow(this, "arrow_left", Alignment::Horizontal::Left, false); - rightArrow = addArrow(this, "arrow_right", Alignment::Horizontal::Right, false); + leftArrow = addArrow(this, "arrow_left_20px_W_M", Alignment::Horizontal::Left, false); + rightArrow = addArrow(this, "arrow_right_20px_W_M", Alignment::Horizontal::Right, false); bar = addBarGraph(this, maxValue, startValue); focusChangedCallback = [this](Item &item) { diff --git a/module-apps/apps-common/widgets/TextWithIconsWidget.hpp b/module-apps/apps-common/widgets/TextWithIconsWidget.hpp index afb248545..67170ff63 100644 --- a/module-apps/apps-common/widgets/TextWithIconsWidget.hpp +++ b/module-apps/apps-common/widgets/TextWithIconsWidget.hpp @@ -28,7 +28,7 @@ namespace gui class TextWithSnippet : public HBox { - constexpr static auto defaultSnippet = "Rectangle"; + constexpr static auto defaultSnippet = "label_rectangle_W_M"; public: TextWithSnippet(const std::string &text, const UTF8 &font, const UTF8 &snippet = defaultSnippet); diff --git a/module-gui/gui/widgets/CheckBox.cpp b/module-gui/gui/widgets/CheckBox.cpp index 5e4190b57..1694a2ae4 100644 --- a/module-gui/gui/widgets/CheckBox.cpp +++ b/module-gui/gui/widgets/CheckBox.cpp @@ -24,7 +24,7 @@ namespace gui setEdges(RectangleEdge::Bottom); setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center)); - image = new Image(this, "small_tick_W_M"); + image = new Image(this, "small_tick_32px_W_M"); image->setVisible(false); applyCallbacks(); diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp index 5300e333c..cfc279eb6 100644 --- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp +++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsMenuWindow.cpp @@ -30,10 +30,10 @@ namespace gui if (window.empty()) { return false; } - application->switchWindow( - window, - gui::ShowMode::GUI_SHOW_INIT, - std::make_unique(gui::DialogMetadata{name, "search_big", " "})); + application->switchWindow(window, + gui::ShowMode::GUI_SHOW_INIT, + std::make_unique( + gui::DialogMetadata{name, "search_128px_W_G", " "})); return true; }, [=](gui::Item &item) { return true; },