Skip to content

Commit 51c59fa

Browse files
pubiqqhunterstich
pubiqq
authored and
hunterstich
committed
[Catalog] Small fixes
Resolves #2751 GIT_ORIGIN_REV_ID=fbae7afaa081033f02e3ce1fbd82e52e28274c4c PiperOrigin-RevId: 459277358
1 parent 0c56a45 commit 51c59fa

File tree

9 files changed

+359
-294
lines changed

9 files changed

+359
-294
lines changed

‎catalog/java/io/material/catalog/checkbox/res/layout/cat_checkbox.xml‎

Lines changed: 79 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -16,110 +16,127 @@
1616
limitations under the License.
1717
-->
1818

19-
<LinearLayout
20-
xmlns:android="http://schemas.android.com/apk/res/android"
19+
<ScrollView
20+
xmlns:android="http://schemas.android.com/apk/res/android"
21+
android:layout_width="match_parent"
22+
android:layout_height="match_parent">
23+
24+
<LinearLayout
2125
android:id="@+id/main_viewGroup"
2226
android:layout_width="match_parent"
2327
android:layout_height="wrap_content"
24-
android:padding="@dimen/cat_checkbox_padding"
25-
android:orientation="vertical">
26-
<GridLayout
28+
android:orientation="vertical"
29+
android:padding="@dimen/cat_checkbox_padding">
30+
31+
<GridLayout
2732
android:layout_width="wrap_content"
2833
android:layout_height="wrap_content"
2934
android:columnCount="2"
3035
android:useDefaultMargins="true">
31-
<TextView
36+
37+
<TextView
3238
android:layout_width="match_parent"
3339
android:layout_height="match_parent"
3440
android:layout_columnSpan="2"
3541
android:text="@string/cat_checkbox_intro" />
36-
<CheckBox
42+
43+
<CheckBox
3744
android:layout_width="match_parent"
3845
android:layout_height="match_parent"
3946
android:checked="true"
4047
android:enabled="true"
41-
android:text="@string/cat_checkbox_enabled"/>
42-
<CheckBox
48+
android:text="@string/cat_checkbox_enabled" />
49+
50+
<CheckBox
4351
android:layout_width="match_parent"
4452
android:layout_height="match_parent"
4553
android:checked="false"
4654
android:enabled="true"
47-
android:text="@string/cat_checkbox_enabled"/>
48-
<TextView
55+
android:text="@string/cat_checkbox_enabled" />
56+
57+
<TextView
4958
android:layout_width="match_parent"
5059
android:layout_height="match_parent"
5160
android:layout_columnSpan="2"
5261
android:text="@string/cat_checkbox_disabled_guide" />
53-
<CheckBox
62+
63+
<CheckBox
5464
android:layout_width="match_parent"
5565
android:layout_height="match_parent"
5666
android:checked="true"
5767
android:enabled="false"
58-
android:text="@string/cat_checkbox_disabled"/>
59-
<CheckBox
68+
android:text="@string/cat_checkbox_disabled" />
69+
70+
<CheckBox
6071
android:layout_width="match_parent"
6172
android:layout_height="match_parent"
6273
android:checked="false"
6374
android:enabled="false"
64-
android:text="@string/cat_checkbox_disabled"/>
65-
</GridLayout>
75+
android:text="@string/cat_checkbox_disabled" />
76+
</GridLayout>
6677

67-
<com.google.android.material.divider.MaterialDivider
68-
android:layout_width="match_parent"
69-
android:layout_height="wrap_content"
70-
android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
71-
android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin"/>
78+
<com.google.android.material.divider.MaterialDivider
79+
android:layout_width="match_parent"
80+
android:layout_height="wrap_content"
81+
android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
82+
android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin" />
7283

