Skip to content

Commit 67f4755

Browse files
authored
formatting strings
1 parent c0345b1 commit 67f4755

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/TracksActivity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.core.view.MenuItemCompat
1515
import com.google.gson.Gson
1616
import com.google.gson.reflect.TypeToken
1717
import com.simplemobiletools.commons.dialogs.FilePickerDialog
18+
import com.simplemobiletools.commons.dialogs.PermissionRequiredDialog
1819
import com.simplemobiletools.commons.extensions.*
1920
import com.simplemobiletools.commons.helpers.NavigationIcon
2021
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@@ -85,7 +86,7 @@ class TracksActivity : SimpleActivity() {
8586
startActivity(this)
8687
}
8788
} else {
88-
toast(R.string.no_post_notifications_permissions)
89+
PermissionRequiredDialog(this, R.string.allow_notifications_music_player)
8990
}
9091
}
9192
}
@@ -219,11 +220,11 @@ class TracksActivity : SimpleActivity() {
219220
}
220221
TYPE_ALBUM -> {
221222
val albumTracks = getAlbumTracksSync(album.id)
222-
albumTracks.sortWith(compareBy({ it.trackId }, { it.title.toLowerCase() }))
223+
albumTracks.sortWith(compareBy({ it.trackId }, { it.title.lowercase() }))
223224
tracks.addAll(albumTracks)
224225

225226
val coverArt = ContentUris.withAppendedId(artworkUri, album.id).toString()
226-
val header = AlbumHeader(album.title, coverArt, album.year, tracks.size, tracks.sumBy { it.duration }, album.artist)
227+
val header = AlbumHeader(album.title, coverArt, album.year, tracks.size, tracks.sumOf { it.duration }, album.artist)
227228
listItems.add(header)
228229
listItems.addAll(tracks)
229230
}
@@ -361,8 +362,7 @@ class TracksActivity : SimpleActivity() {
361362

362363
private fun onSearchQueryChanged(text: String) {
363364
val filtered = tracksIgnoringSearch.filter {
364-
it.title.contains(text, true) ||
365-
(it.artist + " - " + it.album).contains(text, true)
365+
it.title.contains(text, true) || ("${it.artist} - ${it.album}").contains(text, true)
366366
}.toMutableList() as ArrayList<Track>
367367
(tracks_list.adapter as? TracksAdapter)?.updateItems(filtered, text)
368368
tracks_placeholder.beGoneIf(filtered.isNotEmpty())
@@ -404,7 +404,7 @@ class TracksActivity : SimpleActivity() {
404404

405405
}
406406
} else {
407-
toast(R.string.no_post_notifications_permissions)
407+
PermissionRequiredDialog(this, R.string.allow_notifications_music_player)
408408
}
409409
}
410410
}

0 commit comments

Comments
 (0)