Rework options menu for fragments

pranavpandey · Jun 16, 2022 · 9701e84 · 9701e84
1 parent b523246
commit 9701e84
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 45 deletions.
diff --git a/.../pranavpandey/android/dynamic/support/permission/fragment/DynamicPermissionsFragment.java b/.../pranavpandey/android/dynamic/support/permission/fragment/DynamicPermissionsFragment.java
@@ -156,19 +156,19 @@ public void onClick(View v) {
     }
 
     @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
+    public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        super.onCreateMenu(menu, inflater);
 
         inflater.inflate(R.menu.ads_menu_info, menu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+    public boolean onMenuItemSelected(@NonNull MenuItem item) {
         if (item.getItemId() == R.id.ads_menu_info) {
             DynamicPermissionUtils.launchAppInfo(requireContext());
         }
 
-        return super.onOptionsItemSelected(item);
+        return super.onMenuItemSelected(item);
     }
 
     @Override

diff --git a/.../src/main/java/com/pranavpandey/android/dynamic/support/theme/fragment/ThemeFragment.java b/.../src/main/java/com/pranavpandey/android/dynamic/support/theme/fragment/ThemeFragment.java
@@ -274,8 +274,8 @@ public void onPrepareOptionsMenu(@NonNull Menu menu) {
     }
 
     @Override
-    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
+    public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
+        super.onCreateMenu(menu, inflater);
 
         inflater.inflate(R.menu.ads_menu_theme, menu);
 
@@ -289,7 +289,7 @@ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflat
     }
 
     @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+    public boolean onMenuItemSelected(@NonNull MenuItem item) {
         int i = item.getItemId();
 
         if (i == R.id.ads_menu_theme_data_copy) {
@@ -343,7 +343,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             return true;
         }
 
-        return super.onOptionsItemSelected(item);
+        return super.onMenuItemSelected(item);
     }
 
     @Override

diff --git a/...e/src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/AboutFragment.kt b/...e/src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/AboutFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.view.View
 import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.AppBarLayout
 import com.pranavpandey.android.dynamic.support.fragment.DynamicViewPager2Fragment
@@ -52,22 +53,29 @@ class AboutFragment : DynamicViewPager2Fragment() {
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        // Scroll toolbar for this fragment.
+        dynamicActivity.setToolbarLayoutFlags(
+            AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
+                    or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS)
+    }
+
+    override fun setHasOptionsMenu(): Boolean {
+        return true
+    }
+
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateMenu(menu, inflater)
         inflater.inflate(R.menu.ads_menu_info, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.ads_menu_info) {
             DynamicPermissionUtils.launchAppInfo(requireContext())
         }
-        return super.onOptionsItemSelected(item)
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        setHasOptionsMenu(true)
+        return super.onMenuItemSelected(item)
     }
 
     override fun getSubtitle(): CharSequence? {
@@ -105,13 +113,4 @@ class AboutFragment : DynamicViewPager2Fragment() {
         // TODO: Return item count.
         return 2
     }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-
-        // Scroll toolbar for this fragment.
-        dynamicActivity.setToolbarLayoutFlags(
-                AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
-                        or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS)
-    }
 }
diff --git a/...src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/WidgetsFragment.kt b/...src/main/java/com/pranavpandey/android/dynamic/support/sample/fragment/WidgetsFragment.kt
@@ -27,9 +27,7 @@ import com.pranavpandey.android.dynamic.support.fragment.DynamicFragment
 import com.pranavpandey.android.dynamic.support.listener.DynamicSearchListener
 import com.pranavpandey.android.dynamic.support.model.DynamicMenu
 import com.pranavpandey.android.dynamic.support.sample.R
-import com.pranavpandey.android.dynamic.support.util.DynamicMenuUtils
 import com.pranavpandey.android.dynamic.support.util.DynamicResourceUtils
-import java.util.*
 
 /**
  * Widgets fragment to show various widgets and their states by using [DynamicFragment].
@@ -120,36 +118,26 @@ class WidgetsFragment : DynamicFragment(), DynamicSearchListener, TextWatcher {
         mSpinnerThree!!.setSelection(2)
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu) {
-        super.onPrepareOptionsMenu(menu)
-
-        // Try to force the menu icons.
-        DynamicMenuUtils.forceMenuIcons(menu)
+    override fun setHasOptionsMenu(): Boolean {
+        return true
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateMenu(menu, inflater)
 
         // Inflate menu for this fragment.
         inflater.inflate(R.menu.menu_widgets, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_search -> {
                 // Expand search view on search menu selected.
                 dynamicActivity.expandSearchView(true)
             }
         }
 
-        return super.onOptionsItemSelected(item)
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        // TODO: Enable app bar options menu.
-        setHasOptionsMenu(true)
+        return super.onMenuItemSelected(item)
     }
 
     override fun onSearchViewExpanded() {