Skip to content

Commit ad6afbf

Browse files
imhappiraajkumars
imhappi
authored and
raajkumars
committedJul 5, 2023
[Carousel][Catalog] Add fullscreen demo to catalog
PiperOrigin-RevId: 544700979
·
1.13.0-alpha121.11.0-alpha01
1 parent bc54f2e commit ad6afbf

6 files changed

+364
-2
lines changed
 

‎catalog/java/io/material/catalog/carousel/CarouselFragment.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,18 @@ public Fragment createFragment() {
7373
return new HeroCarouselDemoFragment();
7474
}
7575
},
76+
new Demo(R.string.cat_carousel_fullscreen_demo_title) {
77+
@Override
78+
public Fragment createFragment() {
79+
return new FullScreenStrategyDemoFragment();
80+
}
81+
},
7682
new Demo(R.string.cat_carousel_default_list_demo_title) {
7783
@Override
7884
public Fragment createFragment() {
7985
return new DefaultListDemoFragment();
8086
}
81-
}
82-
);
87+
});
8388
}
8489

8590
/** The Dagger module for {@link CarouselFragment} dependencies. */

‎catalog/java/io/material/catalog/carousel/FullScreenStrategyDemoFragment.java

+171
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
/*
2+
* Copyright 2023 The Android Open Source Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package io.material.catalog.carousel;
18+
19+
import io.material.catalog.R;
20+
21+
import android.os.Bundle;
22+
import androidx.recyclerview.widget.RecyclerView;
23+
import androidx.recyclerview.widget.SnapHelper;
24+
import android.view.LayoutInflater;
25+
import android.view.View;
26+
import android.view.View.OnClickListener;
27+
import android.view.ViewGroup;
28+
import android.widget.AutoCompleteTextView;
29+
import android.widget.Button;
30+
import androidx.annotation.NonNull;
31+
import androidx.annotation.Nullable;
32+
import com.google.android.material.bottomsheet.BottomSheetDialog;
33+
import com.google.android.material.carousel.CarouselLayoutManager;
34+
import com.google.android.material.carousel.CarouselSnapHelper;
35+
import com.google.android.material.carousel.FullScreenCarouselStrategy;
36+
import com.google.android.material.divider.MaterialDividerItemDecoration;
37+
import com.google.android.material.materialswitch.MaterialSwitch;
38+
import com.google.android.material.slider.Slider;
39+
import com.google.android.material.slider.Slider.OnSliderTouchListener;
40+
import io.material.catalog.feature.DemoFragment;
41+
42+
/** A fragment that displays the fullscreen variant of the Carousel. */
43+
public class FullScreenStrategyDemoFragment extends DemoFragment {
44+
45+
private MaterialDividerItemDecoration horizontalDivider;
46+
private BottomSheetDialog bottomSheetDialog;
47+
48+
@NonNull
49+
@Override
50+
public View onCreateDemoView(
51+
@NonNull LayoutInflater layoutInflater,
52+
@Nullable ViewGroup viewGroup,
53+
@Nullable Bundle bundle) {
54+
return layoutInflater.inflate(
55+
R.layout.cat_carousel_full_screen_fragment, viewGroup, false /* attachToRoot */);
56+
}
57+
58+
@Override
59+
@SuppressWarnings("RestrictTo")
60+
public void onViewCreated(@NonNull View view, @Nullable Bundle bundle) {
61+
super.onViewCreated(view, bundle);
62+
63+
bottomSheetDialog = new BottomSheetDialog(view.getContext());
64+
bottomSheetDialog.setContentView(R.layout.cat_carousel_bottom_sheet_contents);
65+
// Opt in to perform swipe to dismiss animation when dismissing bottom sheet dialog.
66+
bottomSheetDialog.setDismissWithAnimation(true);
67+
68+
horizontalDivider =
69+
new MaterialDividerItemDecoration(
70+
requireContext(), MaterialDividerItemDecoration.HORIZONTAL);
71+
72+
Button showBottomSheetButton = view.findViewById(R.id.show_bottomsheet_button);
73+
showBottomSheetButton.setOnClickListener(new OnClickListener() {
74+
@Override
75+
public void onClick(View v) {
76+
bottomSheetDialog.show();
77+
}
78+
});
79+
80+
MaterialSwitch debugSwitch = bottomSheetDialog.findViewById(R.id.debug_switch);
81+
MaterialSwitch drawDividers = bottomSheetDialog.findViewById(R.id.draw_dividers_switch);
82+
MaterialSwitch enableFlingSwitch = bottomSheetDialog.findViewById(R.id.enable_fling_switch);
83+
AutoCompleteTextView itemCountDropdown =
84+
bottomSheetDialog.findViewById(R.id.item_count_dropdown);
85+
Slider positionSlider = bottomSheetDialog.findViewById(R.id.position_slider);
86+
87+
// A vertical fullscreen carousel
88+
RecyclerView fullscreenRecyclerView =
89+
view.findViewById(R.id.fullscreen_carousel_recycler_view);
90+
CarouselLayoutManager carouselLayoutManager =
91+
new CarouselLayoutManager(new FullScreenCarouselStrategy(),
92+
RecyclerView.VERTICAL);
93+
carouselLayoutManager.setDebuggingEnabled(
94+
fullscreenRecyclerView, debugSwitch.isChecked());
95+
fullscreenRecyclerView.setLayoutManager(carouselLayoutManager);
96+
fullscreenRecyclerView.setNestedScrollingEnabled(false);
97+
98+
debugSwitch.setOnCheckedChangeListener(
99+
(buttonView, isChecked) -> {
100+
carouselLayoutManager.setOrientation(CarouselLayoutManager.VERTICAL);
101+
fullscreenRecyclerView.setBackgroundResource(
102+
isChecked ? R.drawable.dashed_outline_rectangle : 0);
103+
carouselLayoutManager.setDebuggingEnabled(
104+
fullscreenRecyclerView, isChecked);
105+
});
106+
107+
drawDividers.setOnCheckedChangeListener(
108+
(buttonView, isChecked) -> {
109+
if (isChecked) {
110+
fullscreenRecyclerView.addItemDecoration(horizontalDivider);
111+
} else {
112+
fullscreenRecyclerView.removeItemDecoration(horizontalDivider);
113+
}
114+
});
115+
116+
CarouselAdapter adapter =
117+
new CarouselAdapter(
118+
(item, position) -> fullscreenRecyclerView.scrollToPosition(position),
119+
R.layout.cat_carousel_item_vertical);
120+
121+
SnapHelper flingDisabledSnapHelper = new CarouselSnapHelper();
122+
SnapHelper flingEnabledSnapHelper = new CarouselSnapHelper(false);
123+
124+
flingDisabledSnapHelper.attachToRecyclerView(fullscreenRecyclerView);
125+
126+
enableFlingSwitch.setOnCheckedChangeListener(
127+
(buttonView, isChecked) -> {
128+
if (isChecked) {
129+
flingDisabledSnapHelper.attachToRecyclerView(null);
130+
flingEnabledSnapHelper.attachToRecyclerView(fullscreenRecyclerView);
131+
} else {
132+
flingEnabledSnapHelper.attachToRecyclerView(null);
133+
flingDisabledSnapHelper.attachToRecyclerView(fullscreenRecyclerView);
134+
}
135+
});
136+
137+
itemCountDropdown.setOnItemClickListener(
138+
(parent, view1, position, id) ->
139+
adapter.submitList(
140+
CarouselData.createItems().subList(0, position),
141+
updateSliderRange(positionSlider, adapter)));
142+
143+
positionSlider.addOnSliderTouchListener(
144+
new OnSliderTouchListener() {
145+
@Override
146+
public void onStartTrackingTouch(@NonNull Slider slider) {}
147+
148+
@Override
149+
public void onStopTrackingTouch(@NonNull Slider slider) {
150+
fullscreenRecyclerView.smoothScrollToPosition((int) slider.getValue() - 1);
151+
}
152+
});
153+
154+
fullscreenRecyclerView.setAdapter(adapter);
155+
adapter.submitList(CarouselData.createItems(), updateSliderRange(positionSlider, adapter));
156+
}
157+
158+
private static Runnable updateSliderRange(Slider slider, CarouselAdapter adapter) {
159+
return () -> {
160+
if (adapter.getItemCount() <= 1) {
161+
slider.setEnabled(false);
162+
return;
163+
}
164+
165+
slider.setValueFrom(1);
166+
slider.setValue(1);
167+
slider.setValueTo(adapter.getItemCount());
168+
slider.setEnabled(true);
169+
};
170+
}
171+
}

