[Searchbar] Update catalog demo to optionally show searchbar menu

PiperOrigin-RevId: 741210806

Author: imhappi

catalog/java/io/material/catalog/AndroidManifest.xml

@@ -111,7 +111,7 @@
       android:windowSoftInputMode="adjustNothing"
       android:exported="true" />
     <activity
-      android:name="io.material.catalog.search.SearchBarWithOutsideIconsDemoActivity"
+      android:name="io.material.catalog.search.SearchBarWithAppBarIconsDemoActivity"
       android:windowSoftInputMode="adjustNothing"
       android:exported="true" />
   </application>

catalog/java/io/material/catalog/search/SearchBarWithOutsideIconsDemoActivity.java renamed to catalog/java/io/material/catalog/search/SearchBarWithAppBarIconsDemoActivity.java

@@ -18,19 +18,22 @@
 
 import io.material.catalog.R;
 
+import static io.material.catalog.search.SearchDemoUtils.showSnackbar;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.android.material.materialswitch.MaterialSwitch;
 import com.google.android.material.search.SearchBar;
 import com.google.android.material.search.SearchView;
 import io.material.catalog.feature.DemoActivity;
 
-/** An activity that displays a Searchbar in an Appbar with outside icons demo. */
-public class SearchBarWithOutsideIconsDemoActivity extends DemoActivity {
+/** An activity that displays a SearchBar in an AppBar with outside icons demo. */
+public class SearchBarWithAppBarIconsDemoActivity extends DemoActivity {
 
   @Nullable
   @Override
@@ -44,6 +47,19 @@ public View onCreateDemoView(
     SearchView searchView = view.findViewById(R.id.cat_search_view);
     LinearLayout suggestionContainer = view.findViewById(R.id.cat_search_view_suggestion_container);
 
+    MaterialSwitch menuSwitch = view.findViewById(R.id.cat_search_bar_menu_switch);
+    menuSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+      if (isChecked) {
+        searchBar.inflateMenu(R.menu.cat_searchview_menu);
+        searchBar.setOnMenuItemClickListener(
+            menuItem -> {
+              showSnackbar(SearchBarWithAppBarIconsDemoActivity.this, menuItem);
+              return true;
+            });
+      } else {
+        searchBar.getMenu().clear();
+      }
+    });
     searchView.setupWithSearchBar(searchBar);
     SearchDemoUtils.setUpSearchView(this, searchBar, searchView);
     SearchDemoUtils.setUpSuggestions(suggestionContainer, searchBar, searchView);

catalog/java/io/material/catalog/search/SearchFragment.java

@@ -70,10 +70,10 @@ public Intent createActivityIntent() {
           }
         });
     additionalDemos.add(
-        new Demo(R.string.cat_searchbar_outside_icon_title) {
+        new Demo(R.string.cat_searchbar_appbar_with_icons_title) {
           @Override
           public Intent createActivityIntent() {
-            return new Intent(getContext(), SearchBarWithOutsideIconsDemoActivity.class);
+            return new Intent(getContext(), SearchBarWithAppBarIconsDemoActivity.class);
           }
         });
     return additionalDemos;

catalog/java/io/material/catalog/search/res/layout/cat_search_appbar_icons_fragment.xml

@@ -24,23 +24,22 @@
     android:id="@+id/app_bar_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:fitsSystemWindows="true"
-    app:statusBarForeground="?attr/colorSurface">
+    android:fitsSystemWindows="true">
 
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_gravity="center_vertical">
-      <ImageView
+      <Button
         android:id="@+id/product_logo"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:scaleType="center"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="8dp"
         android:contentDescription="@string/cat_searchbar_home_icon_description"
+        style="?attr/materialIconButtonStyle"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_home_default_24px"/>
+        app:icon="@drawable/ic_home_default_24px"/>
       <com.google.android.material.search.SearchBar
         android:id="@+id/cat_search_bar"
         android:layout_width="0dp"
@@ -49,18 +48,16 @@
         android:layout_marginVertical="4dp"
         android:layout_gravity="center_vertical"
         app:defaultMarginsEnabled="false"
-        app:textCentered="true"
-        app:hideNavigationIcon="true"
         android:hint="@string/cat_searchbar_short_hint"/>
-      <ImageView
+      <Button
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:scaleType="center"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="4dp"
+        style="?attr/materialIconButtonStyle"
         android:contentDescription="@string/cat_searchbar_cast_icon_description"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_cast_vd_theme_24" />
+        app:icon="@drawable/ic_cast_vd_theme_24" />
     </LinearLayout>
 
   </com.google.android.material.appbar.AppBarLayout>
@@ -71,13 +68,35 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical">
+    <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:orientation="horizontal">
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/cat_searchbar_menu_switch_title"/>
+    <com.google.android.material.materialswitch.MaterialSwitch
+      android:id="@+id/cat_search_bar_menu_switch"
+      android:layout_gravity="center_horizontal"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="24dp" />
+    </LinearLayout>
+
     <TextView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
-      android:fitsSystemWindows="true"
       android:lineSpacingMultiplier="1.2"
       android:text="@string/cat_searchbar_lorem_ipsum"/>
+    </LinearLayout>
   </androidx.core.widget.NestedScrollView>
 
   <com.google.android.material.search.SearchView

catalog/java/io/material/catalog/search/res/values/strings.xml

@@ -69,8 +69,8 @@
           description="Title for trips tab.[CHAR_LIMIT=40]">Trips</string>
   <string name="cat_searchbar_recycler_title"
           description="Title for recycler view demo.[CHAR_LIMIT=100]">RecyclerView Demo</string>
-  <string name="cat_searchbar_outside_icon_title"
-          description="Title for Searchbar with outside icons demo.[CHAR_LIMIT=NONE]">Searchbar Demo with Outside Icons</string>
+  <string name="cat_searchbar_appbar_with_icons_title"
+          description="Title for SearchBar in an AppBarLayout with icons demo.[CHAR_LIMIT=NONE]">Searchar in AppBarLayout with Icons Demo</string>
   <string name="cat_searchbar_recycler_item_title_prefix"
           description="Title for recycler item.[CHAR_LIMIT=40]">Message</string>
 
@@ -94,4 +94,6 @@
           description="Description about a cast icon button.[CHAR_LIMIT=NONE]">Cast</string>
   <string name="cat_searchbar_short_hint"
       description="Search bar short hint text to open search view [CHAR_LIMIT=40]">Search product</string>
+  <string name="cat_searchbar_menu_switch_title"
+    description="Title of a switch that enables or disables a menu inside of the SearchBar [CHAR_LIMIT=NONE]">Enable menu within SearchBar</string>
 </resources>