Merge pull request #17025 from wordpress-mobile/Jetpack-focus-feature-specific-bottom-sheet-

Jetpack focus: fixes for bottom sheet

Author: ravishanker

WordPress/src/main/java/org/wordpress/android/ui/mysite/jetpackbadge/JetpackPoweredAdapter.kt

@@ -7,13 +7,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.fragment.app.viewModels
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.databinding.JetpackPoweredBottomSheetBinding
+import org.wordpress.android.databinding.JetpackPoweredExpandedBottomSheetBinding
 import org.wordpress.android.ui.ActivityLauncherWrapper
 import org.wordpress.android.ui.ActivityLauncherWrapper.Companion.JETPACK_PACKAGE_NAME
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType
@@ -22,51 +22,63 @@ import org.wordpress.android.ui.main.WPMainNavigationView.PageType.NOTIFS
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType.READER
 import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredDialogAction.DismissDialog
 import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredDialogAction.OpenPlayStore
-import org.wordpress.android.util.extensions.disableAnimation
 import org.wordpress.android.util.extensions.exhaustive
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class JetpackPoweredBottomSheetFragment : BottomSheetDialogFragment() {
-    @Inject lateinit var adapter: JetpackPoweredAdapter
     @Inject lateinit var activityLauncherWrapper: ActivityLauncherWrapper
     private val viewModel: JetpackPoweredDialogViewModel by viewModels()
+    private var fullScreen: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        fullScreen = arguments?.getBoolean(KEY_FULL_SCREEN, false) ?: false
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.jetpack_powered_bottom_sheet, container)
+        val layout = if (fullScreen) {
+            R.layout.jetpack_powered_expanded_bottom_sheet
+        } else {
+            R.layout.jetpack_powered_bottom_sheet
+        }
+
+        return inflater.inflate(layout, container)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        with(JetpackPoweredBottomSheetBinding.bind(view)) {
-            initializeViews()
-            setupObservers()
-        }
-    }
-
-    private fun JetpackPoweredBottomSheetBinding.initializeViews() {
-        contentRecyclerView.layoutManager = LinearLayoutManager(requireActivity())
-        contentRecyclerView.adapter = adapter
-        contentRecyclerView.disableAnimation()
-
-        primaryButton.setOnClickListener { viewModel.openJetpackAppDownloadLink() }
-
-        val fullScreen = arguments?.getBoolean(KEY_FULL_SCREEN, false) ?: false
-
         if (fullScreen) {
-            secondaryButton.visibility = View.VISIBLE
-            val pageType = arguments?.getSerializable(KEY_SITE_SCREEN) as? PageType ?: MY_SITE
-            secondaryButton.text = when (pageType) {
-                MY_SITE -> getString(R.string.wp_jetpack_continue_to_stats)
-                READER -> getString(R.string.wp_jetpack_continue_to_reader)
-                NOTIFS -> getString(R.string.wp_jetpack_continue_to_notifications)
+            with(JetpackPoweredExpandedBottomSheetBinding.bind(view)) {
+                when (arguments?.getSerializable(KEY_SITE_SCREEN) as? PageType ?: MY_SITE) {
+                    MY_SITE -> {
+                        title.text = getString(R.string.wp_jetpack_powered_stats_powered_by_jetpack)
+                        caption.text = getString(R.string.wp_jetpack_powered_stats_powered_by_jetpack_caption)
+                        secondaryButton.text = getString(R.string.wp_jetpack_continue_to_stats)
+                    }
+                    READER -> {
+                        title.text = getString(R.string.wp_jetpack_powered_reader_powered_by_jetpack)
+                        caption.text = getString(R.string.wp_jetpack_powered_reader_powered_by_jetpack_caption)
+                        secondaryButton.text = getString(R.string.wp_jetpack_continue_to_reader)
+                    }
+                    NOTIFS -> {
+                        title.text = getString(R.string.wp_jetpack_powered_notifications_powered_by_jetpack)
+                        caption.text = getString(R.string.wp_jetpack_powered_notifications_powered_by_jetpack_caption)
+                        secondaryButton.text = getString(R.string.wp_jetpack_continue_to_notifications)
+                    }
+                }
+                primaryButton.setOnClickListener { viewModel.openJetpackAppDownloadLink() }
+                secondaryButton.setOnClickListener { viewModel.dismissBottomSheet() }
+            }
+        } else {
+            with(JetpackPoweredBottomSheetBinding.bind(view)) {
+                primaryButton.setOnClickListener { viewModel.openJetpackAppDownloadLink() }
             }
-            secondaryButton.setOnClickListener { viewModel.dismissBottomSheet() }
         }
 
         (dialog as? BottomSheetDialog)?.apply {
@@ -81,15 +93,11 @@ class JetpackPoweredBottomSheetFragment : BottomSheetDialogFragment() {
                 expandBottomSheet(bottomSheetBehavior)
             }
         }
-    }
-
-    private fun JetpackPoweredBottomSheetBinding.setupObservers() {
-        viewModel.start()
 
-        viewModel.uiState.observe(this@JetpackPoweredBottomSheetFragment) { uiState ->
-            adapter.submitList(uiState?.uiItems ?: listOf())
-        }
+        setupObservers()
+    }
 
+    private fun setupObservers() {
         viewModel.action.observe(viewLifecycleOwner) { action ->
             when (action) {
                 is OpenPlayStore -> {

WordPress/src/main/java/org/wordpress/android/ui/mysite/jetpackbadge/JetpackPoweredBottomSheetFragment.kt

@@ -4,13 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
-import org.wordpress.android.R
-import org.wordpress.android.R.string
 import org.wordpress.android.modules.UI_THREAD
-import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredItem.Caption
-import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredItem.Illustration
-import org.wordpress.android.ui.mysite.jetpackbadge.JetpackPoweredItem.Title
-import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.JetpackBrandingUtils
 import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
@@ -21,34 +15,16 @@ class JetpackPoweredDialogViewModel @Inject constructor(
     @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
     private val jetpackBrandingUtils: JetpackBrandingUtils
 ) : ScopedViewModel(mainDispatcher) {
-    private val _uiState = MutableLiveData<UiState>()
-    val uiState: LiveData<UiState> = _uiState
-
     private val _action = MutableLiveData<JetpackPoweredDialogAction>()
     val action: LiveData<JetpackPoweredDialogAction> = _action
 
-    @Suppress("ForbiddenComment")
-    fun start() {
-        _uiState.value = UiState(
-                listOf(
-                        Illustration(R.raw.wp2jp),
-                        Title(UiStringRes(string.wp_jetpack_powered_better_with_jetpack)),
-                        Caption(UiStringRes(string.wp_jetpack_powered_features))
-                )
-        )
-    }
-
-    @Suppress("ForbiddenComment")
     fun openJetpackAppDownloadLink() {
         jetpackBrandingUtils.trackGetJetpackAppTapped()
         _action.value = JetpackPoweredDialogAction.OpenPlayStore
     }
 
-    @Suppress("ForbiddenComment")
     fun dismissBottomSheet() {
         jetpackBrandingUtils.trackDismissTapped()
         _action.value = JetpackPoweredDialogAction.DismissDialog
     }
-
-    data class UiState(val uiItems: List<JetpackPoweredItem>)
 }