‎catalog/java/io/material/catalog/carousel/res/layout/cat_carousel_bottom_sheet_contents.xml

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2023 The Android Open Source Project
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
https://www.apache.org/licenses/LICENSE-2.0
8+
Unless required by applicable law or agreed to in writing, software
9+
distributed under the License is distributed on an "AS IS" BASIS,
10+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
See the License for the specific language governing permissions and
12+
limitations under the License.
13+
-->
14+
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
15+
android:layout_width="match_parent"
16+
android:layout_height="wrap_content"
17+
xmlns:app="http://schemas.android.com/apk/res-auto">
18+
<LinearLayout
19+
android:id="@+id/container"
20+
android:layout_height="wrap_content"
21+
android:layout_width="match_parent"
22+
android:orientation="vertical">
23+
24+
<com.google.android.material.materialswitch.MaterialSwitch
25+
android:id="@+id/debug_switch"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:checked="false"
29+
android:layout_marginHorizontal="16dp"
30+
android:layout_marginVertical="8dp"
31+
android:textAppearance="?attr/textAppearanceBodyLarge"
32+
android:text="@string/cat_carousel_debug_mode_label"/>
33+
34+
<com.google.android.material.materialswitch.MaterialSwitch
35+
android:id="@+id/draw_dividers_switch"
36+
android:layout_width="match_parent"
37+
android:layout_height="wrap_content"
38+
android:checked="false"
39+
android:layout_marginHorizontal="16dp"
40+
android:layout_marginVertical="8dp"
41+
android:textAppearance="?attr/textAppearanceBodyLarge"
42+
android:text="@string/cat_carousel_draw_dividers_label"/>
43+
44+
<com.google.android.material.materialswitch.MaterialSwitch
45+
android:id="@+id/enable_fling_switch"
46+
android:layout_width="match_parent"
47+
android:layout_height="wrap_content"
48+
android:checked="false"
49+
android:layout_marginHorizontal="16dp"
50+
android:layout_marginVertical="8dp"
51+
android:textAppearance="?attr/textAppearanceBodyLarge"
52+
android:text="@string/cat_carousel_enable_fling_label"/>
53+
54+
<com.google.android.material.textfield.TextInputLayout
55+
style="?attr/textInputFilledExposedDropdownMenuStyle"
56+
android:layout_width="match_parent"
57+
android:layout_height="wrap_content"
58+
android:layout_gravity="center_vertical"
59+
android:layout_marginHorizontal="16dp"
60+
android:layout_marginVertical="8dp"
61+
app:helperTextEnabled="false">
62+
63+
<AutoCompleteTextView
64+
android:id="@+id/item_count_dropdown"
65+
android:layout_width="match_parent"
66+
android:layout_height="wrap_content"
67+
android:inputType="none"
68+
android:hint="@string/cat_carousel_adapter_item_count_hint_label"
69+
app:simpleItems="@array/cat_carousel_adapter_count_content"/>
70+
71+
</com.google.android.material.textfield.TextInputLayout>
72+
73+
<TextView
74+
android:id="@+id/position_slider_label"
75+
android:layout_width="wrap_content"
76+
android:layout_height="wrap_content"
77+
android:layout_marginHorizontal="16dp"
78+
android:layout_marginTop="16dp"
79+
android:labelFor="@id/position_slider"
80+
android:text="@string/cat_carousel_position_slider_label"
81+
android:textAppearance="?attr/textAppearanceBodyLarge"/>
82+
83+
<com.google.android.material.slider.Slider
84+
android:id="@+id/position_slider"
85+
android:layout_width="match_parent"
86+
android:layout_height="wrap_content"
87+
android:layout_marginHorizontal="16dp"
88+
android:layout_marginBottom="8dp"
89+
android:contentDescription="@string/cat_carousel_position_slider_content_description"
90+
android:stepSize="1.0"/>
91+
92+
</LinearLayout>
93+
</androidx.core.widget.NestedScrollView>

