Skip to content

Commit 6aca97d

Browse files
hunterstichhunterstich
committed
Remove question mark prefix from theme summary attribute names
1 parent 1ccde4d commit 6aca97d

File tree

6 files changed

+39
-35
lines changed

6 files changed

+39
-35
lines changed

‎Material Theme Builder/app/src/main/res/layout/color_attribute_view_layout.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<merge xmlns:android="http://schemas.android.com/apk/res/android">
18+
<merge xmlns:android="http://schemas.android.com/apk/res/android"
19+
xmlns:tools="http://schemas.android.com/tools">
1920

2021
<TextView
2122
android:id="@+id/color_attribute"
@@ -25,7 +26,7 @@
2526
android:layout_marginEnd="26dp"
2627
android:textAppearance="?attr/textAppearanceBody1"
2728
android:textColor="@color/material_on_background_emphasis_medium"
28-
android:text="\?colorPrimary" />
29+
tools:text="colorPrimary" />
2930

3031
<io.material.materialthemebuilder.widget.ColorDotView
3132
android:id="@+id/color_dot"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<merge xmlns:android="http://schemas.android.com/apk/res/android">
18+
<merge xmlns:android="http://schemas.android.com/apk/res/android"
19+
xmlns:tools="http://schemas.android.com/tools">
1920

2021
<TextView
2122
android:id="@+id/shape_attribute"
2223
android:layout_width="wrap_content"
2324
android:layout_height="wrap_content"
2425
android:layout_gravity="start|center_vertical"
2526
android:layout_marginEnd="72dp"
26-
android:text="\?shapeAppearanceSmallComponent"
2727
android:textAppearance="?attr/textAppearanceBody1"
28-
android:textColor="@color/material_on_background_emphasis_medium"/>
28+
android:textColor="@color/material_on_background_emphasis_medium"
29+
tools:text="shapeAppearanceSmallComponent" />
2930

3031
<TextView
3132
android:id="@+id/shape_preview"

