kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2812 from Isira-Seneviratne/bundleOf

Browse Source 
Use bundleOf().
This commit is contained in:
Bnyro 2023-01-22 08:48:42 +01:00 committed by GitHub
commit a7aba58011
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
View File

@ -269,9 +269,7 @@ class MainActivity : BaseActivity() {
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String?): Boolean { override fun onQueryTextSubmit(query: String?): Boolean {
val bundle = Bundle() navController.navigate(R.id.searchResultFragment, bundleOf("query" to query))
bundle.putString("query", query)
navController.navigate(R.id.searchResultFragment, bundle)
searchViewModel.setQuery("") searchViewModel.setQuery("")
searchView.clearFocus() searchView.clearFocus()
return true return true
@ -299,9 +297,7 @@ class MainActivity : BaseActivity() {
} }
if (navController.currentDestination?.id != R.id.searchFragment) { if (navController.currentDestination?.id != R.id.searchFragment) {
val bundle = Bundle() navController.navigate(R.id.searchFragment, bundleOf("query" to newText))
bundle.putString("query", newText)
navController.navigate(R.id.searchFragment, bundle)
} else { } else {
searchViewModel.setQuery(newText) searchViewModel.setQuery(newText)
} }

22
app/src/main/java/com/github/libretube/util/NavigationHelper.kt
View File

@ -5,7 +5,6 @@ import android.content.Context
import android.content.ContextWrapper import android.content.ContextWrapper
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
@ -81,13 +80,13 @@ object NavigationHelper {
return return
} }
val bundle = Bundle().apply { val bundle = bundleOf(
putString(IntentData.videoId, videoId.toID()) IntentData.videoId to videoId.toID(),
putString(IntentData.playlistId, playlistId) IntentData.playlistId to playlistId,
putString(IntentData.channelId, channelId) IntentData.channelId to channelId,
putBoolean(IntentData.keepQueue, keepQueue) IntentData.keepQueue to keepQueue,
timeStamp?.let { putLong(IntentData.timeStamp, it) } IntentData.timeStamp to timeStamp
} )
val activity = context as AppCompatActivity val activity = context as AppCompatActivity
activity.supportFragmentManager.beginTransaction() activity.supportFragmentManager.beginTransaction()
@ -111,9 +110,10 @@ object NavigationHelper {
if (playlistId == null) return if (playlistId == null) return
val activity = unwrap(context) val activity = unwrap(context)
val bundle = Bundle() val bundle = bundleOf(
bundle.putString(IntentData.playlistId, playlistId) IntentData.playlistId to playlistId,
bundle.putSerializable(IntentData.playlistType, playlistType) IntentData.playlistType to playlistType
)
activity.navController.navigate(R.id.playlistFragment, bundle) activity.navController.navigate(R.id.playlistFragment, bundle)
} }

33
app/src/main/java/com/github/libretube/util/NowPlayingNotification.kt
View File

@ -16,6 +16,7 @@ import android.support.v4.media.session.MediaSessionCompat
import android.support.v4.media.session.PlaybackStateCompat import android.support.v4.media.session.PlaybackStateCompat
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
import androidx.core.os.bundleOf
import coil.request.ImageRequest import coil.request.ImageRequest
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.api.obj.Streams import com.github.libretube.api.obj.Streams
@ -196,21 +197,23 @@ class NowPlayingNotification(
player: Player, player: Player,
windowIndex: Int windowIndex: Int
): MediaDescriptionCompat { ): MediaDescriptionCompat {
return MediaDescriptionCompat.Builder().apply { val appIcon = BitmapFactory.decodeResource(
setTitle(streams?.title!!) context.resources,
setSubtitle(streams?.uploader) R.drawable.ic_launcher_monochrome
val appIcon = BitmapFactory.decodeResource( )
context.resources, val title = streams?.title!!
R.drawable.ic_launcher_monochrome val uploader = streams?.uploader
) val extras = bundleOf(
val extras = Bundle().apply { MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON to appIcon,
putParcelable(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, appIcon) MediaMetadataCompat.METADATA_KEY_TITLE to title,
putString(MediaMetadataCompat.METADATA_KEY_TITLE, streams?.title!!) MediaMetadataCompat.METADATA_KEY_ARTIST to uploader
putString(MediaMetadataCompat.METADATA_KEY_ARTIST, streams?.uploader) )
} return MediaDescriptionCompat.Builder()
setIconBitmap(appIcon) .setTitle(title)
setExtras(extras) .setSubtitle(uploader)
}.build() .setIconBitmap(appIcon)
.setExtras(extras)
.build()
} }
override fun getSupportedQueueNavigatorActions(player: Player): Long { override fun getSupportedQueueNavigatorActions(player: Player): Long {