Reorganize pillarbox-demo structure (#398)

SRGSSR · Jan 19, 2024 · 0c01535 · 0c01535
1 parent 25bb6cd
commit 0c01535
Show file tree

Hide file tree

Showing 37 changed files with 138 additions and 159 deletions.
diff --git a/pillarbox-demo/src/main/AndroidManifest.xml b/pillarbox-demo/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
             android:launchMode="singleTask"
             android:supportsPictureInPicture="true" />
         <activity
-            android:name=".ui.player.mediacontroller.MediaControllerActivity"
+            android:name=".ui.showcases.integrations.MediaControllerActivity"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|smallestScreenSize"
             android:exported="true"
             android:launchMode="singleTask"

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/MainActivity.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/MainActivity.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import ch.srgssr.pillarbox.demo.ui.MainNavigation
 import ch.srgssr.pillarbox.demo.ui.theme.PillarboxTheme
 
 /**

diff --git a/...rgssr/pillarbox/demo/ui/MainNavigation.kt → ...h/srgssr/pillarbox/demo/MainNavigation.kt b/...rgssr/pillarbox/demo/ui/MainNavigation.kt → ...h/srgssr/pillarbox/demo/MainNavigation.kt
@@ -2,7 +2,7 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui
+package ch.srgssr.pillarbox.demo
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -53,20 +53,17 @@ import ch.srg.dataProvider.integrationlayer.request.image.ImageWidth
 import ch.srg.dataProvider.integrationlayer.request.image.decorated
 import ch.srgssr.pillarbox.analytics.SRGAnalytics
 import ch.srgssr.pillarbox.core.business.integrationlayer.service.IlHost
-import ch.srgssr.pillarbox.demo.DemoPageView
-import ch.srgssr.pillarbox.demo.R
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
 import ch.srgssr.pillarbox.demo.shared.di.PlayerModule
 import ch.srgssr.pillarbox.demo.shared.ui.HomeDestination
 import ch.srgssr.pillarbox.demo.shared.ui.NavigationRoutes
 import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.SearchViewModel
 import ch.srgssr.pillarbox.demo.shared.ui.navigate
-import ch.srgssr.pillarbox.demo.trackPagView
 import ch.srgssr.pillarbox.demo.ui.examples.ExamplesHome
-import ch.srgssr.pillarbox.demo.ui.integrationLayer.SearchView
-import ch.srgssr.pillarbox.demo.ui.integrationLayer.listNavGraph
+import ch.srgssr.pillarbox.demo.ui.lists.listsNavGraph
 import ch.srgssr.pillarbox.demo.ui.player.SimplePlayerActivity
-import ch.srgssr.pillarbox.demo.ui.showcases.showCasesNavGraph
+import ch.srgssr.pillarbox.demo.ui.search.SearchHome
+import ch.srgssr.pillarbox.demo.ui.showcases.showcasesNavGraph
 import ch.srgssr.pillarbox.demo.ui.theme.PillarboxTheme
 import ch.srgssr.pillarbox.demo.ui.theme.paddings
 import java.net.URL
@@ -129,19 +126,19 @@ fun MainNavigation() {
             }
 
             navigation(startDestination = NavigationRoutes.showcaseList, route = HomeDestination.ShowCases.route) {
-                showCasesNavGraph(navController)
+                showcasesNavGraph(navController)
             }
 
             navigation(startDestination = NavigationRoutes.contentLists, route = HomeDestination.Lists.route) {
                 val ilRepository = PlayerModule.createIlRepository(context, ilHost)
 
-                listNavGraph(navController, ilRepository, ilHost)
+                listsNavGraph(navController, ilRepository, ilHost)
             }
 
             composable(route = NavigationRoutes.searchHome, DemoPageView("home", listOf("app", "pillarbox", "search"))) {
                 val ilRepository = PlayerModule.createIlRepository(context)
                 val viewModel: SearchViewModel = viewModel(factory = SearchViewModel.Factory(ilRepository))
-                SearchView(searchViewModel = viewModel) {
+                SearchHome(searchViewModel = viewModel) {
                     val item = DemoItem(
                         title = it.title,
                         uri = it.urn,

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/service/DemoMediaLibraryService.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/service/DemoMediaLibraryService.kt
@@ -13,7 +13,7 @@ import androidx.media3.session.LibraryResult
 import androidx.media3.session.MediaSession
 import ch.srgssr.pillarbox.demo.shared.data.DemoBrowser
 import ch.srgssr.pillarbox.demo.shared.di.PlayerModule
-import ch.srgssr.pillarbox.demo.ui.player.mediacontroller.MediaControllerActivity
+import ch.srgssr.pillarbox.demo.ui.showcases.integrations.MediaControllerActivity
 import ch.srgssr.pillarbox.player.service.PillarboxMediaLibraryService
 import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
 import com.google.common.collect.ImmutableList

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/service/DemoMediaSessionService.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/service/DemoMediaSessionService.kt
@@ -11,7 +11,7 @@ import androidx.media3.common.C
 import androidx.media3.common.MediaItem
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
 import ch.srgssr.pillarbox.demo.shared.di.PlayerModule
-import ch.srgssr.pillarbox.demo.ui.player.mediacontroller.MediaControllerActivity
+import ch.srgssr.pillarbox.demo.ui.showcases.integrations.MediaControllerActivity
 import ch.srgssr.pillarbox.player.service.PillarboxMediaSessionService
 import ch.srgssr.pillarbox.player.utils.PendingIntentUtils
 

diff --git a/...x/demo/ui/integrationLayer/ContentView.kt → ...llarbox/demo/ui/components/ContentView.kt b/...x/demo/ui/integrationLayer/ContentView.kt → ...llarbox/demo/ui/components/ContentView.kt
@@ -2,14 +2,15 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui.integrationLayer
+package ch.srgssr.pillarbox.demo.ui.components
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import ch.srg.dataProvider.integrationlayer.data.ImageUrl
+import ch.srg.dataProvider.integrationlayer.data.remote.Channel
 import ch.srg.dataProvider.integrationlayer.data.remote.Media
 import ch.srg.dataProvider.integrationlayer.data.remote.MediaType
 import ch.srg.dataProvider.integrationlayer.data.remote.Show
@@ -19,7 +20,6 @@ import ch.srg.dataProvider.integrationlayer.data.remote.Type
 import ch.srg.dataProvider.integrationlayer.data.remote.Vendor
 import ch.srgssr.pillarbox.demo.shared.R
 import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.data.Content
-import ch.srgssr.pillarbox.demo.ui.DemoListItemView
 import ch.srgssr.pillarbox.demo.ui.theme.PillarboxTheme
 import java.util.Date
 import kotlin.time.Duration.Companion.seconds
@@ -100,7 +100,7 @@ private fun ShowPreview() {
         title = "Show Title",
         description = "Show description",
         transmission = Transmission.TV,
-        imageUrl = ImageUrl("https://image1.png")
+        imageUrl = ImageUrl("https://show.image.png")
     )
 
     PillarboxTheme {
@@ -120,7 +120,7 @@ private fun TopicPreview() {
         urn = "urn:show:id",
         title = "Topic title",
         transmission = Transmission.TV,
-        imageUrl = ImageUrl("https://image2.png")
+        imageUrl = ImageUrl("https://topic.image.png")
     )
 
     PillarboxTheme {
@@ -145,7 +145,7 @@ private fun MediaPreview() {
         mediaType = MediaType.VIDEO,
         playableAbroad = true,
         type = Type.CLIP,
-        imageUrl = ImageUrl("https://image2.png")
+        imageUrl = ImageUrl("https://media.image.png")
     )
 
     PillarboxTheme {
@@ -155,3 +155,24 @@ private fun MediaPreview() {
         )
     }
 }
+
+@Composable
+@Preview(showBackground = true)
+private fun ChannelPreview() {
+    val channel = Channel(
+        id = "id",
+        vendor = Vendor.RTR,
+        urn = "urn:media:id",
+        title = "Channel title",
+        description = "Channel description",
+        imageUrl = ImageUrl("https://channel.image.png"),
+        transmission = Transmission.RADIO
+    )
+
+    PillarboxTheme {
+        ContentView(
+            content = Content.Channel(channel),
+            onClick = {}
+        )
+    }
+}
diff --git a/...r/pillarbox/demo/ui/DemoListHeaderView.kt → .../demo/ui/components/DemoListHeaderView.kt b/...r/pillarbox/demo/ui/DemoListHeaderView.kt → .../demo/ui/components/DemoListHeaderView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui
+package ch.srgssr.pillarbox.demo.ui.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme

diff --git a/...ssr/pillarbox/demo/ui/DemoListItemView.kt → ...ox/demo/ui/components/DemoListItemView.kt b/...ssr/pillarbox/demo/ui/DemoListItemView.kt → ...ox/demo/ui/components/DemoListItemView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui
+package ch.srgssr.pillarbox.demo.ui.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column

diff --git a/.../pillarbox/demo/ui/DemoListSectionView.kt → ...demo/ui/components/DemoListSectionView.kt b/.../pillarbox/demo/ui/DemoListSectionView.kt → ...demo/ui/components/DemoListSectionView.kt
@@ -2,7 +2,7 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui
+package ch.srgssr.pillarbox.demo.ui.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope

diff --git a/...sr/pillarbox/demo/ui/SystemUiExtension.kt → ...larbox/demo/ui/components/ShowSystemUi.kt b/...sr/pillarbox/demo/ui/SystemUiExtension.kt → ...larbox/demo/ui/components/ShowSystemUi.kt
@@ -2,7 +2,7 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui
+package ch.srgssr.pillarbox.demo.ui.components
 
 import android.app.Activity
 import android.content.Context
@@ -13,32 +13,9 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.window.DialogWindowProvider
-import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 
-/**
- * Hide system ui
- */
-fun Activity.hideSystemUi() {
-    WindowCompat.setDecorFitsSystemWindows(window, false)
-    WindowInsetsControllerCompat(window, window.decorView).let { controller ->
-        controller.hide(WindowInsetsCompat.Type.systemBars())
-        controller.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-    }
-}
-
-/**
- * Show system ui
- */
-fun Activity.showSystemUi() {
-    WindowCompat.setDecorFitsSystemWindows(window, true)
-    WindowInsetsControllerCompat(
-        window,
-        window.decorView
-    ).show(WindowInsetsCompat.Type.systemBars())
-}
-
 /**
  * Show system ui
  *

diff --git a/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/examples/ExamplesHome.kt b/pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/examples/ExamplesHome.kt
@@ -25,9 +25,9 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import ch.srgssr.pillarbox.demo.BuildConfig
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
 import ch.srgssr.pillarbox.demo.shared.data.Playlist
-import ch.srgssr.pillarbox.demo.ui.DemoListHeaderView
-import ch.srgssr.pillarbox.demo.ui.DemoListItemView
-import ch.srgssr.pillarbox.demo.ui.DemoListSectionView
+import ch.srgssr.pillarbox.demo.ui.components.DemoListHeaderView
+import ch.srgssr.pillarbox.demo.ui.components.DemoListItemView
+import ch.srgssr.pillarbox.demo.ui.components.DemoListSectionView
 import ch.srgssr.pillarbox.demo.ui.player.SimplePlayerActivity
 import ch.srgssr.pillarbox.demo.ui.theme.PillarboxTheme
 import ch.srgssr.pillarbox.demo.ui.theme.paddings
@@ -39,9 +39,9 @@ import ch.srgssr.pillarbox.demo.ui.theme.paddings
  */
 @Composable
 fun ExamplesHome() {
-    val exampleViewModel: ExampleViewModel = viewModel()
+    val examplesViewModel: ExamplesViewModel = viewModel()
     val context = LocalContext.current
-    val playlists by exampleViewModel.contents.collectAsState()
+    val playlists by examplesViewModel.contents.collectAsState()
 
     ListStreamView(playlists = playlists) {
         SimplePlayerActivity.startActivity(context, it)

diff --git a/...rbox/demo/ui/examples/ExampleViewModel.kt → ...box/demo/ui/examples/ExamplesViewModel.kt b/...rbox/demo/ui/examples/ExampleViewModel.kt → ...box/demo/ui/examples/ExamplesViewModel.kt
@@ -18,11 +18,11 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.stateIn
 
 /**
- * Example view model
+ * Examples view model
  *
  * @param application Android Application to create [ILRepository]
  */
-class ExampleViewModel(application: Application) : AndroidViewModel(application) {
+class ExamplesViewModel(application: Application) : AndroidViewModel(application) {
     private val repository: ILRepository = PlayerModule.createIlRepository(application)
 
     /**

diff --git a/...o/ui/integrationLayer/ContentListsView.kt → ...gssr/pillarbox/demo/ui/lists/ListsHome.kt b/...o/ui/integrationLayer/ContentListsView.kt → ...gssr/pillarbox/demo/ui/lists/ListsHome.kt
@@ -2,7 +2,7 @@
  * Copyright (c) SRG SSR. All rights reserved.
  * License information is available from the LICENSE file.
  */
-package ch.srgssr.pillarbox.demo.ui.integrationLayer
+package ch.srgssr.pillarbox.demo.ui.lists
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
@@ -21,6 +21,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.paging.compose.collectAsLazyPagingItems
 import ch.srgssr.pillarbox.demo.DemoPageView
+import ch.srgssr.pillarbox.demo.composable
 import ch.srgssr.pillarbox.demo.shared.data.DemoItem
 import ch.srgssr.pillarbox.demo.shared.ui.NavigationRoutes
 import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.ContentList
@@ -29,10 +30,9 @@ import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.data.Content
 import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.data.ILRepository
 import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.data.contentListFactories
 import ch.srgssr.pillarbox.demo.shared.ui.integrationLayer.data.contentListSections
-import ch.srgssr.pillarbox.demo.ui.DemoListHeaderView
-import ch.srgssr.pillarbox.demo.ui.DemoListItemView
-import ch.srgssr.pillarbox.demo.ui.DemoListSectionView
-import ch.srgssr.pillarbox.demo.ui.composable
+import ch.srgssr.pillarbox.demo.ui.components.DemoListHeaderView
+import ch.srgssr.pillarbox.demo.ui.components.DemoListItemView
+import ch.srgssr.pillarbox.demo.ui.components.DemoListSectionView
 import ch.srgssr.pillarbox.demo.ui.player.SimplePlayerActivity
 import ch.srgssr.pillarbox.demo.ui.theme.PillarboxTheme
 import ch.srgssr.pillarbox.demo.ui.theme.paddings
@@ -43,7 +43,7 @@ private val defaultListsLevels = listOf("app", "pillarbox", "lists")
 /**
  * Build Navigation for integration layer list view
  */
-fun NavGraphBuilder.listNavGraph(navController: NavController, ilRepository: ILRepository, ilHost: URL) {
+fun NavGraphBuilder.listsNavGraph(navController: NavController, ilRepository: ILRepository, ilHost: URL) {
     val contentClick = { contentList: ContentList, content: Content ->
         when (content) {
             is Content.Show -> {
@@ -92,7 +92,7 @@ fun NavGraphBuilder.listNavGraph(navController: NavController, ilRepository: ILR
     }
 
     composable(route = NavigationRoutes.contentLists, DemoPageView("home", defaultListsLevels)) {
-        ContentListsView { contentList ->
+        ListsHome { contentList ->
             navController.navigate(route = contentList.destinationRoute)
         }
     }
@@ -110,7 +110,7 @@ fun NavGraphBuilder.listNavGraph(navController: NavController, ilRepository: ILR
                 )
             )
 
-            ContentListView(
+            ListsSubSection(
                 title = contentList.destinationTitle,
                 items = viewModel.data.collectAsLazyPagingItems(),
                 modifier = Modifier.fillMaxWidth(),
@@ -125,7 +125,7 @@ fun NavGraphBuilder.listNavGraph(navController: NavController, ilRepository: ILR
 }
 
 @Composable
-private fun ContentListsView(onContentSelected: (ContentList) -> Unit) {
+private fun ListsHome(onContentSelected: (ContentList) -> Unit) {
     LazyColumn(
         contentPadding = PaddingValues(
             start = MaterialTheme.paddings.baseline,
@@ -161,7 +161,7 @@ private fun ContentListsView(onContentSelected: (ContentList) -> Unit) {
 @Preview(showBackground = true)
 private fun ContentListPreview() {
     PillarboxTheme {
-        ContentListsView {
+        ListsHome {
         }
     }
 }