Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.
Prev Previous commit
Next Next commit
Remove question mark prefix from theme summary attribute names
  • Loading branch information
hunterstich committed Jan 17, 2020
commit 6aca97d73c590ee5c00d306bd4f0d84fc03153c3
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
~ limitations under the License.
-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<TextView
android:id="@+id/color_attribute"
Expand All @@ -25,7 +26,7 @@
android:layout_marginEnd="26dp"
android:textAppearance="?attr/textAppearanceBody1"
android:textColor="@color/material_on_background_emphasis_medium"
android:text="\?colorPrimary" />
tools:text="colorPrimary" />

<io.material.materialthemebuilder.widget.ColorDotView
android:id="@+id/color_dot"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@
~ limitations under the License.
-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<TextView
android:id="@+id/shape_attribute"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_marginEnd="72dp"
android:text="\?shapeAppearanceSmallComponent"
android:textAppearance="?attr/textAppearanceBody1"
android:textColor="@color/material_on_background_emphasis_medium"/>
android:textColor="@color/material_on_background_emphasis_medium"
tools:text="shapeAppearanceSmallComponent" />

<TextView
android:id="@+id/shape_preview"
Expand Down
24 changes: 12 additions & 12 deletions Material Theme Builder/app/src/main/res/layout/subsystem_color.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorPrimary"
android:text="colorPrimary"
app:colorFillColor="?attr/colorPrimary"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -46,7 +46,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorPrimaryVariant"
android:text="colorPrimaryVariant"
app:colorFillColor="?attr/colorPrimaryVariant"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -55,7 +55,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorSecondary"
android:text="colorSecondary"
app:colorFillColor="?attr/colorSecondary"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -65,7 +65,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorSecondaryVariant"
android:text="colorSecondaryVariant"
app:colorFillColor="?attr/colorSecondaryVariant"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -75,7 +75,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorBackground"
android:text="colorBackground"
app:colorFillColor="?android:attr/colorBackground"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -84,7 +84,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorSurface"
android:text="colorSurface"
app:colorFillColor="?attr/colorSurface"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -93,7 +93,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorError"
android:text="colorError"
app:colorFillColor="?attr/colorError"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -102,7 +102,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorOnPrimary"
android:text="colorOnPrimary"
app:colorFillColor="?attr/colorOnPrimary"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -111,7 +111,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorOnSecondary"
android:text="colorOnSecondary"
app:colorFillColor="?attr/colorOnSecondary"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -120,7 +120,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorOnBackground"
android:text="colorOnBackground"
app:colorFillColor="?attr/colorOnBackground"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -129,7 +129,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorOnSurface"
android:text="colorOnSurface"
app:colorFillColor="?attr/colorOnSurface"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -138,7 +138,7 @@
<io.material.materialthemebuilder.widget.ColorAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?colorOnError"
android:text="colorOnError"
app:colorFillColor="?attr/colorOnError"
app:colorStrokeColor="?attr/colorOnBackground"
android:layout_marginTop="@dimen/keyline_2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<io.material.materialthemebuilder.widget.ShapeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?shapeAppearanceSmallComponent"
android:text="shapeAppearanceSmallComponent"
app:shapeAppearance="?attr/shapeAppearanceSmallComponent"
app:shapeSizeLetter="@string/shape_appearance_small_label"
app:shapeStrokeColor="?attr/colorOnBackground"
Expand All @@ -48,7 +48,7 @@
<io.material.materialthemebuilder.widget.ShapeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?shapeAppearanceMediumComponent"
android:text="shapeAppearanceMediumComponent"
app:shapeAppearance="?attr/shapeAppearanceMediumComponent"
app:shapeSizeLetter="@string/shape_appearance_medium_label"
app:shapeStrokeColor="?attr/colorOnBackground"
Expand All @@ -59,7 +59,7 @@
<io.material.materialthemebuilder.widget.ShapeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?shapeAppearanceLargeComponent"
android:text="shapeAppearanceLargeComponent"
app:shapeAppearance="?shapeAppearanceLargeComponent"
app:shapeSizeLetter="@string/shape_appearance_large_label"
app:shapeStrokeColor="?attr/colorOnBackground"
Expand Down
26 changes: 13 additions & 13 deletions Material Theme Builder/app/src/main/res/layout/subsystem_type.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceHeadline1"
android:text="textAppearanceHeadline1"
app:previewText="@string/text_appearance_h1_label"
app:previewTextAppearance="?attr/textAppearanceHeadline1"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -46,7 +46,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceHeadline2"
android:text="textAppearanceHeadline2"
app:previewText="@string/text_appearance_h2_label"
app:previewTextAppearance="?attr/textAppearanceHeadline2"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -55,7 +55,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceHeadline3"
android:text="textAppearanceHeadline3"
app:previewText="@string/text_appearance_h3_label"
app:previewTextAppearance="?attr/textAppearanceHeadline3"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -64,7 +64,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceHeadline4"
android:text="textAppearanceHeadline4"
app:previewText="@string/text_appearance_h4_label"
app:previewTextAppearance="?attr/textAppearanceHeadline4"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -73,7 +73,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceHeadline5"
android:text="textAppearanceHeadline5"
app:previewText="@string/text_appearance_h5_label"
app:previewTextAppearance="?attr/textAppearanceHeadline5"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -82,7 +82,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceHeadline6"
android:text="textAppearanceHeadline6"
app:previewText="@string/text_appearance_h6_label"
app:previewTextAppearance="?attr/textAppearanceHeadline6"
android:layout_marginTop="@dimen/keyline_2"
Expand All @@ -91,7 +91,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceSubtitle1"
android:text="textAppearanceSubtitle1"
app:previewText="@string/text_appearance_subtitle_1_label"
app:previewTextAppearance="?attr/textAppearanceSubtitle1"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand All @@ -101,7 +101,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceSubtitle2"
android:text="textAppearanceSubtitle2"
app:previewText="@string/text_appearance_subtitle_2_label"
app:previewTextAppearance="?attr/textAppearanceSubtitle2"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand All @@ -111,7 +111,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceBody1"
android:text="textAppearanceBody1"
app:previewText="@string/text_appearance_body_1_label"
app:previewTextAppearance="?attr/textAppearanceBody1"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand All @@ -121,7 +121,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceBody2"
android:text="textAppearanceBody2"
app:previewText="@string/text_appearance_body_2_label"
app:previewTextAppearance="?attr/textAppearanceBody2"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand All @@ -131,7 +131,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceButton"
android:text="textAppearanceButton"
app:previewText="@string/text_appearance_button_label"
app:previewTextAppearance="?attr/textAppearanceButton"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand All @@ -141,7 +141,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceCaption"
android:text="textAppearanceCaption"
app:previewText="@string/text_appearance_caption_label"
app:previewTextAppearance="?attr/textAppearanceCaption"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand All @@ -151,7 +151,7 @@
<io.material.materialthemebuilder.widget.TypeAttributeView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="\?textAppearanceOverline"
android:text="textAppearanceOverline"
app:previewText="@string/text_appearance_overline_label"
app:previewTextAppearance="?attr/textAppearanceOverline"
app:previewTextColor="@color/material_on_background_emphasis_medium"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
~ limitations under the License.
-->

<merge xmlns:android="http://schemas.android.com/apk/res/android">
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<TextView
android:id="@+id/type_attribute"
Expand All @@ -25,7 +26,8 @@
android:gravity="start"
android:layout_weight=".6"
android:textAppearance="?attr/textAppearanceBody1"
android:textColor="@color/material_on_background_emphasis_medium" />
android:textColor="@color/material_on_background_emphasis_medium"
tools:text="textAppearanceBody1"/>

<TextView
android:id="@+id/type_attribute_preview"
Expand Down