Skip to content

Commit

Permalink
move player fragments to same file
Browse files Browse the repository at this point in the history
  • Loading branch information
@crackededed
crackededed committed Jan 26, 2025
1 parent 911b66a commit 04c8a65
Show file tree
Hide file tree
Showing 23 changed files with 3,012 additions and 4,183 deletions.
29 changes: 14 additions & 15 deletions app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ import com.github.andreyasadchy.xtra.ui.channel.ChannelPagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.common.BaseNetworkFragment
import com.github.andreyasadchy.xtra.ui.main.IntegrityDialog
import com.github.andreyasadchy.xtra.ui.main.MainActivity
import com.github.andreyasadchy.xtra.ui.player.BasePlayerFragment
import com.github.andreyasadchy.xtra.ui.player.stream.StreamPlayerFragment
import com.github.andreyasadchy.xtra.ui.player.PlayerFragment
import com.github.andreyasadchy.xtra.ui.view.SlidingLayout
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.LifecycleListener
Expand Down Expand Up @@ -594,7 +593,7 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
if (raid != null) {
if (!viewModel.raidClosed) {
if (raid.openStream) {
if (requireContext().prefs().getBoolean(C.CHAT_RAIDS_AUTO_SWITCH, true) && parentFragment is BasePlayerFragment) {
if (requireContext().prefs().getBoolean(C.CHAT_RAIDS_AUTO_SWITCH, true) && parentFragment is PlayerFragment) {
(requireActivity() as? MainActivity)?.startStream(
Stream(
channelId = raid.targetId,
Expand Down Expand Up @@ -856,9 +855,9 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
viewModel.playbackMessage.collectLatest {
if (it != null) {
if (it.live != null) {
(parentFragment as? StreamPlayerFragment)?.updateLiveStatus(it.live, it.serverTime, channelLogin)
(parentFragment as? PlayerFragment)?.updateLiveStatus(it.live, it.serverTime, channelLogin)
}
(parentFragment as? StreamPlayerFragment)?.updateViewerCount(it.viewers)
(parentFragment as? PlayerFragment)?.updateViewerCount(it.viewers)
}
}
}
Expand All @@ -867,7 +866,7 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.streamInfo.collectLatest {
if (it != null) {
(parentFragment as? StreamPlayerFragment)?.updateStreamInfo(it.title, it.gameId, null, it.gameName)
(parentFragment as? PlayerFragment)?.updateStreamInfo(it.title, it.gameId, null, it.gameName)
}
}
}
Expand Down Expand Up @@ -1006,8 +1005,8 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
channelId = channelId,
channelLogin = channelLogin,
chatUrl = chatUrl,
getCurrentPosition = (parentFragment as BasePlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as BasePlayerFragment)::getCurrentSpeed
getCurrentPosition = (parentFragment as PlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as PlayerFragment)::getCurrentSpeed
)
}
} else {
Expand All @@ -1032,8 +1031,8 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
channelLogin = channelLogin,
videoId = videoId,
startTime = args.getInt(KEY_START_TIME),
getCurrentPosition = (parentFragment as BasePlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as BasePlayerFragment)::getCurrentSpeed
getCurrentPosition = (parentFragment as PlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as PlayerFragment)::getCurrentSpeed
)
}
}
Expand Down Expand Up @@ -1224,7 +1223,7 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
channelLogo = channelLogo
)
)
(parentFragment as? BasePlayerFragment)?.minimize()
(parentFragment as? PlayerFragment)?.minimize()
}

