Skip to content

Commit 4792282

Browse files
alt236alt236
committed
Externalised strings
1 parent b0d65c0 commit 4792282

5 files changed

Lines changed: 46 additions & 34 deletions

File tree

‎sample_app/res/layout/activity_main.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:layout_column="0"
2121
android:layout_gravity="center_horizontal"
2222
android:layout_row="0"
23-
android:text="Bluetooth LE:"
23+
android:text="@string/label_bluetooth_le_status"
2424
android:textSize="12sp"
2525
android:textStyle="bold" />
2626

@@ -41,7 +41,7 @@
4141
android:layout_column="0"
4242
android:layout_gravity="left"
4343
android:layout_row="1"
44-
android:text="Bluetooth:"
44+
android:text="@string/label_bluetooth_status"
4545
android:textSize="12sp"
4646
android:textStyle="bold" />
4747

‎sample_app/res/layout/list_item_view_device_info.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
style="@style/GridLayoutTitleTextView"
1717
android:layout_width="wrap_content"
1818
android:layout_height="wrap_content"
19-
android:text="Device Name:" />
19+
android:text="@string/label_device_name" />
2020

2121
<TextView
2222
android:id="@+id/deviceName"
@@ -26,7 +26,7 @@
2626
style="@style/GridLayoutTitleTextView"
2727
android:layout_width="wrap_content"
2828
android:layout_height="wrap_content"
29-
android:text="Device Address" />
29+
android:text="@string/label_device_address" />
3030

3131
<TextView
3232
android:id="@+id/deviceAddress"
@@ -36,7 +36,7 @@
3636
style="@style/GridLayoutTitleTextView"
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
39-
android:text="Device Class:" />
39+
android:text="@string/label_device_class" />
4040

4141
<TextView
4242
android:id="@+id/deviceClass"
@@ -46,7 +46,7 @@
4646
style="@style/GridLayoutTitleTextView"
4747
android:layout_width="wrap_content"
4848
android:layout_height="wrap_content"
49-
android:text="Bonding State" />
49+
android:text="@string/label_bonding_state" />
5050

5151
<TextView
5252
android:id="@+id/deviceBondingState"

‎sample_app/res/layout/list_item_view_ibeacon_details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
style="@style/GridLayoutTitleTextView"
1717
android:layout_width="wrap_content"
1818
android:layout_height="wrap_content"
19-
android:text="Company ID:" />
19+
android:text="@string/label_company_id" />
2020

2121
<TextView
2222
android:id="@+id/companyId"
@@ -26,7 +26,7 @@
2626
style="@style/GridLayoutTitleTextView"
2727
android:layout_width="wrap_content"
2828
android:layout_height="wrap_content"
29-
android:text="Advertisement:" />
29+
android:text="@string/label_advertisement" />
3030

3131
<TextView
3232
android:id="@+id/advertisement"
@@ -36,7 +36,7 @@
3636
style="@style/GridLayoutTitleTextView"
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
39-
android:text="UUID:" />
39+
android:text="@string/label_uuid" />
4040

4141
<TextView
4242
android:id="@+id/uuid"
@@ -46,7 +46,7 @@
4646
style="@style/GridLayoutTitleTextView"
4747
android:layout_width="wrap_content"
4848
android:layout_height="wrap_content"
49-
android:text="Major:" />
49+
android:text="@string/label_major" />
5050

5151
<TextView
5252
android:id="@+id/major"
@@ -56,7 +56,7 @@
5656
style="@style/GridLayoutTitleTextView"
5757
android:layout_width="wrap_content"
5858
android:layout_height="wrap_content"
59-
android:text="Minor:" />
59+
android:text="@string/label_minor" />
6060

6161
<TextView
6262
android:id="@+id/minor"
@@ -66,7 +66,7 @@
6666
style="@style/GridLayoutTitleTextView"
6767
android:layout_width="wrap_content"
6868
android:layout_height="wrap_content"
69-
android:text="TX Power:" />
69+
android:text="@string/label_tx_power" />
7070

7171
<TextView
7272
android:id="@+id/txpower"

‎sample_app/res/layout/list_item_view_rssi_info.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
style="@style/GridLayoutTitleTextView"
1717
android:layout_width="wrap_content"
1818
android:layout_height="wrap_content"
19-
android:text="First Timestamp:" />
19+
android:text="@string/label_first_timestamp" />
2020

2121
<TextView
2222
android:id="@+id/firstTimestamp"
@@ -26,7 +26,7 @@
2626
style="@style/GridLayoutTitleTextView"
2727
android:layout_width="wrap_content"
2828
android:layout_height="wrap_content"
29-
android:text="First RSSI:" />
29+
android:text="@string/label_first_rssi" />
3030

3131
<TextView
3232
android:id="@+id/firstRssi"
@@ -36,7 +36,7 @@
3636
style="@style/GridLayoutTitleTextView"
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
39-
android:text="Last Timestamp:" />
39+
android:text="@string/label_last_timestamp" />
4040