‎catalog/java/io/material/catalog/carousel/res/layout/cat_carousel_full_screen_fragment.xml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2023 The Android Open Source Project
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
https://www.apache.org/licenses/LICENSE-2.0
8+
Unless required by applicable law or agreed to in writing, software
9+
distributed under the License is distributed on an "AS IS" BASIS,
10+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
See the License for the specific language governing permissions and
12+
limitations under the License.
13+
-->
14+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
15+
xmlns:app="http://schemas.android.com/apk/res-auto"
16+
android:layout_width="match_parent"
17+
android:layout_height="match_parent"
18+
android:orientation="vertical">
19+
20+
<TextView
21+
android:id="@+id/fullscreen_title_text_view"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_marginHorizontal="16dp"
25+
android:layout_marginVertical="4dp"
26+
android:text="@string/cat_carousel_fullscreen_title"
27+
android:textAppearance="?attr/textAppearanceTitleMedium" />
28+
29+
<TextView
30+
android:id="@+id/fullscreen_desc_text_view"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:layout_marginHorizontal="16dp"
34+
android:layout_marginVertical="4dp"
35+
android:text="@string/cat_carousel_fullscreen_desc"
36+
android:textAppearance="?attr/textAppearanceBodyMedium" />
37+
<Button
38+
android:id="@+id/show_bottomsheet_button"
39+
android:layout_width="wrap_content"
40+
android:layout_height="wrap_content"
41+
android:layout_margin="16dp"
42+
android:text="@string/cat_carousel_show_debug_options"/>
43+
44+
<androidx.recyclerview.widget.RecyclerView
45+
android:id="@+id/fullscreen_carousel_recycler_view"
46+
android:layout_width="match_parent"
47+
android:layout_height="0dp"
48+
android:layout_weight="1"
49+
android:layout_marginHorizontal="16dp"
50+
android:layout_marginVertical="16dp"
51+
android:clipChildren="false"
52+
android:clipToPadding="false" />
53+
</LinearLayout>
54+