‎Material Theme Builder/app/src/main/res/layout/subsystem_color.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<io.material.materialthemebuilder.widget.ColorAttributeView
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
40-
android:text="\?colorPrimary"
40+
android:text="colorPrimary"
4141
app:colorFillColor="?attr/colorPrimary"
4242
app:colorStrokeColor="?attr/colorOnBackground"
4343
android:layout_marginTop="@dimen/keyline_2"
@@ -46,7 +46,7 @@
4646
<io.material.materialthemebuilder.widget.ColorAttributeView
4747
android:layout_width="match_parent"
4848
android:layout_height="wrap_content"
49-
android:text="\?colorPrimaryVariant"
49+
android:text="colorPrimaryVariant"
5050
app:colorFillColor="?attr/colorPrimaryVariant"
5151
app:colorStrokeColor="?attr/colorOnBackground"
5252
android:layout_marginTop="@dimen/keyline_2"
@@ -55,7 +55,7 @@
5555
<io.material.materialthemebuilder.widget.ColorAttributeView
5656
android:layout_width="match_parent"
5757
android:layout_height="wrap_content"
58-
android:text="\?colorSecondary"
58+
android:text="colorSecondary"
5959
app:colorFillColor="?attr/colorSecondary"
6060
app:colorStrokeColor="?attr/colorOnBackground"
6161
android:layout_marginTop="@dimen/keyline_2"
@@ -65,7 +65,7 @@
6565
<io.material.materialthemebuilder.widget.ColorAttributeView
6666
android:layout_width="match_parent"
6767
android:layout_height="wrap_content"
68-
android:text="\?colorSecondaryVariant"
68+
android:text="colorSecondaryVariant"
6969
app:colorFillColor="?attr/colorSecondaryVariant"
7070
app:colorStrokeColor="?attr/colorOnBackground"
7171
android:layout_marginTop="@dimen/keyline_2"
@@ -75,7 +75,7 @@
7575
<io.material.materialthemebuilder.widget.ColorAttributeView
7676
android:layout_width="match_parent"
7777
android:layout_height="wrap_content"
78-
android:text="\?colorBackground"
78+
android:text="colorBackground"
7979
app:colorFillColor="?android:attr/colorBackground"
8080
app:colorStrokeColor="?attr/colorOnBackground"
8181
android:layout_marginTop="@dimen/keyline_2"
@@ -84,7 +84,7 @@
8484
<io.material.materialthemebuilder.widget.ColorAttributeView
8585
android:layout_width="match_parent"
8686
android:layout_height="wrap_content"
87-
android:text="\?colorSurface"
87+
android:text="colorSurface"
8888
app:colorFillColor="?attr/colorSurface"
8989
app:colorStrokeColor="?attr/colorOnBackground"
9090
android:layout_marginTop="@dimen/keyline_2"
@@ -93,7 +93,7 @@
9393
<io.material.materialthemebuilder.widget.ColorAttributeView
9494
android:layout_width="match_parent"
9595
android:layout_height="wrap_content"
96-
android:text="\?colorError"
96+
android:text="colorError"
9797
app:colorFillColor="?attr/colorError"
9898
app:colorStrokeColor="?attr/colorOnBackground"
9999
android:layout_marginTop="@dimen/keyline_2"
@@ -102,7 +102,7 @@
102102
<io.material.materialthemebuilder.widget.ColorAttributeView
103103
android:layout_width="match_parent"
104104
android:layout_height="wrap_content"
105-
android:text="\?colorOnPrimary"
105+
android:text="colorOnPrimary"
106106
app:colorFillColor="?attr/colorOnPrimary"
107107
app:colorStrokeColor="?attr/colorOnBackground"
108108
android:layout_marginTop="@dimen/keyline_2"
@@ -111,7 +111,7 @@
111111
<io.material.materialthemebuilder.widget.ColorAttributeView
112112
android:layout_width="match_parent"
113113
android:layout_height="wrap_content"
114-
android:text="\?colorOnSecondary"
114+
android:text="colorOnSecondary"
115115
app:colorFillColor="?attr/colorOnSecondary"
116116
app:colorStrokeColor="?attr/colorOnBackground"
117117
android:layout_marginTop="@dimen/keyline_2"
@@ -120,7 +120,7 @@
120120
<io.material.materialthemebuilder.widget.ColorAttributeView
121121
android:layout_width="match_parent"
122122
android:layout_height="wrap_content"
123-
android:text="\?colorOnBackground"
123+
android:text="colorOnBackground"
124124
app:colorFillColor="?attr/colorOnBackground"
125125
app:colorStrokeColor="?attr/colorOnBackground"
126126
android:layout_marginTop="@dimen/keyline_2"
@@ -129,7 +129,7 @@
129129
<io.material.materialthemebuilder.widget.ColorAttributeView
130130
android:layout_width="match_parent"
131131
android:layout_height="wrap_content"
132-
android:text="\?colorOnSurface"
132+
android:text="colorOnSurface"
133133
app:colorFillColor="?attr/colorOnSurface"
134134
app:colorStrokeColor="?attr/colorOnBackground"
135135
android:layout_marginTop="@dimen/keyline_2"
@@ -138,7 +138,7 @@
138138
<io.material.materialthemebuilder.widget.ColorAttributeView
139139
android:layout_width="match_parent"
140140
android:layout_height="wrap_content"
141-
android:text="\?colorOnError"
141+
android:text="colorOnError"
142142
app:colorFillColor="?attr/colorOnError"
143143
app:colorStrokeColor="?attr/colorOnBackground"
144144
android:layout_marginTop="@dimen/keyline_2"

