diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 6e5089742..b583d7835 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,18 @@ - + - + - - + + - - + + diff --git a/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt b/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt index 0e96721eb..f281ede74 100644 --- a/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt +++ b/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt @@ -5,6 +5,8 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.FrameLayout +import android.widget.ImageView import android.widget.ProgressBar import android.widget.TextView import androidx.constraintlayout.motion.widget.MotionLayout @@ -64,6 +66,8 @@ class PlayerFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + val mainActivity = activity as MainActivity + mainActivity.findViewById(R.id.container).visibility=View.VISIBLE val playerMotionLayout = view.findViewById(R.id.playerMotionLayout) motionLayout = playerMotionLayout exoPlayerView = view.findViewById(R.id.player) @@ -111,9 +115,21 @@ class PlayerFragment : Fragment() { playerMotionLayout.progress=1.toFloat() playerMotionLayout.transitionToStart() fetchJson(view) + view.findViewById(R.id.close_imageView).setOnClickListener{ + println("wtf?") + val mainActivity = activity as MainActivity + mainActivity.supportFragmentManager.beginTransaction() + .remove(this) + .commit() + mainActivity.findViewById(R.id.container).layoutParams=ViewGroup.LayoutParams(0,0) + + } } - + override fun onStop() { + super.onStop() + exoPlayer.stop() + } companion object { /** @@ -140,6 +156,7 @@ class PlayerFragment : Fragment() { exoPlayerView.player = exoPlayer exoPlayer.setMediaItem(MediaItem.fromUri(url)) exoPlayer.prepare() + exoPlayer.play() } private fun fetchJson(view: View) { @@ -162,7 +179,7 @@ class PlayerFragment : Fragment() { val videoInPlayer = gson.fromJson(body, VideoInPlayer::class.java) runOnUiThread { initPlayer(view,videoInPlayer.hls) - + view.findViewById(R.id.title_textView).text = videoInPlayer.title } } diff --git a/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt b/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt index 28b0be48a..07137484b 100644 --- a/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt +++ b/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt @@ -45,7 +45,10 @@ class TrendingAdapter(private val videoFeed: List