[Carousel] Removed CenteredCarouselConfiguration.

This removes CenteredCarouselConfigration and its superclass MultibrowseCarouselConfiguration and renames StartCarouselConfiguration to MultiBrowseCarouselConfiguration. PiperOrigin-RevId: 506424085
material-components · Feb 1, 2023 · ff48bc5 · ff48bc5
1 parent e2636ff
commit ff48bc5
Show file tree

Hide file tree

Showing 9 changed files with 188 additions and 548 deletions.
diff --git a/catalog/java/io/material/catalog/carousel/CarouselMainDemoFragment.java b/catalog/java/io/material/catalog/carousel/CarouselMainDemoFragment.java
@@ -26,10 +26,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.carousel.CarouselLayoutManager;
-import com.google.android.material.carousel.CenteredCarouselConfiguration;
 import io.material.catalog.feature.DemoFragment;
 
-/** A fragment that displays the main Carousel demos for the Catalog app. */
+/** A fragment that displays the main Carousel demo for the Catalog app. */
 public class CarouselMainDemoFragment extends DemoFragment {
 
   @NonNull
@@ -46,19 +45,16 @@ public View onCreateDemoView(
   public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
     super.onViewCreated(view, bundle);
 
-    // A centered multi-browse carousel
-    RecyclerView multiBrowseCenteredRecyclerView =
-        view.findViewById(R.id.multi_browse_centered_carousel_recycler_view);
+    RecyclerView carouselRecyclerView =
+        view.findViewById(R.id.carousel_recycler_view);
     CarouselLayoutManager multiBrowseCenteredCarouselLayoutManager = new CarouselLayoutManager();
-    multiBrowseCenteredCarouselLayoutManager.setCarouselConfiguration(
-        new CenteredCarouselConfiguration(multiBrowseCenteredCarouselLayoutManager));
-    multiBrowseCenteredRecyclerView.setLayoutManager(multiBrowseCenteredCarouselLayoutManager);
-    multiBrowseCenteredRecyclerView.setNestedScrollingEnabled(false);
+    carouselRecyclerView.setLayoutManager(multiBrowseCenteredCarouselLayoutManager);
+    carouselRecyclerView.setNestedScrollingEnabled(false);
 
     CarouselAdapter adapter =
         new CarouselAdapter(
-            (item, position) -> multiBrowseCenteredRecyclerView.scrollToPosition(position));
-    multiBrowseCenteredRecyclerView.setAdapter(adapter);
+            (item, position) -> carouselRecyclerView.scrollToPosition(position));
+    carouselRecyclerView.setAdapter(adapter);
 
     adapter.submitList(CarouselData.createItems());
   }

diff --git a/catalog/java/io/material/catalog/carousel/MultiBrowseDemoFragment.java b/catalog/java/io/material/catalog/carousel/MultiBrowseDemoFragment.java
@@ -26,7 +26,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.carousel.CarouselLayoutManager;
-import com.google.android.material.carousel.StartCarouselConfiguration;
+import com.google.android.material.carousel.MultiBrowseCarouselConfiguration;
 import com.google.android.material.materialswitch.MaterialSwitch;
 import io.material.catalog.feature.DemoFragment;
 
@@ -55,8 +55,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
     RecyclerView multiBrowseStartRecyclerView =
         view.findViewById(R.id.multi_browse_start_carousel_recycler_view);
     CarouselLayoutManager multiBrowseStartCarouselLayoutManager = new CarouselLayoutManager();
-    multiBrowseStartCarouselLayoutManager.setCarouselConfiguration(
-        new StartCarouselConfiguration(multiBrowseStartCarouselLayoutManager));
     multiBrowseStartCarouselLayoutManager.setDrawDebugEnabled(
         multiBrowseStartRecyclerView, debugSwitch.isChecked());
     multiBrowseStartRecyclerView.setLayoutManager(multiBrowseStartCarouselLayoutManager);
@@ -73,7 +71,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
     forceCompactSwitch.setOnCheckedChangeListener(
         (buttonView, isChecked) ->
             multiBrowseStartCarouselLayoutManager.setCarouselConfiguration(
-                new StartCarouselConfiguration(multiBrowseStartCarouselLayoutManager, isChecked)));
+                new MultiBrowseCarouselConfiguration(
+                    multiBrowseStartCarouselLayoutManager, isChecked)));
 
     CarouselAdapter adapter =
         new CarouselAdapter(

diff --git a/catalog/java/io/material/catalog/carousel/res/layout/cat_carousel.xml b/catalog/java/io/material/catalog/carousel/res/layout/cat_carousel.xml
@@ -22,7 +22,7 @@
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/multi_browse_centered_carousel_recycler_view"
+      android:id="@+id/carousel_recycler_view"
       android:layout_width="match_parent"
       android:layout_height="196dp"
       android:layout_marginHorizontal="16dp"

diff --git a/lib/java/com/google/android/material/carousel/CarouselLayoutManager.java b/lib/java/com/google/android/material/carousel/CarouselLayoutManager.java
@@ -113,7 +113,7 @@ private static final class ChildCalculations {
   }
 
   public CarouselLayoutManager() {
-    setCarouselConfiguration(new StartCarouselConfiguration(this));
+    setCarouselConfiguration(new MultiBrowseCarouselConfiguration(this));
   }
 
   public CarouselLayoutManager(

diff --git a/lib/java/com/google/android/material/carousel/CenteredCarouselConfiguration.java b/lib/java/com/google/android/material/carousel/CenteredCarouselConfiguration.java