‎Material Theme Builder/app/src/main/res/layout/subsystem_shape.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<io.material.materialthemebuilder.widget.ShapeAttributeView
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
40-
android:text="\?shapeAppearanceSmallComponent"
40+
android:text="shapeAppearanceSmallComponent"
4141
app:shapeAppearance="?attr/shapeAppearanceSmallComponent"
4242
app:shapeSizeLetter="@string/shape_appearance_small_label"
4343
app:shapeStrokeColor="?attr/colorOnBackground"
@@ -48,7 +48,7 @@
4848
<io.material.materialthemebuilder.widget.ShapeAttributeView
4949
android:layout_width="match_parent"
5050
android:layout_height="wrap_content"
51-
android:text="\?shapeAppearanceMediumComponent"
51+
android:text="shapeAppearanceMediumComponent"
5252
app:shapeAppearance="?attr/shapeAppearanceMediumComponent"
5353
app:shapeSizeLetter="@string/shape_appearance_medium_label"
5454
app:shapeStrokeColor="?attr/colorOnBackground"
@@ -59,7 +59,7 @@
5959
<io.material.materialthemebuilder.widget.ShapeAttributeView
6060
android:layout_width="match_parent"
6161
android:layout_height="wrap_content"
62-
android:text="\?shapeAppearanceLargeComponent"
62+
android:text="shapeAppearanceLargeComponent"
6363
app:shapeAppearance="?shapeAppearanceLargeComponent"
6464
app:shapeSizeLetter="@string/shape_appearance_large_label"
6565
app:shapeStrokeColor="?attr/colorOnBackground"

