mir/newpipe
2
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-08-28 21:27:58 +00:00
Code Issues Releases Wiki Activity

VideoDetailFragment: convert to kotlin (mechanical, fixup)

Browse Source 
Mostly 1:1, I had to fix a few places where the automatic conversion
did not infer the right kotlin types, and places where it tried to
convert to `double` instead of using `float` like the original.

Everything else is the result of automatic conversion.
This commit is contained in:
Profpatsch 2025-05-13 18:06:49 +02:00 committed by Stypox
parent bf72fd1fa5
commit cc3ecd4169
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.kt
View File

@ -112,6 +112,7 @@ import org.schabi.newpipe.util.ExtractorHelper
import org.schabi.newpipe.util.InfoCache import org.schabi.newpipe.util.InfoCache
import org.schabi.newpipe.util.ListHelper import org.schabi.newpipe.util.ListHelper
import org.schabi.newpipe.util.Localization import org.schabi.newpipe.util.Localization
import org.schabi.newpipe.util.NO_SERVICE_ID
import org.schabi.newpipe.util.NavigationHelper import org.schabi.newpipe.util.NavigationHelper
import org.schabi.newpipe.util.PermissionHelper import org.schabi.newpipe.util.PermissionHelper
import org.schabi.newpipe.util.PlayButtonHelper import org.schabi.newpipe.util.PlayButtonHelper
@ -229,7 +230,7 @@ class VideoDetailFragment :
// It will do nothing if the player is not in fullscreen mode // It will do nothing if the player is not in fullscreen mode
hideSystemUiIfNeeded() hideSystemUiIfNeeded()
val playerUi: Optional<MainPlayerUi?> = val playerUi: Optional<MainPlayerUi> =
player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java) player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java)
if (!player!!.videoPlayerSelected() && !playAfterConnect) { if (!player!!.videoPlayerSelected() && !playAfterConnect) {
return return
@ -469,8 +470,7 @@ class VideoDetailFragment :
makeOnClickListener( makeOnClickListener(
Consumer { info: StreamInfo? -> Consumer { info: StreamInfo? ->
if (getFM() != null && currentInfo != null) { if (getFM() != null && currentInfo != null) {
val fragment = getParentFragmentManager().findFragmentById val fragment = getParentFragmentManager().findFragmentById(R.id.fragment_holder)
(R.id.fragment_holder)
// commit previous pending changes to database // commit previous pending changes to database
if (fragment is LocalPlaylistFragment) { if (fragment is LocalPlaylistFragment) {
@ -715,7 +715,7 @@ class VideoDetailFragment :
View.GONE View.GONE
) )
binding!!.detailControlsCrashThePlayer.setVisibility( binding!!.detailControlsCrashThePlayer.setVisibility(
if (DEBUG && PreferenceManager.getDefaultSharedPreferences(getContext()!!) if (DEBUG && PreferenceManager.getDefaultSharedPreferences(requireContext())
.getBoolean(getString(R.string.show_crash_the_player_key), false) .getBoolean(getString(R.string.show_crash_the_player_key), false)
) )
View.VISIBLE View.VISIBLE
@ -887,11 +887,11 @@ class VideoDetailFragment :
Handler(Looper.getMainLooper()).postDelayed( Handler(Looper.getMainLooper()).postDelayed(
Runnable { Runnable {
if (activity == null) { if (activity == null) {
return@postDelayed return@Runnable
} }
// Data can already be drawn, don't spend time twice // Data can already be drawn, don't spend time twice
if (info.getName() == binding!!.detailVideoTitleView.getText().toString()) { if (info.getName() == binding!!.detailVideoTitleView.getText().toString()) {
return@postDelayed return@Runnable
} }
prepareAndHandleInfo(info, scrollToTop) prepareAndHandleInfo(info, scrollToTop)
}, },
@ -1296,7 +1296,7 @@ class VideoDetailFragment :
removeVideoPlayerView() removeVideoPlayerView()
if (this.isAutoplayEnabled) { if (this.isAutoplayEnabled) {
playerService!!.stopForImmediateReusing() playerService!!.stopForImmediateReusing()
root.ifPresent(Consumer { view: View? -> view!!.setVisibility(View.GONE) }) root.ifPresent(Consumer { view: View -> view.setVisibility(View.GONE) })
} else { } else {
playerHolder.stopService() playerHolder.stopService()
} }
@ -1373,7 +1373,7 @@ class VideoDetailFragment :
Handler(Looper.getMainLooper()).post( Handler(Looper.getMainLooper()).post(
Runnable { Runnable {
if (!this.isPlayerAvailable || getView() == null) { if (!this.isPlayerAvailable || getView() == null) {
return@post return@Runnable
} }
// setup the surface view height, so that it fits the video correctly // setup the surface view height, so that it fits the video correctly
setHeightThumbnail() setHeightThumbnail()
@ -1424,7 +1424,7 @@ class VideoDetailFragment :
activity.getWindow().getDecorView() activity.getWindow().getDecorView()
).getHeight() ).getHeight()
setHeightThumbnail(height, metrics) setHeightThumbnail(height, metrics)
getView()!!.getViewTreeObserver().removeOnPreDrawListener(preDrawListener) requireView().getViewTreeObserver().removeOnPreDrawListener(preDrawListener)
} }
return false return false
} }
@ -1627,11 +1627,11 @@ class VideoDetailFragment :
binding!!.detailSubChannelThumbnailView.setImageBitmap(null) binding!!.detailSubChannelThumbnailView.setImageBitmap(null)
} }
override fun handleResult(info: StreamInfo) { override fun handleResult(info: StreamInfo?) {
super.handleResult(info) super.handleResult(info)
currentInfo = info currentInfo = info
setInitialData(info.getServiceId(), info.getOriginalUrl(), info.getName(), playQueue) setInitialData(info!!.getServiceId(), info.getOriginalUrl(), info.getName(), playQueue)
updateTabs(info) updateTabs(info)
@ -2277,7 +2277,7 @@ class VideoDetailFragment :
binding!!.detailControlsOpenInBrowser.setBackgroundColor(transparent) binding!!.detailControlsOpenInBrowser.setBackgroundColor(transparent)
binding!!.detailControlsPlayWithKodi.setBackgroundColor(transparent) binding!!.detailControlsPlayWithKodi.setBackgroundColor(transparent)
} }
if (DeviceUtils.isDesktopMode(getContext()!!)) { if (DeviceUtils.isDesktopMode(requireContext())) {
// Remove the "hover" overlay (since it is visible on all mouse events and interferes // Remove the "hover" overlay (since it is visible on all mouse events and interferes
// with the video content being played) // with the video content being played)
binding!!.detailThumbnailRootLayout.setForeground(null) binding!!.detailThumbnailRootLayout.setForeground(null)
@ -2309,9 +2309,9 @@ class VideoDetailFragment :
private fun findQueueInStack(queue: PlayQueue?): StackItem? { private fun findQueueInStack(queue: PlayQueue?): StackItem? {
var item: StackItem? = null var item: StackItem? = null
val iterator: MutableIterator<StackItem> = stack.descendingIterator() val iterator: MutableIterator<StackItem?> = stack.descendingIterator()
while (iterator.hasNext()) { while (iterator.hasNext()) {
val next = iterator.next() val next = iterator.next()!!
if (next.getPlayQueue().equals(queue)) { if (next.getPlayQueue().equals(queue)) {
item = next item = next
break break
@ -2380,9 +2380,9 @@ class VideoDetailFragment :
} else { } else {
val selectedVideoStreamIndexForExternalPlayers = val selectedVideoStreamIndexForExternalPlayers =
ListHelper.getDefaultResolutionIndex(activity, videoStreamsForExternalPlayers) ListHelper.getDefaultResolutionIndex(activity, videoStreamsForExternalPlayers)
val resolutions = videoStreamsForExternalPlayers.stream() val resolutions = videoStreamsForExternalPlayers.map {
.map<String?> { obj: VideoStream? -> obj!!.getResolution() } it!!.getResolution() as CharSequence
.toArray<CharSequence?> { _Dummy_.__Array__() } }.toTypedArray()
builder.setSingleChoiceItems( builder.setSingleChoiceItems(
resolutions, selectedVideoStreamIndexForExternalPlayers, resolutions, selectedVideoStreamIndexForExternalPlayers,
@ -2430,14 +2430,13 @@ class VideoDetailFragment :
} else { } else {
val selectedAudioStream = val selectedAudioStream =
ListHelper.getDefaultAudioFormat(activity, audioTracks) ListHelper.getDefaultAudioFormat(activity, audioTracks)
val trackNames = audioTracks.stream() val trackNames = audioTracks
.map<String?> { audioStream: AudioStream? -> .map { audioStream: AudioStream? ->
Localization.audioTrackName( Localization.audioTrackName(
activity, activity,
audioStream audioStream
) )
} }.toTypedArray()
.toArray<CharSequence?> { _Dummy_.__Array__() }
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setTitle(R.string.select_audio_track_external_players) .setTitle(R.string.select_audio_track_external_players)
@ -2476,7 +2475,7 @@ class VideoDetailFragment :
playerHolder.stopService() playerHolder.stopService()
setInitialData(0, null, "", null) setInitialData(0, null, "", null)
currentInfo = null currentInfo = null
updateOverlayData(null, null, mutableListOf<Image?>()) updateOverlayData(null, null, mutableListOf<Image>())
} }
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
@ -2588,9 +2587,9 @@ class VideoDetailFragment :
hideSystemUiIfNeeded() hideSystemUiIfNeeded()
// Conditions when the player should be expanded to fullscreen // Conditions when the player should be expanded to fullscreen
if (DeviceUtils.isLandscape(requireContext()) && if (DeviceUtils.isLandscape(requireContext()) &&
this.isPlayerAvailable && this@VideoDetailFragment.isPlayerAvailable &&
player!!.isPlaying() && player!!.isPlaying() &&
!this.isFullscreen && !DeviceUtils.isTablet(activity) !this@VideoDetailFragment.isFullscreen && !DeviceUtils.isTablet(activity)
) { ) {
player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java) player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java)
.ifPresent(Consumer { obj: MainPlayerUi? -> obj!!.toggleFullscreen() }) .ifPresent(Consumer { obj: MainPlayerUi? -> obj!!.toggleFullscreen() })
@ -2606,7 +2605,7 @@ class VideoDetailFragment :
// Re-enable clicks // Re-enable clicks
setOverlayElementsClickable(true) setOverlayElementsClickable(true)
if (this.isPlayerAvailable) { if (this@VideoDetailFragment.isPlayerAvailable) {
player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java) player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java)
.ifPresent(Consumer { obj: MainPlayerUi? -> obj!!.closeItemsList() }) .ifPresent(Consumer { obj: MainPlayerUi? -> obj!!.closeItemsList() })
} }
@ -2614,10 +2613,10 @@ class VideoDetailFragment :
} }
BottomSheetBehavior.STATE_DRAGGING, BottomSheetBehavior.STATE_SETTLING -> { BottomSheetBehavior.STATE_DRAGGING, BottomSheetBehavior.STATE_SETTLING -> {
if (this.isFullscreen) { if (this@VideoDetailFragment.isFullscreen) {
showSystemUi() showSystemUi()
} }
if (this.isPlayerAvailable) { if (this@VideoDetailFragment.isPlayerAvailable) {
player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java).ifPresent( player!!.UIs().getOpt<MainPlayerUi>(MainPlayerUi::class.java).ifPresent(
Consumer { ui: MainPlayerUi? -> Consumer { ui: MainPlayerUi? ->
if (ui!!.isControlsVisible()) { if (ui!!.isControlsVisible()) {
@ -2665,7 +2664,7 @@ class VideoDetailFragment :
private fun updateOverlayData( private fun updateOverlayData(
overlayTitle: String?, overlayTitle: String?,
uploader: String?, uploader: String?,
thumbnails: MutableList<Image?> thumbnails: MutableList<Image>
) { ) {
binding!!.overlayTitleTextView.setText(if (TextUtils.isEmpty(overlayTitle)) "" else overlayTitle) binding!!.overlayTitleTextView.setText(if (TextUtils.isEmpty(overlayTitle)) "" else overlayTitle)
binding!!.overlayChannelTextView.setText(if (TextUtils.isEmpty(uploader)) "" else uploader) binding!!.overlayChannelTextView.setText(if (TextUtils.isEmpty(uploader)) "" else uploader)