diff --git a/TODO.rst b/TODO.rst index 4e6ed5c..42480ef 100644 --- a/TODO.rst +++ b/TODO.rst @@ -59,7 +59,7 @@ Wasp-os * [ ] Look and feel * [X] Add a simple theming approach - * [ ] Update icon for Music player + * [X] Update icon for Music player * [ ] Introduce fwd/back/vol+/vol- buttons to the music player * [X] Update icon for Alarm app * [X] Update art work for buttons in Confirmation view diff --git a/res/music_icon.png b/res/music_icon.png new file mode 100644 index 0000000..59eb726 Binary files /dev/null and b/res/music_icon.png differ diff --git a/wasp/apps/musicplayer.py b/wasp/apps/musicplayer.py index 91483c3..62ade8a 100644 --- a/wasp/apps/musicplayer.py +++ b/wasp/apps/musicplayer.py @@ -22,10 +22,39 @@ import wasp import icons import time +# 2-bit RLE, generated from res/music_icon.png, 358 bytes +icon = ( + b'\x02' + b'`@' + b'\x1e\xa4<\xa4<\xa4;\xa6?X\xec2\xf0/\xf2-' + b'\xf4,\xc3@[n\xc3,\xc3n\xc3,\xc3n\xc3,' + b'\xc3n\xc3,\xc3b\xc7E\xc3,\xc3]\xccE\xc3,' + b'\xc3Z\xcfE\xc3,\xc3T\xd5E\xc3,\xc3Q\xd8E' + b'\xc3,\xc3Q\xd8E\xc3,\xc3Q\xd8E\xc3,\xc3Q' + b'\xd0E\xc3E\xc3,\xc3Q\xccI\xc3E\xc3,\xc3Q' + b'\xc9L\xc3E\xc3,\xc3Q\xc5P\xc3E\xc3,\xc3Q' + b'\xc3R\xc3E\xc3,\xc3Q\xc3R\xc3E\xc3,\xc3Q' + b'\xc3R\xc3E\xc3+\xc4Q\xc3R\xc3E\xc3*\xc5Q' + b'\xc3R\xc3E\xc3*\xc5Q\xc3R\xc3E\xc3*\xc5Q' + b'\xc3R\xc3E\xc3*\xc5Q\xc3R\xc3E\xc3*\xc5Q' + b'\xc3R\xc3E\xc3*\xc5Q\xc3R\xc3E\xc3*\xc5Q' + b'\xc3L\xc4B\xc3E\xc3+\xc4Q\xc3I\xccE\xc3,' + b'\xc3Q\xc3H\xcdE\xc3,\xc3Q\xc3G\xceE\xc3,' + b'\xc3K\xc3C\xc3F\xcfE\xc3,\xc3H\xccF\xcfE' + b'\xc3,\xc3G\xcdF\xcfE\xc3,\xc3F\xceF\xcfE' + b'\xc3,\xc3E\xcfF\xcfE\xc3,\xc3E\xcfG\xceE' + b'\xc3,\xc3D\xd0H\xccF\xc3,\xc3D\xd0I\xcaG' + b'\xc3,\xc3E\xcfK\xc5J\xc3,\xc3E\xce[\xc3,' + b'\xc3F\xcd[\xc3,\xc3G\xca]\xc3,\xc3I\xc7^' + b'\xc3,\xc3n\xc3,\xc3n\xc3,\xc3n\xc3,\xc3n' + b'\xc3,\xf4-\xf2/\xf02\xec?X\xa6;\xa4<\xa4' + b'<\xa4\x1e' +) + class MusicPlayerApp(object): """ Music Player Controller application.""" NAME = 'Music' - ICON = icons.headset + ICON = icon def __init__(self): diff --git a/wasp/icons.py b/wasp/icons.py index 8954b59..7b187d2 100644 --- a/wasp/icons.py +++ b/wasp/icons.py @@ -215,27 +215,6 @@ blestatus = ( b'\x13\xc2\x14\xc1\x0e' ) -# 2-bit RLE, generated from res/headset.png, 229 bytes -headset = ( - b'\x02' - b'`@' - b'?\xff\x0c\xcc?\x12\xd2?\x0c\xd8?\x07\xdc?\x04\xde' - b'?\x01\xe2=\xd1\x02\xd1;\xcd\x0c\xcd9\xcb\x12\xcb7' - b'\xca\x16\xca5\xca\x18\xca4\xc8\x1c\xc83\xc8\x1e\xc81' - b'\xc8 \xc80\xc8 \xc8/\xc8"\xc8.\xc7$\xc7-' - b'\xc8$\xc8,\xc7&\xc7,\xc7&\xc7,\xc6(\xc6+' - b'\xc7(\xc7*\xc7(\xc7*\xc7(\xc7*\xc7(\xc7*' - b'\xc6*\xc6*\xc6*\xc6*\xc6*\xc6*\xc6*\xc6*' - b'\xc6*\xc6*\xc6*\xc6*\xc6*\xc6*\xc6*\xc6*' - b'\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*' - b'\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*' - b'\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*' - b'\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2*' - b'\xd2\x12\xd2*\xd2\x12\xd2*\xd2\x12\xd2+\xd1\x12\xd1,' - b'\xd1\x12\xd1-\xd0\x12\xd0/\xcf\x12\xcf2\xcd\x12\xcd?' - b'\xff\\' -) - # 2-bit RLE, generated from res/play.png, 282 bytes play = ( b'\x02'