Merge pull request #1500 from Bnyro/master

Player improvements
This commit is contained in:
Bnyro 2022-10-05 22:18:42 +02:00 committed by GitHub
commit e471d3c665
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 13 deletions

View File

@ -1,5 +1,6 @@
package com.github.libretube.ui.activities package com.github.libretube.ui.activities
import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
import android.content.res.Configuration import android.content.res.Configuration
@ -387,15 +388,13 @@ class MainActivity : BaseActivity() {
} }
} }
@SuppressLint("SwitchIntDef")
override fun onConfigurationChanged(newConfig: Configuration) { override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig) super.onConfigurationChanged(newConfig)
val orientation = newConfig.orientation
if (orientation == Configuration.ORIENTATION_PORTRAIT) { when (newConfig.orientation) {
println("Portrait") Configuration.ORIENTATION_PORTRAIT -> unsetFullscreen()
unsetFullscreen() Configuration.ORIENTATION_LANDSCAPE -> setFullscreen()
} else if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
println("Landscape")
setFullscreen()
} }
} }

View File

@ -1558,12 +1558,11 @@ class PlayerFragment : BaseFragment() {
if (autoRotationEnabled) { if (autoRotationEnabled) {
val orientation = newConfig.orientation val orientation = newConfig.orientation
if (orientation == Configuration.ORIENTATION_LANDSCAPE) { when (orientation) {
// go to fullscreen mode // go to fullscreen mode
setFullscreen() Configuration.ORIENTATION_LANDSCAPE -> setFullscreen()
} else {
// exit fullscreen if not landscape // exit fullscreen if not landscape
unsetFullscreen() else -> unsetFullscreen()
} }
} }
} }

View File

@ -2,6 +2,7 @@ package com.github.libretube.ui.views
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.content.res.Configuration
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.AttributeSet import android.util.AttributeSet
@ -384,4 +385,19 @@ internal class CustomExoPlayerView(
} }
.show(childFragmentManager) .show(childFragmentManager)
} }
override fun onConfigurationChanged(newConfig: Configuration?) {
super.onConfigurationChanged(newConfig)
val offsetFactor: Float = when (newConfig?.orientation) {
Configuration.ORIENTATION_LANDSCAPE -> 2F
else -> 1F / 2F
}
binding.progressBar.let {
val params = it.layoutParams as MarginLayoutParams
params.bottomMargin = (params.bottomMargin * offsetFactor).toInt()
it.layoutParams = params
}
}
} }

View File

@ -207,8 +207,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="15dp" android:layout_height="15dp"
app:bar_height="2dp" app:bar_height="2dp"
app:played_color="?attr/colorOnSecondary" app:played_color="?attr/colorSecondary"
app:scrubber_color="?attr/colorOnPrimary" app:scrubber_color="?attr/colorSecondary"
app:scrubber_dragged_size="15dp" app:scrubber_dragged_size="15dp"
app:scrubber_enabled_size="12dp" /> app:scrubber_enabled_size="12dp" />