added progressbar to main ui & bugfix

This commit is contained in:
janis
2022-10-31 18:18:46 +01:00
parent ac673bb979
commit 01a3dd57d1
6 changed files with 26 additions and 10 deletions

View File

@@ -255,6 +255,20 @@ RootScreen:
id: current_song id: current_song
font_size: 25 font_size: 25
color: app.theme_cls.primary_dark color: app.theme_cls.primary_dark
FloatLayout:
MDProgressBar:
orientation: "horizontal"
value: 100
pos_hint: {"top": 0.5, "x": 0.1}
color: (1, 1, 1, 0.5)
size_hint: 0.8, 0.2
MDProgressBar:
orientation: "horizontal"
value: 0
pos_hint: {"top": 0.5, "x": 0.1}
color: app.theme_cls.primary_dark
id: progressbars
size_hint: 0.8, 0.025
FloatLayout: FloatLayout:
GridLayout: GridLayout:
size_hint: 0.8, 0.9 size_hint: 0.8, 0.9

View File

@@ -1 +1 @@
0,songlist.csv 1,songlist.csv
1 0 1 songlist.csv

View File

@@ -1,3 +1,3 @@
2 0
Tennessee Waltz - New 101 Strings Orchestra | Slow Walz (Langsam),Morning has broken - Cat Stevens | Walzer (Mittel),Magia - Alvaro Soler | Flashmob (Mittel),Say So - Doja Cat | Discofox (Langsam),Save Your Tears (Remix) - The Weeknd & Ariana Grande | Discofox (Langsam),Shivers - Ed Sheeran | Jive/ Rocknroll (Mittel),I feel good - Ray Charles | Jive/Rocknroll (Mittel),Muevelo - Rey Ruiz | Cha cha cha (Mittel),Suelta la cintura - Ruben leon | Cha cha cha (Mittel),Como Volver a Ser Feliz - Luis Enrique | Salsa (Mittel),Mas que nada - black eyed peas | Salsa/Discofox (Mittel),Moon River - Henry Mancini | Slow Walz (Langsam),Dancing Queen - ABBA | Discofox (Langsam),Don't Call Me Up - Mabel | Discofox (Mittel),Magia - Alvaro Soler | Flashmob (Mittel),Lets have a Party - Wanda Jackson | Jive (mittel),Crazy Little Thing Called Love - Queen | Jive / Rocknroll (Schnell),El Diablo Anda Suelto - Rey Ruiz | Cha cha cha (Mittel),Lets get loud - Jennifer Lopez | Cha cha cha (Schnell),Enamorame - Somos del Barrio | Salsa (Mittel),Something Stupid (feat. Reese Witherspoon) - Michael Bublé | Rumba/cha cha cha (Langsam),When a man loves a woman - Percy Sledge | (Langsam),Scharlachrot - Patent Ochsner | Walzer (Langsam),Ily (i love you baby) [feat. Emilee] - Surf Mesa | Discofox (Mittel),Like a sex machine - James Brown | Discofox (Mittel),Uptown Funk (feat. Bruno Mars) - Discofox | Discofox (Schnell),Tutti Frutti - Little Richard | Jive / Rocknroll (Mittel),Jailhouse Rock - Elvis Presley | Jive / Rocknroll (Schnell),Are you lonesome - Elvis Presley | Slow Walz (Langsam),Ay Mujer - Rey Ruiz | Cha cha cha (Mittel),Rico Vacilon - Pedro Garcia & His Del Prado Orchestra | Cha cha cha (Mittel),Jeepers creepers - Benny Goodmann | Foxtrott (Mittel),An der schönen blauen Donau - New 101 Strings Orchestra | Wiener Walzer (Schnell),The Last Waltz - Engelbert Humperdinck | Walzer (Mittel),Stand by me - Sam Brown | Cha cha cha (Lansam),Stayin' Alive - Bee Gees | Discofox (Mittel),Easy On Me - Adele | (Langsam),Magia - Alvaro Soler | Flashmob (Mittel),Friday (feat. Mufasa & Hypeman) [Dopamine Re-Edit] - Riton & Nightcrawlers | Party (Mittel),YMCA - Village People | Party (Mittel),Cotton eyed Joe (Hennustall zermatt mix) - Rednex | Party (Mittel),Gangnam style - PSY | Party (Mittel),Take On Me - a-ha | Jive (Schnell),Rock Around the Clock - Bill Haley & His Comets | Jive / Rocknroll (Schnell),Satisfaction - Rolling Stones | Party (Mittel),"Un, dos, tres - Ricky Martin | Party (Mittel)",Party Rock anthem - LFMBQ | Party (Mittel),I don't care - Icona Pop | Party (Mittel),Love tonight - Shouse & David Guetta | Party (Mittel),Insomnia - Faithless | Party (Mittel),Angels - Robbie Williams | Slow (Langsam),Nothing compares to you - Sinead O'Connor | Slow (Langsam) Lupus Nocte - Hadouken (Royalty Free Music).mp3,Minecraft OST - Pigstep.mp3,The Day You Went Away.mp3,sha la la.mp3
191.33242797851562 163.7987518310547
1 2 0
2 Tennessee Waltz - New 101 Strings Orchestra | Slow Walz (Langsam) Lupus Nocte - Hadouken (Royalty Free Music).mp3,Minecraft OST - Pigstep.mp3,The Day You Went Away.mp3,sha la la.mp3
3 191.33242797851562 163.7987518310547

View File

@@ -1 +1 @@
/mnt/storage/SORTED/Music/KB /mnt/storage/SORTED/Music
1 /mnt/storage/SORTED/Music/KB /mnt/storage/SORTED/Music

View File

@@ -308,6 +308,7 @@ class Main(MDScreen):
self.__songlength = self.__songlinfo.pop(0) self.__songlength = self.__songlinfo.pop(0)
self.__songdisplay = int(self.__songpos / float(self.__songlength) * 100) self.__songdisplay = int(self.__songpos / float(self.__songlength) * 100)
self.manager.get_screen("Showcase").ids.progressbars.value = self.__songdisplay self.manager.get_screen("Showcase").ids.progressbars.value = self.__songdisplay
self.ids.progressbars.value = self.__songdisplay
self.__current = self.__upcoming.pop(self.__currents) self.__current = self.__upcoming.pop(self.__currents)
if self.__config == ["1"]: if self.__config == ["1"]:
self.__current_output = self.__current[:(len(self.__current) - 4)] self.__current_output = self.__current[:(len(self.__current) - 4)]

View File

@@ -70,12 +70,13 @@ class ShowcaseScreen(MDScreen):
self.__current = comHandler.getcurrentsong(address) self.__current = comHandler.getcurrentsong(address)
self.__upcoming = comHandler.getupcomingsongs(address) self.__upcoming = comHandler.getupcomingsongs(address)
self.songlength = comHandler.getsonglength(address) self.songlength = comHandler.getsonglength(address)
elif self.songpos > self.lastsongpos:
self.isplaying = True
elif self.songpos == self.lastsongpos:
self.isplaying = False
else: else:
pass if self.songpos > self.lastsongpos:
self.isplaying = True
elif self.songpos == self.lastsongpos:
self.isplaying = False
else:
pass
self.lastsongpos = self.songpos self.lastsongpos = self.songpos
self.ids.current_song.text = self.__current self.ids.current_song.text = self.__current
self.ids.upcoming_songs.text = self.__upcoming self.ids.upcoming_songs.text = self.__upcoming