diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 14b50f829..6f44777cd 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,6 @@ - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 79f8570ac..880291fb8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,6 +5,7 @@ + @@ -16,6 +17,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8da6a054e..6775d1ee7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ package="xyz.btcland.libretube"> + (R.id.playerMotionLayout).getTransition(R.id.yt_transition).isEnabled = true + } else if (orientation == Configuration.ORIENTATION_LANDSCAPE) { + println("Landscape") + //findViewById(R.id.playerMotionLayout).getTransition(R.id.yt_transition).isEnabled = false + + } + } } \ No newline at end of file diff --git a/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt b/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt index 08bdb99b0..648dca3a8 100644 --- a/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt +++ b/app/src/main/java/xyz/btcland/libretube/PlayerFragment.kt @@ -135,11 +135,13 @@ class PlayerFragment : Fragment() { view.findViewById(R.id.close_imageButton).visibility =View.GONE view.findViewById(R.id.quality_text).visibility =View.GONE mainMotionLayout.progress = 1.toFloat() + mainActivity.supportActionBar?.show() }else if(currentId==sId){ view.findViewById(R.id.quality_select).visibility =View.VISIBLE view.findViewById(R.id.close_imageButton).visibility =View.VISIBLE view.findViewById(R.id.quality_text).visibility =View.VISIBLE mainMotionLayout.progress = 0.toFloat() + mainActivity.supportActionBar?.hide() } } @@ -183,28 +185,27 @@ class PlayerFragment : Fragment() { } } view.findViewById(R.id.fullscreen).setOnClickListener{ + //remember to hide everything when new shit added if (!isFullScreen){ view.findViewById(R.id.scrollView2).visibility = View.GONE view.findViewById(R.id.linLayout).visibility = View.GONE view.findViewById(R.id.textTest).visibility = View.GONE - view.findViewById(R.id.main_container).visibility = View.GONE + //view.findViewById(R.id.main_container).visibility = View.GONE with(motionLayout) { getConstraintSet(R.id.start).constrainHeight(R.id.player, -1) - enableTransition(R.xml.player_scene,false) + //getTransition(R.id.yt_transition).isEnabled = false } - (activity as MainActivity)?.supportActionBar?.hide() isFullScreen=true }else{ view.findViewById(R.id.scrollView2).visibility = View.VISIBLE view.findViewById(R.id.linLayout).visibility = View.VISIBLE view.findViewById(R.id.textTest).visibility = View.VISIBLE - view.findViewById(R.id.main_container).visibility = View.VISIBLE + //view.findViewById(R.id.main_container).visibility = View.VISIBLE with(motionLayout) { getConstraintSet(R.id.start).constrainHeight(R.id.player, 0) - enableTransition(R.xml.player_scene,true) + //getTransition(R.id.yt_transition).isEnabled = true } - (activity as MainActivity)?.supportActionBar?.show() isFullScreen=false } @@ -247,7 +248,7 @@ class PlayerFragment : Fragment() { fun run() { val request = Request.Builder() - .url("https://pipedapi.kavin.rocks/streams/$videoId") + .url("http://piped-api.alefvanoon.xyz/streams/$videoId") .build() client.newCall(request).enqueue(object : Callback { override fun onFailure(call: Call, e: IOException) { diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml new file mode 100644 index 000000000..05cf80ffb --- /dev/null +++ b/app/src/main/res/layout-land/fragment_player.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 9899bc216..9265bfb81 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -50,13 +50,11 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - + + + \ No newline at end of file diff --git a/app/src/main/res/xml/player_scene.xml b/app/src/main/res/xml/player_scene.xml index d716e64f7..b29aacd64 100644 --- a/app/src/main/res/xml/player_scene.xml +++ b/app/src/main/res/xml/player_scene.xml @@ -4,6 +4,7 @@ xmlns:motion="http://schemas.android.com/apk/res-auto">