[FloatingToolbar] Removed floating toolbar-specific icon button styles from theme overlay

PiperOrigin-RevId: 712607176

Author: imhappi

catalog/java/io/material/catalog/floatingtoolbar/FloatingToolbarMainDemoFragment.java

@@ -63,6 +63,7 @@ public View onCreateDemoView(
     // Initialize group of bold buttons.
     List<MaterialButton> boldButtons =
         initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_button_bold);
+    boldButtons.addAll(initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_vibrant_button_bold));
     for (MaterialButton boldButton : boldButtons) {
       boldButton.addOnCheckedChangeListener(
           (button, isChecked) -> {
@@ -83,6 +84,7 @@ public View onCreateDemoView(
     // Initialize group of italics format buttons.
     List<MaterialButton> italicButtons =
         initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_button_italic);
+    italicButtons.addAll(initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_vibrant_button_italic));
     for (MaterialButton italicButton : italicButtons) {
       italicButton.addOnCheckedChangeListener(
           (button, isChecked) -> {
@@ -102,6 +104,7 @@ public View onCreateDemoView(
     // Initialize group of underline format buttons.
     List<MaterialButton> underlineButtons =
         initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_button_underlined);
+    underlineButtons.addAll(initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_vibrant_button_underlined));
     for (MaterialButton underlineButton : underlineButtons) {
       underlineButton.addOnCheckedChangeListener(
           (button, isChecked) -> {
@@ -118,13 +121,15 @@ public View onCreateDemoView(
     // Initialize color text format buttons.
     List<MaterialButton> colorTextButtons =
         initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_button_color_text);
+    colorTextButtons.addAll(initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_vibrant_button_color_text));
     for (MaterialButton colorTextButton : colorTextButtons) {
       colorTextButton.setOnClickListener(v -> bodyText.setTextColor(getRandomColor()));
     }
 
     // Initialize color fill format buttons.
     List<MaterialButton> colorFillButtons =
         initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_button_color_fill);
+    colorFillButtons.addAll(initializeFormatButtons(floatingToolbars, R.id.floating_toolbar_vibrant_button_color_fill));
     for (MaterialButton colorFillButton : colorFillButtons) {
       colorFillButton.setOnClickListener(v -> view.setBackgroundColor(getRandomColor()));
     }
@@ -169,7 +174,9 @@ private List<MaterialButton> initializeFormatButtons(
       @NonNull List<FloatingToolbarLayout> floatingToolbars, @IdRes int formatButtonId) {
     List<MaterialButton> formatButtons = new ArrayList<>();
     for (FloatingToolbarLayout floatingToolbar : floatingToolbars) {
-      formatButtons.add(floatingToolbar.findViewById(formatButtonId));
+      if (floatingToolbar.findViewById(formatButtonId) != null) {
+          formatButtons.add(floatingToolbar.findViewById(formatButtonId));
+      }
     }
     return formatButtons;
   }

catalog/java/io/material/catalog/floatingtoolbar/res/layout/cat_floating_toolbar_content.xml

@@ -16,8 +16,8 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto">
   <Button
-    style="?attr/materialIconButtonStyle"
     android:id="@+id/floating_toolbar_button_bold"
+    style="?attr/materialIconButtonStyle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:checkable="true"

catalog/java/io/material/catalog/floatingtoolbar/res/layout/cat_floating_toolbar_fragment.xml

@@ -129,10 +129,10 @@
 
 <com.google.android.material.floatingtoolbar.FloatingToolbarLayout
   android:id="@+id/floating_toolbar_bottom"
-  style="?attr/floatingToolbarVibrantStyle"
   android:layout_width="wrap_content"
   android:layout_height="wrap_content"
   android:layout_gravity="bottom|center"
+  style="?attr/floatingToolbarVibrantStyle"
   android:layout_margin="16dp">
 
   <LinearLayout
@@ -142,7 +142,44 @@
     android:layout_gravity="center"
     android:orientation="horizontal">
 
-    <include layout="@layout/cat_floating_toolbar_content" />
+    <Button
+      android:id="@+id/floating_toolbar_vibrant_button_bold"
+      style="@style/Widget.Material3.FloatingToolbar.IconButton.Vibrant"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:checkable="true"
+      android:contentDescription="@string/cat_floating_toolbar_button_bold_content_description"
+      app:icon="@drawable/ic_format_bold_24px" />
+    <Button
+      style="@style/Widget.Material3.FloatingToolbar.IconButton.Vibrant"
+      android:id="@+id/floating_toolbar_vibrant_button_italic"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:checkable="true"
+      android:contentDescription="@string/cat_floating_toolbar_button_italic_content_description"
+      app:icon="@drawable/ic_format_italic_24px" />
+    <Button
+      style="@style/Widget.Material3.FloatingToolbar.IconButton.Vibrant"
+      android:id="@+id/floating_toolbar_vibrant_button_underlined"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:checkable="true"
+      android:contentDescription="@string/cat_floating_toolbar_button_underlined_content_description"
+      app:icon="@drawable/ic_format_underlined_24px" />
+    <Button
+      style="@style/Widget.Material3.FloatingToolbar.IconButton.Vibrant"
+      android:id="@+id/floating_toolbar_vibrant_button_color_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:contentDescription="@string/cat_floating_toolbar_button_color_text_content_description"
+      app:icon="@drawable/ic_format_color_text_24px" />
+    <Button
+      style="@style/Widget.Material3.FloatingToolbar.IconButton.Vibrant"
+      android:id="@+id/floating_toolbar_vibrant_button_color_fill"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:contentDescription="@string/cat_floating_toolbar_button_color_fill_content_description"
+      app:icon="@drawable/ic_format_color_fill_24px" />
   </LinearLayout>
 </com.google.android.material.floatingtoolbar.FloatingToolbarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

lib/java/com/google/android/material/floatingtoolbar/res/values/styles.xml

@@ -34,18 +34,10 @@
 
   <!-- Style for Vibrant color variation of the Floating Toolbar. -->
   <style name="Widget.Material3.FloatingToolbar.Vibrant">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.FloatingToolbar.Vibrant</item>
     <item name="backgroundTint">@macro/m3_comp_toolbar_floating_vibrant_container_color</item>
   </style>
 
-  <!-- Style for icon buttons within Floating Toolbars. This style is
-       automatically set on all buttons which use ?attr/materialIconButtonStyle
-       for their button style and are children of a Floating Toolbar. -->
-  <style name="Widget.Material3.FloatingToolbar.IconButton" parent="Widget.Material3.Button.IconButton"/>
-
-  <!-- Style for icon buttons within Vibrant Floating Toolbars. This style is
-       automatically set on all buttons which use ?attr/materialIconButtonStyle
-       for their button style and are children of a Vibrant Floating Toolbar. -->
+  <!-- Style for icon buttons within Vibrant Floating Toolbars. -->
   <style name="Widget.Material3.FloatingToolbar.IconButton.Vibrant" parent="Widget.Material3.Button.IconButton.Filled.Tonal">
     <item name="android:textColor">@color/m3_floating_toolbar_vibrant_icon_button_text_color_selector</item>
     <item name="backgroundTint">@color/m3_floating_toolbar_vibrant_icon_button_container_color_selector</item>