Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix example apps on API 35+ #77

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Fix example apps on API 35+ #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MuxVideoMedia3"
tools:targetApi="31">
>
<activity
android:name=".examples.carousel.PlayerCarouselActivity"
android:screenOrientation="sensorPortrait"
android:exported="false"
android:theme="@style/Theme.MuxVideoMedia3.NoActionBar"
tools:ignore="LockedOrientationActivity" />
<activity
android:name=".examples.BasicPlayerActivity"
Expand Down
17 changes: 17 additions & 0 deletions app/src/main/java/com/mux/player/media3/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mux.player.media3.databinding.ActivityMainBinding
Expand All @@ -25,6 +29,19 @@ class MainActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)

ViewCompat.setOnApplyWindowInsetsListener(binding.mainExampleTb) { v, insets ->
val bars = insets.getInsets(
WindowInsetsCompat.Type.systemBars()
or WindowInsetsCompat.Type.displayCutout()
)
v.updatePadding(
top = bars.top,
bottom = bars.bottom,
)
WindowInsetsCompat.CONSUMED
}

examplesView.layoutManager = LinearLayoutManager(this)

binding.mainExampleTb.apply {
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/mux/player/media3/examples/BasicPlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import android.util.Log
import android.widget.Toast
import androidx.annotation.OptIn
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.WindowCompat
import androidx.media3.common.MediaMetadata
import androidx.media3.common.PlaybackException
import androidx.media3.common.Player
Expand All @@ -32,6 +33,9 @@ class BasicPlayerActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

WindowCompat.setDecorFitsSystemWindows(window, true)

binding = ActivityBasicPlayerBinding.inflate(layoutInflater)
setContentView(binding.root)
}
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/java/com/mux/player/media3/examples/ConfigurablePlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ import android.widget.Toast
import androidx.annotation.OptIn
import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import androidx.media3.common.MediaItem
import androidx.media3.common.MediaMetadata
import androidx.media3.common.PlaybackException
Expand Down Expand Up @@ -52,6 +55,18 @@ class ConfigurablePlayerActivity : AppCompatActivity() {
binding = ActivityConfigurablePlayerBinding.inflate(layoutInflater)
setContentView(binding.root)

ViewCompat.setOnApplyWindowInsetsListener(binding.root) { v, insets ->
val bars = insets.getInsets(
WindowInsetsCompat.Type.systemBars()
or WindowInsetsCompat.Type.displayCutout()
)
v.updatePadding(
top = bars.top,
bottom = bars.bottom,
)
WindowInsetsCompat.CONSUMED
}

if (savedInstanceState != null) {
playbackParamsHelper.restoreInstanceState(savedInstanceState)
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_basic_player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<androidx.media3.ui.PlayerView
android:id="@+id/player"
android:layout_width="match_parent"
android:layout_height="320dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="4:3"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_configurable_player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<androidx.media3.ui.PlayerView
android:id="@+id/player"
android:layout_width="match_parent"
android:layout_height="320dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="4:3"
app:layout_constraintTop_toTopOf="parent" />

<LinearLayout
Expand Down