Summarize verses on song playlist; 1,2,3→ 1-3
This commit is contained in:
parent
981e22e191
commit
e60acce0c8
1 changed files with 4 additions and 3 deletions
|
|
@ -333,7 +333,7 @@ fun SimpleDrawerContent(
|
||||||
contentTitle = di?.contentTitle ?: "chant introuvable",
|
contentTitle = di?.contentTitle ?: "chant introuvable",
|
||||||
selected = di != null && di.path == activePath,
|
selected = di != null && di.path == activePath,
|
||||||
enabled = di != null,
|
enabled = di != null,
|
||||||
stz = song.entry.stanzas,
|
stzS = song.entry.stanzas.toSet(),
|
||||||
onClick = {
|
onClick = {
|
||||||
if (di != null) {
|
if (di != null) {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
|
|
@ -664,10 +664,11 @@ fun DrawerPlaylistSongRow(
|
||||||
contentTitle: String,
|
contentTitle: String,
|
||||||
selected: Boolean,
|
selected: Boolean,
|
||||||
enabled: Boolean,
|
enabled: Boolean,
|
||||||
stz: List<Int>,
|
stzS: Set<Int>,
|
||||||
onClick: () -> Unit,
|
onClick: () -> Unit,
|
||||||
) {
|
) {
|
||||||
val verses = if(stz.isEmpty()) "" else ": ${stz.joinToString(", ")}"
|
val stz = summarizeVerses(stzS)
|
||||||
|
val verses = if(stzS.isEmpty()) "" else ": ${stz}"
|
||||||
NavigationDrawerItem(
|
NavigationDrawerItem(
|
||||||
icon = {
|
icon = {
|
||||||
Text("♪", fontSize = 20.sp)
|
Text("♪", fontSize = 20.sp)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue