From 01cf1a399351756d0fcee73bd5c2c3f777903f7f Mon Sep 17 00:00:00 2001 From: rahulsainani Date: Mon, 20 Nov 2023 18:15:55 +0100 Subject: [PATCH] Bug 1865452 - Remove review checker crossfade (cherry picked from commit 4353524a52c791f7955cefcf1d93db3d2a42241e) --- .../ui/ReviewQualityCheckBottomSheet.kt | 124 +++++++++--------- 1 file changed, 59 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt index fda572a32..07608506e 100644 --- a/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt +++ b/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckBottomSheet.kt @@ -4,7 +4,6 @@ package org.mozilla.fenix.shopping.ui -import androidx.compose.animation.Crossfade import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable @@ -143,74 +142,69 @@ private fun ProductReview( onRecommendedProductClick: (aid: String, url: String) -> Unit, onProductRecommendationImpression: (aid: String) -> Unit, ) { - Crossfade( - targetState = state.productReviewState, - label = "ProductReview-Crossfade", - ) { productReviewState -> - when (productReviewState) { - is AnalysisPresent -> { - ProductAnalysis( - productRecommendationsEnabled = state.productRecommendationsPreference, - productAnalysis = productReviewState, - productVendor = state.productVendor, - isSettingsExpanded = state.isSettingsExpanded, - isInfoExpanded = state.isInfoExpanded, - isHighlightsExpanded = state.isHighlightsExpanded, - onOptOutClick = onOptOutClick, - onReanalyzeClick = onReanalyzeClick, - onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange, - onHighlightsExpandToggleClick = onHighlightsExpandToggleClick, - onSettingsExpandToggleClick = onSettingsExpandToggleClick, - onInfoExpandToggleClick = onInfoExpandToggleClick, - onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick, - onFooterLinkClick = onFooterLinkClick, - onRecommendedProductClick = onRecommendedProductClick, - onRecommendedProductImpression = onProductRecommendationImpression, - ) - } - - is ReviewQualityCheckState.OptedIn.ProductReviewState.Error -> { - ProductAnalysisError( - error = productReviewState, - productRecommendationsEnabled = state.productRecommendationsPreference, - productVendor = state.productVendor, - isSettingsExpanded = state.isSettingsExpanded, - isInfoExpanded = state.isInfoExpanded, - onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick, - onOptOutClick = onOptOutClick, - onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange, - onFooterLinkClick = onFooterLinkClick, - onSettingsExpandToggleClick = onSettingsExpandToggleClick, - onInfoExpandToggleClick = onInfoExpandToggleClick, - modifier = Modifier.fillMaxWidth(), - ) - } + when (val productReviewState = state.productReviewState) { + is AnalysisPresent -> { + ProductAnalysis( + productRecommendationsEnabled = state.productRecommendationsPreference, + productAnalysis = productReviewState, + productVendor = state.productVendor, + isSettingsExpanded = state.isSettingsExpanded, + isInfoExpanded = state.isInfoExpanded, + isHighlightsExpanded = state.isHighlightsExpanded, + onOptOutClick = onOptOutClick, + onReanalyzeClick = onReanalyzeClick, + onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange, + onHighlightsExpandToggleClick = onHighlightsExpandToggleClick, + onSettingsExpandToggleClick = onSettingsExpandToggleClick, + onInfoExpandToggleClick = onInfoExpandToggleClick, + onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick, + onFooterLinkClick = onFooterLinkClick, + onRecommendedProductClick = onRecommendedProductClick, + onRecommendedProductImpression = onProductRecommendationImpression, + ) + } - is ReviewQualityCheckState.OptedIn.ProductReviewState.Loading -> { - ProductReviewLoading() - } + is ReviewQualityCheckState.OptedIn.ProductReviewState.Error -> { + ProductAnalysisError( + error = productReviewState, + productRecommendationsEnabled = state.productRecommendationsPreference, + productVendor = state.productVendor, + isSettingsExpanded = state.isSettingsExpanded, + isInfoExpanded = state.isInfoExpanded, + onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick, + onOptOutClick = onOptOutClick, + onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange, + onFooterLinkClick = onFooterLinkClick, + onSettingsExpandToggleClick = onSettingsExpandToggleClick, + onInfoExpandToggleClick = onInfoExpandToggleClick, + modifier = Modifier.fillMaxWidth(), + ) + } - is ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent -> { - LaunchedEffect(Unit) { - onNoAnalysisPresent() - } + is ReviewQualityCheckState.OptedIn.ProductReviewState.Loading -> { + ProductReviewLoading() + } - NoAnalysis( - isAnalyzing = productReviewState.isReanalyzing, - onAnalyzeClick = onAnalyzeClick, - productRecommendationsEnabled = state.productRecommendationsPreference, - productVendor = state.productVendor, - isSettingsExpanded = state.isSettingsExpanded, - isInfoExpanded = state.isInfoExpanded, - onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick, - onOptOutClick = onOptOutClick, - onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange, - onSettingsExpandToggleClick = onSettingsExpandToggleClick, - onInfoExpandToggleClick = onInfoExpandToggleClick, - onFooterLinkClick = onFooterLinkClick, - modifier = Modifier.fillMaxWidth(), - ) + is ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent -> { + LaunchedEffect(Unit) { + onNoAnalysisPresent() } + + NoAnalysis( + isAnalyzing = productReviewState.isReanalyzing, + onAnalyzeClick = onAnalyzeClick, + productRecommendationsEnabled = state.productRecommendationsPreference, + productVendor = state.productVendor, + isSettingsExpanded = state.isSettingsExpanded, + isInfoExpanded = state.isInfoExpanded, + onReviewGradeLearnMoreClick = onReviewGradeLearnMoreClick, + onOptOutClick = onOptOutClick, + onProductRecommendationsEnabledStateChange = onProductRecommendationsEnabledStateChange, + onSettingsExpandToggleClick = onSettingsExpandToggleClick, + onInfoExpandToggleClick = onInfoExpandToggleClick, + onFooterLinkClick = onFooterLinkClick, + modifier = Modifier.fillMaxWidth(), + ) } } }