Skip to content

Commit a0c1ba4

Browse files
Change button labels to Title Case (#66)
* Remove textAllCaps styling * Force project items lowercase * Tweaked 'Show another way' button to be tallker
1 parent 49678b0 commit a0c1ba4

File tree

12 files changed

+3
-25
lines changed

12 files changed

+3
-25
lines changed

app/src/main/res/layout-land/view_projects_pattern.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
android:gravity="center"
9595
android:textSize="@dimen/pairing_step_button_text_size"
9696
android:textColor="@android:color/black"
97-
android:textAllCaps="true"
9897
android:background="@drawable/white_btn"
9998
android:drawableEnd="@drawable/next_step_pairing_btn"
10099
android:drawablePadding="8dp"
@@ -128,7 +127,6 @@
128127
android:gravity="center_vertical"
129128
android:textSize="@dimen/pairing_step_button_text_size"
130129
android:textColor="@android:color/black"
131-
android:textAllCaps="true"
132130
android:background="@drawable/cancel_btn"
133131
android:drawableEnd="@drawable/cancel_step_pairing_btn"
134132
android:text="@string/txt_cancel_btn" />
@@ -145,7 +143,6 @@
145143
android:gravity="center_vertical"
146144
android:textSize="@dimen/pairing_step_button_text_size"
147145
android:textColor="@android:color/black"
148-
android:textAllCaps="true"
149146
android:background="@drawable/green_btn"
150147
android:drawableEnd="@drawable/ic_done_black"
151148
android:text="@string/btn_continue" />

app/src/main/res/layout-land/view_projects_searching.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
android:gravity="center|center_vertical"
9595
android:textSize="@dimen/pairing_step_button_text_size"
9696
android:textColor="@android:color/black"
97-
android:textAllCaps="true"
9897
android:background="@drawable/white_btn"
9998
android:drawableEnd="@drawable/next_step_pairing_btn"
10099
android:drawablePadding="8dp"

app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<TextView
1616
android:id="@+id/pair_tip_step_1_step"
17-
style="@style/pairing_step_title_style"
17+
style="@style/white_header_text_style"
1818
android:contentDescription="@string/desc_connect_tip_text_step"
1919
android:text="@string/connect_tip_text_step" />
2020

app/src/main/res/layout-sw600dp-port/view_entering_pattern_step.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<TextView
1616
android:id="@+id/pair_enter_pattern_step_2"
17-
style="@style/pairing_step_title_style"
17+
style="@style/white_header_text_style"
1818
android:text="Step 2" />
1919

2020
<TextView

app/src/main/res/layout/project_items.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
android:background="@drawable/editor_grey_bg"
2525
android:gravity="start|center_vertical"
2626
android:inputType="textNoSuggestions|textVisiblePassword"
27-
android:textAllCaps="false"
2827
android:textColor="@android:color/white"
2928
android:textSize="@dimen/project_items_text_size"
3029
android:visibility="invisible" />

app/src/main/res/layout/view_projects_pattern.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
android:gravity="center"
7474
android:textSize="@dimen/pairing_step_button_text_size"
7575
android:textColor="@android:color/black"
76-
android:textAllCaps="true"
7776
android:background="@drawable/white_btn"
7877
android:drawableEnd="@drawable/next_step_pairing_btn"
7978
android:drawablePadding="8dp"
@@ -105,7 +104,6 @@
105104
android:gravity="center_vertical"
106105
android:textSize="@dimen/pairing_step_button_text_size"
107106
android:textColor="@android:color/black"
108-
android:textAllCaps="true"
109107
android:background="@drawable/cancel_btn"
110108
android:drawableEnd="@drawable/cancel_step_pairing_btn"
111109
android:text="@string/txt_cancel_btn" />
@@ -123,7 +121,6 @@
123121
android:gravity="center_vertical"
124122
android:textSize="@dimen/pairing_step_button_text_size"
125123
android:textColor="@android:color/black"
126-
android:textAllCaps="true"
127124
android:background="@drawable/green_btn"
128125
android:drawableEnd="@drawable/ic_done_black"
129126
android:text="@string/btn_continue" />

app/src/main/res/layout/view_projects_searching.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
android:gravity="center|center_vertical"
7373
android:textSize="@dimen/pairing_step_button_text_size"
7474
android:textColor="@android:color/black"
75-
android:textAllCaps="true"
7675
android:background="@drawable/white_btn"
7776
android:drawableEnd="@drawable/next_step_pairing_btn"
7877
android:drawablePadding="8dp"

app/src/main/res/values-land/styles.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<item name="android:textSize">@dimen/main_activity_button_text_size</item>
1616
<item name="android:textColor">@android:color/white</item>
1717
<item name="android:textAlignment">center</item>
18-
<item name="android:textAllCaps">true</item>
1918
<item name="android:visibility">visible</item>
2019
</style>
2120

@@ -63,7 +62,6 @@
6362
<item name="android:gravity">center</item>
6463
<item name="android:textSize">@dimen/another_way_button_text_size</item>
6564
<item name="android:textColor">@android:color/black</item>
66-
<item name="android:textAllCaps">true</item>
6765
<item name="android:paddingStart">@dimen/pairing_step_button_padding</item>
6866
<item name="android:paddingEnd">@dimen/pairing_step_button_padding</item>
6967
<item name="android:layout_weight">@dimen/another_way_button_layout_weight</item>

app/src/main/res/values-sw600dp-port/styles.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<style name="AppTheme.NoActionBar">
99
<item name="windowActionBar">false</item>
1010
<item name="windowNoTitle">true</item>
11-
<item name="android:textAllCaps">false</item>
1211
</style>
1312

1413
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
@@ -113,7 +112,6 @@
113112
<item name="android:textSize">@dimen/main_activity_button_text_size</item>
114113
<item name="android:textColor">@android:color/white</item>
115114
<item name="android:textAlignment">center</item>
116-
<item name="android:textAllCaps">true</item>
117115
<item name="android:visibility">visible</item>
118116
</style>
119117

@@ -145,9 +143,6 @@
145143
</style>
146144

147145
<!-- Pairing step text styles -->
148-
<style name="pairing_step_title_style" parent="white_header_text_style">
149-
<item name="android:textAllCaps">true</item>
150-
</style>
151146

152147
<style name="pairing_step_tip_text_style" parent="white_header_text_style">
153148
<item name="android:textSize">@dimen/pairing_step_tip_text_size</item>

app/src/main/res/values-v21/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<style name="AppTheme.NoActionBar">
44
<item name="windowActionBar">false</item>
55
<item name="windowNoTitle">true</item>
6-
<item name="android:textAllCaps">false</item>
76
</style>
87
</resources>

app/src/main/res/values/dimens.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<dimen name="pairing_step_two_tip_layout_margin_top">16dp</dimen>
113113
<dimen name="pairing_step_tip_instruction_text_size">18sp</dimen>
114114
<integer name="pairing_searching_step_button_layout_weight_sum">2</integer>
115-
<dimen name="another_way_button_height">41dp</dimen>
115+
<dimen name="another_way_button_height">45dp</dimen>
116116
<dimen name="another_way_button_text_size">18sp</dimen>
117117
<dimen name="another_way_button_layout_weightSum">3</dimen>
118118
<dimen name="another_way_button_layout_weight">2</dimen>

app/src/main/res/values/styles.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<style name="AppTheme.NoActionBar">
99
<item name="windowActionBar">false</item>
1010
<item name="windowNoTitle">true</item>
11-
<item name="android:textAllCaps">false</item>
1211
</style>
1312

1413
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
@@ -101,15 +100,13 @@
101100
<!-- My scripts custom button -->
102101
<style name="custom_button_text">
103102
<item name="android:textSize">@dimen/p1_font_size</item>
104-
<item name="android:textAllCaps">true</item>
105103
<item name="android:textColor">@android:color/black</item>
106104
<item name="android:textAppearance">?android:textAppearance</item>
107105
</style>
108106

109107
<!-- Edit project button -->
110108
<style name="edit_project_text">
111109
<item name="android:textSize">@dimen/p1_font_size</item>
112-
<item name="android:textAllCaps">true</item>
113110
<item name="android:textColor">@android:color/white</item>
114111
<item name="android:textAppearance">?android:textAppearance</item>
115112
</style>
@@ -211,7 +208,6 @@
211208
<item name="android:gravity">center</item>
212209
<item name="android:textSize">@dimen/another_way_button_text_size</item>
213210
<item name="android:textColor">@android:color/black</item>
214-
<item name="android:textAllCaps">true</item>
215211
<item name="android:paddingStart">@dimen/pairing_step_button_padding</item>
216212
<item name="android:paddingEnd">@dimen/pairing_step_button_padding</item>
217213
<item name="android:layout_weight">@dimen/another_way_button_layout_weight</item>
@@ -224,7 +220,6 @@
224220
<item name="android:gravity">center_vertical</item>
225221
<item name="android:textSize">@dimen/pairing_step_button_text_size</item>
226222
<item name="android:textColor">@android:color/black</item>
227-
<item name="android:textAllCaps">true</item>
228223
<item name="android:paddingStart">@dimen/pairing_step_button_padding</item>
229224
<item name="android:paddingEnd">@dimen/pairing_step_button_padding</item>
230225
</style>

0 commit comments

Comments
 (0)