Update ActivityLogListActivity.kt

Update static banner on ActivityLog screen to scrollable animation

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt

@@ -4,14 +4,13 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup.MarginLayoutParams
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.RecyclerView
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.databinding.ActivityLogListActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.RequestCodes
+import org.wordpress.android.ui.ScrollableViewInitializedListener
 import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailActivity
 import org.wordpress.android.ui.jetpack.backup.download.KEY_BACKUP_DOWNLOAD_ACTION_STATE_ID
 import org.wordpress.android.ui.jetpack.backup.download.KEY_BACKUP_DOWNLOAD_DOWNLOAD_ID
@@ -26,29 +25,42 @@ import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_REWINDABLE_ONLY_
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ActivityLogListActivity : LocaleAwareActivity() {
+class ActivityLogListActivity : LocaleAwareActivity(), ScrollableViewInitializedListener {
     @Inject lateinit var jetpackBrandingUtils: JetpackBrandingUtils
+    private var binding: ActivityLogListActivityBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         with(ActivityLogListActivityBinding.inflate(layoutInflater)) {
             setContentView(root)
+            binding = this
             checkAndUpdateUiToBackupScreen()
 
             setSupportActionBar(toolbarMain)
+        }
+        supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+    }
 
-            if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
-                jetpackBanner.root.isVisible = true
-                jetpackBrandingUtils.setNavigationBarColorForBanner(window)
+    override fun onScrollableViewInitialized(containerId: Int) {
+        initJetpackBanner(containerId)
+    }
 
-                // Add bottom margin to content.
-                val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
-                fragment?.view?.updateLayoutParams<MarginLayoutParams> {
-                    bottomMargin = resources.getDimensionPixelSize(R.dimen.jetpack_banner_height)
-                }
+    private fun initJetpackBanner(scrollableContainerId: Int) {
+        if (jetpackBrandingUtils.shouldShowJetpackBranding()) {
+            binding?.root?.post {
+                val jetpackBannerView = binding?.jetpackBanner?.root ?: return@post
+                val scrollableView = binding?.root?.findViewById<View>(scrollableContainerId) as? RecyclerView
+                        ?: return@post
+
+                jetpackBrandingUtils.showJetpackBannerIfScrolledToTop(jetpackBannerView, scrollableView)
+                window?.let { jetpackBrandingUtils.setNavigationBarColorForBanner(it) }
+                jetpackBrandingUtils.initJetpackBannerAnimation(jetpackBannerView, scrollableView)
 
                 if (jetpackBrandingUtils.shouldShowJetpackPoweredBottomSheet()) {
-                    jetpackBanner.root.setOnClickListener {
+                    binding?.jetpackBanner?.root?.setOnClickListener {
                         jetpackBrandingUtils.trackBannerTapped(ACTIVITY_LOG)
                         JetpackPoweredBottomSheetFragment
                                 .newInstance()
@@ -57,10 +69,6 @@ class ActivityLogListActivity : LocaleAwareActivity() {
                 }
             }
         }
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-        }
     }
 
     /**