From ab04c9c64a7986ca4b87a403995c42b8450c5cab Mon Sep 17 00:00:00 2001
From: pekingme <8545955+pekingme@users.noreply.github.com>
Date: Mon, 6 Jun 2022 16:09:26 -0700
Subject: [PATCH] [FAB] Combined Small, Regular, and Large styles in one
catalog fragment.
Cleaned up unused string res.
PiperOrigin-RevId: 453304787
---
.../catalog/fab/ExtendedFabDemoFragment.java | 2 +-
.../io/material/catalog/fab/FabFragment.java | 7 -
.../catalog/fab/FabMainDemoFragment.java | 4 +-
.../catalog/fab/LargeFabDemoFragment.java | 36 ----
.../fab/res/layout/cat_fab_fragment.xml | 5 +-
...extended_fabs.xml => m3_extended_fabs.xml} | 8 +-
.../catalog/fab/res/layout/m3_fabs.xml | 157 ++++++++++++++++++
.../catalog/fab/res/layout/m3_large_fabs.xml | 92 ----------
.../{theme_fab.xml => m3_theme_fab.xml} | 21 ++-
.../fab/res/layout/m3_theme_large_fab.xml | 43 -----
.../catalog/fab/res/layout/mtrl_fabs.xml | 127 --------------
.../catalog/fab/res/values/strings.xml | 88 +++++-----
12 files changed, 221 insertions(+), 369 deletions(-)
delete mode 100644 catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java
rename catalog/java/io/material/catalog/fab/res/layout/{mtrl_extended_fabs.xml => m3_extended_fabs.xml} (93%)
create mode 100644 catalog/java/io/material/catalog/fab/res/layout/m3_fabs.xml
delete mode 100644 catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml
rename catalog/java/io/material/catalog/fab/res/layout/{theme_fab.xml => m3_theme_fab.xml} (68%)
delete mode 100644 catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml
delete mode 100644 catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml
diff --git a/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java b/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java
index 78a31be6455..d98ebb090ae 100644
--- a/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java
+++ b/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java
@@ -93,6 +93,6 @@ public View onCreateDemoView(
@LayoutRes
protected int getExtendedFabContent() {
- return R.layout.mtrl_extended_fabs;
+ return R.layout.m3_extended_fabs;
}
}
diff --git a/catalog/java/io/material/catalog/fab/FabFragment.java b/catalog/java/io/material/catalog/fab/FabFragment.java
index 9847e69484f..ef41e531f80 100644
--- a/catalog/java/io/material/catalog/fab/FabFragment.java
+++ b/catalog/java/io/material/catalog/fab/FabFragment.java
@@ -70,13 +70,6 @@ public Fragment createFragment() {
return new ExtendedFabBehaviorDemoFragment();
}
});
- additionalDemos.add(
- new Demo(R.string.m3_large_fab_demo_title) {
- @Override
- public Fragment createFragment() {
- return new LargeFabDemoFragment();
- }
- });
return additionalDemos;
}
diff --git a/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java b/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java
index 9bbd4d9ccad..933a005f898 100644
--- a/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java
@@ -95,11 +95,11 @@ public View onCreateDemoView(
@LayoutRes
protected int getFabsContent() {
- return R.layout.mtrl_fabs;
+ return R.layout.m3_fabs;
}
@LayoutRes
protected int getThemeFabLayoutResId() {
- return R.layout.theme_fab;
+ return R.layout.m3_theme_fab;
}
}
diff --git a/catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java b/catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java
deleted file mode 100644
index e9bee857764..00000000000
--- a/catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.material.catalog.fab;
-
-import io.material.catalog.R;
-
-/**
- * A landing fragment that demos large FABs
- */
-public class LargeFabDemoFragment extends FabMainDemoFragment {
-
- @Override
- protected int getFabsContent() {
- return R.layout.m3_large_fabs;
- }
-
- @Override
- protected int getThemeFabLayoutResId() {
- return R.layout.m3_theme_large_fab;
- }
-
-}
diff --git a/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml b/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml
index 151e2ac753e..a14de909f1f 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml
@@ -24,15 +24,16 @@
android:orientation="vertical">
+ android:rowCount="12">
diff --git a/catalog/java/io/material/catalog/fab/res/layout/mtrl_extended_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
similarity index 93%
rename from catalog/java/io/material/catalog/fab/res/layout/mtrl_extended_fabs.xml
rename to catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
index 2e07dc20aa2..cef790cbca2 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/mtrl_extended_fabs.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_gravity="start|center"
- android:text="@string/m3_surface_fab_label" />
+ android:text="@string/m3_surface_extended_fab_label" />
+ android:text="@string/m3_primary_extended_fab_label" />
+ android:text="@string/m3_secondary_extended_fab_label" />
+ android:text="@string/m3_tertiary_extended_fab_label" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml
deleted file mode 100644
index 64387308a8b..00000000000
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/catalog/java/io/material/catalog/fab/res/layout/theme_fab.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_theme_fab.xml
similarity index 68%
rename from catalog/java/io/material/catalog/fab/res/layout/theme_fab.xml
rename to catalog/java/io/material/catalog/fab/res/layout/m3_theme_fab.xml
index 92859870c3c..00b0a8d4ee0 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/theme_fab.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_theme_fab.xml
@@ -26,23 +26,32 @@
+ android:layout_columnSpan="3"
+ android:text="@string/m3_theme_fab_label"/>
+ android:contentDescription="@string/m3_theme_small_fab_content_desc"
+ app:srcCompat="@drawable/ic_add_24px"/>
+
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml
deleted file mode 100644
index ba4915d5ff3..00000000000
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml
deleted file mode 100644
index 5f6c604cabd..00000000000
--- a/catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/catalog/java/io/material/catalog/fab/res/values/strings.xml b/catalog/java/io/material/catalog/fab/res/values/strings.xml
index 25af12dc576..38226cbb2cd 100644
--- a/catalog/java/io/material/catalog/fab/res/values/strings.xml
+++ b/catalog/java/io/material/catalog/fab/res/values/strings.xml
@@ -17,61 +17,51 @@
- Floating Action Button
- The Floating Action Button (FAB) represents your product\'s primary action, and should be considered a direct extension of its brand.
- Extended FAB
- Extended FAB Behavior
+ Floating Action Button
+ The Floating Action Button (FAB) represents your product\'s primary action, and should be considered a direct extension of its brand.
+ Extended FAB
+ Extended FAB Behavior
- Regular
- Legacy
- Theme
+ Extended FAB
+ Extended FAB
- With icon and text
- Without icon
- Without text
- Extended FAB
+ Hide FABs
+ Show FABs
+ Rotate FABs
+ Shrink FABs
+ Extend FABs
- Hide FABs
- Show FABs
- Rotate FABs
- Shrink FABs
- Extend FABs
- Hide FAB on Scroll
- Shrink FAB on Scroll
+ FAB clicked
+ Extended FAB clicked
- FAB clicked
- Extended FAB clicked
+
+ Primary (default, small, large)
+ Secondary (default, small, large)
+ Tertiary (default, small, large)
+ Surface (default, small, large)
+ Theme (default, small, large)
- Regular FAB
- Regular mini FAB
- Legacy FAB
- Legacy mini FAB
- Themed FAB
- Mini themed FAB
- Extended FAB
+ Primary FAB
+ Primary small FAB
+ Primary large FAB
+ Secondary FAB
+ Secondary small FAB
+ Secondary large FAB
+ Tertiary FAB
+ Tertiary small FAB
+ Tertiary large FAB
+ Surface FAB
+ Surface small FAB
+ Surface large FAB
+ Theme FAB
+ Theme small FAB
+ Theme large FAB
-
- Primary
- Secondary
- Tertiary
- Surface
-
- Primary FAB
- Primary mini FAB
- Secondary FAB
- Secondary mini FAB
- Tertiary FAB
- Tertiary mini FAB
- Surface FAB
- Surface mini FAB
- Theme large FAB
-
- Large FAB
-
- Large primary FAB
- Large secondary FAB
- Large tertiary FAB
- Large surface FAB
+
+ Primary
+ Secondary
+ Tertiary
+ Surface