added activate dialog on episode long click

DatL4g · Dec 3, 2023 · b89f2d1 · b89f2d1
1 parent 329a063
commit b89f2d1
Show file tree

Hide file tree

Showing 18 changed files with 286 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+TODO
+
 app/release/*
 !app/release/.gitkeep
 

diff --git a/...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt b/...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt
@@ -119,6 +119,9 @@ private fun SearchBar(component: FavoriteComponent) {
         modifier = Modifier.fillMaxWidth().animateContentSize(),
         active = queryComp.isNotBlank() && items.isNotEmpty(),
         onActiveChange = {},
+        placeholder = {
+            Text(text = stringResource(SharedRes.strings.search))
+        },
         leadingIcon = {
             Icon(
                 imageVector = Icons.Default.Search,

diff --git a/...in/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt b/...in/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt
@@ -29,7 +29,7 @@ import io.kamel.image.asyncPainterResource
 @Composable
 fun LazyGridItemScope.EpisodeItem(episode: Home.Episode, onclick: () -> Unit) {
     ElevatedCard(
-        modifier = Modifier.animateItemPlacement().focusScale(1.05F).height(150.dp).bounceClick().clip(MaterialTheme.shapes.medium).onClick {
+        modifier = Modifier.animateItemPlacement().focusScale(1.02F).height(150.dp).bounceClick().clip(MaterialTheme.shapes.medium).onClick {
             onclick()
         }
     ) {

diff --git a/...ain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt b/...ain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt
@@ -58,7 +58,7 @@ fun LazyItemScope.SeriesItem(series: DBSeries, modifier: Modifier = Modifier, on
 @Composable
 private fun SeriesItem(title: String, coverHref: String?, modifier: Modifier = Modifier, onClick: () -> Unit) {
     ElevatedCard(
-        modifier = modifier.focusScale(1.05F).height(150.dp).bounceClick().clip(MaterialTheme.shapes.medium).onClick {
+        modifier = modifier.focusScale(1.02F).height(150.dp).bounceClick().clip(MaterialTheme.shapes.medium).onClick {
             onClick()
         }
     ) {

diff --git a/...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt b/...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt
@@ -168,6 +168,9 @@ private fun SearchBar(component: SearchComponent) {
         modifier = Modifier.fillMaxWidth().padding(8.dp).animateContentSize(),
         active = queryComp.isNotBlank() && items.isNotEmpty(),
         onActiveChange = {},
+        placeholder = {
+            Text(text = stringResource(SharedRes.strings.search))
+        },
         leadingIcon = {
             Icon(
                 imageVector = Icons.Default.Search,

diff --git a/...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/DialogConfig.kt b/...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/DialogConfig.kt
@@ -11,17 +11,23 @@ sealed class DialogConfig : Parcelable {
     data class Season(
         val selected: Series.Season,
         val seasons: List<Series.Season>
-    ) : DialogConfig()
+    ) : DialogConfig(), Parcelable
 
     @Parcelize
     data class Language(
         val selected: Series.Language,
         val languages: List<Series.Language>
-    ) : DialogConfig()
+    ) : DialogConfig(), Parcelable
 
     @Parcelize
     data class StreamUnavailable(
         val series: Series,
         val episode: Series.Episode
-    ) : DialogConfig()
+    ) : DialogConfig(), Parcelable
+
+    @Parcelize
+    data class Activate(
+        val series: Series,
+        val episode: Series.Episode
+    ) : DialogConfig(), Parcelable
 }
diff --git a/...onMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt b/...onMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt
@@ -34,4 +34,5 @@ interface SeriesComponent : Component {
 
     fun toggleFavorite(): Any?
     fun itemClicked(episode: Series.Episode): Any?
+    fun itemLongClicked(episode: Series.Episode)
 }
diff --git a/...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt b/...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt
@@ -258,9 +258,17 @@ private fun CompactScreen(component: SeriesComponent) {
                         )
                     }
 
-                    SeriesContent(current.series, dbEpisodes, loadingEpisode) {
-                        component.itemClicked(it)
-                    }
+                    SeriesContent(
+                        content = current.series,
+                        dbEpisodes = dbEpisodes,
+                        loadingEpisode = loadingEpisode,
+                        onEpisodeClick = {
+                            component.itemClicked(it)
+                        },
+                        onEpisodeLongClick = {
+                            component.itemLongClicked(it)
+                        }
+                    )
                 }
 
                 DisposableEffect(state) {
@@ -390,9 +398,17 @@ private fun DefaultScreen(component: SeriesComponent) {
                         }
                     }
 
-                    SeriesContent(current.series, dbEpisodes, loadingEpisode) {
-                        component.itemClicked(it)
-                    }
+                    SeriesContent(
+                        content = current.series,
+                        dbEpisodes = dbEpisodes,
+                        loadingEpisode = loadingEpisode,
+                        onEpisodeClick = {
+                            component.itemClicked(it)
+                        },
+                        onEpisodeLongClick = {
+                            component.itemLongClicked(it)
+                        }
+                    )
                 }
                 VerticalScrollbar(rememberScrollbarAdapter(state))
 
@@ -407,14 +423,28 @@ private fun DefaultScreen(component: SeriesComponent) {
     }
 }
 
-private fun LazyListScope.SeriesContent(content: Series, dbEpisodes: List<Episode>, loadingEpisode: String?, onEpisodeClick: (Series.Episode) -> Unit) {
+private fun LazyListScope.SeriesContent(
+    content: Series,
+    dbEpisodes: List<Episode>,
+    loadingEpisode: String?,
+    onEpisodeClick: (Series.Episode) -> Unit,
+    onEpisodeLongClick: (Series.Episode) -> Unit
+) {
     items(content.episodes, key = { it.href }) { episode ->
         val dbEpisode = remember(dbEpisodes, episode.href) {
             dbEpisodes.firstOrNull { it.href == episode.href } ?: dbEpisodes.firstOrNull { it.href.equals(episode.href, true) }
         }
 
-        EpisodeItem(episode, dbEpisode, loadingEpisode.equals(episode.href, true)) {
-            onEpisodeClick(episode)
-        }
+        EpisodeItem(
+            content = episode,
+            dbEpisode = dbEpisode,
+            isLoading = loadingEpisode.equals(episode.href, true),
+            onClick = {
+                onEpisodeClick(episode)
+            },
+            onLongClick = {
+                onEpisodeLongClick(episode)
+            }
+        )
     }
 }
diff --git a/.../kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreenComponent.kt b/.../kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreenComponent.kt
@@ -29,6 +29,7 @@ import dev.datlag.burningseries.shared.other.StateSaver
 import dev.datlag.burningseries.shared.ui.navigation.Component
 import dev.datlag.burningseries.shared.ui.navigation.DialogComponent
 import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.ActivateScreenComponent
+import dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.activate.ActivateDialogComponent
 import dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.language.LanguageDialogComponent
 import dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.season.SeasonDialogComponent
 import dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.unavailable.UnavailableDialogComponent
@@ -156,6 +157,16 @@ class SeriesScreenComponent(
                     navigation.activate(SeriesConfig.Activate(series, episode))
                 }
             )
+            is DialogConfig.Activate -> ActivateDialogComponent(
+                componentContext = slotContext,
+                di = di,
+                series = config.series,
+                episode = config.episode,
+                onDismiss = dialogNavigation::dismiss,
+                onActivate = { series, episode ->
+                    navigation.activate(SeriesConfig.Activate(series, episode))
+                }
+            )
         }
     }
     override val dialog: Value<ChildSlot<DialogConfig, DialogComponent>> = _dialog
@@ -262,6 +273,15 @@ class SeriesScreenComponent(
         episodeStateMachine.dispatch(EpisodeAction.Load(episode))
     }
 
+    override fun itemLongClicked(episode: Series.Episode) {
+        currentSeries.value?.let { series ->
+            showDialog(DialogConfig.Activate(
+                series = series,
+                episode = episode
+            ))
+        }
+    }
+
     private fun loadNewSeason(season: Series.Season) = ioScope().launchIO {
         (currentSeries.value ?: currentSeries.firstOrNull())?.let { series ->
             seriesStateMachine.dispatch(SeriesAction.Load(series.hrefBuilder(season.value)))

diff --git a/.../kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt b/.../kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt
@@ -32,7 +32,13 @@ import dev.icerock.moko.resources.compose.stringResource
 import kotlin.math.roundToInt
 
 @Composable
-fun EpisodeItem(content: Series.Episode, dbEpisode: Episode?, isLoading: Boolean, onClick: () -> Unit) {
+fun EpisodeItem(
+    content: Series.Episode,
+    dbEpisode: Episode?,
+    isLoading: Boolean,
+    onClick: () -> Unit,
+    onLongClick: () -> Unit
+) {
     val blurHash = remember(content.href) { BlurHash.random() }
     val enabled = content.hosters.isNotEmpty()
 
@@ -51,9 +57,17 @@ fun EpisodeItem(content: Series.Episode, dbEpisode: Episode?, isLoading: Boolean
     }
 
     Row(
-        modifier = Modifier.padding(vertical = 4.dp).fillMaxWidth().focusScale(1.05F).height(100.dp).clip(MaterialTheme.shapes.medium).onClick(enabled) {
-            onClick()
-        }.ifTrue(enabled) { bounceClick(0.95F) }.ifFalse(enabled) { alpha(0.5F) },
+        modifier = Modifier
+            .padding(vertical = 4.dp)
+            .fillMaxWidth()
+            .focusScale(1.02F)
+            .height(100.dp)
+            .clip(MaterialTheme.shapes.medium)
+            .onClick(
+                enabled = enabled,
+                onLongClick = onLongClick,
+                onClick = onClick
+            ).ifTrue(enabled) { bounceClick(0.95F) }.ifFalse(enabled) { alpha(0.5F) },
         horizontalArrangement = Arrangement.spacedBy(8.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {

diff --git a/...datlag/burningseries/shared/ui/screen/initial/series/dialog/activate/ActivateComponent.kt b/...datlag/burningseries/shared/ui/screen/initial/series/dialog/activate/ActivateComponent.kt
@@ -0,0 +1,11 @@
+package dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.activate
+
+import dev.datlag.burningseries.model.Series
+import dev.datlag.burningseries.shared.ui.navigation.DialogComponent
+
+interface ActivateComponent : DialogComponent {
+    val series: Series
+    val episode: Series.Episode
+
+    fun activate()
+}
diff --git a/...ev/datlag/burningseries/shared/ui/screen/initial/series/dialog/activate/ActivateDialog.kt b/...ev/datlag/burningseries/shared/ui/screen/initial/series/dialog/activate/ActivateDialog.kt
@@ -0,0 +1,49 @@
+package dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.activate
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.style.TextOverflow
+import dev.datlag.burningseries.shared.SharedRes
+import dev.icerock.moko.resources.compose.stringResource
+
+@Composable
+fun ActivateDialog(component: ActivateComponent) {
+    AlertDialog(
+        onDismissRequest = {
+            component.dismiss()
+        },
+        title = {
+            Text(
+                text = stringResource(SharedRes.strings.activate_episode_title),
+                style = MaterialTheme.typography.headlineMedium,
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+                softWrap = true
+            )
+        },
+        text = {
+            Text(text = stringResource(SharedRes.strings.activate_episode_text))
+        },
+        confirmButton = {
+            Button(
+                onClick = {
+                    component.activate()
+                }
+            ) {
+                Text(text = stringResource(SharedRes.strings.activate))
+            }
+        },
+        dismissButton = {
+            Button(
+                onClick = {
+                    component.dismiss()
+                }
+            ) {
+                Text(text = stringResource(SharedRes.strings.later))
+            }
+        }
+    )
+}
diff --git a/.../burningseries/shared/ui/screen/initial/series/dialog/activate/ActivateDialogComponent.kt b/.../burningseries/shared/ui/screen/initial/series/dialog/activate/ActivateDialogComponent.kt
@@ -0,0 +1,30 @@
+package dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.activate
+
+import androidx.compose.runtime.Composable
+import com.arkivanov.decompose.ComponentContext
+import dev.datlag.burningseries.model.Series
+import org.kodein.di.DI
+
+class ActivateDialogComponent(
+    componentContext: ComponentContext,
+    override val di: DI,
+    override val series: Series,
+    override val episode: Series.Episode,
+    private val onDismiss: () -> Unit,
+    private val onActivate: (Series, Series.Episode) -> Unit
+) : ActivateComponent, ComponentContext by componentContext {
+
+    @Composable
+    override fun render() {
+        ActivateDialog(this)
+    }
+
+    override fun dismiss() {
+        onDismiss()
+    }
+
+    override fun activate() {
+        onActivate(series, episode)
+        dismiss()
+    }
+}
diff --git a/app/shared/src/commonMain/resources/MR/base/strings.xml b/app/shared/src/commonMain/resources/MR/base/strings.xml
@@ -61,4 +61,8 @@
     <string name="selected">Selected</string>
     <string name="available">Available</string>
     <string name="disconnect">Disconnect</string>
+    <string name="vlc_required">VLC is required to play videos on your PC.\nMake sure to only download and install the official package from videolan.org or your system package manager.</string>
+    <string name="download">Download</string>
+    <string name="activate_episode_title">Activate episode</string>
+    <string name="activate_episode_text">Do you want to activate this episode now?</string>
 </resources>
diff --git a/app/shared/src/commonMain/resources/MR/de/strings.xml b/app/shared/src/commonMain/resources/MR/de/strings.xml
@@ -61,4 +61,8 @@
     <string name="selected">Ausgewählt</string>
     <string name="available">Verfügbar</string>
     <string name="disconnect">Unterbrechen</string>
+    <string name="vlc_required">VLC muss auf deinem PC installiert sein, um Videos abzuspielen.\nStelle sicher, dass du nur das offizielle Paket von videolan.org oder deinem Systempaketmanager herunterlädst und installierst.</string>
+    <string name="download">Herunterladen</string>
+    <string name="activate_episode_title">Episode aktivieren</string>
+    <string name="activate_episode_text">Willst du diese Episode jetzt aktivieren?</string>
 </resources>
diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/AppIO.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/AppIO.kt
@@ -146,4 +146,5 @@ object AppIO {
     }
 
     private const val APP_NAME = "Burning-Series"
+    internal const val VLC_ORG = "https://www.videolan.org/vlc"
 }