From 2cdd11d96ab6da9bb4e6ad2b44017ad8ca53bcbb Mon Sep 17 00:00:00 2001
From: Erwin Ried <1091420+eried@users.noreply.github.com>
Date: Sat, 30 May 2020 16:26:06 +0200
Subject: [PATCH] More icon standarization
---
firmware/application/bitmap.hpp | 86 +++++++++++++++++----------
firmware/graphics/icon_file_text.png | Bin 143 -> 156 bytes
firmware/graphics/icon_file_wav.png | Bin 0 -> 168 bytes
firmware/graphics/icon_replay.png | Bin 149 -> 116 bytes
4 files changed, 54 insertions(+), 32 deletions(-)
create mode 100644 firmware/graphics/icon_file_wav.png
diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp
index 45c254e1..e1f9f10b 100644
--- a/firmware/application/bitmap.hpp
+++ b/firmware/application/bitmap.hpp
@@ -582,27 +582,49 @@ static constexpr Bitmap bitmap_icon_file_iq {
};
static constexpr uint8_t bitmap_icon_file_text_data[] = {
- 0x00, 0x20,
- 0x00, 0x30,
- 0x00, 0x38,
- 0x00, 0x38,
- 0x00, 0x34,
- 0x00, 0x32,
- 0x00, 0x31,
- 0x80, 0x30,
- 0xC0, 0x30,
- 0xE0, 0x3F,
- 0x30, 0x30,
- 0x18, 0x30,
- 0x0C, 0x30,
- 0x0E, 0x78,
- 0x1F, 0xFC,
- 0x00, 0x00,
+ 0xFC, 0x03,
+ 0x04, 0x06,
+ 0x04, 0x0E,
+ 0x04, 0x1E,
+ 0xF4, 0x3E,
+ 0x04, 0x20,
+ 0xF4, 0x2F,
+ 0x04, 0x20,
+ 0xF4, 0x2F,
+ 0x04, 0x20,
+ 0xF4, 0x2F,
+ 0x04, 0x20,
+ 0xF4, 0x2F,
+ 0x04, 0x20,
+ 0x04, 0x20,
+ 0xFC, 0x3F,
};
static constexpr Bitmap bitmap_icon_file_text {
{ 16, 16 }, bitmap_icon_file_text_data
};
+static constexpr uint8_t bitmap_icon_file_wav_data[] = {
+ 0xFC, 0x03,
+ 0x04, 0x06,
+ 0x04, 0x0E,
+ 0x04, 0x1E,
+ 0x04, 0x3E,
+ 0x84, 0x20,
+ 0xC4, 0x22,
+ 0xF4, 0x20,
+ 0xF4, 0x2E,
+ 0xF4, 0x20,
+ 0xC4, 0x22,
+ 0x84, 0x24,
+ 0x04, 0x28,
+ 0x04, 0x20,
+ 0x04, 0x20,
+ 0xFC, 0x3F,
+};
+static constexpr Bitmap bitmap_icon_file_wav {
+ { 16, 16 }, bitmap_icon_file_wav_data
+};
+
static constexpr uint8_t bitmap_icon_fox_data[] = {
0x18, 0x18,
0x28, 0x14,
@@ -1044,22 +1066,22 @@ static constexpr Bitmap bitmap_icon_remote {
};
static constexpr uint8_t bitmap_icon_replay_data[] = {
- 0x60, 0x00,
- 0xE0, 0x00,
- 0xE0, 0x01,
- 0xE0, 0x03,
- 0xE0, 0x07,
- 0xE0, 0x0F,
- 0xE0, 0x1F,
- 0xE0, 0x3F,
- 0xE0, 0x3F,
- 0xE0, 0x1F,
- 0xE0, 0x0F,
- 0xE0, 0x07,
- 0xE0, 0x03,
- 0xE0, 0x01,
- 0xE0, 0x00,
- 0x60, 0x00,
+ 0x00, 0x00,
+ 0x00, 0x00,
+ 0x0C, 0x00,
+ 0x3C, 0x00,
+ 0xFC, 0x00,
+ 0xFC, 0x03,
+ 0xFC, 0x0F,
+ 0xFC, 0x3F,
+ 0xFC, 0x3F,
+ 0xFC, 0x0F,
+ 0xFC, 0x03,
+ 0xFC, 0x00,
+ 0x3C, 0x00,
+ 0x0C, 0x00,
+ 0x00, 0x00,
+ 0x00, 0x00,
};
static constexpr Bitmap bitmap_icon_replay {
{ 16, 16 }, bitmap_icon_replay_data
diff --git a/firmware/graphics/icon_file_text.png b/firmware/graphics/icon_file_text.png
index b31f8129e2af1b2ad3583d48d8943c9dfebc90ab..c5f4a0d49e010c02a088c818a5aa973dcc2ab26d 100644
GIT binary patch
delta 127
zcmV-_0D%9G0h|GlBzR&;L_t(IPwi7d4!|G`lK(%tOOvrF!>L!J7fq!Uu|>I8L<G-n
z2LKzd33?!syZeVVK_h}JrkG^{CHWAj7g^EyLnTuR)V%t+Lj{^lMMuHgGdupm-$c5>
hYdn}qCWei40nc2F5x$Q==l}o!07*qoM6N<$f&lLAGyVVo
delta 114
zcmV-&0FD2g0gnNYBx_blL_t(IjlGgd3IHGs1M~k+$CFS>m&AjG9)!+Vg8)FcNyf7e
zKMP|07hLE`5CL0|hCM-sEkQA;3zTXF-ObVl8$1dWxD_;STeAVcGBGDu=_gKo09`u1
UP(57Nvj6}907*qoM6N<$f~`v_+W-In
diff --git a/firmware/graphics/icon_file_wav.png b/firmware/graphics/icon_file_wav.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e798c2d8866020e5214a1644eb4b2bcbde8171c
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`d7dtgAr}5yF9&ilC~~k|nEPA)
zmOzmtTWRsax~@s;GaueOd`9QmO&*4qcFdsx4{rWkU3EeH!AX-e9*s}j2}@X4Wq+*W
zEO;oA#aMf8&4%QLK=$JeW*6>C6_}k1S=;~1;r8DbTz8M}VlRpOs`D$E(O};SLC!5-
Syn!||c)I$ztaD0eVgLZ5-awTA
literal 0
HcmV?d00001
diff --git a/firmware/graphics/icon_replay.png b/firmware/graphics/icon_replay.png
index ae6e694770527ea0ac0ac766c333fabcd4dd922b..04b0b2d5e2580f5d946764fe00ff4e053fe4fbeb 100644
GIT binary patch
delta 86
zcmbQrSTaE+z}nNrF~p)bIUyn8hri;oNsI;#8yQn1TJACk@f^x$5M&cfXOL_5FlOj>
pEHP{N*XZ%T#icB08AEUy1H(eiUn1J^pG_Hnz|+;wWt~$(69D1D9CZKy
delta 119
zcmV--0Equ|l>v|>aa>76K~y+T#nUkk03ZkhK>PnkV;oF~skFH0h<I^mG02ICSYrTS
z_jyJaHsBx<P>2Oohz;D37Qm1;a3W7YM*aXfVC^5A>1+Wk+BR_Og#}cll7MPt38=>_
Z4-=@=KoJv8y!!wE002ovPDHLkV1fuLE_(m~
--
GitLab