From 2876499c4fae5e85067c3d7c53cbbab145c22828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Wed, 9 Feb 2022 14:57:44 +0300 Subject: [PATCH] [FL-2249] Bluetooth: update status bar icon #985 --- applications/bt/bt_service/bt.c | 8 ++++---- assets/compiled/assets_icons.c | 14 +++++++------- assets/compiled/assets_icons.h | 4 ++-- assets/icons/StatusBar/BT_Pair_9x8.png | Bin 2072 -> 0 bytes .../icons/StatusBar/Bluetooth_Connected_16x8.png | Bin 0 -> 3613 bytes ...{Bluetooth_5x8.png => Bluetooth_Idle_5x8.png} | Bin 6 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 assets/icons/StatusBar/BT_Pair_9x8.png create mode 100644 assets/icons/StatusBar/Bluetooth_Connected_16x8.png rename assets/icons/StatusBar/{Bluetooth_5x8.png => Bluetooth_Idle_5x8.png} (100%) diff --git a/applications/bt/bt_service/bt.c b/applications/bt/bt_service/bt.c index 32008f523..75392caf3 100755 --- a/applications/bt/bt_service/bt.c +++ b/applications/bt/bt_service/bt.c @@ -16,9 +16,9 @@ static void bt_draw_statusbar_callback(Canvas* canvas, void* context) { Bt* bt = context; if(bt->status == BtStatusAdvertising) { - canvas_draw_icon(canvas, 0, 0, &I_Bluetooth_5x8); + canvas_draw_icon(canvas, 0, 0, &I_Bluetooth_Idle_5x8); } else if(bt->status == BtStatusConnected) { - canvas_draw_icon(canvas, 0, 0, &I_BT_Pair_9x8); + canvas_draw_icon(canvas, 0, 0, &I_Bluetooth_Connected_16x8); } } @@ -257,10 +257,10 @@ static void bt_on_key_storage_change_callback(uint8_t* addr, uint16_t size, void static void bt_statusbar_update(Bt* bt) { if(bt->status == BtStatusAdvertising) { - view_port_set_width(bt->statusbar_view_port, icon_get_width(&I_Bluetooth_5x8)); + view_port_set_width(bt->statusbar_view_port, icon_get_width(&I_Bluetooth_Idle_5x8)); view_port_enabled_set(bt->statusbar_view_port, true); } else if(bt->status == BtStatusConnected) { - view_port_set_width(bt->statusbar_view_port, icon_get_width(&I_BT_Pair_9x8)); + view_port_set_width(bt->statusbar_view_port, icon_get_width(&I_Bluetooth_Connected_16x8)); view_port_enabled_set(bt->statusbar_view_port, true); } else { view_port_enabled_set(bt->statusbar_view_port, false); diff --git a/assets/compiled/assets_icons.c b/assets/compiled/assets_icons.c index 409f7034c..1d395b96e 100644 --- a/assets/compiled/assets_icons.c +++ b/assets/compiled/assets_icons.c @@ -525,9 +525,6 @@ const uint8_t *_I_Cry_dolph_55x52[] = {_I_Cry_dolph_55x52_0}; const uint8_t _I_Attention_5x8_0[] = {0x00,0x0E,0x0A,0x0A,0x0A,0x0E,0x04,0x00,0x0E,}; const uint8_t *_I_Attention_5x8[] = {_I_Attention_5x8_0}; -const uint8_t _I_BT_Pair_9x8_0[] = {0x00,0x11,0x01,0x35,0x00,0x58,0x01,0x31,0x00,0x30,0x01,0x59,0x00,0x34,0x01,0x11,0x01,}; -const uint8_t *_I_BT_Pair_9x8[] = {_I_BT_Pair_9x8_0}; - const uint8_t _I_Background_128x11_0[] = {0x01,0x00,0x70,0x00,0xff,0x40,0x40,0xc9,0xe0,0xff,0x80,0x06,0x1e,0x08,0x38,0x0c,0x0c,0x1e,0x93,0x00,0x19,0x46,0x01,0x07,0x7d,0x83,0x03,0xd2,0x31,0xff,0xdb,0xd5,0x66,0x20,0x83,0xc0,0xff,0x05,0x24,0x00,0x1c,0x78,0x28,0xbc,0x40,0x72,0xbf,0xcf,0x47,0xeb,0x40,0xdb,0x7a,0xbf,0xf0,0x40,0x39,0x60,0x28,0x3f,0xe0,0xa0,0xea,0x80,0x63,0x3f,0x0b,0x17,0xe4,0x3e,0x5a,0xbc,0xf9,0x99,0x70,0x1f,0x81,0x50,0xc0,0x80,0xe7,0x3e,0x1e,0x9d,0x57,0xfb,0x7f,0x23,0x15,0xb0,0x12,0x5b,0x5b,0x02,0x1d,0x8c,0xc3,0x80,0x24,0x9e,0x03,0x80,0x5e,0x40,0x00,0xa1,0x88,0x0e,0x98,0x00,0x7b,0x07,0x08,0xb2,0x44,0x41,}; const uint8_t *_I_Background_128x11[] = {_I_Background_128x11_0}; @@ -540,8 +537,11 @@ const uint8_t *_I_Battery_19x8[] = {_I_Battery_19x8_0}; const uint8_t _I_Battery_26x8_0[] = {0x01,0x00,0x13,0x00,0xff,0x7f,0xef,0xf0,0x08,0x0c,0x03,0x00,0x03,0x38,0x18,0x0c,0xa0,0x40,0x36,0x05,0x98,0x6d,0x00,}; const uint8_t *_I_Battery_26x8[] = {_I_Battery_26x8_0}; -const uint8_t _I_Bluetooth_5x8_0[] = {0x00,0x04,0x0D,0x16,0x0C,0x0C,0x16,0x0D,0x04,}; -const uint8_t *_I_Bluetooth_5x8[] = {_I_Bluetooth_5x8_0}; +const uint8_t _I_Bluetooth_Connected_16x8_0[] = {0x00,0x04,0x00,0x0D,0x00,0x16,0x60,0x4C,0x97,0x4C,0x97,0x16,0x60,0x0D,0x00,0x04,0x00,}; +const uint8_t *_I_Bluetooth_Connected_16x8[] = {_I_Bluetooth_Connected_16x8_0}; + +const uint8_t _I_Bluetooth_Idle_5x8_0[] = {0x00,0x04,0x0D,0x16,0x0C,0x0C,0x16,0x0D,0x04,}; +const uint8_t *_I_Bluetooth_Idle_5x8[] = {_I_Bluetooth_Idle_5x8_0}; const uint8_t _I_Charging_lightning_9x10_0[] = {0x00,0x40,0x01,0xA0,0x00,0x50,0x00,0xE8,0x01,0x84,0x00,0x42,0x00,0x2F,0x00,0x14,0x00,0x0A,0x00,0x05,0x00,}; const uint8_t *_I_Charging_lightning_9x10[] = {_I_Charging_lightning_9x10_0}; @@ -753,12 +753,12 @@ const Icon I_SDError_43x35 = {.width=43,.height=35,.frame_count=1,.frame_rate=0, const Icon I_SDQuestion_35x43 = {.width=35,.height=43,.frame_count=1,.frame_rate=0,.frames=_I_SDQuestion_35x43}; const Icon I_Cry_dolph_55x52 = {.width=55,.height=52,.frame_count=1,.frame_rate=0,.frames=_I_Cry_dolph_55x52}; const Icon I_Attention_5x8 = {.width=5,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Attention_5x8}; -const Icon I_BT_Pair_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BT_Pair_9x8}; const Icon I_Background_128x11 = {.width=128,.height=11,.frame_count=1,.frame_rate=0,.frames=_I_Background_128x11}; const Icon I_BadUsb_9x8 = {.width=9,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_BadUsb_9x8}; const Icon I_Battery_19x8 = {.width=19,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_19x8}; const Icon I_Battery_26x8 = {.width=26,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Battery_26x8}; -const Icon I_Bluetooth_5x8 = {.width=5,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Bluetooth_5x8}; +const Icon I_Bluetooth_Connected_16x8 = {.width=16,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Bluetooth_Connected_16x8}; +const Icon I_Bluetooth_Idle_5x8 = {.width=5,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Bluetooth_Idle_5x8}; const Icon I_Charging_lightning_9x10 = {.width=9,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Charging_lightning_9x10}; const Icon I_Charging_lightning_mask_9x10 = {.width=9,.height=10,.frame_count=1,.frame_rate=0,.frames=_I_Charging_lightning_mask_9x10}; const Icon I_Lock_8x8 = {.width=8,.height=8,.frame_count=1,.frame_rate=0,.frames=_I_Lock_8x8}; diff --git a/assets/compiled/assets_icons.h b/assets/compiled/assets_icons.h index 3b756c1b4..8fa6d6c6c 100644 --- a/assets/compiled/assets_icons.h +++ b/assets/compiled/assets_icons.h @@ -136,12 +136,12 @@ extern const Icon I_SDError_43x35; extern const Icon I_SDQuestion_35x43; extern const Icon I_Cry_dolph_55x52; extern const Icon I_Attention_5x8; -extern const Icon I_BT_Pair_9x8; extern const Icon I_Background_128x11; extern const Icon I_BadUsb_9x8; extern const Icon I_Battery_19x8; extern const Icon I_Battery_26x8; -extern const Icon I_Bluetooth_5x8; +extern const Icon I_Bluetooth_Connected_16x8; +extern const Icon I_Bluetooth_Idle_5x8; extern const Icon I_Charging_lightning_9x10; extern const Icon I_Charging_lightning_mask_9x10; extern const Icon I_Lock_8x8; diff --git a/assets/icons/StatusBar/BT_Pair_9x8.png b/assets/icons/StatusBar/BT_Pair_9x8.png deleted file mode 100644 index 4382cc744eb14fdcdd6699c1cffac110b927fe04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2072 zcma)7eQXnD7{6f*-S{x#0z$+bM~DM#uXkO$_113bdM&N2ShfNyNZ{6c+rC+QSMRQC zI}mUP3I@se0|P@Aafu|8O+GZ@ki}_2SmYxSFpGo$hTuel3L|KS^S$e~4q?PU`td%$ z=lR|5`FNk(=3laCO2MoG48x{)J#01l%|{=dZUXvl>#V$vVNc(Ofm)^3SH*@H0JE8G1=)Yg`0W&yPDr3E*af*s!1srF%+08xT;4yw&zcA|tv6QFiSBMUwjLM>pN z65te33W#FNPB_$w#r-3R;52P8<3&C$1O+v<`5K`b#*z_nDBLT^3MYiXNI1-eo1Pf1HkR?jG>Fx*5DAb`okz-_!-8Y5 zY{xXrDaJ&p23>Mg6iQPw+H*$3P}LA*`VZuFI{lIuhB1W6)r%@|ughtntQL!&Hc;9P z#BHbsYE^&)8vyT?#Q5;NQ?2~?wW6PxEV{R9JRHAR)VT4ax*0}vd7z9&D5IIO>!Jp{ zo;_ucF{tUqaqU(zTu7Z?JCTq?J{bbMRuDv&MP)Ipq&NvUB4_~6Ooqb{O?oCfmN;dg zjHoOR@ui{wv5h~6S+Tf{R5#a%G#i;se~kF7!&}y3Prn^99_ofFuKlxfOfcq zmi4t4YSGIfZxcifeWZ~XR@9tqKDUrvT6n4={LWysu(zjf+H&WH3*Wl;c%9x^A5FHH zei-!M`Dx%vOL57l-v6VA8`^eHw*~w&YPMQvv)K_`*VSBlxLxR4{?`{94+#`kbnxJ_ zFD~CJ6zt4@_2rhmXIgsBESSBjuzdQxe#vpIe$~#hL0;~?_Dsuwr&QPB=EPrSoZ5K! zm0LkBW1Zbs<#=%U)CTVxM2SgX-}Rkka?e}3t6<;Kru+RN&xuyy@BZf5;Lmm4cV0TZ zxMN!9QZ}-!5LT@}Fukp@@>1K+`7>v3Zx|Z7chNKTZrR0KPx%Md2FVZnU*)yl+C6Ym z47N_Zdh+d~ug$OMp18U5KdN0ve1Ei6o+{2cLaa&V{aAK>-XHt7kONJTBb#U3Ifq`l`3X-@#;{4xsh>P-@4n}e zk@2#QfNoEG2Q>{d>Ux@nhD@th-Z(+0o9F00or3M!)ehf`57HOAR-Rqo4sY~!pY2<` etmHF`bR7#mVEZoI9oV71(7moDY)9qVrhfqn0J$*$ diff --git a/assets/icons/StatusBar/Bluetooth_Connected_16x8.png b/assets/icons/StatusBar/Bluetooth_Connected_16x8.png new file mode 100644 index 0000000000000000000000000000000000000000..c77bc1494f92b16d0a078b47acfa6df6a45890f7 GIT binary patch literal 3613 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 X0xtk%_Z)B;2L)JL*qN7_d0hG*G(b{c literal 0 HcmV?d00001 diff --git a/assets/icons/StatusBar/Bluetooth_5x8.png b/assets/icons/StatusBar/Bluetooth_Idle_5x8.png similarity index 100% rename from assets/icons/StatusBar/Bluetooth_5x8.png rename to assets/icons/StatusBar/Bluetooth_Idle_5x8.png