Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Move Material Theme Builder from MDC library repo to material-components-android-examples. #23

Merged
merged 9 commits into from
Feb 20, 2020
Merged

Move Material Theme Builder from MDC library repo to material-components-android-examples. #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
49950cc
Migrate Material Theme Builder from MDC library to MDC examples
hunterstich Jan 17, 2020
d951a12
Update all layouts to rely on MaterialComponentsViewInflater
hunterstich Jan 17, 2020
52c0f90
Update color theme usage and guidance.
hunterstich Jan 17, 2020
1ccde4d
Update all attribute references to use 'attr' namespace
hunterstich Jan 17, 2020
6aca97d
Remove question mark prefix from theme summary attribute names
hunterstich Jan 17, 2020
4faa223
Update README instructions for new structure and location
hunterstich Jan 17, 2020
c736df2
Remove mtb gitignore in favor of root gitignore
hunterstich Jan 17, 2020
8d8110f
Rename mtb project folder
hunterstich Jan 27, 2020
b8ae7de
Update README to reflect new project folder name
hunterstich Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update all layouts to rely on MaterialComponentsViewInflater
  • Loading branch information
@hunterstich
hunterstich committed Jan 17, 2020
commit d951a12c977f62d17a6767756169620697d565d2
2 changes: 1 addition & 1 deletion Material Theme Builder/app/src/main/res/layout/component_bottom_sheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.button.MaterialButton
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
12 changes: 6 additions & 6 deletions Material Theme Builder/app/src/main/res/layout/component_buttons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.button.MaterialButton
<Button
android:id="@+id/button_filled"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -47,7 +47,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/label" />

<com.google.android.material.button.MaterialButton
<Button
style="@style/Widget.MaterialComponents.Button.TextButton"
android:id="@+id/button_text"
android:layout_width="wrap_content"
Expand All @@ -61,7 +61,7 @@
app:layout_constraintStart_toEndOf="@+id/button_filled"
app:layout_constraintTop_toTopOf="@+id/button_filled" />

<com.google.android.material.button.MaterialButton
<Button
style="?materialButtonOutlinedStyle"
android:id="@+id/button_outlined"
android:layout_width="wrap_content"
Expand All @@ -82,21 +82,21 @@
app:layout_constraintTop_toBottomOf="@+id/button_filled"
app:layout_constraintStart_toStartOf="parent">

<com.google.android.material.button.MaterialButton
<Button
style="?materialButtonOutlinedStyle"
android:id="@+id/button_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_left_button_label" />

<com.google.android.material.button.MaterialButton
<Button
style="?materialButtonOutlinedStyle"
android:id="@+id/button_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/button_center_button_label" />

<com.google.android.material.button.MaterialButton
<Button
style="?materialButtonOutlinedStyle"
android:id="@+id/button_three"
android:layout_width="wrap_content"
Expand Down
6 changes: 3 additions & 3 deletions Material Theme Builder/app/src/main/res/layout/component_cards.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">

<androidx.appcompat.widget.AppCompatImageView
<ImageView
android:id="@+id/card_header"
android:layout_width="match_parent"
android:layout_height="192dp"
Expand Down Expand Up @@ -97,7 +97,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_title" />

<com.google.android.material.button.MaterialButton
<Button
style="@style/Widget.MaterialComponents.Button.TextButton"
android:id="@+id/card_button_one"
android:layout_width="wrap_content"
Expand All @@ -111,7 +111,7 @@
app:layout_constraintTop_toBottomOf="@id/card_body"
app:layout_constraintBottom_toBottomOf="parent" />

<com.google.android.material.button.MaterialButton
<Button
style="@style/Widget.MaterialComponents.Button.TextButton"
android:id="@+id/card_button_two"
android:layout_width="wrap_content"
Expand Down
4 changes: 2 additions & 2 deletions Material Theme Builder/app/src/main/res/layout/component_checkbox.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.checkbox.MaterialCheckBox
<CheckBox
android:id="@+id/checkbox_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -46,7 +46,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/checkbox_two" />

<com.google.android.material.checkbox.MaterialCheckBox
<CheckBox
android:id="@+id/checkbox_two"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion Material Theme Builder/app/src/main/res/layout/component_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.button.MaterialButton
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
4 changes: 2 additions & 2 deletions Material Theme Builder/app/src/main/res/layout/component_radio_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<com.google.android.material.radiobutton.MaterialRadioButton
<RadioButton
android:id="@+id/radio_button_one"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true" />

<com.google.android.material.radiobutton.MaterialRadioButton
<RadioButton
android:id="@+id/radio_button_two"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
Expand Down
4 changes: 2 additions & 2 deletions Material Theme Builder/app/src/main/res/layout/label_view_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.appcompat.widget.AppCompatImageView
<ImageView
android:id="@+id/label_leading_image_view"
android:layout_width="24dp"
android:layout_height="24dp"
Expand All @@ -37,7 +37,7 @@
android:textAppearance="?textAppearanceOverline"
android:alpha="?alphaEmphasisMedium" />

<androidx.appcompat.widget.AppCompatImageView
<ImageView
android:id="@+id/label_trailing_image_view"
android:layout_width="24dp"
android:layout_height="24dp"
Expand Down
2 changes: 1 addition & 1 deletion Material Theme Builder/app/src/main/res/layout/shape_attribute_view_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
android:textAppearance="?textAppearanceBody1"
android:alpha="?alphaEmphasisMedium" />

<androidx.appcompat.widget.AppCompatTextView
<TextView
android:id="@+id/shape_preview"
android:layout_width="56dp"
android:layout_height="48dp"
Expand Down