73-
<CheckBox
84+
<CheckBox
7485
android:id="@+id/checkbox_toggle"
7586
android:layout_width="match_parent"
7687
android:layout_height="match_parent"
7788
android:checked="false"
7889
android:enabled="true"
79-
android:text="@string/cat_checkbox_enablable_description"/>
80-
<LinearLayout
81-
android:id="@+id/checkbox_toggle_container"
82-
android:layout_width="match_parent"
83-
android:layout_height="wrap_content"
84-
android:layout_marginStart="@dimen/cat_checkbox_indent"
85-
android:orientation="vertical">
90+
android:text="@string/cat_checkbox_enablable_description" />
91+
92+
<LinearLayout
93+
android:id="@+id/checkbox_toggle_container"
94+
android:layout_width="match_parent"
95+
android:layout_height="wrap_content"
96+
android:layout_marginStart="@dimen/cat_checkbox_indent"
97+
android:orientation="vertical">
98+
99+
<CheckBox
100+
android:layout_width="match_parent"
101+
android:layout_height="match_parent"
102+
android:checked="true"
103+
android:enabled="false"
104+
android:text="@string/cat_checkbox_toggle" />
105+
106+
<CheckBox
107+
android:layout_width="match_parent"
108+
android:layout_height="match_parent"
109+
android:checked="false"
110+
android:enabled="false"
111+
android:text="@string/cat_checkbox_toggle" />
112+
</LinearLayout>
113+
114+
<com.google.android.material.divider.MaterialDivider
115+
android:layout_width="match_parent"
116+
android:layout_height="wrap_content"
117+
android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
118+
android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin" />
119+
120+
<TextView
121+
android:layout_width="match_parent"
122+
android:layout_height="wrap_content"
123+
android:text="@string/cat_checkbox_no_text" />
124+
86125
<CheckBox
126+
android:layout_width="wrap_content"
127+
android:layout_height="wrap_content" />
128+
129+
<com.google.android.material.divider.MaterialDivider
87130
android:layout_width="match_parent"
88-
android:layout_height="match_parent"
89-
android:checked="true"
90-
android:enabled="false"
91-
android:text="@string/cat_checkbox_toggle"/>
131+
android:layout_height="wrap_content"
132+
android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
133+
android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin" />
134+
92135
<CheckBox
136+
android:id="@+id/checkbox_toggle_error"
93137
android:layout_width="match_parent"
94138
android:layout_height="match_parent"
95-
android:checked="false"
96-
android:enabled="false"
97-
android:text="@string/cat_checkbox_toggle"/>
139+
android:text="@string/cat_checkbox_toggle_error" />
98140
</LinearLayout>
99141

100-
<com.google.android.material.divider.MaterialDivider
101-
android:layout_width="match_parent"
102-
android:layout_height="wrap_content"
103-
android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
104-
android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin"/>
105-
106-
<TextView
107-
android:layout_width="match_parent"
108-
android:layout_height="wrap_content"
109-
android:text="@string/cat_checkbox_no_text"/>
110-
<CheckBox
111-
android:layout_width="wrap_content"
112-
android:layout_height="wrap_content"/>
113-
114-
<com.google.android.material.divider.MaterialDivider
115-
android:layout_width="match_parent"
116-
android:layout_height="wrap_content"
117-
android:layout_marginTop="@dimen/cat_checkbox_line_separator_margin"
118-
android:layout_marginBottom="@dimen/cat_checkbox_line_separator_margin"/>
119-
120-
<CheckBox
121-
android:id="@+id/checkbox_toggle_error"
122-
android:layout_width="match_parent"
123-
android:layout_height="match_parent"
124-
android:text="@string/cat_checkbox_toggle_error"/>
125-
</LinearLayout>
142+
</ScrollView>

‎catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_behavior_fragment.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,13 @@
2222
<com.google.android.material.appbar.AppBarLayout
2323
android:id="@+id/app_bar"
2424
android:layout_width="match_parent"
25-
android:layout_height="192dp"
25+
android:layout_height="wrap_content"
2626
android:fitsSystemWindows="true">
27+
2728
<com.google.android.material.appbar.CollapsingToolbarLayout
28-
style="?attr/catalogToolbarStyle"
29+
style="?attr/collapsingToolbarLayoutLargeStyle"
2930
android:layout_width="match_parent"
30-
android:layout_height="match_parent"
31-
app:collapsedTitleTextAppearance="?attr/textAppearanceHeadline6"
32-
app:contentScrim="?attr/colorPrimary"
33-
app:expandedTitleGravity="bottom"
34-
app:expandedTitleMarginBottom="56dp"
35-
app:expandedTitleMarginStart="16dp"
36-
app:expandedTitleTextAppearance="?attr/textAppearanceHeadline5"
31+
android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
3732
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
3833

3934
<androidx.appcompat.widget.Toolbar

‎catalog/java/io/material/catalog/fab/res/layout/cat_extended_fab_fragment.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
android:gravity="center_horizontal"
2323
android:orientation="vertical">
2424
<FrameLayout
25-
android:layout_width="wrap_content"
25+
android:layout_width="match_parent"
2626
android:layout_height="0dp"
2727
android:layout_weight="1">
2828
<ScrollView
2929
android:id="@+id/content"
30-
android:layout_width="wrap_content"
31-
android:layout_height="wrap_content"
30+
android:layout_width="match_parent"
31+
android:layout_height="match_parent"
3232
android:layout_gravity="center_vertical"/>
3333
</FrameLayout>
3434

‎catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
android:layout_width="wrap_content"
2121
android:layout_height="wrap_content"
22-
android:layout_gravity="center_vertical"
22+
android:layout_gravity="center_horizontal"
2323
android:padding="8dp"
2424
android:clipToPadding="false"
2525
android:columnCount="2"

0 commit comments

Comments
 (0)