From b2b1437c4fdf94a99daef77cee8446de8aed405f Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Wed, 24 Jan 2024 11:19:20 +0100 Subject: [PATCH 1/4] Avoid displaying my store expanded toolbar on campaign preview screen --- .../woocommerce/android/ui/main/MainActivity.kt | 14 +++++++++++++- .../android/ui/main/MainAnimatorHelper.kt | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt index 18f3a4bbc69..6eccb15f3c6 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt @@ -61,6 +61,7 @@ import com.woocommerce.android.ui.appwidgets.WidgetUpdater import com.woocommerce.android.ui.base.BaseFragment import com.woocommerce.android.ui.base.TopLevelFragment import com.woocommerce.android.ui.base.UIMessageResolver +import com.woocommerce.android.ui.blaze.creation.preview.BlazeCampaignCreationPreviewFragment import com.woocommerce.android.ui.compose.theme.WooThemeWithBackground import com.woocommerce.android.ui.feedback.SurveyType import com.woocommerce.android.ui.login.LoginActivity @@ -158,18 +159,25 @@ class MainActivity : @Inject lateinit var presenter: MainContract.Presenter + @Inject lateinit var loginAnalyticsListener: LoginAnalyticsListener + @Inject lateinit var selectedSite: SelectedSite + @Inject lateinit var uiMessageResolver: UIMessageResolver + @Inject lateinit var crashLogging: CrashLogging + @Inject lateinit var appWidgetUpdaters: WidgetUpdater.StatsWidgetUpdaters + @Inject lateinit var trialStatusBarFormatterFactory: TrialStatusBarFormatterFactory + @Inject lateinit var startUpgradeFlowFactory: StartUpgradeFlowFactory @Inject lateinit var animatorHelper: MainAnimatorHelper @@ -206,9 +214,12 @@ class MainActivity : override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) { if (f is DialogFragment) return + if (f is BlazeCampaignCreationPreviewFragment) // Context on why this is needed check GH issue #10563 + animatorHelper.cancelToolBarAnimation() + when (val appBarStatus = (f as? BaseFragment)?.activityAppBarStatus ?: AppBarStatus.Visible()) { is AppBarStatus.Visible -> { - showToolbar(f is TopLevelFragment) + showToolbar(animate = true) // re-expand the AppBar when returning to top level fragment, // collapse it when entering a child fragment if (f is TopLevelFragment) { @@ -327,6 +338,7 @@ class MainActivity : } ) } + override fun hideProgressDialog() { progressDialog?.apply { if (isShowing) { diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt index 1e08efd1f79..cdbcf74a650 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt @@ -55,6 +55,10 @@ class MainAnimatorHelper @Inject constructor(private val resourceProvider: Resou } } + fun cancelToolBarAnimation() { + toolbarAnimator.cancel() + } + private companion object { private const val COLLAPSING_ANIMATION_DURATION = 200L private const val TOOLBAR_ANIMATION_DURATION = 300L From 823fdc50c6100f0fe9a0e60efe8d1e26d6de2dde Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Wed, 24 Jan 2024 11:25:53 +0100 Subject: [PATCH 2/4] Revert accidental change --- .../com/woocommerce/android/ui/main/MainActivity.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt index 6eccb15f3c6..e1a46b5a1fa 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt @@ -162,22 +162,16 @@ class MainActivity : @Inject lateinit var loginAnalyticsListener: LoginAnalyticsListener - @Inject lateinit var selectedSite: SelectedSite - @Inject lateinit var uiMessageResolver: UIMessageResolver - @Inject lateinit var crashLogging: CrashLogging - @Inject lateinit var appWidgetUpdaters: WidgetUpdater.StatsWidgetUpdaters - @Inject lateinit var trialStatusBarFormatterFactory: TrialStatusBarFormatterFactory - @Inject lateinit var startUpgradeFlowFactory: StartUpgradeFlowFactory @Inject lateinit var animatorHelper: MainAnimatorHelper @@ -219,7 +213,7 @@ class MainActivity : when (val appBarStatus = (f as? BaseFragment)?.activityAppBarStatus ?: AppBarStatus.Visible()) { is AppBarStatus.Visible -> { - showToolbar(animate = true) + showToolbar(animate = f is TopLevelFragment) // re-expand the AppBar when returning to top level fragment, // collapse it when entering a child fragment if (f is TopLevelFragment) { From 1ef85b83d553770d54ac2b23c2722bcf524abcf0 Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Wed, 24 Jan 2024 11:26:25 +0100 Subject: [PATCH 3/4] Remove extra space --- .../main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt index e1a46b5a1fa..013a9ce3493 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt @@ -159,7 +159,6 @@ class MainActivity : @Inject lateinit var presenter: MainContract.Presenter - @Inject lateinit var loginAnalyticsListener: LoginAnalyticsListener @Inject From 6dadcd8d8f3f8a25e418fd7443f9ca0ec745e555 Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Wed, 24 Jan 2024 11:27:49 +0100 Subject: [PATCH 4/4] Fix typo --- .../main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt | 2 +- .../com/woocommerce/android/ui/main/MainAnimatorHelper.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt index 013a9ce3493..6c93f3fc0bd 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt @@ -208,7 +208,7 @@ class MainActivity : if (f is DialogFragment) return if (f is BlazeCampaignCreationPreviewFragment) // Context on why this is needed check GH issue #10563 - animatorHelper.cancelToolBarAnimation() + animatorHelper.cancelToolbarAnimation() when (val appBarStatus = (f as? BaseFragment)?.activityAppBarStatus ?: AppBarStatus.Visible()) { is AppBarStatus.Visible -> { diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt index cdbcf74a650..6b459d5cd02 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainAnimatorHelper.kt @@ -55,7 +55,7 @@ class MainAnimatorHelper @Inject constructor(private val resourceProvider: Resou } } - fun cancelToolBarAnimation() { + fun cancelToolbarAnimation() { toolbarAnimator.cancel() }