pi/babyphone
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improve monitor activity with LinearLayout and helper text

Browse Source
This commit is contained in:
Branden Archer
2015-12-27 16:20:22 -05:00
parent eb1eac8111
commit ea29a0f4eb
3 changed files with 47 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
res/layout/activity_monitor.xml
View File

@@ -1,7 +1,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/LinearLayout1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
@@ -9,64 +11,46 @@
tools:context="protect.babymonitor.MonitorActivity" > tools:context="protect.babymonitor.MonitorActivity" >
<TextView <TextView
android:id="@+id/textView1" android:id="@+id/childDeviceTitle"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:gravity="center"
android:layout_centerHorizontal="true" android:text="@string/childDevice"
android:layout_marginTop="40dp" android:textSize="25sp" />
android:text="Child Device"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TableLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginTop="124dp" >
<TableRow
android:id="@+id/TableRow01"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<Space <Space
android:layout_width="match_parent"
android:layout_height="15dip" />
<TextView
android:id="@+id/serviceTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:text="@string/serviceTitle"
android:textSize="20sp" />
<TextView <TextView
android:id="@+id/textService" android:id="@+id/textService"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading"
android:textSize="20sp" /> android:textSize="20sp" />
<Space <TextView
android:id="@+id/serviceDescription"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
</TableRow> android:text="@string/serviceDescription" />
<TableRow
android:id="@+id/tableRow1"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<Space <Space
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="15dip" />
<TextView <TextView
android:id="@+id/textStatus" android:id="@+id/textStatus"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:text=""
android:textSize="20sp" /> android:textSize="20sp" />
<Space </LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</TableRow>
</TableLayout>
</RelativeLayout>

7
res/values/strings.xml
View File

@@ -7,5 +7,12 @@
<string name="useAsChildDevice">Use as Child Device</string> <string name="useAsChildDevice">Use as Child Device</string>
<string name="childDescription">Device is placed with baby, and sends audio to a paired parent device</string> <string name="childDescription">Device is placed with baby, and sends audio to a paired parent device</string>
<string name="parentDescription">Pairs with child device and plays received audio</string> <string name="parentDescription">Pairs with child device and plays received audio</string>
<string name="childDevice">Child Device</string>
<string name="serviceTitle">Service:</string>
<string name="serviceDescription">Name of the service that parent must pair to</string>
<string name="loading">Loading...</string>
<string name="stopped">Stopped</string>
<string name="streaming">Streaming...</string>
<string name="waitingForParent">Waiting for Parent...</string>
</resources> </resources>

9
src/protect/babymonitor/MonitorActivity.java
View File

@@ -53,7 +53,7 @@ public class MonitorActivity extends Activity
public void run() public void run()
{ {
final TextView statusText = (TextView) findViewById(R.id.textStatus); final TextView statusText = (TextView) findViewById(R.id.textStatus);
statusText.setText("Streaming..."); statusText.setText(R.string.streaming);
} }
}); });
@@ -94,9 +94,6 @@ public class MonitorActivity extends Activity
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_monitor); setContentView(R.layout.activity_monitor);
final TextView text = (TextView) findViewById(R.id.textStatus);
text.setText("Loading...");
try try
{ {
// Initialize a server socket on the next available port. // Initialize a server socket on the next available port.
@@ -137,7 +134,7 @@ public class MonitorActivity extends Activity
public void run() public void run()
{ {
final TextView statusText = (TextView) findViewById(R.id.textStatus); final TextView statusText = (TextView) findViewById(R.id.textStatus);
statusText.setText("Stopped"); statusText.setText(R.string.stopped);
} }
}); });
} }
@@ -216,7 +213,7 @@ public class MonitorActivity extends Activity
public void run() public void run()
{ {
final TextView statusText = (TextView) findViewById(R.id.textStatus); final TextView statusText = (TextView) findViewById(R.id.textStatus);
statusText.setText("Waiting for connection..."); statusText.setText(R.string.waitingForParent);
final TextView serviceText = (TextView) findViewById(R.id.textService); final TextView serviceText = (TextView) findViewById(R.id.textService);
serviceText.setText(serviceName); serviceText.setText(serviceName);