Init banner animation in onCreateView to get rid of ScrollableViewInitializedListener

Author: ovitrif

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java

@@ -72,7 +72,6 @@
 import org.wordpress.android.ui.EmptyViewMessageType;
 import org.wordpress.android.ui.FilteredRecyclerView;
 import org.wordpress.android.ui.RequestCodes;
-import org.wordpress.android.ui.ScrollableViewInitializedListener;
 import org.wordpress.android.ui.ViewPagerFragment;
 import org.wordpress.android.ui.main.BottomNavController;
 import org.wordpress.android.ui.main.SitePickerActivity;
@@ -529,21 +528,11 @@ private void showJetpackBanner() {
         mJetpackBrandingUtils.setNavigationBarColorForBanner(requireActivity().getWindow());
         mJetpackBanner.setVisibility(View.VISIBLE);
 
-        if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
-            mJetpackBanner.setOnClickListener(v -> {
-                mJetpackBrandingUtils.trackBannerTapped(Screen.READER_SEARCH);
-                new JetpackPoweredBottomSheetFragment()
-                        .show(getChildFragmentManager(), JetpackPoweredBottomSheetFragment.TAG);
-            });
-        }
-
-        if (!isSearching()) {
-            // Add bottom margin to search suggestions post list and empty view.
-            int jetpackBannerHeight = getResources().getDimensionPixelSize(R.dimen.jetpack_banner_height);
-            ((MarginLayoutParams) mRecyclerView.getSearchSuggestionsRecyclerView().getLayoutParams()).bottomMargin
-                    = jetpackBannerHeight;
-            ((MarginLayoutParams) mActionableEmptyView.getLayoutParams()).bottomMargin = jetpackBannerHeight;
-        }
+        // Add bottom margin to search suggestions list and empty view.
+        int jetpackBannerHeight = getResources().getDimensionPixelSize(R.dimen.jetpack_banner_height);
+        ((MarginLayoutParams) mRecyclerView.getSearchSuggestionsRecyclerView().getLayoutParams()).bottomMargin
+                = jetpackBannerHeight;
+        ((MarginLayoutParams) mActionableEmptyView.getLayoutParams()).bottomMargin = jetpackBannerHeight;
     }
 
     private void hideJetpackBanner() {
@@ -791,11 +780,6 @@ public void onResume() {
             showEmptyView();
         }
 
-        if (getActivity() instanceof ScrollableViewInitializedListener) {
-            ((ScrollableViewInitializedListener) getActivity())
-                    .onScrollableViewInitialized(mRecyclerView.getInternalRecyclerView().getId());
-        }
-
         mViewModel.onFragmentResume(mIsTopLevel, isSearching(), isFilterableScreen(),
                 isFilterableScreen() ? mSubFilterViewModel.getCurrentSubfilterValue() : null);
     }
@@ -1162,6 +1146,17 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) {
         mProgress.setVisibility(View.GONE);
 
         mJetpackBanner = rootView.findViewById(R.id.jetpack_banner);
+        if (mJetpackBrandingUtils.shouldShowJetpackBranding()) {
+            mJetpackBrandingUtils.initJetpackBannerAnimation(mJetpackBanner, mRecyclerView.getInternalRecyclerView());
+
+            if (mJetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
+                mJetpackBanner.setOnClickListener(v -> {
+                    mJetpackBrandingUtils.trackBannerTapped(Screen.READER_SEARCH);
+                    new JetpackPoweredBottomSheetFragment()
+                            .show(getChildFragmentManager(), JetpackPoweredBottomSheetFragment.TAG);
+                });
+            }
+        }
 
         if (savedInstanceState != null && savedInstanceState.getBoolean(ReaderConstants.KEY_IS_REFRESHING)) {
             mIsUpdating = true;

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSearchActivity.kt

@@ -1,13 +1,10 @@
 package org.wordpress.android.ui.reader
 
 import android.os.Bundle
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.LocaleAwareActivity
-import org.wordpress.android.ui.ScrollableViewInitializedListener
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.tracker.ReaderTrackerType.MAIN_READER
 import org.wordpress.android.util.JetpackBrandingUtils
@@ -19,8 +16,7 @@ import javax.inject.Inject
  * into new tested classes without requiring us to change the search behavior.
  */
 @AndroidEntryPoint
-class ReaderSearchActivity : LocaleAwareActivity(),
-        ScrollableViewInitializedListener {
+class ReaderSearchActivity : LocaleAwareActivity() {
     @Inject lateinit var readerTracker: ReaderTracker
     @Inject lateinit var jetpackBrandingUtils: JetpackBrandingUtils
 
@@ -47,23 +43,4 @@ class ReaderSearchActivity : LocaleAwareActivity(),
         super.onPause()
         readerTracker.stop(MAIN_READER)
     }
-
-    override fun onScrollableViewInitialized(containerId: Int) {
-        val fragmentContainer = supportFragmentManager.findFragmentById(R.id.fragment_container)
-
-        if (fragmentContainer is ReaderPostListFragment) {
-            val fragmentView = fragmentContainer.view ?: return
-
-            fragmentView.post {
-                // post is used to create a minimal delay here. containerId changes just before
-                // onScrollableViewInitialized is called, and findViewById can't find the new id before the delay.
-                val jetpackBannerView = fragmentView.findViewById<View>(R.id.jetpack_banner)
-                val scrollableView = fragmentView.findViewById<View>(containerId) as RecyclerView
-
-                if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
-                    jetpackBrandingUtils.initJetpackBannerAnimation(jetpackBannerView, scrollableView)
-                }
-            }
-        }
-    }
 }