‎catalog/java/io/material/catalog/carousel/res/layout/cat_carousel_item_vertical.xml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2022 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
https://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<com.google.android.material.carousel.MaskableFrameLayout
19+
xmlns:android="http://schemas.android.com/apk/res/android"
20+
xmlns:app="http://schemas.android.com/apk/res-auto"
21+
xmlns:tools="http://schemas.android.com/tools"
22+
android:id="@+id/carousel_item_container"
23+
android:layout_width="match_parent"
24+
android:layout_height="match_parent"
25+
android:foreground="?attr/selectableItemBackground"
26+
app:shapeAppearance="?attr/shapeAppearanceCornerExtraLarge">
27+
<ImageView
28+
android:id="@+id/carousel_image_view"
29+
android:layout_width="match_parent"
30+
android:layout_height="match_parent"
31+
android:scaleType="centerCrop"
32+
tools:ignore="ContentDescription" />
33+
</com.google.android.material.carousel.MaskableFrameLayout>

‎catalog/java/io/material/catalog/carousel/res/values/strings.xml

+6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<string name="cat_carousel_enable_snap_label" description="The title of a switch to enable snapping to carousel items.[CHAR_LIMIT=NONE]">Enable Snap</string>
2323
<string name="cat_carousel_enable_fling_label" description="The title of a switch to enable the flinging gesture.[CHAR_LIMIT=NONE]">Enable fling</string>
2424

25+
<string name="cat_carousel_show_debug_options" description="The title of the button that shows carousel debug options.[CHAR_LIMIT=NONE]">Show debug options</string>
26+
2527
<string name="cat_carousel_adapter_item_count_hint_label" translatable="false">Item count</string>
2628
<string name="cat_carousel_position_slider_label" translatable="false">Scroll position</string>
2729
<string name="cat_carousel_snap_switch_description" description="Content description of a switch to enable snapping.[CHAR_LIMIT=NONE]">Enable snapping to carousel items</string>
@@ -47,6 +49,7 @@
4749

4850
<string name="cat_carousel_multi_browse_demo_title" translatable="false">Multi-browse Carousel</string>
4951
<string name="cat_carousel_hero_demo_title" description="Name of the hero variant demo. [CHAR_LIMIT=NONE]">Hero Carousel</string>
52+
<string name="cat_carousel_fullscreen_demo_title" translatable="false">Fullscreen Carousel</string>
5053
<string name="cat_carousel_default_list_demo_title" translatable="false">Default List</string>
5154

5255
<string name="cat_carousel_multi_browse_title" translatable="false">Multi-browse</string>
@@ -55,6 +58,9 @@
5558
<string name="cat_carousel_hero_title" description="Title of the hero variant demo. [CHAR_LIMIT=NONE]">Hero</string>
5659
<string name="cat_carousel_hero_desc" description="Description of the hero variant demo.[CHAR_LIMIT=NONE]">Hero carousels allow browsing with a focus on one main item at a time.</string>
5760

61+
<string name="cat_carousel_fullscreen_title" description="Title of the fullscreen variant demo. [CHAR_LIMIT=NONE]">Fullscreen</string>
62+
<string name="cat_carousel_fullscreen_desc" description="Title of the fullscreen variant demo. [CHAR_LIMIT=NONE]">Fullscreen carousels allow browsing with a focus on one item at a time.</string>
63+
5864
<string name="cat_carousel_default_title" translatable="false">Default</string>
5965
<string name="cat_carousel_default_desc" translatable="false">A default horizontal list.</string>
6066

0 commit comments

Comments
 (0)
Please sign in to comment.