wordpress-mobile · ParaskP7 · Jan 25, 2023 · Dec 8, 2022 · Dec 8, 2022 · Dec 8, 2022
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -366,14 +366,21 @@ dependencies {
     debugImplementation "com.facebook.stetho:stetho:$stethoVersion"
     debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
 
+    implementation "androidx.arch.core:core-common:$androidxArchCoreVersion"
+    implementation "androidx.arch.core:core-runtime:$androidxArchCoreVersion"
     implementation "com.google.code.gson:gson:$googleGsonVersion"
     implementation "androidx.core:core:$androidxCoreVersion"
     implementation "androidx.core:core-ktx:$androidxCoreVersion"
+    implementation "androidx.lifecycle:lifecycle-common:$androidxLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-runtime:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidxLifecycleVersion"
+    implementation "androidx.activity:activity:$androidxActivityVersion"
+    implementation "androidx.activity:activity-ktx:$androidxActivityVersion"
     implementation "androidx.fragment:fragment:$androidxFragmentVersion"
     implementation "androidx.fragment:fragment-ktx:$androidxFragmentVersion"
     implementation "androidx.media:media:$androidxMediaVersion"
     implementation "androidx.appcompat:appcompat:$androidxAppcompatVersion"
+    implementation "androidx.appcompat:appcompat-resources:$androidxAppcompatVersion"
     implementation "androidx.cardview:cardview:$androidxCardviewVersion"
     implementation "androidx.recyclerview:recyclerview:$androidxRecyclerviewVersion"
     implementation "com.google.android.material:material:$googleMaterialVersion"
@@ -384,7 +391,10 @@ dependencies {
     implementation "androidx.work:work-runtime-ktx:$androidxWorkVersion"
     implementation "androidx.work:work-gcm:$androidxWorkVersion" // GCMNetworkManager on api <= 22
     implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintlayoutVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-livedata-core:$androidxLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-livedata:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidxLifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-process:$androidxLifecycleVersion"
     implementation "com.android.volley:volley:$androidVolleyVersion"

diff --git a/...ss/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditFragment.kt b/...ss/src/main/java/org/wordpress/android/ui/comments/unified/UnifiedCommentsEditFragment.kt
@@ -8,6 +8,7 @@ import android.view.MenuItem
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.MenuProvider
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -36,7 +37,7 @@ import org.wordpress.android.util.SnackbarSequencer
 import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
-class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_fragment) {
+class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_fragment), MenuProvider {
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
 
@@ -58,6 +59,7 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        requireActivity().addMenuProvider(this, viewLifecycleOwner)
 
         val site = requireArguments().getSerializable(WordPress.SITE) as SiteModel
         val commentIdentifier = requireNotNull(
@@ -73,8 +75,6 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
     }
 
     private fun UnifiedCommentsEditFragmentBinding.setupToolbar() {
-        setHasOptionsMenu(true)
-
         val activity = (requireActivity() as AppCompatActivity)
         activity.setSupportActionBar(toolbarMain)
         activity.supportActionBar?.let {
@@ -102,7 +102,7 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
         site: SiteModel,
         commentIdentifier: CommentIdentifier
     ) {
-        viewModel.uiActionEvent.observeEvent(viewLifecycleOwner, {
+        viewModel.uiActionEvent.observeEvent(viewLifecycleOwner) {
             when (it) {
                 CLOSE -> {
                     requireActivity().finish()
@@ -117,13 +117,13 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
                     EditCancelDialogFragment.newInstance().show(childFragmentManager, EDIT_CANCEL_DIALOG_TAG)
                 }
             }
-        })
+        }
 
-        viewModel.onSnackbarMessage.observeEvent(viewLifecycleOwner, { messageHolder ->
+        viewModel.onSnackbarMessage.observeEvent(viewLifecycleOwner) { messageHolder ->
             showSnackbar(messageHolder)
-        })
+        }
 
-        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+        viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             if (uiState.showProgress) {
                 loadingView.visibility = View.VISIBLE
                 scrollView.visibility = View.GONE
@@ -161,7 +161,7 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
                 commentEditEmailAddress.isEnabled = enableEditEmail
                 userName.isEnabled = enableEditName
             }
-        })
+        }
 
         viewModel.start(site, commentIdentifier)
     }
@@ -203,29 +203,27 @@ class UnifiedCommentsEditFragment : Fragment(R.layout.unified_comments_edit_frag
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.edit_comment_menu, menu)
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.edit_comment_menu, menu)
 
         menu.findItem(R.id.action_item)?.let { actionMenu ->
             actionMenu.setOnMenuItemClickListener {
                 viewModel.onActionMenuClicked()
                 true
             }
 
-            viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
                 actionMenu.isEnabled = uiState.canSaveChanges
-            })
+            }
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                viewModel.onBackPressed()
-            }
+    override fun onMenuItemSelected(menuItem: MenuItem) = when (menuItem.itemId) {
+        android.R.id.home -> {
+            viewModel.onBackPressed()
+            true
         }
-        return true
+        else -> true
     }
 
     companion object {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryFragment.kt
@@ -1,9 +1,12 @@
 package org.wordpress.android.ui.jetpack.scan.history
 
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.RecyclerView
@@ -29,7 +32,7 @@ import org.wordpress.android.util.LocaleManagerWrapper
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), ScrollableViewInitializedListener {
+class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), MenuProvider, ScrollableViewInitializedListener {
     @Inject
     lateinit var uiHelpers: UiHelpers
 
@@ -43,9 +46,11 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), Scrollable
 
     private val onTabSelectedListener = object : OnTabSelectedListener {
         override fun onTabReselected(tab: Tab) {
+            // Do nothing
         }
 
         override fun onTabUnselected(tab: Tab) {
+            // Do nothing
         }
 
         override fun onTabSelected(tab: Tab) {
@@ -55,6 +60,7 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), Scrollable
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        requireActivity().addMenuProvider(this, viewLifecycleOwner)
         binding = ScanHistoryFragmentBinding.bind(view).apply {
             initViewModel(getSite(savedInstanceState))
             initToolbar()
@@ -72,7 +78,7 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), Scrollable
     }
 
     private fun ScanHistoryFragmentBinding.setupObservers() {
-        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+        viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             uiHelpers.updateVisibility(tabLayout, uiState.contentVisible)
             uiHelpers.updateVisibility(viewPager, uiState.contentVisible)
             uiHelpers.updateVisibility(fullscreenErrorWithRetry.errorLayout, uiState.errorVisible)
@@ -82,7 +88,7 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), Scrollable
                 }
                 is ErrorUiState -> fullscreenErrorWithRetry.updateErrorLayout(uiState)
             }
-        })
+        }
     }
 
     private fun FullscreenErrorWithRetryBinding.updateErrorLayout(uiState: ErrorUiState) {
@@ -105,7 +111,6 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), Scrollable
     }
 
     private fun ScanHistoryFragmentBinding.initToolbar() {
-        setHasOptionsMenu(true)
         val activity = (requireActivity() as AppCompatActivity)
         toolbarMain.title = getString(R.string.scan_history)
         activity.setSupportActionBar(toolbarMain)
@@ -128,12 +133,16 @@ class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), Scrollable
         super.onSaveInstanceState(outState)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        // Do nothing
+    }
+
+    override fun onMenuItemSelected(menuItem: MenuItem) = when (menuItem.itemId) {
+        android.R.id.home -> {
             requireActivity().onBackPressed()
-            return true
+            true
         }
-        return super.onOptionsItemSelected(item)
+        else -> false
     }
 
     private class ScanHistoryTabAdapter(