Skip to content

Commit d951a12

Browse files
committed
Update all layouts to rely on MaterialComponentsViewInflater
1 parent 49950cc commit d951a12

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

Material Theme Builder/app/src/main/res/layout/component_bottom_sheet.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
app:layout_constraintStart_toStartOf="parent"
3535
app:layout_constraintTop_toTopOf="parent" />
3636

37-
<com.google.android.material.button.MaterialButton
37+
<Button
3838
android:id="@+id/button"
3939
android:layout_width="wrap_content"
4040
android:layout_height="wrap_content"

Material Theme Builder/app/src/main/res/layout/component_buttons.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
app:layout_constraintStart_toStartOf="parent"
3535
app:layout_constraintTop_toTopOf="parent" />
3636

37-
<com.google.android.material.button.MaterialButton
37+
<Button
3838
android:id="@+id/button_filled"
3939
android:layout_width="wrap_content"
4040
android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
4747
app:layout_constraintStart_toStartOf="parent"
4848
app:layout_constraintTop_toBottomOf="@+id/label" />
4949

50-
<com.google.android.material.button.MaterialButton
50+
<Button
5151
style="@style/Widget.MaterialComponents.Button.TextButton"
5252
android:id="@+id/button_text"
5353
android:layout_width="wrap_content"
@@ -61,7 +61,7 @@
6161
app:layout_constraintStart_toEndOf="@+id/button_filled"
6262
app:layout_constraintTop_toTopOf="@+id/button_filled" />
6363

64-
<com.google.android.material.button.MaterialButton
64+
<Button
6565
style="?materialButtonOutlinedStyle"
6666
android:id="@+id/button_outlined"
6767
android:layout_width="wrap_content"
@@ -82,21 +82,21 @@
8282
app:layout_constraintTop_toBottomOf="@+id/button_filled"
8383
app:layout_constraintStart_toStartOf="parent">
8484

85-
<com.google.android.material.button.MaterialButton
85+
<Button
8686
style="?materialButtonOutlinedStyle"
8787
android:id="@+id/button_one"
8888
android:layout_width="wrap_content"
8989
android:layout_height="wrap_content"
9090
android:text="@string/button_left_button_label" />
9191

92-
<com.google.android.material.button.MaterialButton
92+
<Button
9393
style="?materialButtonOutlinedStyle"
9494
android:id="@+id/button_center"
9595
android:layout_width="wrap_content"
9696
android:layout_height="wrap_content"
9797
android:text="@string/button_center_button_label" />
9898

99-
<com.google.android.material.button.MaterialButton
99+
<Button
100100
style="?materialButtonOutlinedStyle"
101101
android:id="@+id/button_three"
102102
android:layout_width="wrap_content"

Material Theme Builder/app/src/main/res/layout/component_cards.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
android:layout_width="match_parent"
4848
android:layout_height="wrap_content">
4949

50-
<androidx.appcompat.widget.AppCompatImageView
50+
<ImageView
5151
android:id="@+id/card_header"
5252
android:layout_width="match_parent"
5353
android:layout_height="192dp"
@@ -97,7 +97,7 @@
9797
app:layout_constraintStart_toStartOf="parent"
9898
app:layout_constraintTop_toBottomOf="@id/card_title" />
9999

100-
<com.google.android.material.button.MaterialButton
100+
<Button
101101
style="@style/Widget.MaterialComponents.Button.TextButton"
102102
android:id="@+id/card_button_one"
103103
android:layout_width="wrap_content"
@@ -111,7 +111,7 @@
111111
app:layout_constraintTop_toBottomOf="@id/card_body"
112112
app:layout_constraintBottom_toBottomOf="parent" />
113113

114-
<com.google.android.material.button.MaterialButton
114+
<Button
115115
style="@style/Widget.MaterialComponents.Button.TextButton"
116116
android:id="@+id/card_button_two"
117117
android:layout_width="wrap_content"

Material Theme Builder/app/src/main/res/layout/component_checkbox.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
app:layout_constraintStart_toStartOf="parent"
3535
app:layout_constraintTop_toTopOf="parent" />
3636

37-
<com.google.android.material.checkbox.MaterialCheckBox
37+
<CheckBox
3838
android:id="@+id/checkbox_one"
3939
android:layout_width="wrap_content"
4040
android:layout_height="wrap_content"
@@ -46,7 +46,7 @@
4646
app:layout_constraintStart_toStartOf="parent"
4747
app:layout_constraintTop_toTopOf="@+id/checkbox_two" />
4848

49-
<com.google.android.material.checkbox.MaterialCheckBox
49+
<CheckBox
5050
android:id="@+id/checkbox_two"
5151
android:layout_width="wrap_content"
5252
android:layout_height="wrap_content"

Material Theme Builder/app/src/main/res/layout/component_dialog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
app:layout_constraintStart_toStartOf="parent"
3535
app:layout_constraintTop_toTopOf="parent" />
3636

37-
<com.google.android.material.button.MaterialButton
37+
<Button
3838
android:id="@+id/button"
3939
android:layout_width="wrap_content"
4040
android:layout_height="wrap_content"

Material Theme Builder/app/src/main/res/layout/component_radio_button.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
app:layout_constraintStart_toStartOf="parent"
4545
app:layout_constraintEnd_toEndOf="parent">
4646

47-
<com.google.android.material.radiobutton.MaterialRadioButton
47+
<RadioButton
4848
android:id="@+id/radio_button_one"
4949
android:layout_width="wrap_content"
5050
android:layout_height="wrap_content"
5151
android:checked="true" />
5252

53-
<com.google.android.material.radiobutton.MaterialRadioButton
53+
<RadioButton
5454
android:id="@+id/radio_button_two"
5555
android:layout_width="wrap_content"
5656
android:layout_height="wrap_content" />

Material Theme Builder/app/src/main/res/layout/label_view_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<merge xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto">
2020

21-
<androidx.appcompat.widget.AppCompatImageView
21+
<ImageView
2222
android:id="@+id/label_leading_image_view"
2323
android:layout_width="24dp"
2424
android:layout_height="24dp"
@@ -37,7 +37,7 @@
3737
android:textAppearance="?textAppearanceOverline"
3838
android:alpha="?alphaEmphasisMedium" />
3939

40-
<androidx.appcompat.widget.AppCompatImageView
40+
<ImageView
4141
android:id="@+id/label_trailing_image_view"
4242
android:layout_width="24dp"
4343
android:layout_height="24dp"

Material Theme Builder/app/src/main/res/layout/shape_attribute_view_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
android:textAppearance="?textAppearanceBody1"
2828
android:alpha="?alphaEmphasisMedium" />
2929

30-
<androidx.appcompat.widget.AppCompatTextView
30+
<TextView
3131
android:id="@+id/shape_preview"
3232
android:layout_width="56dp"
3333
android:layout_height="48dp"

0 commit comments

Comments
 (0)