Tweak enter pin if needed step

- Update title to say "If asked for a PIN"
- Add "Tap Next to pair" text
- Update micro:bit image to the "Let's do it" one

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

@@ -25,7 +25,7 @@
             <TextView
                 android:id="@+id/enter_pin_if_needed_title"
                 style="@style/pairing_step_header_style"
-                android:text="@string/searchingTitle" />
+                android:text="@string/enter_pin_if_needed_title" />
 
             <!--pairing animation-->
             <pl.droidsonroids.gif.GifImageView
@@ -42,11 +42,28 @@
 
             <TextView
                 android:id="@+id/enter_pin_if_needed_text"
-                android:layout_width="wrap_content"
                 style="@style/pairing_step_tip_text_style"
-                android:layout_marginBottom="@dimen/pairing_step_tip_title_margin_bottom"
                 android:textSize="@dimen/pairing_step_title_text_size"
-                android:text="@string/searching_tip_step_text_one_line" />
+                android:text="@string/enter_pin_if_needed_next_text" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignStart="@id/enter_pin_if_needed_text"
+                android:layout_centerInParent="true">
+                <TextView
+                    style="@style/pairing_step_tip_text_style"
+                    android:layout_width="@dimen/pairing_step_text_width"
+                    android:textSize="@dimen/pairing_step_tip_instruction_text_size"
+                    android:layout_alignBottom="@id/pairing_step_one_image"
+                    android:text="@string/enter_pin_if_needed_text_one_line" />
+
+                <ImageView
+                    android:id="@+id/pairing_step_one_image"
+                    style="@style/pairing_step_image_layout_style"
+                    android:layout_alignParentEnd="true"
+                    android:src="@drawable/ic_person_step_1" />
+            </RelativeLayout>
 
             <!-- Pairing confirmation buttons-->
             <LinearLayout

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

@@ -12,7 +12,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:gravity="bottom|center"
-        android:text="@string/searchingTitle" />
+        android:text="@string/enter_pin_if_needed_title" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -40,14 +40,18 @@
             <TextView
                 android:id="@+id/enter_pin_if_needed_text"
                 style="@style/pairing_step_tip_text_style"
-                android:text="@string/searching_tip_step_text" />
+                android:text="@string/enter_pin_if_needed_next_text" />
+
+            <TextView
+                style="@style/pairing_step_tip_text_style"
+                android:text="@string/enter_pin_if_needed_text" />
 
         </LinearLayout>
 
         <ImageView
             android:id="@+id/searching_emoji"
             style="@style/pairing_step_image_layout_style"
-            android:src="@drawable/ic_where_are_you" />
+            android:src="@drawable/ic_person_step_1" />
     </LinearLayout>
 
     <!-- Pairing confirmation buttons-->

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

@@ -12,7 +12,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:gravity="bottom|center"
-        android:text="@string/searchingTitle" />
+        android:text="@string/enter_pin_if_needed_title" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -36,16 +36,19 @@
 
             <TextView
                 android:id="@+id/enter_pin_if_needed_text"
+                style="@style/pairing_step_tip_text_style"
+                android:text="@string/enter_pin_if_needed_next_text" />
+
+            <TextView
                 style="@style/pairing_step_tip_text_style"
                 android:paddingEnd="@dimen/pairing_step_searching_tip_text_padding_end"
-                android:text="@string/searching_tip_step_text" />
+                android:text="@string/enter_pin_if_needed_text" />
 
         </LinearLayout>
 
         <ImageView
-            android:id="@+id/searching_emoji"
             style="@style/pairing_step_image_layout_style"
-            android:src="@drawable/ic_where_are_you" />
+            android:src="@drawable/ic_person_step_1" />
     </LinearLayout>
 
     <!-- Pairing confirmation buttons-->

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

@@ -161,7 +161,7 @@
     <string name="desc_step_connect_tip_text_step_four_text">When you see the success message, press RESET and you\'re done!</string>
     <string name="desc_step_connect_tip_text_step_three">Step 3</string>
     <string name="desc_step_connect_tip_text_step_four">Step 4</string>
-    <string name="searching_microbit">Choose Pair (or Pair &amp; connect) \nin the notification you will receive.</string>
+    <string name="searching_microbit">Choose Pair \n(or Pair &amp; connect) in the notification you will receive.</string>
     <string name="searching_microbit_one_line">Choose Pair (or Pair &amp; connect) in the notification you will receive.</string>
     <string name="step_connect_tip_text_step_two">Step 2</string>
     <string name="connect_tip_text">Hold the A and B buttons then press and release RESET. Keep holding A and B until the screen fills up</string>
@@ -319,8 +319,10 @@
     <string name="desc_connection_status_flash_text">Micro:Bit connection status</string>
     <string name="desc_send_project_btn">Flash code to your Micro:bit</string>
     <string name="desc_delete_project_btn">Delete code</string>
-    <string name="searching_tip_step_text">If asked for a PIN, press button A \non the micro:bit</string>
-    <string name="searching_tip_step_text_one_line">If asked for a PIN, press button A on the micro:bit</string>
+    <string name="enter_pin_if_needed_title">If asked for a PIN</string>
+    <string name="enter_pin_if_needed_text">If asked for a PIN, press button A \non the micro:bit</string>
+    <string name="enter_pin_if_needed_text_one_line">If asked for a PIN, press button A on the micro:bit</string>
+    <string name="enter_pin_if_needed_next_text">Tap Next to pair</string>
     <string name="desc_connect_pair_micro_bit">Pair a new micro:bit</string>
     <string name="most_recent_device_status">Most recently used micro:bit</string>
     <string name="device_connected_device_status">Currently connected micro:bit</string>