summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Thompson <daniel@redfelineninja.org.uk>2020-11-22 09:22:50 (GMT)
committerDaniel Thompson <daniel@redfelineninja.org.uk>2020-11-22 09:22:50 (GMT)
commit6f0238415ff55e9e5969465c811a86781963ff87 (patch)
tree3edd568f180ef1306d07a5e6c95eef8b85a1486b
parentfd0e0d77aa9ca90f0cb110a31fb098d189b87114 (diff)
apps: music: Add to application index
Additionally we rename the screenshot to conform to the naming convention (app.NAME + 'App.png') used for simulator screenshots. Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
-rw-r--r--docs/apps.rst10
-rw-r--r--res/MusicApp.pngbin0 -> 6316 bytes
-rw-r--r--res/MusicPlayerApp.pngbin8324 -> 0 bytes
-rw-r--r--wasp/apps/musicplayer.py23
4 files changed, 21 insertions, 12 deletions
diff --git a/docs/apps.rst b/docs/apps.rst
index 7b24401..9decb62 100644
--- a/docs/apps.rst
+++ b/docs/apps.rst
@@ -37,3 +37,13 @@ Games
This is enabled by default in the simulator. The app is bundled in the
firmware image but it is disabled by default to keep RAM available for
user developed applications. It can be enabled by modifying ``main.py``.
+
+Integration
+-----------
+
+.. automodule:: apps.musicplayer
+
+This app is enabled by default in the simulator.
+The app is also frozen into the firmware image but it is disabled by
+default in order to keep RAM available for user developed applications.
+It can be enabled by modifying ``main.py``.
diff --git a/res/MusicApp.png b/res/MusicApp.png
new file mode 100644
index 0000000..0d034b6
--- /dev/null
+++ b/res/MusicApp.png
Binary files differ
diff --git a/res/MusicPlayerApp.png b/res/MusicPlayerApp.png
deleted file mode 100644
index 9b6b7e3..0000000
--- a/res/MusicPlayerApp.png
+++ /dev/null
Binary files differ
diff --git a/wasp/apps/musicplayer.py b/wasp/apps/musicplayer.py
index cf96ca1..91483c3 100644
--- a/wasp/apps/musicplayer.py
+++ b/wasp/apps/musicplayer.py
@@ -3,12 +3,18 @@
# Copyright (C) 2020 Carlos Gil
"""Music Player for GadgetBridge
-~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ .. figure:: res/MusicApp.png
+ :width: 179
+
+ Screenshot of the Music Player application
Music Player Controller:
-- Touch: play/pause
-- Swipe UPDOWN: Volume down/up
-- Swipe LEFTRIGHT: next/previous
+
+* Touch: play/pause
+* Swipe UPDOWN: Volume down/up
+* Swipe LEFTRIGHT: next/previous
"""
import wasp
@@ -16,15 +22,8 @@ import wasp
import icons
import time
-
class MusicPlayerApp(object):
- """ Music Player Controller application.
-
- .. figure:: res/MusicPlayerApp.png
- :width: 179
-
- Screenshot of the Music Player application
- """
+ """ Music Player Controller application."""
NAME = 'Music'
ICON = icons.headset