Minor UI tweaks
This commit is contained in:
@@ -30,7 +30,7 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name="uk.co.alt236.btlescan.activities.DetailsActivity"
|
android:name="uk.co.alt236.btlescan.activities.DeviceDetailsActivity"
|
||||||
android:label="@string/app_name" >
|
android:label="@string/app_name" >
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name="uk.co.alt236.btlescan.activities.DeviceControlActivity" />
|
<activity android:name="uk.co.alt236.btlescan.activities.DeviceControlActivity" />
|
||||||
|
|||||||
+5
-2
@@ -19,7 +19,7 @@ import android.widget.TextView;
|
|||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import butterknife.InjectView;
|
import butterknife.InjectView;
|
||||||
|
|
||||||
public class DetailsActivity extends Activity{
|
public class DeviceDetailsActivity extends Activity{
|
||||||
private static final String SECTION_LINE = "------------------------------";
|
private static final String SECTION_LINE = "------------------------------";
|
||||||
public static final String EXTRA_DEVICE = "extra_device";
|
public static final String EXTRA_DEVICE = "extra_device";
|
||||||
|
|
||||||
@@ -79,6 +79,8 @@ public class DetailsActivity extends Activity{
|
|||||||
if(device == null){
|
if(device == null){
|
||||||
append(sb, "Invalid Device Data!", null);
|
append(sb, "Invalid Device Data!", null);
|
||||||
} else {
|
} else {
|
||||||
|
append(sb, "Device Info", null);
|
||||||
|
append(sb, SECTION_LINE, null);
|
||||||
append(sb, "Device Name", device.getName());
|
append(sb, "Device Name", device.getName());
|
||||||
append(sb, "Device Address", device.getAddress());
|
append(sb, "Device Address", device.getAddress());
|
||||||
|
|
||||||
@@ -110,7 +112,8 @@ public class DetailsActivity extends Activity{
|
|||||||
|
|
||||||
for(final AdRecord record : adRecords){
|
for(final AdRecord record : adRecords){
|
||||||
append(sb, "#" +record.getType() + " " + record.getHumanReadableType(), null);
|
append(sb, "#" +record.getType() + " " + record.getHumanReadableType(), null);
|
||||||
append(sb, AdRecordUtils.getRecordDataAsString(record), null);
|
append(sb, " As String: '" + AdRecordUtils.getRecordDataAsString(record) + "'", null);
|
||||||
|
append(sb, " As Array : " + ByteUtils.byteArrayToHexString(record.getData()), null);
|
||||||
append(sb, "", null);
|
append(sb, "", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,8 +50,8 @@ public class MainActivity extends ListActivity {
|
|||||||
if (device == null) return;
|
if (device == null) return;
|
||||||
|
|
||||||
|
|
||||||
final Intent intent = new Intent(this, DetailsActivity.class);
|
final Intent intent = new Intent(this, DeviceDetailsActivity.class);
|
||||||
intent.putExtra(DetailsActivity.EXTRA_DEVICE, device);
|
intent.putExtra(DeviceDetailsActivity.EXTRA_DEVICE, device);
|
||||||
|
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user