‎Material Theme Builder/app/src/main/res/layout/subsystem_type.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<io.material.materialthemebuilder.widget.TypeAttributeView
3838
android:layout_width="match_parent"
3939
android:layout_height="wrap_content"
40-
android:text="\?textAppearanceHeadline1"
40+
android:text="textAppearanceHeadline1"
4141
app:previewText="@string/text_appearance_h1_label"
4242
app:previewTextAppearance="?attr/textAppearanceHeadline1"
4343
android:layout_marginTop="@dimen/keyline_2"
@@ -46,7 +46,7 @@
4646
<io.material.materialthemebuilder.widget.TypeAttributeView
4747
android:layout_width="match_parent"
4848
android:layout_height="wrap_content"
49-
android:text="\?textAppearanceHeadline2"
49+
android:text="textAppearanceHeadline2"
5050
app:previewText="@string/text_appearance_h2_label"
5151
app:previewTextAppearance="?attr/textAppearanceHeadline2"
5252
android:layout_marginTop="@dimen/keyline_2"
@@ -55,7 +55,7 @@
5555
<io.material.materialthemebuilder.widget.TypeAttributeView
5656
android:layout_width="match_parent"
5757
android:layout_height="wrap_content"
58-
android:text="\?textAppearanceHeadline3"
58+
android:text="textAppearanceHeadline3"
5959
app:previewText="@string/text_appearance_h3_label"
6060
app:previewTextAppearance="?attr/textAppearanceHeadline3"
6161
android:layout_marginTop="@dimen/keyline_2"
@@ -64,7 +64,7 @@
6464
<io.material.materialthemebuilder.widget.TypeAttributeView
6565
android:layout_width="match_parent"
6666
android:layout_height="wrap_content"
67-
android:text="\?textAppearanceHeadline4"
67+
android:text="textAppearanceHeadline4"
6868
app:previewText="@string/text_appearance_h4_label"
6969
app:previewTextAppearance="?attr/textAppearanceHeadline4"
7070
android:layout_marginTop="@dimen/keyline_2"
@@ -73,7 +73,7 @@
7373
<io.material.materialthemebuilder.widget.TypeAttributeView
7474
android:layout_width="match_parent"
7575
android:layout_height="wrap_content"
76-
android:text="\?textAppearanceHeadline5"
76+
android:text="textAppearanceHeadline5"
7777
app:previewText="@string/text_appearance_h5_label"
7878
app:previewTextAppearance="?attr/textAppearanceHeadline5"
7979
android:layout_marginTop="@dimen/keyline_2"
@@ -82,7 +82,7 @@
8282
<io.material.materialthemebuilder.widget.TypeAttributeView
8383
android:layout_width="match_parent"
8484
android:layout_height="wrap_content"
85-
android:text="\?textAppearanceHeadline6"
85+
android:text="textAppearanceHeadline6"
8686
app:previewText="@string/text_appearance_h6_label"
8787
app:previewTextAppearance="?attr/textAppearanceHeadline6"
8888
android:layout_marginTop="@dimen/keyline_2"
@@ -91,7 +91,7 @@
9191
<io.material.materialthemebuilder.widget.TypeAttributeView
9292
android:layout_width="match_parent"
9393
android:layout_height="wrap_content"
94-
android:text="\?textAppearanceSubtitle1"
94+
android:text="textAppearanceSubtitle1"
9595
app:previewText="@string/text_appearance_subtitle_1_label"
9696
app:previewTextAppearance="?attr/textAppearanceSubtitle1"
9797
app:previewTextColor="@color/material_on_background_emphasis_medium"
@@ -101,7 +101,7 @@
101101
<io.material.materialthemebuilder.widget.TypeAttributeView
102102
android:layout_width="match_parent"
103103
android:layout_height="wrap_content"
104-
android:text="\?textAppearanceSubtitle2"
104+
android:text="textAppearanceSubtitle2"
105105
app:previewText="@string/text_appearance_subtitle_2_label"
106106
app:previewTextAppearance="?attr/textAppearanceSubtitle2"
107107
app:previewTextColor="@color/material_on_background_emphasis_medium"
@@ -111,7 +111,7 @@
111111
<io.material.materialthemebuilder.widget.TypeAttributeView
112112
android:layout_width="match_parent"
113113
android:layout_height="wrap_content"
114-
android:text="\?textAppearanceBody1"
114+
android:text="textAppearanceBody1"
115115
app:previewText="@string/text_appearance_body_1_label"
116116
app:previewTextAppearance="?attr/textAppearanceBody1"
117117
app:previewTextColor="@color/material_on_background_emphasis_medium"
@@ -121,7 +121,7 @@
121121
<io.material.materialthemebuilder.widget.TypeAttributeView
122122
android:layout_width="match_parent"
123123
android:layout_height="wrap_content"
124-
android:text="\?textAppearanceBody2"
124+
android:text="textAppearanceBody2"
125125
app:previewText="@string/text_appearance_body_2_label"
126126
app:previewTextAppearance="?attr/textAppearanceBody2"
127127
app:previewTextColor="@color/material_on_background_emphasis_medium"
@@ -131,7 +131,7 @@
131131
<io.material.materialthemebuilder.widget.TypeAttributeView
132132
android:layout_width="match_parent"
133133
android:layout_height="wrap_content"
134-
android:text="\?textAppearanceButton"
134+
android:text="textAppearanceButton"
135135
app:previewText="@string/text_appearance_button_label"
136136
app:previewTextAppearance="?attr/textAppearanceButton"
137137
app:previewTextColor="@color/material_on_background_emphasis_medium"
@@ -141,7 +141,7 @@
141141
<io.material.materialthemebuilder.widget.TypeAttributeView
142142
android:layout_width="match_parent"
143143
android:layout_height="wrap_content"
144-
android:text="\?textAppearanceCaption"
144+
android:text="textAppearanceCaption"
145145
app:previewText="@string/text_appearance_caption_label"
146146
app:previewTextAppearance="?attr/textAppearanceCaption"
147147
app:previewTextColor="@color/material_on_background_emphasis_medium"
@@ -151,7 +151,7 @@
151151
<io.material.materialthemebuilder.widget.TypeAttributeView
152152
android:layout_width="match_parent"
153153
android:layout_height="wrap_content"
154-
android:text="\?textAppearanceOverline"
154+
android:text="textAppearanceOverline"
155155
app:previewText="@string/text_appearance_overline_label"
156156
app:previewTextAppearance="?attr/textAppearanceOverline"
157157
app:previewTextColor="@color/material_on_background_emphasis_medium"

‎Material Theme Builder/app/src/main/res/layout/type_attribute_view_layout.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
~ limitations under the License.
1616
-->
1717

18-
<merge xmlns:android="http://schemas.android.com/apk/res/android">
18+
<merge xmlns:android="http://schemas.android.com/apk/res/android"
19+
xmlns:tools="http://schemas.android.com/tools">
1920

2021
<TextView
2122
android:id="@+id/type_attribute"
@@ -25,7 +26,8 @@
2526
android:gravity="start"
2627
android:layout_weight=".6"
2728
android:textAppearance="?attr/textAppearanceBody1"
28-
android:textColor="@color/material_on_background_emphasis_medium" />
29+
android:textColor="@color/material_on_background_emphasis_medium"
30+
tools:text="textAppearanceBody1"/>
2931

3032
<TextView
3133
android:id="@+id/type_attribute_preview"

0 commit comments

Comments
 (0)