diff --git a/app/src/main/java/net/newpipe/newplayer/MainActivity.kt b/app/src/main/java/net/newpipe/newplayer/MainActivity.kt index 51ca4b6..bc043ef 100644 --- a/app/src/main/java/net/newpipe/newplayer/MainActivity.kt +++ b/app/src/main/java/net/newpipe/newplayer/MainActivity.kt @@ -20,6 +20,7 @@ package net.newpipe.newplayer +import android.content.res.Configuration import android.os.Bundle import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity @@ -33,10 +34,15 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) enableEdgeToEdge() setContentView(R.layout.activity_main) - ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> - val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) - v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - insets + + //TODO: This is a dirty hack. Fix this later on + if (getResources().configuration.orientation != Configuration.ORIENTATION_LANDSCAPE) { + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } } + } } \ No newline at end of file diff --git a/app/src/main/java/net/newpipe/newplayer/NewPlayer.kt b/app/src/main/java/net/newpipe/newplayer/NewPlayer.kt new file mode 100644 index 0000000..6fcb829 --- /dev/null +++ b/app/src/main/java/net/newpipe/newplayer/NewPlayer.kt @@ -0,0 +1,11 @@ +package net.newpipe.newplayer + +interface NewPlayer { + + interface Listener { + + } +} + +class NewPlayerImpl { +} \ No newline at end of file diff --git a/app/src/main/java/net/newpipe/newplayer/PlayerFragment.kt b/app/src/main/java/net/newpipe/newplayer/PlayerFragment.kt index 95fa959..9b43a2b 100644 --- a/app/src/main/java/net/newpipe/newplayer/PlayerFragment.kt +++ b/app/src/main/java/net/newpipe/newplayer/PlayerFragment.kt @@ -53,19 +53,21 @@ class PlayerFragment() : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { + + val window = activity?.window!! val insetsController = WindowCompat.getInsetsController(window, window.decorView) insetsController.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + if (viewModel.uiState.value.fullscreen) { + println("gurken fragment created for fullscreen") + //insetsController.hide(WindowInsetsCompat.Type.systemBars()) + } + val view = inflater.inflate(R.layout.player_framgent, container, false) val composeView = view.findViewById(R.id.player_copose_view) val frameView = view.findViewById(R.id.frame_layout) - if (viewModel.uiState.value.fullscreen) { - println("gurken fragment created for fullscreen") - insetsController.hide(WindowInsetsCompat.Type.systemBars()) - } - viewModel.listener = object : VideoPlayerViewModel.Listener { override fun requestUpdateLayoutRatio(ratio: Float) { frameView.updateLayoutParams { diff --git a/app/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt b/app/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt index 383c6fd..e1bec00 100644 --- a/app/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt +++ b/app/src/main/java/net/newpipe/newplayer/ui/VideoPlayerControllerUI.kt @@ -29,11 +29,14 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.systemBars +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.List import androidx.compose.material.icons.automirrored.filled.MenuBook @@ -92,9 +95,18 @@ fun VideoPlayerControllerUI( switchToEmbeddedView: () -> Unit ) { Surface( - modifier = Modifier.fillMaxSize(), color = Color.Transparent + modifier = Modifier.fillMaxSize(), color = Color(0x75000000) ) { - Box(modifier = Modifier.background(Color.Transparent)) { + Box( + modifier = if (isFullscreen) { + Modifier + .background(Color.Transparent) + .windowInsetsPadding(WindowInsets.systemBars) + } else { + Modifier + .background(Color.Transparent) + } + ) { TopUI( modifier = Modifier .align(Alignment.TopStart)