Merge pull request #75 from Divinelink/feature/details-fab-actions

[Expandable FAB] Introduce Expandable FAB Component on Details Screen
Divinelink · Oct 13, 2024 · a3f9a52 · a3f9a52
2 parents 227e43c + f79a15b
commit a3f9a52
Show file tree

Hide file tree

Showing 53 changed files with 1,048 additions and 462 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -126,8 +126,6 @@ dependencies {
   implementation(libs.compose.ui.tooling)
   implementation(libs.compose.ui.tooling.preview)
 
-  implementation(libs.compose.coil)
-
   debugImplementation(libs.compose.ui.tooling.preview)
   debugImplementation(libs.compose.ui.test.manifest)
 

diff --git a/.../test/kotlin/com/andreolas/movierama/details/domain/usecase/GetMediaDetailsUseCaseTest.kt b/.../test/kotlin/com/andreolas/movierama/details/domain/usecase/GetMediaDetailsUseCaseTest.kt
diff --git a/app/src/test/kotlin/com/andreolas/ui/details/DetailsContentTest.kt b/app/src/test/kotlin/com/andreolas/ui/details/DetailsContentTest.kt
@@ -2,6 +2,7 @@ package com.andreolas.ui.details
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotDisplayed
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.onAllNodesWithText
 import androidx.compose.ui.test.onNodeWithContentDescription
@@ -13,11 +14,14 @@ import com.andreolas.factories.ReviewFactory
 import com.andreolas.factories.details.domain.model.account.AccountMediaDetailsFactory
 import com.andreolas.factories.details.domain.model.account.AccountMediaDetailsFactory.toWizard
 import com.andreolas.movierama.R
+import com.divinelink.core.model.details.DetailActionItem
+import com.divinelink.core.model.details.DetailsMenuOptions
 import com.divinelink.core.model.details.video.Video
 import com.divinelink.core.model.details.video.VideoSite
 import com.divinelink.core.model.media.MediaType
 import com.divinelink.core.testing.ComposeTest
 import com.divinelink.core.testing.factories.model.details.MediaDetailsFactory
+import com.divinelink.core.testing.getString
 import com.divinelink.core.testing.setContentWithTheme
 import com.divinelink.core.ui.TestTags
 import com.divinelink.core.ui.TestTags.LOADING_CONTENT
@@ -26,7 +30,6 @@ import com.divinelink.core.ui.components.details.reviews.REVIEWS_LIST
 import com.divinelink.core.ui.components.details.videos.VIDEO_PLAYER_TAG
 import com.divinelink.feature.details.media.ui.DetailsContent
 import com.divinelink.feature.details.media.ui.DetailsViewState
-import com.divinelink.feature.details.media.ui.MOVIE_DETAILS_SCROLLABLE_LIST_TAG
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
@@ -145,7 +148,7 @@ class DetailsContentTest : ComposeTest() {
     val reviewsTitle = composeTestRule.activity.getString(uiR.string.details__reviews)
 
     composeTestRule
-      .onNodeWithTag(MOVIE_DETAILS_SCROLLABLE_LIST_TAG)
+      .onNodeWithTag(TestTags.Details.CONTENT_LIST)
       .performScrollToNode(
         hasText(reviewsTitle),
       )
@@ -464,6 +467,7 @@ class DetailsContentTest : ComposeTest() {
           mediaId = 0,
           mediaType = MediaType.MOVIE,
           mediaDetails = MediaDetailsFactory.FightClub(),
+          menuOptions = listOf(DetailsMenuOptions.SHARE),
         ),
         onNavigateUp = {},
         onMarkAsFavoriteClicked = {},
@@ -480,9 +484,7 @@ class DetailsContentTest : ComposeTest() {
     with(composeTestRule) {
       onNodeWithTag(TestTags.Menu.MENU_BUTTON_VERTICAL).performClick()
       onNodeWithTag(
-        TestTags.Menu.MENU_ITEM.format(
-          composeTestRule.activity.getString(uiR.string.core_ui_share),
-        ),
+        TestTags.Menu.MENU_ITEM.format(getString(uiR.string.core_ui_share)),
       )
         .assertIsDisplayed()
         .performClick()
@@ -516,5 +518,79 @@ class DetailsContentTest : ComposeTest() {
     }
   }
 
+  @Test
+  fun `test open request dialog for tv show`() {
+    setContentWithTheme {
+      DetailsContent(
+        viewState = DetailsViewState(
+          mediaId = 0,
+          mediaType = MediaType.TV,
+          actionButtons = DetailActionItem.entries,
+          mediaDetails = MediaDetailsFactory.TheOffice(),
+        ),
+        onNavigateUp = {},
+        onMarkAsFavoriteClicked = {},
+        onSimilarMovieClicked = {},
+        onConsumeSnackbar = {},
+        onAddRateClicked = {},
+        onAddToWatchlistClicked = {},
+        requestMedia = {},
+        viewAllCreditsClicked = {},
+        onPersonClick = {},
+      )
+    }
+    composeTestRule
+      .onNodeWithText(getString(detailsR.string.feature_details_request))
+      .assertIsNotDisplayed()
+
+    composeTestRule
+      .onNodeWithTag(TestTags.Components.ExpandableFab.BUTTON)
+      .performClick()
+
+    composeTestRule
+      .onNodeWithText(getString(detailsR.string.feature_details_request))
+      .assertIsDisplayed()
+      .performClick()
+
+    composeTestRule.onNodeWithTag(TestTags.Dialogs.SELECT_SEASONS_DIALOG).assertIsDisplayed()
+  }
+
+  @Test
+  fun `test open request dialog for movie`() {
+    setContentWithTheme {
+      DetailsContent(
+        viewState = DetailsViewState(
+          mediaId = 0,
+          mediaType = MediaType.MOVIE,
+          actionButtons = DetailActionItem.entries,
+          mediaDetails = MediaDetailsFactory.FightClub(),
+        ),
+        onNavigateUp = {},
+        onMarkAsFavoriteClicked = {},
+        onSimilarMovieClicked = {},
+        onConsumeSnackbar = {},
+        onAddRateClicked = {},
+        onAddToWatchlistClicked = {},
+        requestMedia = {},
+        viewAllCreditsClicked = {},
+        onPersonClick = {},
+      )
+    }
+    composeTestRule
+      .onNodeWithText(getString(detailsR.string.feature_details_request))
+      .assertIsNotDisplayed()
+
+    composeTestRule
+      .onNodeWithTag(TestTags.Components.ExpandableFab.BUTTON)
+      .performClick()
+
+    composeTestRule
+      .onNodeWithText(getString(detailsR.string.feature_details_request))
+      .assertIsDisplayed()
+      .performClick()
+
+    composeTestRule.onNodeWithTag(TestTags.Dialogs.REQUEST_MOVIE_DIALOG).assertIsDisplayed()
+  }
+
   private val reviews = ReviewFactory.ReviewList()
 }
diff --git a/app/src/test/kotlin/com/andreolas/ui/details/DetailsScreenTest.kt b/app/src/test/kotlin/com/andreolas/ui/details/DetailsScreenTest.kt
@@ -6,7 +6,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
-import androidx.compose.ui.test.performScrollTo
+import androidx.compose.ui.test.performScrollToIndex
 import androidx.compose.ui.test.performScrollToNode
 import androidx.compose.ui.test.performTouchInput
 import androidx.compose.ui.test.swipeRight
@@ -34,7 +34,6 @@ import com.divinelink.core.ui.TestTags
 import com.divinelink.feature.credits.screens.destinations.CreditsScreenDestination
 import com.divinelink.feature.details.media.ui.DetailsScreen
 import com.divinelink.feature.details.media.ui.DetailsViewModel
-import com.divinelink.feature.details.media.ui.MOVIE_DETAILS_SCROLLABLE_LIST_TAG
 import com.divinelink.feature.details.media.ui.MediaDetailsResult
 import com.divinelink.feature.details.screens.destinations.DetailsScreenDestination
 import com.divinelink.feature.settings.screens.destinations.AccountSettingsScreenDestination
@@ -112,7 +111,7 @@ class DetailsScreenTest : ComposeTest() {
     }
 
     composeTestRule
-      .onNodeWithTag(MOVIE_DETAILS_SCROLLABLE_LIST_TAG)
+      .onNodeWithTag(TestTags.Details.CONTENT_LIST)
       .performScrollToNode(
         matcher = hasText(
           MediaItemFactory.MoviesList()[0].name,
@@ -316,9 +315,6 @@ class DetailsScreenTest : ComposeTest() {
     val requestMediaUseCase = FakeRequestMediaUseCase()
     val destinationsNavigator = FakeDestinationsNavigator()
 
-    var verifyNavigatedToCredits: Pair<Boolean, CreditsNavArguments?> = false to null
-    var verifyNavigatedToDetails = false
-
     // Initial navigation to Details screen
     destinationsNavigator.navigate(
       direction = DetailsScreenDestination(
@@ -379,8 +375,9 @@ class DetailsScreenTest : ComposeTest() {
     }
 
     with(composeTestRule) {
+      onNodeWithTag(TestTags.Details.CONTENT_LIST).performScrollToIndex(2)
+
       onNodeWithText(getString(R.string.core_ui_view_all))
-        .performScrollTo()
         .assertIsDisplayed()
         .performClick()
 

diff --git a/core/commons/src/main/kotlin/com/divinelink/core/commons/ErrorHandler.kt b/core/commons/src/main/kotlin/com/divinelink/core/commons/ErrorHandler.kt
@@ -13,8 +13,9 @@ class ErrorHandler private constructor() {
 
     fun create(
       throwable: Throwable,
-      actions: ErrorHandler.() -> Unit,
-    ) = ErrorHandler().apply(actions).handle(throwable)
+      skipGlobal: Boolean = false,
+      actions: ErrorHandler.() -> Unit = {},
+    ) = ErrorHandler().apply(actions).handle(throwable = throwable, skipGlobal = skipGlobal)
   }
 
   /**

diff --git a/core/datastore/src/main/java/com/divinelink/core/datastore/PreferenceStorage.kt b/core/datastore/src/main/java/com/divinelink/core/datastore/PreferenceStorage.kt
@@ -17,6 +17,7 @@ import com.divinelink.core.datastore.DataStorePreferenceStorage.PreferencesKeys.
 import com.divinelink.core.datastore.DataStorePreferenceStorage.PreferencesKeys.PREF_SELECTED_THEME
 import com.divinelink.core.designsystem.theme.Theme
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
@@ -150,7 +151,7 @@ class DataStorePreferenceStorage(private val dataStore: DataStore<Preferences>)
 
   override val hasSession: Flow<Boolean> = dataStore.data.map {
     it[PREF_HAS_SESSION] ?: false
-  }
+  }.distinctUntilChanged()
 
   override suspend fun clearAccountId() {
     dataStore.edit {

diff --git a/core/designsystem/src/main/res/values-night/material3_colors.xml b/core/designsystem/src/main/res/values-night/material3_colors.xml
@@ -29,8 +29,4 @@
   <color name="colorShadow">@color/dark_colorShadow</color>
   <color name="colorSurfaceTint">@color/dark_colorSurfaceTint</color>
   <color name="colorSurfaceTintColor">@color/dark_colorSurfaceTintColor</color>
-
-  <color name="colorSurface2">@color/dark_colorSurface2</color>
-
-  <color name="colorSurface_60">@color/dark_colorSurface_60</color>
 </resources>
diff --git a/core/designsystem/src/main/res/values-night/material3_colors_dark.xml b/core/designsystem/src/main/res/values-night/material3_colors_dark.xml
@@ -29,8 +29,4 @@
   <color name="dark_colorShadow">#000000</color>
   <color name="dark_colorSurfaceTint">#5BD5FA</color>
   <color name="dark_colorSurfaceTintColor">#5BD5FA</color>
-
-  <color name="dark_colorSurface2">#172224</color>
-
-  <color name="dark_colorSurface_60">#99FBFCFF</color>-->
 </resources>
diff --git a/core/designsystem/src/main/res/values/material3_colors.xml b/core/designsystem/src/main/res/values/material3_colors.xml
@@ -29,8 +29,4 @@
   <color name="colorShadow">@color/light_colorShadow</color>
   <color name="colorSurfaceTint">@color/light_colorSurfaceTint</color>
   <color name="colorSurfaceTintColor">@color/light_colorSurfaceTintColor</color>
-
-  <color name="colorSurface2">@color/light_colorSurface2</color>
-
-  <color name="colorSurface_60">@color/light_colorSurface_60</color>
 </resources>
diff --git a/core/designsystem/src/main/res/values/material3_colors_light.xml b/core/designsystem/src/main/res/values/material3_colors_light.xml
@@ -31,7 +31,4 @@
   <color name="light_colorShadow">#000000</color>
   <color name="light_colorSurfaceTint">#00677E</color>
   <color name="light_colorSurfaceTintColor">#00677E</color>
-
-  <color name="light_colorSurface2">#F0F9FE</color>
-  <color name="light_colorSurface_60">#99FBFCFF</color>
 </resources>
diff --git a/core/domain/src/main/kotlin/com/divinelink/core/domain/GetDetailsActionItemsUseCase.kt b/core/domain/src/main/kotlin/com/divinelink/core/domain/GetDetailsActionItemsUseCase.kt
@@ -0,0 +1,28 @@
+package com.divinelink.core.domain
+
+import com.divinelink.core.commons.domain.DispatcherProvider
+import com.divinelink.core.commons.domain.FlowUseCase
+import com.divinelink.core.datastore.PreferenceStorage
+import com.divinelink.core.model.details.DetailActionItem
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+
+class GetDetailsActionItemsUseCase(
+  private val storage: PreferenceStorage,
+  val dispatcher: DispatcherProvider,
+) : FlowUseCase<Unit, List<DetailActionItem>>(dispatcher.io) {
+
+  override fun execute(parameters: Unit): Flow<Result<List<DetailActionItem>>> = combine(
+    storage.jellyseerrAccount,
+  ) { account ->
+
+    val menuItems = buildList {
+      add(DetailActionItem.RATE)
+      add(DetailActionItem.WATCHLIST)
+      account.firstOrNull()?.let {
+        add(DetailActionItem.REQUEST)
+      }
+    }
+    Result.success(menuItems)
+  }
+}
diff --git a/core/domain/src/main/kotlin/com/divinelink/core/domain/GetDropdownMenuItemsUseCase.kt b/core/domain/src/main/kotlin/com/divinelink/core/domain/GetDropdownMenuItemsUseCase.kt
@@ -1,27 +1,18 @@
 package com.divinelink.core.domain
 
+import com.divinelink.core.commons.domain.DispatcherProvider
 import com.divinelink.core.commons.domain.FlowUseCase
-import com.divinelink.core.datastore.PreferenceStorage
 import com.divinelink.core.model.details.DetailsMenuOptions
-import com.divinelink.core.commons.domain.DispatcherProvider
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flow
 
-class GetDropdownMenuItemsUseCase(
-  private val storage: PreferenceStorage,
-  val dispatcher: DispatcherProvider,
-) : FlowUseCase<Unit, List<DetailsMenuOptions>>(dispatcher.io) {
+class GetDropdownMenuItemsUseCase(val dispatcher: DispatcherProvider) :
+  FlowUseCase<Unit, List<DetailsMenuOptions>>(dispatcher.io) {
 
-  override fun execute(parameters: Unit): Flow<Result<List<DetailsMenuOptions>>> = combine(
-    storage.jellyseerrAccount,
-  ) { account ->
-    val menuItems = mutableListOf<DetailsMenuOptions>()
-    menuItems.add(DetailsMenuOptions.SHARE)
-
-    account.firstOrNull()?.let {
-      menuItems.add(DetailsMenuOptions.REQUEST)
+  override fun execute(parameters: Unit): Flow<Result<List<DetailsMenuOptions>>> = flow {
+    val menuItems = buildList {
+      add(DetailsMenuOptions.SHARE)
     }
-
-    Result.success(menuItems)
+    emit(Result.success(menuItems))
   }
 }
diff --git a/core/domain/src/main/kotlin/com/divinelink/core/domain/di/UseCaseModule.kt b/core/domain/src/main/kotlin/com/divinelink/core/domain/di/UseCaseModule.kt
@@ -1,12 +1,13 @@
 package com.divinelink.core.domain.di
 
 import com.divinelink.core.domain.CreateRequestTokenUseCase
-import com.divinelink.core.domain.change.FetchChangesUseCase
 import com.divinelink.core.domain.FetchWatchlistUseCase
 import com.divinelink.core.domain.GetAccountDetailsUseCase
 import com.divinelink.core.domain.GetDropdownMenuItemsUseCase
+import com.divinelink.core.domain.GetDetailsActionItemsUseCase
 import com.divinelink.core.domain.HandleAuthenticationRequestUseCase
 import com.divinelink.core.domain.MarkAsFavoriteUseCase
+import com.divinelink.core.domain.change.FetchChangesUseCase
 import com.divinelink.core.domain.credits.FetchCreditsUseCase
 import com.divinelink.core.domain.details.person.FetchPersonDetailsUseCase
 import com.divinelink.core.domain.jellyseerr.GetJellyseerrAccountDetailsUseCase
@@ -43,6 +44,7 @@ val useCaseModule = module {
   factoryOf(::FetchWatchlistUseCase)
   factoryOf(::GetAccountDetailsUseCase)
   factoryOf(::GetDropdownMenuItemsUseCase)
+  factoryOf(::GetDetailsActionItemsUseCase)
   factoryOf(::HandleAuthenticationRequestUseCase)
   factoryOf(::MarkAsFavoriteUseCase)
 }