Externalised strings

sample_app/res/layout/activity_main.xml

@@ -20,7 +20,7 @@
             android:layout_column="0"
             android:layout_gravity="center_horizontal"
             android:layout_row="0"
-            android:text="Bluetooth LE:"
+            android:text="@string/label_bluetooth_le_status"
             android:textSize="12sp"
             android:textStyle="bold" />
 
@@ -41,7 +41,7 @@
             android:layout_column="0"
             android:layout_gravity="left"
             android:layout_row="1"
-            android:text="Bluetooth:"
+            android:text="@string/label_bluetooth_status"
             android:textSize="12sp"
             android:textStyle="bold" />
 

sample_app/res/layout/list_item_view_device_info.xml

@@ -16,7 +16,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Device Name:" />
+            android:text="@string/label_device_name" />
 
         <TextView
             android:id="@+id/deviceName"
@@ -26,7 +26,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Device Address" />
+            android:text="@string/label_device_address" />
 
         <TextView
             android:id="@+id/deviceAddress"
@@ -36,7 +36,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Device Class:" />
+            android:text="@string/label_device_class" />
 
         <TextView
             android:id="@+id/deviceClass"
@@ -46,7 +46,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Bonding State" />
+            android:text="@string/label_bonding_state" />
 
         <TextView
             android:id="@+id/deviceBondingState"

sample_app/res/layout/list_item_view_ibeacon_details.xml

@@ -16,7 +16,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Company ID:" />
+            android:text="@string/label_company_id" />
 
         <TextView
             android:id="@+id/companyId"
@@ -26,7 +26,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Advertisement:" />
+            android:text="@string/label_advertisement" />
 
         <TextView
             android:id="@+id/advertisement"
@@ -36,7 +36,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="UUID:" />
+            android:text="@string/label_uuid" />
 
         <TextView
             android:id="@+id/uuid"
@@ -46,7 +46,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Major:" />
+            android:text="@string/label_major" />
 
         <TextView
             android:id="@+id/major"
@@ -56,7 +56,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Minor:" />
+            android:text="@string/label_minor" />
 
         <TextView
             android:id="@+id/minor"
@@ -66,7 +66,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="TX Power:" />
+            android:text="@string/label_tx_power" />
 
         <TextView
             android:id="@+id/txpower"

sample_app/res/layout/list_item_view_rssi_info.xml

@@ -16,7 +16,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="First Timestamp:" />
+            android:text="@string/label_first_timestamp" />
 
         <TextView
             android:id="@+id/firstTimestamp"
@@ -26,7 +26,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="First RSSI:" />
+            android:text="@string/label_first_rssi" />
 
         <TextView
             android:id="@+id/firstRssi"
@@ -36,7 +36,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Last Timestamp:" />
+            android:text="@string/label_last_timestamp" />
 
         <TextView
             android:id="@+id/lastTimestamp"
@@ -46,7 +46,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Last RSSI:" />
+            android:text="@string/label_last_rssi" />
 
         <TextView
             android:id="@+id/lastRssi"
@@ -56,7 +56,7 @@
             style="@style/GridLayoutTitleTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Running Average RSSI:" />
+            android:text="@string/label_running_average_rssi" />
 
         <TextView
             android:id="@+id/runningAverageRssi"

sample_app/res/values/strings.xml

@@ -5,11 +5,13 @@
     <string name="app_name">Bluetooth LE Scanner</string>
     <string name="connected">Connected</string>
     <string name="disconnected">Disconnected</string>
+    <string name="invalid_device_data">Invalid Device Data!</string>
     <string name="no_data">No data</string>
     <string name="not_supported">Not supported</string>
     <string name="off">Off</string>
     <string name="on">On</string>
     <string name="supported">Supported</string>
+    <string name="unknown">unknown</string>
     <string name="unknown_characteristic">Unknown characteristic</string>
     <string name="unknown_device">Unknown device</string>
     <string name="unknown_service">Unknown service</string>
@@ -27,33 +29,43 @@
     <string name="menu_stop">Stop</string>
     <string name="menu_share">Share</string>
 
-
-
-    <!-- List Items -->
-    <string name="label_data">Data:</string>
-    <string name="label_device_address">Device address:</string>
-    <string name="label_distance">Distance:</string>
-    <string name="label_mac">MAC:</string>
-    <string name="label_major">Major:</string>
-    <string name="label_minor">Minor:</string>
-    <string name="label_rssi">RSSI:</string>
-    <string name="label_state">State:</string>
-    <string name="label_tx_power">TX Power:</string>
-    <string name="label_uuid">UUID:</string>
-    <string name="about_dialog_text">This is a sample application using the Bluetooth LE Library.\n\nGithub: https://github.com/alt236/Bluetooth-LE-Library---Android\n\nCopyright: Alexandros Schillings</string>
+    <!-- Export Email Strings -->
     <string name="exporter_email_device_list_subject">Bluetooth LE Scan Results (%s)</string>
     <string name="exporter_email_device_services_subject" formatted="false">Bluetooth LE Device GATT Results (%s, %s)</string>
     <string name="exporter_email_device_list_body">Please find attached the scan results.</string>
     <string name="exporter_email_device_list_picker_text">Please select your email client:</string>
+
+    <!-- Labels -->
+    <string name="about_dialog_text">This is a sample application using the Bluetooth LE Library.\n\nGithub: https://github.com/alt236/Bluetooth-LE-Library---Android\n\nCopyright: Alexandros Schillings</string>
+    <string name="header_device_info">Device Info</string>
     <string name="header_ibeacon_data">iBeacon Data</string>
     <string name="header_raw_ad_records">Raw Ad Records</string>
-    <string name="header_scan_record">Scan Record</string>
     <string name="header_rssi_info">RSSI Info</string>
-    <string name="header_device_info">Device Info</string>
-    <string name="invalid_device_data">Invalid Device Data!</string>
-    <string name="unknown">unknown</string>
-    <string name="label_as_string">As String:</string>
+    <string name="header_scan_record">Scan Record</string>
+    <string name="label_advertisement">Advertisement:</string>
     <string name="label_as_array">As Array:</string>
+    <string name="label_as_string">As String:</string>
+    <string name="label_bluetooth_le_status">Bluetooth LE:</string>
+    <string name="label_bluetooth_status">Bluetooth:</string>
+    <string name="label_bonding_state">Bonding State:</string>
+    <string name="label_company_id">Company ID:</string>
+    <string name="label_data">Data:</string>
     <string name="label_desc">Desc:</string>
+    <string name="label_device_address">Device address:</string>
+    <string name="label_device_class">Device Class:</string>
+    <string name="label_device_name">Device Name:</string>
+    <string name="label_distance">Distance:</string>
+    <string name="label_first_rssi">First RSSI:</string>
+    <string name="label_first_timestamp">First Timestamp:</string>
+    <string name="label_last_rssi">Last RSSI:</string>
+    <string name="label_last_timestamp">Last Timestamp:</string>
+    <string name="label_mac">MAC:</string>
+    <string name="label_major">Major:</string>
+    <string name="label_minor">Minor:</string>
+    <string name="label_rssi">RSSI:</string>
+    <string name="label_running_average_rssi">Running Average RSSI:</string>
+    <string name="label_state">State:</string>
+    <string name="label_tx_power">TX Power:</string>
+    <string name="label_uuid">UUID:</string>
 
 </resources>