Skip to content

Commit ff48bc5

Browse files
hunterstichdsn5ft
authored andcommitted
[Carousel] Removed CenteredCarouselConfiguration.
This removes CenteredCarouselConfigration and its superclass MultibrowseCarouselConfiguration and renames StartCarouselConfiguration to MultiBrowseCarouselConfiguration. PiperOrigin-RevId: 506424085
1 parent e2636ff commit ff48bc5

File tree

9 files changed

+188
-548
lines changed

9 files changed

+188
-548
lines changed

catalog/java/io/material/catalog/carousel/CarouselMainDemoFragment.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@
2626
import androidx.annotation.NonNull;
2727
import androidx.annotation.Nullable;
2828
import com.google.android.material.carousel.CarouselLayoutManager;
29-
import com.google.android.material.carousel.CenteredCarouselConfiguration;
3029
import io.material.catalog.feature.DemoFragment;
3130

32-
/** A fragment that displays the main Carousel demos for the Catalog app. */
31+
/** A fragment that displays the main Carousel demo for the Catalog app. */
3332
public class CarouselMainDemoFragment extends DemoFragment {
3433

3534
@NonNull
@@ -46,19 +45,16 @@ public View onCreateDemoView(
4645
public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
4746
super.onViewCreated(view, bundle);
4847

49-
// A centered multi-browse carousel
50-
RecyclerView multiBrowseCenteredRecyclerView =
51-
view.findViewById(R.id.multi_browse_centered_carousel_recycler_view);
48+
RecyclerView carouselRecyclerView =
49+
view.findViewById(R.id.carousel_recycler_view);
5250
CarouselLayoutManager multiBrowseCenteredCarouselLayoutManager = new CarouselLayoutManager();
53-
multiBrowseCenteredCarouselLayoutManager.setCarouselConfiguration(
54-
new CenteredCarouselConfiguration(multiBrowseCenteredCarouselLayoutManager));
55-
multiBrowseCenteredRecyclerView.setLayoutManager(multiBrowseCenteredCarouselLayoutManager);
56-
multiBrowseCenteredRecyclerView.setNestedScrollingEnabled(false);
51+
carouselRecyclerView.setLayoutManager(multiBrowseCenteredCarouselLayoutManager);
52+
carouselRecyclerView.setNestedScrollingEnabled(false);
5753

5854
CarouselAdapter adapter =
5955
new CarouselAdapter(
60-
(item, position) -> multiBrowseCenteredRecyclerView.scrollToPosition(position));
61-
multiBrowseCenteredRecyclerView.setAdapter(adapter);
56+
(item, position) -> carouselRecyclerView.scrollToPosition(position));
57+
carouselRecyclerView.setAdapter(adapter);
6258

6359
adapter.submitList(CarouselData.createItems());
6460
}

catalog/java/io/material/catalog/carousel/MultiBrowseDemoFragment.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import androidx.annotation.NonNull;
2727
import androidx.annotation.Nullable;
2828
import com.google.android.material.carousel.CarouselLayoutManager;
29-
import com.google.android.material.carousel.StartCarouselConfiguration;
29+
import com.google.android.material.carousel.MultiBrowseCarouselConfiguration;
3030
import com.google.android.material.materialswitch.MaterialSwitch;
3131
import io.material.catalog.feature.DemoFragment;
3232

@@ -55,8 +55,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
5555
RecyclerView multiBrowseStartRecyclerView =
5656
view.findViewById(R.id.multi_browse_start_carousel_recycler_view);
5757
CarouselLayoutManager multiBrowseStartCarouselLayoutManager = new CarouselLayoutManager();
58-
multiBrowseStartCarouselLayoutManager.setCarouselConfiguration(
59-
new StartCarouselConfiguration(multiBrowseStartCarouselLayoutManager));
6058
multiBrowseStartCarouselLayoutManager.setDrawDebugEnabled(
6159
multiBrowseStartRecyclerView, debugSwitch.isChecked());
6260
multiBrowseStartRecyclerView.setLayoutManager(multiBrowseStartCarouselLayoutManager);
@@ -73,7 +71,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
7371
forceCompactSwitch.setOnCheckedChangeListener(
7472
(buttonView, isChecked) ->
7573
multiBrowseStartCarouselLayoutManager.setCarouselConfiguration(
76-
new StartCarouselConfiguration(multiBrowseStartCarouselLayoutManager, isChecked)));
74+
new MultiBrowseCarouselConfiguration(
75+
multiBrowseStartCarouselLayoutManager, isChecked)));
7776

7877
CarouselAdapter adapter =
7978
new CarouselAdapter(

catalog/java/io/material/catalog/carousel/res/layout/cat_carousel.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:orientation="vertical">
2323

2424
<androidx.recyclerview.widget.RecyclerView
25-
android:id="@+id/multi_browse_centered_carousel_recycler_view"
25+
android:id="@+id/carousel_recycler_view"
2626
android:layout_width="match_parent"
2727
android:layout_height="196dp"
2828
android:layout_marginHorizontal="16dp"

lib/java/com/google/android/material/carousel/CarouselLayoutManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private static final class ChildCalculations {
113113
}
114114

115115
public CarouselLayoutManager() {
116-
setCarouselConfiguration(new StartCarouselConfiguration(this));
116+
setCarouselConfiguration(new MultiBrowseCarouselConfiguration(this));
117117
}
118118

119119
public CarouselLayoutManager(

lib/java/com/google/android/material/carousel/CenteredCarouselConfiguration.java

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)