override fun onNetworkRestored() {
Expand All @@ -1241,8 +1240,8 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
chatUrl = args.getString(KEY_CHAT_URL),
videoId = args.getString(KEY_VIDEO_ID),
startTime = args.getInt(KEY_START_TIME),
getCurrentPosition = (parentFragment as BasePlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as BasePlayerFragment)::getCurrentSpeed
getCurrentPosition = (parentFragment as PlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as PlayerFragment)::getCurrentSpeed
)
}
}
Expand Down Expand Up @@ -1270,8 +1269,8 @@ class ChatFragment : BaseNetworkFragment(), LifecycleListener, MessageClickedDia
chatUrl = args.getString(KEY_CHAT_URL),
videoId = args.getString(KEY_VIDEO_ID),
startTime = args.getInt(KEY_START_TIME),
getCurrentPosition = (parentFragment as BasePlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as BasePlayerFragment)::getCurrentSpeed
getCurrentPosition = (parentFragment as PlayerFragment)::getCurrentPosition,
getCurrentSpeed = (parentFragment as PlayerFragment)::getCurrentSpeed
)
}
}
Expand Down
20 changes: 8 additions & 12 deletions app/src/main/java/com/github/andreyasadchy/xtra/ui/main/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,7 @@ import com.github.andreyasadchy.xtra.ui.channel.ChannelPagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.common.Scrollable
import com.github.andreyasadchy.xtra.ui.games.GameMediaFragmentDirections
import com.github.andreyasadchy.xtra.ui.games.GamePagerFragmentDirections
import com.github.andreyasadchy.xtra.ui.player.BasePlayerFragment
import com.github.andreyasadchy.xtra.ui.player.clip.ClipPlayerFragment
import com.github.andreyasadchy.xtra.ui.player.offline.OfflinePlayerFragment
import com.github.andreyasadchy.xtra.ui.player.stream.StreamPlayerFragment
import com.github.andreyasadchy.xtra.ui.player.video.VideoPlayerFragment
import com.github.andreyasadchy.xtra.ui.player.PlayerFragment
import com.github.andreyasadchy.xtra.ui.view.SlidingLayout
import com.github.andreyasadchy.xtra.util.C
import com.github.andreyasadchy.xtra.util.DisplayUtils
Expand Down Expand Up @@ -100,7 +96,7 @@ class MainActivity : AppCompatActivity(), SlidingLayout.Listener {
private lateinit var binding: ActivityMainBinding
private val viewModel: MainViewModel by viewModels()
private lateinit var navController: NavController
var playerFragment: BasePlayerFragment? = null
var playerFragment: PlayerFragment? = null
private set
private val networkCallback = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) {
Expand Down Expand Up @@ -661,19 +657,19 @@ class MainActivity : AppCompatActivity(), SlidingLayout.Listener {
//Navigation listeners

fun startStream(stream: Stream) {
startPlayer(StreamPlayerFragment.newInstance(stream))
startPlayer(PlayerFragment.newInstance(stream))
}

fun startVideo(video: Video, offset: Double?, ignoreSavedPosition: Boolean = false) {
startPlayer(VideoPlayerFragment.newInstance(video, offset, ignoreSavedPosition))
startPlayer(PlayerFragment.newInstance(video, offset, ignoreSavedPosition))
}

fun startClip(clip: Clip) {
startPlayer(ClipPlayerFragment.newInstance(clip))
startPlayer(PlayerFragment.newInstance(clip))
}

fun startOfflineVideo(video: OfflineVideo) {
startPlayer(OfflinePlayerFragment.newInstance(video))
startPlayer(PlayerFragment.newInstance(video))
}

//SlidingLayout.Listener
Expand All @@ -692,7 +688,7 @@ class MainActivity : AppCompatActivity(), SlidingLayout.Listener {

//Player methods

private fun startPlayer(fragment: BasePlayerFragment) {
private fun startPlayer(fragment: PlayerFragment) {
playerFragment = fragment
supportFragmentManager.beginTransaction()
.replace(R.id.playerContainer, fragment).commit()
Expand Down Expand Up @@ -722,7 +718,7 @@ class MainActivity : AppCompatActivity(), SlidingLayout.Listener {
private fun restorePlayerFragment() {
if (viewModel.isPlayerOpened) {
if (playerFragment == null) {
playerFragment = supportFragmentManager.findFragmentById(R.id.playerContainer) as BasePlayerFragment?
playerFragment = supportFragmentManager.findFragmentById(R.id.playerContainer) as PlayerFragment?
} else {
if (playerFragment?.secondViewIsHidden() == true && prefs.getString(C.PLAYER_BACKGROUND_PLAYBACK, "0") == "0") {
playerFragment?.maximize()
Expand Down
Loading

0 comments on commit 04c8a65

Please sign in to comment.