4141
<TextView
4242
android:id="@+id/lastTimestamp"
@@ -46,7 +46,7 @@
4646
style="@style/GridLayoutTitleTextView"
4747
android:layout_width="wrap_content"
4848
android:layout_height="wrap_content"
49-
android:text="Last RSSI:" />
49+
android:text="@string/label_last_rssi" />
5050

5151
<TextView
5252
android:id="@+id/lastRssi"
@@ -56,7 +56,7 @@
5656
style="@style/GridLayoutTitleTextView"
5757
android:layout_width="wrap_content"
5858
android:layout_height="wrap_content"
59-
android:text="Running Average RSSI:" />
59+
android:text="@string/label_running_average_rssi" />
6060

6161
<TextView
6262
android:id="@+id/runningAverageRssi"

‎sample_app/res/values/strings.xml‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<string name="app_name">Bluetooth LE Scanner</string>
66
<string name="connected">Connected</string>
77
<string name="disconnected">Disconnected</string>
8+
<string name="invalid_device_data">Invalid Device Data!</string>
89
<string name="no_data">No data</string>
910
<string name="not_supported">Not supported</string>
1011
<string name="off">Off</string>
1112
<string name="on">On</string>
1213
<string name="supported">Supported</string>
14+
<string name="unknown">unknown</string>
1315
<string name="unknown_characteristic">Unknown characteristic</string>
1416
<string name="unknown_device">Unknown device</string>
1517
<string name="unknown_service">Unknown service</string>
@@ -27,33 +29,43 @@
2729
<string name="menu_stop">Stop</string>
2830
<string name="menu_share">Share</string>
2931

32+
<!-- Export Email Strings -->
33+
<string name="exporter_email_device_list_subject">Bluetooth LE Scan Results (%s)</string>
34+
<string name="exporter_email_device_services_subject" formatted="false">Bluetooth LE Device GATT Results (%s, %s)</string>
35+
<string name="exporter_email_device_list_body">Please find attached the scan results.</string>
36+
<string name="exporter_email_device_list_picker_text">Please select your email client:</string>
3037

31-
32-
<!-- List Items -->
38+
<!-- Labels -->
39+
<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>
40+
<string name="header_device_info">Device Info</string>
41+
<string name="header_ibeacon_data">iBeacon Data</string>
42+
<string name="header_raw_ad_records">Raw Ad Records</string>
43+
<string name="header_rssi_info">RSSI Info</string>
44+
<string name="header_scan_record">Scan Record</string>
45+
<string name="label_advertisement">Advertisement:</string>
46+
<string name="label_as_array">As Array:</string>
47+
<string name="label_as_string">As String:</string>
48+
<string name="label_bluetooth_le_status">Bluetooth LE:</string>
49+
<string name="label_bluetooth_status">Bluetooth:</string>
50+
<string name="label_bonding_state">Bonding State:</string>
51+
<string name="label_company_id">Company ID:</string>
3352
<string name="label_data">Data:</string>
53+
<string name="label_desc">Desc:</string>
3454
<string name="label_device_address">Device address:</string>
55+
<string name="label_device_class">Device Class:</string>
56+
<string name="label_device_name">Device Name:</string>
3557
<string name="label_distance">Distance:</string>
58+
<string name="label_first_rssi">First RSSI:</string>
59+
<string name="label_first_timestamp">First Timestamp:</string>
60+
<string name="label_last_rssi">Last RSSI:</string>
61+
<string name="label_last_timestamp">Last Timestamp:</string>
3662
<string name="label_mac">MAC:</string>
3763
<string name="label_major">Major:</string>
3864
<string name="label_minor">Minor:</string>
3965
<string name="label_rssi">RSSI:</string>
66+
<string name="label_running_average_rssi">Running Average RSSI:</string>
4067
<string name="label_state">State:</string>
4168
<string name="label_tx_power">TX Power:</string>
4269
<string name="label_uuid">UUID:</string>
43-
<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>
44-
<string name="exporter_email_device_list_subject">Bluetooth LE Scan Results (%s)</string>
45-
<string name="exporter_email_device_services_subject" formatted="false">Bluetooth LE Device GATT Results (%s, %s)</string>
46-
<string name="exporter_email_device_list_body">Please find attached the scan results.</string>
47-
<string name="exporter_email_device_list_picker_text">Please select your email client:</string>
48-
<string name="header_ibeacon_data">iBeacon Data</string>
49-
<string name="header_raw_ad_records">Raw Ad Records</string>
50-
<string name="header_scan_record">Scan Record</string>
51-
<string name="header_rssi_info">RSSI Info</string>
52-
<string name="header_device_info">Device Info</string>
53-
<string name="invalid_device_data">Invalid Device Data!</string>
54-
<string name="unknown">unknown</string>
55-
<string name="label_as_string">As String:</string>
56-
<string name="label_as_array">As Array:</string>
57-
<string name="label_desc">Desc:</string>
5870

5971
</resources>

0 commit comments

Comments
 (0)