Menu option deprecation fix (#1425)

nozotrox · web-flow · commit a24cbdfb5e41 · 2022-10-24T11:25:35.000+01:00
diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/java/MainFragment.java b/database/app/src/main/java/com/google/firebase/quickstart/database/java/MainFragment.java
@@ -10,6 +10,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.view.MenuHost;
+import androidx.core.view.MenuProvider;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
@@ -22,10 +24,12 @@
 import com.google.firebase.quickstart.database.java.listfragments.MyTopPostsFragment;
 import com.google.firebase.quickstart.database.java.listfragments.RecentPostsFragment;
 
-public class MainFragment extends Fragment {
+public class MainFragment extends Fragment implements MenuProvider {
 
     private FragmentMainBinding binding;
 
+    private MenuHost menuHost;
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -36,7 +40,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setHasOptionsMenu(true);
+
+        // MenuProvider
+        menuHost = requireActivity();
+        menuHost.addMenuProvider(this);
 
         // Create the adapter that will return a fragment for each section
         FragmentStateAdapter mPagerAdapter = new FragmentStateAdapter(getParentFragmentManager(),
@@ -71,20 +78,21 @@ public int getItemCount() {
     }
 
     @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_main, menu);
+    public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) {
+        menuInflater.inflate(R.menu.menu_main, menu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int i = item.getItemId();
+    public boolean onMenuItemSelected(@NonNull MenuItem menuItem) {
+        int i = menuItem.getItemId();
         if (i == R.id.action_logout) {
             FirebaseAuth.getInstance().signOut();
             NavHostFragment.findNavController(this)
                     .navigate(R.id.action_MainFragment_to_SignInFragment);
             return true;
         } else {
-            return super.onOptionsItemSelected(item);
+            return false;
         }
     }
+
 }
diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/MainFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/MainFragment.kt
@@ -7,6 +7,8 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.MenuHost
+import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -19,7 +21,7 @@ import com.google.firebase.quickstart.database.kotlin.listfragments.MyPostsFragm
 import com.google.firebase.quickstart.database.kotlin.listfragments.MyTopPostsFragment
 import com.google.firebase.quickstart.database.kotlin.listfragments.RecentPostsFragment
 
-class MainFragment : Fragment() {
+class MainFragment : Fragment(), MenuProvider {
     private var _binding: FragmentMainBinding? = null
     private val binding get() = _binding!!
 
@@ -32,7 +34,10 @@ class MainFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setHasOptionsMenu(true)
+
+        // MenuProvider
+        val menuHost: MenuHost = requireActivity() as MenuHost
+        menuHost.addMenuProvider(this)
 
         // Create the adapter that will return a fragment for each section
         pagerAdapter = object : FragmentStateAdapter(parentFragmentManager, viewLifecycleOwner.lifecycle) {
@@ -59,17 +64,17 @@ class MainFragment : Fragment() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_main, menu)
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.menu_main, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return if (item.itemId == R.id.action_logout) {
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        return if (menuItem.itemId == R.id.action_logout) {
             Firebase.auth.signOut()
             findNavController().navigate(R.id.action_MainFragment_to_SignInFragment)
             true
         } else {
-            super.onOptionsItemSelected(item)
+            false
         }
     }
 
diff --git a/database/gradle.properties b/database/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
+android.useAndroidX=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/java/MainFragment.java b/firestore/app/src/main/java/com/google/firebase/example/fireeats/java/MainFragment.java
@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -18,6 +19,8 @@
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.text.HtmlCompat;
+import androidx.core.view.MenuHost;
+import androidx.core.view.MenuProvider;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.fragment.NavHostFragment;
@@ -52,7 +55,8 @@
 
 public class MainFragment extends Fragment implements
         FilterDialogFragment.FilterListener,
-        RestaurantAdapter.OnRestaurantSelectedListener, View.OnClickListener {
+        RestaurantAdapter.OnRestaurantSelectedListener, View.OnClickListener,
+        MenuProvider {
 
     private static final String TAG = "MainActivity";
 
@@ -68,10 +72,11 @@ public class MainFragment extends Fragment implements
 
     private MainActivityViewModel mViewModel;
 
+    private MenuHost menuHost;
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        setHasOptionsMenu(true);
         mBinding = FragmentMainBinding.inflate(inflater, container, false);
         return mBinding.getRoot();
     }
@@ -82,6 +87,10 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mBinding.filterBar.setOnClickListener(this);
         mBinding.buttonClearFilter.setOnClickListener(this);
 
+        // MenuProvider
+        menuHost = requireActivity();
+        menuHost.addMenuProvider(this);
+
         // View model
         mViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
 
@@ -153,23 +162,22 @@ public void onStop() {
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_main, menu);
-        super.onCreateOptionsMenu(menu, inflater);
+    public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) {
+        menuInflater.inflate(R.menu.menu_main, menu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onMenuItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_add_items:
                 onAddItemsClicked();
-                break;
+                return true;
             case R.id.menu_sign_out:
                 AuthUI.getInstance().signOut(requireContext());
                 startSignIn();
-                break;
+                return true;
         }
-        return super.onOptionsItemSelected(item);
+        return false;
     }
 
     private void onSignInResult(FirebaseAuthUIAuthenticationResult result) {
diff --git a/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainFragment.kt b/firestore/app/src/main/java/com/google/firebase/example/fireeats/kotlin/MainFragment.kt
@@ -12,6 +12,8 @@ import android.view.ViewGroup
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
+import androidx.core.view.MenuHost
+import androidx.core.view.MenuProvider
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.findNavController
@@ -38,7 +40,8 @@ import com.google.firebase.ktx.Firebase
 
 class MainFragment : Fragment(),
         FilterDialogFragment.FilterListener,
-        RestaurantAdapter.OnRestaurantSelectedListener {
+        RestaurantAdapter.OnRestaurantSelectedListener,
+        MenuProvider {
 
     lateinit var firestore: FirebaseFirestore
     lateinit var query: Query
@@ -50,7 +53,6 @@ class MainFragment : Fragment(),
     private lateinit var viewModel: MainActivityViewModel
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        setHasOptionsMenu(true)
         binding = FragmentMainBinding.inflate(inflater, container, false);
         return binding.root;
     }
@@ -92,6 +94,10 @@ class MainFragment : Fragment(),
             }
         }
 
+        // MenuProvider
+        val menuHost: MenuHost = requireActivity() as MenuHost
+        menuHost.addMenuProvider(this)
+
         binding.recyclerRestaurants.layoutManager = LinearLayoutManager(context)
         binding.recyclerRestaurants.adapter = adapter
 
@@ -123,20 +129,23 @@ class MainFragment : Fragment(),
         adapter.stopListening()
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_main, menu)
-        return super.onCreateOptionsMenu(menu, inflater)
+    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
+        menuInflater.inflate(R.menu.menu_main, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.menu_add_items -> onAddItemsClicked()
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.menu_add_items -> {
+                onAddItemsClicked()
+                true
+            }
             R.id.menu_sign_out -> {
                 AuthUI.getInstance().signOut(requireContext())
                 startSignIn()
+                true
             }
+            else -> false
         }
-        return super.onOptionsItemSelected(item)
     }
 
     private fun onSignInResult(result: FirebaseAuthUIAuthenticationResult) {
diff --git a/firestore/gradle.properties b/firestore/gradle.properties
@@ -18,4 +18,4 @@ org.gradle.jvmargs=-Xmx1536m
 
 # Don't use the gradle build cache since this sample uses experimental SDKs
 android.enableBuildCache=false
-android.useAndroidX=true
+android.useAndroidX=true
