Skip to content

Change button labels to Title Case #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 28, 2024
Merged

Change button labels to Title Case #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27ed531
Remove textAllCaps styling
microbit-grace May 15, 2024
45d16cb
Force project items lowercase
microbit-grace May 16, 2024
a3e6f5c
Make 'Show another way' button taller
microbit-grace May 16, 2024
1c60139
Make pairing flow buttons typeface bold
microbit-grace May 16, 2024
45ae069
Revert "Make pairing flow buttons typeface bold"
microbit-grace May 17, 2024
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
3 changes: 0 additions & 3 deletions app/src/main/res/layout-land/view_projects_pattern.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
android:gravity="center"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/white_btn"
android:drawableEnd="@drawable/next_step_pairing_btn"
android:drawablePadding="8dp"
Expand Down Expand Up @@ -128,7 +127,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/cancel_btn"
android:drawableEnd="@drawable/cancel_step_pairing_btn"
android:text="@string/txt_cancel_btn" />
Expand All @@ -145,7 +143,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/green_btn"
android:drawableEnd="@drawable/ic_done_black"
android:text="@string/btn_continue" />
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout-land/view_projects_searching.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
android:gravity="center|center_vertical"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/white_btn"
android:drawableEnd="@drawable/next_step_pairing_btn"
android:drawablePadding="8dp"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<TextView
android:id="@+id/pair_tip_step_1_step"
style="@style/pairing_step_title_style"
style="@style/white_header_text_style"
android:contentDescription="@string/desc_connect_tip_text_step"
android:text="@string/connect_tip_text_step" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-sw600dp-port/view_entering_pattern_step.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<TextView
android:id="@+id/pair_enter_pattern_step_2"
style="@style/pairing_step_title_style"
style="@style/white_header_text_style"
android:text="Step 2" />

<TextView
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/project_items.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
android:background="@drawable/editor_grey_bg"
android:gravity="start|center_vertical"
android:inputType="textNoSuggestions|textVisiblePassword"
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="@dimen/project_items_text_size"
android:visibility="invisible" />
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/layout/view_projects_pattern.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
android:gravity="center"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/white_btn"
android:drawableEnd="@drawable/next_step_pairing_btn"
android:drawablePadding="8dp"
Expand Down Expand Up @@ -105,7 +104,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/cancel_btn"
android:drawableEnd="@drawable/cancel_step_pairing_btn"
android:text="@string/txt_cancel_btn" />
Expand All @@ -123,7 +121,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/green_btn"
android:drawableEnd="@drawable/ic_done_black"
android:text="@string/btn_continue" />
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/layout/view_projects_searching.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
android:gravity="center|center_vertical"
android:textSize="@dimen/pairing_step_button_text_size"
android:textColor="@android:color/black"
android:textAllCaps="true"
android:background="@drawable/white_btn"
android:drawableEnd="@drawable/next_step_pairing_btn"
android:drawablePadding="8dp"
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values-land/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<item name="android:textSize">@dimen/main_activity_button_text_size</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textAlignment">center</item>
<item name="android:textAllCaps">true</item>
<item name="android:visibility">visible</item>
</style>

Expand Down Expand Up @@ -63,7 +62,6 @@
<item name="android:gravity">center</item>
<item name="android:textSize">@dimen/another_way_button_text_size</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textAllCaps">true</item>
<item name="android:paddingStart">@dimen/pairing_step_button_padding</item>
<item name="android:paddingEnd">@dimen/pairing_step_button_padding</item>
<item name="android:layout_weight">@dimen/another_way_button_layout_weight</item>
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/values-sw600dp-port/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:textAllCaps">false</item>
</style>

<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
Expand Down Expand Up @@ -113,7 +112,6 @@
<item name="android:textSize">@dimen/main_activity_button_text_size</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textAlignment">center</item>
<item name="android:textAllCaps">true</item>
<item name="android:visibility">visible</item>
</style>

Expand Down Expand Up @@ -145,9 +143,6 @@
</style>

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

<style name="pairing_step_tip_text_style" parent="white_header_text_style">
<item name="android:textSize">@dimen/pairing_step_tip_text_size</item>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-v21/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:textAllCaps">false</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
<dimen name="pairing_step_two_tip_layout_margin_top">16dp</dimen>
<dimen name="pairing_step_tip_instruction_text_size">18sp</dimen>
<integer name="pairing_searching_step_button_layout_weight_sum">2</integer>
<dimen name="another_way_button_height">41dp</dimen>
<dimen name="another_way_button_height">45dp</dimen>
<dimen name="another_way_button_text_size">18sp</dimen>
<dimen name="another_way_button_layout_weightSum">3</dimen>
<dimen name="another_way_button_layout_weight">2</dimen>
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:textAllCaps">false</item>
</style>

<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
Expand Down Expand Up @@ -101,15 +100,13 @@
<!-- My scripts custom button -->
<style name="custom_button_text">
<item name="android:textSize">@dimen/p1_font_size</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textAppearance">?android:textAppearance</item>
</style>

<!-- Edit project button -->
<style name="edit_project_text">
<item name="android:textSize">@dimen/p1_font_size</item>
<item name="android:textAllCaps">true</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textAppearance">?android:textAppearance</item>
</style>
Expand Down Expand Up @@ -211,7 +208,6 @@
<item name="android:gravity">center</item>
<item name="android:textSize">@dimen/another_way_button_text_size</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textAllCaps">true</item>
<item name="android:paddingStart">@dimen/pairing_step_button_padding</item>
<item name="android:paddingEnd">@dimen/pairing_step_button_padding</item>
<item name="android:layout_weight">@dimen/another_way_button_layout_weight</item>
Expand All @@ -224,7 +220,6 @@
<item name="android:gravity">center_vertical</item>
<item name="android:textSize">@dimen/pairing_step_button_text_size</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textAllCaps">true</item>
<item name="android:paddingStart">@dimen/pairing_step_button_padding</item>
<item name="android:paddingEnd">@dimen/pairing_step_button_padding</item>
</style>
Expand Down