Tidied up BLE scan activity a bit
This commit is contained in:
@@ -6,25 +6,19 @@
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingRight="8dp">
|
||||
|
||||
<LinearLayout
|
||||
<TextView
|
||||
android:id="@+id/ble_scan_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16pt"
|
||||
android:text="Scan for Bluetooth Data Sources" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ble_connection_warning_tv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:text="@string/ble_connected_warning_text" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ble_scan_status_tv"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16pt"
|
||||
android:text="ble_scan_status_tv" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/startScanButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:onClick="onScanButtonClick"
|
||||
android:text="Start Scan"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ble_present_tv"
|
||||
@@ -47,21 +41,26 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="ble_perm1_tv" />
|
||||
<TextView
|
||||
android:id="@+id/ble_perm2_tv"
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="ble_perm2_tv" />
|
||||
<TextView
|
||||
android:id="@+id/ble_perm3_tv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="ble_perm3_tv" />
|
||||
<TextView
|
||||
android:id="@+id/ble_perm4_tv"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="ble_perm4_tv" />
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ble_scan_status_tv"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="16pt"
|
||||
android:text="ble_scan_status_tv" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/startScanButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:onClick="onScanButtonClick"
|
||||
android:text="Start Scan"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
|
||||
@@ -568,4 +568,5 @@
|
||||
<string name="algorithms">"Algorithms: "</string>
|
||||
<string name="battery_history">Battery History</string>
|
||||
<string name="watch_batt_hist">Watch Battery History (%)</string>
|
||||
<string name="ble_connected_warning_text">NOTE: Devices will not appear on this list if they are already connected - disconnect device from GadgetBridge etc. to allow it to be selected here</string>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user