ToolbarLayout easier menu management

Author: Yanndroid

app/src/main/java/de/dlyt/yanndroid/oneuiexample/MainActivity.java

@@ -10,13 +10,13 @@
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.util.SeslMisc;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -141,18 +141,24 @@ private void init() {
             }
         });
 
-        toolbarLayout.addOverflowButton(R.drawable.ic_samsung_info,
-                R.string.app_info,
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
+        toolbarLayout.inflateMenu(R.menu.main);
+        toolbarLayout.setOnMenuItemClickListener(new ToolbarLayout.OnMenuItemClickListener() {
+            @Override
+            public void onMenuItemClick(MenuItem item) {
+                switch (item.getItemId()) {
+                    case R.id.search:
+                        break;
+                    case R.id.info:
                         startActivity(new Intent().setClass(mContext, AboutActivity.class));
-                    }
-                });
-        toolbarLayout.setMoreMenuButton(getMoreMenuButtonList(),
-                (adapterView, view2, i, j) -> {
-                    toolbarLayout.dismissMoreMenuPopupWindow();
-                });
+                        break;
+                    case R.id.item1:
+                    case R.id.item2:
+                    case R.id.item3:
+                        toolbarLayout.setOverflowMenuBadge(item, toolbarLayout.getOverflowMenuBadge(item) + 1);
+                        break;
+                }
+            }
+        });
 
         //BottomNavigationLayout
         Drawable icon = getDrawable(R.drawable.ic_samsung_drawer);

app/src/main/java/de/dlyt/yanndroid/oneuiexample/tabs/IconsTab.java

@@ -299,11 +299,11 @@ public void setSelecting(boolean enabled) {
 
         if (enabled) {
             mSelecting = true;
-            imageAdapter.notifyItemRangeChanged(0, imageAdapter.getItemCount());
+            imageAdapter.notifyItemRangeChanged(0, imageAdapter.getItemCount()-1);
             drawerLayout.showSelectAllMode(true);
             drawerLayout.setSelectAllCheckedChangeListener((buttonView, isChecked) -> {
                 if (checkAllListening) {
-                    for (int i = 0; i < imageAdapter.getItemCount(); i++) {
+                    for (int i = 0; i < imageAdapter.getItemCount()-1; i++) {
                         selected.put(i, isChecked);
                         imageAdapter.notifyItemChanged(i);
                     }
@@ -318,8 +318,8 @@ public void setSelecting(boolean enabled) {
             onBackPressedCallback.setEnabled(true);
         } else {
             mSelecting = false;
-            for (int i = 0; i < imageAdapter.getItemCount(); i++) selected.put(i, false);
-            imageAdapter.notifyItemRangeChanged(0, imageAdapter.getItemCount());
+            for (int i = 0; i < imageAdapter.getItemCount()-1; i++) selected.put(i, false);
+            imageAdapter.notifyItemRangeChanged(0, imageAdapter.getItemCount()-1);
 
             drawerLayout.setSelectAllCount(0);
             drawerLayout.showSelectAllMode(false);
@@ -338,7 +338,7 @@ public void toggleItemSelected(int position) {
         int count = 0;
         for (Boolean b : selected.values()) if (b) count++;
         DrawerLayout drawerLayout = getActivity().findViewById(R.id.drawer_view);
-        drawerLayout.setSelectAllChecked(count == imageAdapter.getItemCount());
+        drawerLayout.setSelectAllChecked(count == imageAdapter.getItemCount()-1);
         drawerLayout.setSelectAllCount(count);
         checkAllListening = true;
     }
@@ -400,7 +400,7 @@ public void onBindViewHolder(ImageAdapter.ViewHolder holder, final int position)
                     listView.seslSetLongPressMultiSelectionListener(new RecyclerView.SeslLongPressMultiSelectionListener() {
                         @Override
                         public void onItemSelected(RecyclerView var1, View var2, int var3, long var4) {
-                            toggleItemSelected(var3);
+                            if (getItemViewType(var3) == 0) toggleItemSelected(var3);
                         }
 
                         @Override

app/src/main/res/menu/main.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/search"
+        android:icon="@drawable/ic_samsung_search"
+        android:title="Search"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/info"
+        android:icon="@drawable/ic_samsung_info"
+        android:title="@string/app_info"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/item1"
+        android:title="Menu Item 1"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/item2"
+        android:title="Menu Item 2"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/item3"
+        android:title="Menu Item 3"
+        app:showAsAction="never" />
+
+</menu>

yanndroid/oneui/src/main/java/de/dlyt/yanndroid/oneui/layout/AboutPage.java

@@ -11,6 +11,7 @@
 import android.net.Uri;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
@@ -87,23 +88,25 @@ public void onClick(View view) {
                 getActivity().onBackPressed();
             }
         });
-        toolbarLayout.addOverflowButton(R.drawable.ic_samsung_info,
-                R.string.app_info,
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        try {
-                            Intent intent = new Intent("android.settings.APPLICATION_DETAILS_SETTINGS");
-                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                            intent.setData(Uri.parse("package:" + getActivity().getApplicationContext().getPackageName()));
-                            getActivity().startActivity(intent);
-                        } catch (ActivityNotFoundException unused) {
-                            getActivity().startActivity(new Intent("android.settings.MANAGE_APPLICATIONS_SETTINGS"));
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
+
+        toolbarLayout.inflateMenu(R.menu.about_page);
+        toolbarLayout.setOnMenuItemClickListener(new ToolbarLayout.OnMenuItemClickListener() {
+            @Override
+            public void onMenuItemClick(MenuItem item) {
+                if (item.getItemId() == R.id.app_info){
+                    try {
+                        Intent intent = new Intent("android.settings.APPLICATION_DETAILS_SETTINGS");
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        intent.setData(Uri.parse("package:" + getActivity().getApplicationContext().getPackageName()));
+                        getActivity().startActivity(intent);
+                    } catch (ActivityNotFoundException unused) {
+                        getActivity().startActivity(new Intent("android.settings.MANAGE_APPLICATIONS_SETTINGS"));
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                });
+                }
+            }
+        });
 
         try {
             PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);