From a0c1ba488a7320e6361ae319edfa67ff58f93396 Mon Sep 17 00:00:00 2001
From: Grace <145345672+microbit-grace@users.noreply.github.com>
Date: Tue, 28 May 2024 12:38:51 +0100
Subject: [PATCH] Change button labels to Title Case (#66)

* Remove textAllCaps styling
* Force project items lowercase
* Tweaked 'Show another way' button to be tallker
---
 app/src/main/res/layout-land/view_projects_pattern.xml       | 3 ---
 app/src/main/res/layout-land/view_projects_searching.xml     | 1 -
 app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml  | 2 +-
 .../res/layout-sw600dp-port/view_entering_pattern_step.xml   | 2 +-
 app/src/main/res/layout/project_items.xml                    | 1 -
 app/src/main/res/layout/view_projects_pattern.xml            | 3 ---
 app/src/main/res/layout/view_projects_searching.xml          | 1 -
 app/src/main/res/values-land/styles.xml                      | 2 --
 app/src/main/res/values-sw600dp-port/styles.xml              | 5 -----
 app/src/main/res/values-v21/styles.xml                       | 1 -
 app/src/main/res/values/dimens.xml                           | 2 +-
 app/src/main/res/values/styles.xml                           | 5 -----
 12 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout-land/view_projects_pattern.xml b/app/src/main/res/layout-land/view_projects_pattern.xml
index ca1b9fc8..6302e4c8 100644
--- a/app/src/main/res/layout-land/view_projects_pattern.xml
+++ b/app/src/main/res/layout-land/view_projects_pattern.xml
@@ -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"
@@ -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" />
@@ -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" />
diff --git a/app/src/main/res/layout-land/view_projects_searching.xml b/app/src/main/res/layout-land/view_projects_searching.xml
index ce2af768..486fdb9c 100644
--- a/app/src/main/res/layout-land/view_projects_searching.xml
+++ b/app/src/main/res/layout-land/view_projects_searching.xml
@@ -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"
diff --git a/app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml b/app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml
index 722636ef..7516bb24 100644
--- a/app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml
+++ b/app/src/main/res/layout-sw600dp-port/pair_microbit_step.xml
@@ -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" />
 
diff --git a/app/src/main/res/layout-sw600dp-port/view_entering_pattern_step.xml b/app/src/main/res/layout-sw600dp-port/view_entering_pattern_step.xml
index 59ebda8a..cf92d1da 100644
--- a/app/src/main/res/layout-sw600dp-port/view_entering_pattern_step.xml
+++ b/app/src/main/res/layout-sw600dp-port/view_entering_pattern_step.xml
@@ -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
diff --git a/app/src/main/res/layout/project_items.xml b/app/src/main/res/layout/project_items.xml
index d67e8fda..042a0e42 100644
--- a/app/src/main/res/layout/project_items.xml
+++ b/app/src/main/res/layout/project_items.xml
@@ -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" />
diff --git a/app/src/main/res/layout/view_projects_pattern.xml b/app/src/main/res/layout/view_projects_pattern.xml
index a4a7c4d9..96fff86c 100644
--- a/app/src/main/res/layout/view_projects_pattern.xml
+++ b/app/src/main/res/layout/view_projects_pattern.xml
@@ -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"
@@ -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" />
@@ -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" />
diff --git a/app/src/main/res/layout/view_projects_searching.xml b/app/src/main/res/layout/view_projects_searching.xml
index 18f4a0f5..9f92aca4 100644
--- a/app/src/main/res/layout/view_projects_searching.xml
+++ b/app/src/main/res/layout/view_projects_searching.xml
@@ -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"
diff --git a/app/src/main/res/values-land/styles.xml b/app/src/main/res/values-land/styles.xml
index 92a9469f..c5dda0e4 100644
--- a/app/src/main/res/values-land/styles.xml
+++ b/app/src/main/res/values-land/styles.xml
@@ -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>
 
@@ -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>
diff --git a/app/src/main/res/values-sw600dp-port/styles.xml b/app/src/main/res/values-sw600dp-port/styles.xml
index 895f34ea..57640eba 100644
--- a/app/src/main/res/values-sw600dp-port/styles.xml
+++ b/app/src/main/res/values-sw600dp-port/styles.xml
@@ -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" />
@@ -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>
 
@@ -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>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 4643b0c6..d44766d2 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5e6a6e86..57148dd9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1be9af8b..190ad346 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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" />
@@ -101,7 +100,6 @@
     <!-- 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>
@@ -109,7 +107,6 @@
     <!-- 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>
@@ -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>
@@ -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>