[Catalog] Fix issue with top app bar not lifting in catalog demo frag…

…ments PiperOrigin-RevId: 582013479
material-components · Nov 13, 2023 · 22aadb7 · 22aadb7
1 parent a283959
commit 22aadb7
Show file tree

Hide file tree

Showing 22 changed files with 160 additions and 330 deletions.
diff --git a/catalog/androidTest/javatests/io/material/catalog/feature/AndroidManifest.xml b/catalog/androidTest/javatests/io/material/catalog/feature/AndroidManifest.xml
diff --git a/catalog/androidTest/javatests/io/material/catalog/feature/DemoFragmentTest.java b/catalog/androidTest/javatests/io/material/catalog/feature/DemoFragmentTest.java
diff --git a/catalog/java/io/material/catalog/bottomnav/BottomNavigationAnimatedDemoFragment.java b/catalog/java/io/material/catalog/bottomnav/BottomNavigationAnimatedDemoFragment.java
@@ -50,10 +50,14 @@ public View onCreateView(
       LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
     View view = super.onCreateView(layoutInflater, viewGroup, bundle);
     CoordinatorLayout coordinatorLayout = view.findViewById(R.id.cat_demo_fragment_container);
+
     // For unknown reasons, setting this in the xml is cleared out but setting it here takes effect.
+    View container = coordinatorLayout.findViewById(R.id.cat_bottom_navs_animated_container);
     CoordinatorLayout.LayoutParams lp =
-        (LayoutParams) coordinatorLayout.getChildAt(0).getLayoutParams();
+        (LayoutParams) container.getLayoutParams();
+    lp.setBehavior(null);
     lp.gravity = Gravity.BOTTOM;
+
     ViewCompat.setOnApplyWindowInsetsListener(coordinatorLayout, (v, insets) -> insets);
     return view;
   }

diff --git a/catalog/java/io/material/catalog/bottomnav/res/layout/cat_bottom_navs_animated.xml b/catalog/java/io/material/catalog/bottomnav/res/layout/cat_bottom_navs_animated.xml
@@ -17,6 +17,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/cat_bottom_navs_animated_container"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_gravity="bottom"

diff --git a/catalog/java/io/material/catalog/card/res/layout/cat_card_fragment.xml b/catalog/java/io/material/catalog/card/res/layout/cat_card_fragment.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<ScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -147,4 +147,4 @@
         android:layout_height="@dimen/mtrl_card_spacing"/>
 
   </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/catalog/java/io/material/catalog/card/res/layout/cat_card_rich_media_demo_fragment.xml b/catalog/java/io/material/catalog/card/res/layout/cat_card_rich_media_demo_fragment.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<ScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -357,4 +357,4 @@
 
     </com.google.android.material.card.MaterialCardView>
   </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/catalog/java/io/material/catalog/chip/res/layout/cat_chip_fragment.xml b/catalog/java/io/material/catalog/chip/res/layout/cat_chip_fragment.xml
@@ -15,22 +15,17 @@
   limitations under the License.
   -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.core.widget.NestedScrollView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_gravity="center_vertical">
 
-  <ScrollView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_vertical">
-
-    <!-- Chip styles. -->
-    <FrameLayout
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_gravity="center_horizontal"/>
-  </ScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+  <!-- Chip styles. -->
+  <FrameLayout
+    android:id="@+id/content"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp"
+    android:layout_gravity="center_horizontal"/>
+</androidx.core.widget.NestedScrollView>
diff --git a/catalog/java/io/material/catalog/color/res/layout/cat_colors_fragment.xml b/catalog/java/io/material/catalog/color/res/layout/cat_colors_fragment.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<ScrollView
+<androidx.core.widget.NestedScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -89,4 +89,4 @@
       android:padding="8dp"
       android:text="@string/cat_color_utility_note" />
   </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/catalog/java/io/material/catalog/color/res/layout/cat_colors_harmonization_fragment.xml b/catalog/java/io/material/catalog/color/res/layout/cat_colors_harmonization_fragment.xml
@@ -15,7 +15,7 @@
   limitations under the License.
   -->
 
-<ScrollView
+<androidx.core.widget.NestedScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -283,4 +283,4 @@
 
     </LinearLayout>
   </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/catalog/java/io/material/catalog/datepicker/res/layout/picker_main_demo.xml b/catalog/java/io/material/catalog/datepicker/res/layout/picker_main_demo.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<ScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -48,4 +48,4 @@
 
   </LinearLayout>
 
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/catalog/java/io/material/catalog/dialog/res/layout/dialog_main_demo.xml b/catalog/java/io/material/catalog/dialog/res/layout/dialog_main_demo.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<ScrollView
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,4 +27,4 @@
       android:padding="@dimen/cat_dialog_demo_padding"
       android:orientation="vertical">
   </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>