Migrate player shelf to Compose (#3239)

Automattic · Nov 19, 2024 · fcab553 · fcab553
1 parent 70d70cc
commit fcab553
Show file tree

Hide file tree

Showing 11 changed files with 601 additions and 590 deletions.
diff --git a/modules/features/discover/src/main/res/layout/item_most_popular_podcasts.xml b/modules/features/discover/src/main/res/layout/item_most_popular_podcasts.xml
@@ -3,7 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:id="@+id/podcast"
     android:background="?attr/selectableItemBackground"
     android:clipToPadding="false"
     android:orientation="vertical"

diff --git a/modules/features/player/build.gradle.kts b/modules/features/player/build.gradle.kts
@@ -54,6 +54,7 @@ dependencies {
     implementation(libs.androidx.preference.ktx)
     implementation(libs.androidx.webkit)
     implementation(libs.compose.animation)
+    implementation(libs.compose.livedata)
     implementation(libs.compose.material)
     implementation(libs.compose.material.icons.core)
     implementation(libs.compose.ui)
@@ -67,6 +68,7 @@ dependencies {
     implementation(libs.lifecycle.reactivestreams.ktx)
     implementation(libs.lifecycle.runtime.compose)
     implementation(libs.lifecycle.viewmodel.compose)
+    implementation(libs.lottie.compose)
     implementation(libs.media3.exoplayer)
     implementation(libs.media3.extractor)
     implementation(libs.play.cast)

diff --git a/...layer/src/main/java/au/com/shiftyjelly/pocketcasts/player/view/PlayerContainerFragment.kt b/...layer/src/main/java/au/com/shiftyjelly/pocketcasts/player/view/PlayerContainerFragment.kt
@@ -479,7 +479,7 @@ private val step4 = TourStep(
     "More Actions",
     "You can now easily access more actions, as well as customise which actions appear in the player menu.",
     "Finish",
-    TourViewTag.ViewId(R.id.playerActions),
+    TourViewTag.ViewId(R.id.shelfComposeView),
     Gravity.TOP,
 )
 private val tour = listOf(step1, step2, step3, step4)
diff --git a/...s/player/src/main/java/au/com/shiftyjelly/pocketcasts/player/view/PlayerHeaderFragment.kt b/...s/player/src/main/java/au/com/shiftyjelly/pocketcasts/player/view/PlayerHeaderFragment.kt