Merge pull request #522 from squanchy-dev/fix_notifications_speakers

quiro91 · web-flow · commit a8f0e4d2b494 · 2018-04-08T15:12:39.000+01:00
Fix notifications speakers
diff --git a/app/src/debug/java/net/squanchy/support/debug/DebugActivity.kt b/app/src/debug/java/net/squanchy/support/debug/DebugActivity.kt
@@ -110,7 +110,7 @@ class DebugActivity : AppCompatActivity() {
         "UI",
         Option(generateColor()),
         Option(generateColor()),
-        Option("gs://droidcon-italy-2017.appspot.com/tracks/0.webp")
+        Option.empty()
     )
 
     private fun generateColor(): String {
diff --git a/app/src/main/java/net/squanchy/notification/NotificationCreator.kt b/app/src/main/java/net/squanchy/notification/NotificationCreator.kt
@@ -160,7 +160,7 @@ class NotificationCreator(private val context: Context) {
     }
 
     private fun getSpeakerNamesFrom(speakers: List<Speaker>): String {
-        val speakerNames = speakers.joinToString(prefix = ", ", transform = { it.name })
+        val speakerNames = speakers.joinToString(separator = ", ", transform = { it.name })
 
         return context.getString(R.string.event_notification_starting_by, speakerNames)
     }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ class DebugActivity : AppCompatActivity() {`
`110`	`110`	`"UI",`
`111`	`111`	`Option(generateColor()),`
`112`	`112`	`Option(generateColor()),`
`113`		`- Option("gs://droidcon-italy-2017.appspot.com/tracks/0.webp")`
	`113`	`+ Option.empty()`
`114`	`114`	`)`
`115`	`115`
`116`	`116`	`private fun generateColor(): String {`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class NotificationCreator(private val context: Context) {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`private fun getSpeakerNamesFrom(speakers: List<Speaker>): String {`
`163`		`- val speakerNames = speakers.joinToString(prefix = ", ", transform = { it.name })`
	`163`	`+ val speakerNames = speakers.joinToString(separator = ", ", transform = { it.name })`
`164`	`164`
`165`	`165`	`return context.getString(R.string.event_notification_starting_by, speakerNames)`
`166`	`166`	`}`