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

Jump to bottom

Add playback settings to TV demo app #363

Merged
merged 7 commits into from
Dec 14, 2023
Merged

Add playback settings to TV demo app #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b043e2c
Make `*AsState()` methods actually return a `State`
MGaetan89 Dec 4, 2023
7874d84
Simplify `Modifier.handleDPadKeyEvents`
MGaetan89 Dec 4, 2023
efb9499
Display video settings on TV
MGaetan89 Dec 4, 2023
f5b2c73
Fix some Lint warnings
MGaetan89 Dec 8, 2023
42d8472
Add player settings
MGaetan89 Dec 12, 2023
72de449
Fix focus jump
MGaetan89 Dec 14, 2023
ad2583b
Hide player controls when settings are open
MGaetan89 Dec 14, 2023
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
4 changes: 2 additions & 2 deletions pillarbox-core-business/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
~ Copyright (c) SRG SSR. All rights reserved.
~ License information is available from the LICENSE file.
-->
<resources>
<string name="blockReason_geoBlock">Dieser Inhalt ist ausserhalb der Schweiz nicht verfügbar.</string>
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="blockReason_geoBlock" tools:ignore="Typos">Dieser Inhalt ist ausserhalb der Schweiz nicht verfügbar.</string>
<string name="blockReason_legal">Dieser Inhalt ist aus rechtlichen Gründen nicht verfügbar.</string>
<string name="blockReason_commercial">Dieser Werbe-Inhalt ist nicht verfügbar.</string>
<string name="blockReason_ageRating18">Dieser Inhalt ist aus Gründen des Jugendschutzes nur zwischen 22:00 und 5:00 Uhr verfügbar.</string>
Expand Down
10 changes: 4 additions & 6 deletions pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/player/PlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import androidx.activity.compose.setContent
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.ui.Modifier
import androidx.media3.session.MediaSession
import androidx.tv.material3.ExperimentalTvMaterial3Api
import androidx.tv.material3.Surface
import ch.srgssr.pillarbox.demo.shared.data.DemoItem
import ch.srgssr.pillarbox.demo.shared.di.PlayerModule
import ch.srgssr.pillarbox.demo.tv.player.compose.TvPlayerView
Expand All @@ -30,7 +28,6 @@ class PlayerActivity : ComponentActivity() {
private lateinit var player: PillarboxPlayer
private lateinit var mediaSession: MediaSession

@OptIn(ExperimentalTvMaterial3Api::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
player = PlayerModule.provideDefaultPlayer(this)
Expand All @@ -52,9 +49,10 @@ class PlayerActivity : ComponentActivity() {

setContent {
PillarboxTheme {
Surface(modifier = Modifier.fillMaxSize()) {
TvPlayerView(player = player)
}
TvPlayerView(
player = player,
modifier = Modifier.fillMaxSize()
)
}
}
}
Expand Down
Loading