Merge pull request #186 from petterhs/musicUI

music: Symbols for the buttons

Author: JF002

src/displayapp/screens/Music.cpp

@@ -16,6 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include "Music.h"
+#include "Symbols.h"
 #include <cstdint>
 #include "../DisplayApp.h"
 #include "components/ble/MusicService.h"
@@ -58,7 +59,7 @@ Music::Music(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Mus
   lv_obj_set_size(btnVolDown, LV_HOR_RES / 3, 80);
   lv_obj_align(btnVolDown, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
   label = lv_label_create(btnVolDown, nullptr);
-  lv_label_set_text(label, "V-");
+  lv_label_set_text(label, Symbols::volumDown);
   lv_obj_set_hidden(btnVolDown, !displayVolumeButtons);
 
   btnVolUp = lv_btn_create(lv_scr_act(), nullptr);
@@ -67,7 +68,7 @@ Music::Music(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Mus
   lv_obj_set_size(btnVolUp, LV_HOR_RES / 3, 80);
   lv_obj_align(btnVolUp, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
   label = lv_label_create(btnVolUp, nullptr);
-  lv_label_set_text(label, "V+");
+  lv_label_set_text(label, Symbols::volumUp);
   lv_obj_set_hidden(btnVolDown, !displayVolumeButtons);
 
   btnPrev = lv_btn_create(lv_scr_act(), nullptr);
@@ -76,23 +77,23 @@ Music::Music(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Mus
   lv_obj_set_size(btnPrev, LV_HOR_RES / 3, 80);
   lv_obj_align(btnPrev, nullptr, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
   label = lv_label_create(btnPrev, nullptr);
-  lv_label_set_text(label, "<<");
+  lv_label_set_text(label, Symbols::stepBackward);
 
   btnNext = lv_btn_create(lv_scr_act(), nullptr);
   btnNext->user_data = this;
   lv_obj_set_event_cb(btnNext, event_handler);
   lv_obj_set_size(btnNext, LV_HOR_RES / 3, 80);
   lv_obj_align(btnNext, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0);
   label = lv_label_create(btnNext, nullptr);
-  lv_label_set_text(label, ">>");
+  lv_label_set_text(label, Symbols::stepForward);
 
   btnPlayPause = lv_btn_create(lv_scr_act(), nullptr);
   btnPlayPause->user_data = this;
   lv_obj_set_event_cb(btnPlayPause, event_handler);
   lv_obj_set_size(btnPlayPause, LV_HOR_RES / 3, 80);
   lv_obj_align(btnPlayPause, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
   txtPlayPause = lv_label_create(btnPlayPause, nullptr);
-  lv_label_set_text(txtPlayPause, ">");
+  lv_label_set_text(txtPlayPause, Symbols::play);
 
   txtTrackDuration = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_long_mode(txtTrackDuration, LV_LABEL_LONG_SROLL);
@@ -179,7 +180,7 @@ bool Music::Refresh() {
   }
 
   if (playing == Pinetime::Controllers::MusicService::MusicStatus::Playing) {
-    lv_label_set_text(txtPlayPause, "||");
+    lv_label_set_text(txtPlayPause, Symbols::pause);
     if (xTaskGetTickCount() - 1024 >= lastIncrement) {
 
       if (frameB) {
@@ -203,7 +204,7 @@ bool Music::Refresh() {
       UpdateLength();
     }
   } else {
-    lv_label_set_text(txtPlayPause, ">");
+    lv_label_set_text(txtPlayPause, Symbols::play);
   }
 
   return running;