Skip to content

Commit 07ff076

Browse files
authored
Remove leanback (#651)
1 parent 05c5b07 commit 07ff076

File tree

8 files changed

+4
-174
lines changed

8 files changed

+4
-174
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ androidx-activity = "1.9.0"
55
androidx-annotation = "1.8.0"
66
androidx-compose = "2024.06.00"
77
androidx-core = "1.13.1"
8-
androidx-fragment = "1.8.1"
9-
androidx-leanback = "1.0.0"
8+
androidx-fragment = "1.8.2"
109
androidx-lifecycle = "2.8.3"
1110
androidx-media3 = "1.4.0"
1211
androidx-navigation = "2.7.7"
@@ -99,7 +98,6 @@ androidx-media3-common = { group = "androidx.media3", name = "media3-common", ve
9998
androidx-media3-datasource = { group = "androidx.media3", name = "media3-datasource", version.ref = "androidx-media3" }
10099
androidx-media3-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "androidx-media3" }
101100
androidx-media3-ui = { group = "androidx.media3", name = "media3-ui", version.ref = "androidx-media3" }
102-
androidx-media3-ui-leanback = { group = "androidx.media3", name = "media3-ui-leanback", version.ref = "androidx-media3" }
103101
androidx-media3-dash = { group = "androidx.media3", name = "media3-exoplayer-dash", version.ref = "androidx-media3" }
104102
androidx-media3-hls = { group = "androidx.media3", name = "media3-exoplayer-hls", version.ref = "androidx-media3" }
105103
androidx-media3-session = { group = "androidx.media3", name = "media3-session", version.ref = "androidx-media3" }
@@ -129,7 +127,6 @@ androidx-compose-material-icons-core = { module = "androidx.compose.material:mat
129127
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
130128
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
131129
androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable" }
132-
leanback = { group = "androidx.leanback", name = "leanback", version.ref = "androidx-leanback" }
133130
androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
134131
guava = { module = "com.google.guava:guava", version.ref = "guava" }
135132
turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }

pillarbox-demo-tv/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,10 @@ dependencies {
3030
implementation(libs.androidx.compose.ui.unit)
3131
implementation(libs.androidx.compose.ui.util)
3232
implementation(libs.androidx.core)
33-
implementation(libs.androidx.fragment)
34-
implementation(libs.androidx.lifecycle.common)
3533
implementation(libs.androidx.lifecycle.runtime)
3634
implementation(libs.androidx.lifecycle.viewmodel)
3735
implementation(libs.androidx.lifecycle.viewmodel.compose)
3836
implementation(libs.androidx.media3.common)
39-
implementation(libs.androidx.media3.exoplayer)
40-
implementation(libs.androidx.media3.ui.leanback)
4137
implementation(libs.androidx.navigation.common)
4238
implementation(libs.androidx.navigation.compose)
4339
implementation(libs.androidx.navigation.runtime)
@@ -49,7 +45,6 @@ dependencies {
4945
implementation(libs.coil.base)
5046
implementation(libs.kotlin.stdlib)
5147
implementation(libs.kotlinx.coroutines.core)
52-
implementation(libs.leanback)
5348
implementation(libs.srg.data)
5449
implementation(libs.srg.dataprovider.retrofit)
5550

pillarbox-demo-tv/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
2727
</intent-filter>
2828
</activity>
29-
<activity
30-
android:name=".ui.player.PlayerActivity"
31-
android:theme="@style/Theme.Leanback" />
29+
<activity android:name=".ui.player.PlayerActivity" />
3230
</application>
3331

3432
</manifest>

pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/PlayerActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class PlayerActivity : ComponentActivity() {
7474
private const val ARG_ITEM = "demo_item"
7575

7676
/**
77-
* Start player with Leanback fragment.
77+
* Start player.
7878
*
7979
* @param context
8080
* @param demoItem The item to play.

pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/leanback/LeanbackPlayerActivity.kt

Lines changed: 0 additions & 50 deletions
This file was deleted.

pillarbox-demo-tv/src/main/java/ch/srgssr/pillarbox/demo/tv/ui/player/leanback/LeanbackPlayerFragment.kt

Lines changed: 0 additions & 101 deletions
This file was deleted.

pillarbox-demo-tv/src/main/res/layout/activity_leanback_player.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

pillarbox-demo-tv/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
-->
55
<resources>
66

7-
<style name="Theme.Pillarbox" parent="@style/Theme.Leanback" />
7+
<style name="Theme.Pillarbox" parent="android:Theme.Material.Light.NoActionBar" />
88
</resources>

0 commit comments

Comments
 (0)