Skip to content

Commit

Permalink
Remove leanback
Browse files Browse the repository at this point in the history
  • Loading branch information
MGaetan89 committed Jul 23, 2024
1 parent b19f959 commit c1957e1
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 178 deletions.
5 changes: 0 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ 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-lifecycle = "2.8.3"
androidx-media = "1.7.0"
androidx-media3 = "1.3.1"
Expand Down Expand Up @@ -49,7 +47,6 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
Expand Down Expand Up @@ -102,7 +99,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 @@ -133,7 +129,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
1 change: 0 additions & 1 deletion pillarbox-demo-cast/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ dependencies {
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.ui.unit)
implementation(libs.androidx.core)
implementation(libs.androidx.fragment)
implementation(libs.kotlin.stdlib)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ch.srgssr.pillarbox.demo.cast

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.Box
Expand All @@ -11,15 +12,14 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.fragment.app.FragmentActivity
import ch.srgssr.pillarbox.cast.getCastContext
import ch.srgssr.pillarbox.cast.widget.CastButton
import ch.srgssr.pillarbox.demo.cast.ui.theme.PillarboxTheme

/**
* Activity showing how to use Cast with Pillarbox.
*/
class MainActivity : FragmentActivity() {
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Force creation CastContext
Expand Down
5 changes: 0 additions & 5 deletions pillarbox-demo-tv/build.gradle.kts
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
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>
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

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion pillarbox-demo-tv/src/main/res/values/themes.xml
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>

0 comments on commit c1957e1

Please sign in to comment.