Finalised who am I screen layou tweaks

ThoughtWorksAustralia · Mar 5, 2014 · db5dbfc · db5dbfc
1 parent 00da7a0
commit db5dbfc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/AndroidBootcamp/src/main/res/layout/activity_whoami.xml b/AndroidBootcamp/src/main/res/layout/activity_whoami.xml
@@ -2,36 +2,37 @@
  xmlns:tools="http:https://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
  android:orientation="vertical"
  tools:context=".WhoAmIActivity$PlaceholderFragment">
 
  <TextView
  android:id="@+id/player_label"
  android:layout_marginBottom="@dimen/default_inter_row_spacing"
  android:text="@string/player_label"
- android:layout_width="fill_parent"
+ android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  style="@style/PlayerLabelName"/>
+
+ <EditText
+ android:id="@+id/player_field"
+ android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:inputType="textPersonName"
+ android:layout_below="@id/player_label"
+ android:layout_alignLeft="@id/player_label"
+ android:layout_alignRight="@id/player_label"/>
  <Button
  android:id="@+id/player_ok_button"
  android:layout_height="wrap_content"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
  android:text="@string/ok"
  android:onClick="returnPlayer"
- android:layout_alignParentRight="true"
- android:layout_below="@id/player_label" />
- <EditText
- android:id="@+id/player_field"
- android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ style="?android:attr/buttonBarStyle"/>
+ <View
  android:layout_width="fill_parent"
- android:inputType="textPersonName"
- android:layout_below="@id/player_label"
- android:layout_toLeftOf="@+id/player_ok_button"
- android:layout_alignBottom="@id/player_ok_button"/>
-
+ android:layout_height="1dip"
+ android:background="?android:attr/dividerHorizontal"
+ android:layout_above="@id/player_ok_button"/>
 
 </RelativeLayout>
diff --git a/AndroidBootcamp/src/main/res/values/styles.xml b/AndroidBootcamp/src/main/res/values/styles.xml
@@ -11,5 +11,8 @@
  <style name="PlayerLabelName">
  <item name="android:textSize">@dimen/intro_text_size</item>
  <item name="android:textColor">@color/highlight</item>
+ <item name="android:layout_marginLeft">@dimen/activity_horizontal_margin</item>
+ <item name="android:layout_marginRight">@dimen/activity_horizontal_margin</item>
+ <item name="android:layout_marginTop">@dimen/activity_horizontal_margin</item>
  </style>
 </resources>