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

Improve listen activity layout with Linear Layout

Browse Source
This commit is contained in:
Branden Archer
2015-12-27 16:14:35 -05:00
parent c455e966cd
commit 2e9ca0de88
3 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
res/layout/activity_listen.xml
View File

@@ -1,70 +1,58 @@
<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:keepScreenOn="true"
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"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:keepScreenOn="true"
tools:context="protect.babymonitor.MonitorActivity" > tools:context="protect.babymonitor.MonitorActivity" >
<TableLayout
android:id="@+id/tableLayout1"
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/tableRow1"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView <TextView
android:id="@+id/textStatusTitle" android:id="@id/parentDeviceTitle"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/activity_horizontal_margin" android:gravity="center"
android:text="Status:" android:text="@string/parentDevice"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textSize="25sp" />
<Space <Space
android:layout_width="match_parent"
android:layout_height="15dip" />
<TextView
android:id="@+id/connectedToTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:text="@string/connectedTo"
android:textSize="20sp" />
<TextView
android:id="@+id/connectedTo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textSize="20sp" />
<Space
android:layout_width="match_parent"
android:layout_height="15dip" />
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/status"
android:textSize="20sp" />
<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:text="Listening..."
android:textAppearance="?android:attr/textAppearanceLarge" />
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</TableRow>
</TableLayout>
<TextView
android:id="@+id/connectedToTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:padding="@dimen/activity_horizontal_margin"
android:text="Connected to:"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/connectedDeviceNameTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/connectedToTextView"
android:layout_below="@+id/connectedToTextView"
android:layout_marginLeft="20dp"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textSize="20sp" />
</RelativeLayout> </LinearLayout>

4
res/values/strings.xml
View File

@@ -16,5 +16,9 @@
<string name="waitingForParent">Waiting for Parent...</string> <string name="waitingForParent">Waiting for Parent...</string>
<string name="parentDevice">Parent Device</string> <string name="parentDevice">Parent Device</string>
<string name="selectChildDevice">Select Child Device:</string> <string name="selectChildDevice">Select Child Device:</string>
<string name="status">Status:</string>
<string name="connectedTo">Connected To:</string>
<string name="disconnected">Disconnected</string>
<string name="listening">Listening...</string>
</resources> </resources>

12
src/protect/babymonitor/ListenActivity.java
View File

@@ -110,8 +110,11 @@ public class ListenActivity extends Activity
@Override @Override
public void run() public void run()
{ {
final TextView statusText = (TextView) findViewById(R.id.connectedDeviceNameTextView); final TextView connectedText = (TextView) findViewById(R.id.connectedTo);
statusText.setText(_name); connectedText.setText(_name);
final TextView statusText = (TextView) findViewById(R.id.textStatus);
statusText.setText(R.string.listening);
} }
}); });
@@ -139,8 +142,11 @@ public class ListenActivity extends Activity
@Override @Override
public void run() public void run()
{ {
final TextView connectedText = (TextView) findViewById(R.id.connectedTo);
connectedText.setText("");
final TextView statusText = (TextView) findViewById(R.id.textStatus); final TextView statusText = (TextView) findViewById(R.id.textStatus);
statusText.setText("Listening stopped"); statusText.setText(R.string.disconnected);
} }
}); });
} }