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

Remove leanback #651

Merged
merged 2 commits into from
Jul 29, 2024
Merged

Remove leanback #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc9bb42
Remove leanback
MGaetan89 May 8, 2024
ccf3f45
Switch back to using `FragmentActivity`
MGaetan89 Jul 26, 2024
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
5 changes: 1 addition & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ androidx-activity = "1.9.0"
androidx-annotation = "1.8.0"
androidx-compose = "2024.06.00"
androidx-core = "1.13.1"
androidx-fragment = "1.8.1"
androidx-leanback = "1.0.0"
androidx-fragment = "1.8.2"
androidx-lifecycle = "2.8.3"
androidx-media3 = "1.4.0"
androidx-navigation = "2.7.7"
Expand Down Expand Up @@ -99,7 +98,6 @@ androidx-media3-common = { group = "androidx.media3", name = "media3-common", ve
androidx-media3-datasource = { group = "androidx.media3", name = "media3-datasource", version.ref = "androidx-media3" }
androidx-media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "androidx-media3" }
androidx-media3-ui = { group = "androidx.media3", name = "media3-ui", version.ref = "androidx-media3" }
androidx-media3-ui-leanback = { group = "androidx.media3", name = "media3-ui-leanback", version.ref = "androidx-media3" }
androidx-media3-dash = { group = "androidx.media3", name = "media3-exoplayer-dash", version.ref = "androidx-media3" }
androidx-media3-hls = { group = "androidx.media3", name = "media3-exoplayer-hls", version.ref = "androidx-media3" }
androidx-media3-session = { group = "androidx.media3", name = "media3-session", version.ref = "androidx-media3" }
Expand Down Expand Up @@ -129,7 +127,6 @@ androidx-compose-material-icons-core = { module = "androidx.compose.material:mat
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable" }
leanback = { group = "androidx.leanback", name = "leanback", version.ref = "androidx-leanback" }
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
Expand Down
5 changes: 0 additions & 5 deletions pillarbox-demo-tv/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,10 @@ dependencies {
implementation(libs.androidx.compose.ui.unit)
implementation(libs.androidx.compose.ui.util)
implementation(libs.androidx.core)
implementation(libs.androidx.fragment)
implementation(libs.androidx.lifecycle.common)
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.androidx.lifecycle.viewmodel)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.media3.common)
implementation(libs.androidx.media3.exoplayer)
implementation(libs.androidx.media3.ui.leanback)
implementation(libs.androidx.navigation.common)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.navigation.runtime)
Expand All @@ -49,7 +45,6 @@ dependencies {
implementation(libs.coil.base)
implementation(libs.kotlin.stdlib)
implementation(libs.kotlinx.coroutines.core)
implementation(libs.leanback)
implementation(libs.srg.data)
implementation(libs.srg.dataprovider.retrofit)

Expand Down
4 changes: 1 addition & 3 deletions pillarbox-demo-tv/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.player.PlayerActivity"
android:theme="@style/Theme.Leanback" />
<activity android:name=".ui.player.PlayerActivity" />
</application>

</manifest>
2 changes: 1 addition & 1 deletion pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/PlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class PlayerActivity : ComponentActivity() {
private const val ARG_ITEM = "demo_item"

/**
* Start player with Leanback fragment.
* Start player.
*
* @param context
* @param demoItem The item to play.
Expand Down
50 changes: 0 additions & 50 deletions ...tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/leanback/LeanbackPlayerActivity.kt
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions ...tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/leanback/LeanbackPlayerFragment.kt
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions pillarbox-demo-tv/src/main/res/layout/activity_leanback_player.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pillarbox-demo-tv/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
-->
<resources>

<style name="Theme.Pillarbox" parent="@style/Theme.Leanback" />
<style name="Theme.Pillarbox" parent="android:Theme.Material.Light.NoActionBar" />
</resources>
Loading