diff options
author | sjtufs <[email protected]> | 2013-09-02 14:16:22 +0800 |
---|---|---|
committer | sjtufs <[email protected]> | 2013-09-02 14:16:22 +0800 |
commit | 2803cc88dba0fd04a600456a81a7d7ec6dafd41c (patch) | |
tree | b8fe38beba86abcd3034eed806f6f104076876bd /client/Piztor/res/layout | |
parent | d017fb4ca8c9a5d0b6c5533f2549d13aa224e623 (diff) |
fix #44 and update beta version
Diffstat (limited to 'client/Piztor/res/layout')
-rw-r--r-- | client/Piztor/res/layout/activity_login.xml | 3 | ||||
-rw-r--r-- | client/Piztor/res/layout/activity_settings.xml | 96 | ||||
-rw-r--r-- | client/Piztor/res/layout/subscribe_settings.xml | 6 |
3 files changed, 75 insertions, 30 deletions
diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml index cb27495..dac2d35 100644 --- a/client/Piztor/res/layout/activity_login.xml +++ b/client/Piztor/res/layout/activity_login.xml @@ -18,7 +18,7 @@ android:layout_marginTop="16dip"> <ImageView - android:id="@+id/main_headbar_img" + android:id="@+id/login_img" android:layout_width="180dp" android:layout_height="200dp" android:layout_gravity="center_horizontal" @@ -31,6 +31,7 @@ android:text="@string/app_name" android:textSize="30dip" android:textColor="#FFFFFF"/> + </LinearLayout> <LinearLayout diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml index ba67683..18d037a 100644 --- a/client/Piztor/res/layout/activity_settings.xml +++ b/client/Piztor/res/layout/activity_settings.xml @@ -122,34 +122,76 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="20dip" - android:text="@string/colormode" - android:textColor="#FFFFFF"/> - <RadioGroup - android:id="@+id/radioGroup" - android:contentDescription="@string/colormode" - android:layout_width="wrap_content" + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20dip" + android:text="@string/colormode" + android:textColor="#FFFFFF"/> + <RadioGroup + android:id="@+id/colorRadioGroup" + android:contentDescription="@string/colormode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:orientation="horizontal"> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/show_by_team" + android:textSize="18dip" + android:text="@string/show_team" + android:checked="true"/> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:id="@+id/show_by_sex" + android:textSize="18dip" + android:text="@string/show_sex"/> + </RadioGroup> + </LinearLayout> + <View + android:layout_width="fill_parent" + android:layout_height="1.0px" + android:layout_marginTop="20dip" + android:layout_marginBottom="20dip" + android:layout_marginLeft="20dip" + android:layout_marginRight="20dip" + android:background="#ffc0c3c4" /> + <LinearLayout + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:orientation="horizontal"> - <RadioButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/show_by_team" - android:textSize="18dip" - android:text="@string/show_team" - android:checked="true"/> - <RadioButton - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dip" - android:id="@+id/show_by_sex" - android:textSize="18dip" - android:text="@string/show_sex"/> - </RadioGroup> + android:layout_gravity="center" + android:gravity="center"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="20dip" + android:text="@string/locatemode" + android:textColor="#FFFFFF"/> + <RadioGroup + android:id="@+id/locateRadioGroup" + android:contentDescription="@string/locatemode" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:orientation="horizontal"> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/gps_first" + android:textSize="18dip" + android:text="@string/gps_first" + android:checked="true"/> + <RadioButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="10dip" + android:id="@+id/network_first" + android:textSize="18dip" + android:text="@string/network_first"/> + </RadioGroup> </LinearLayout> <View android:layout_width="fill_parent" diff --git a/client/Piztor/res/layout/subscribe_settings.xml b/client/Piztor/res/layout/subscribe_settings.xml index a90837c..92b905b 100644 --- a/client/Piztor/res/layout/subscribe_settings.xml +++ b/client/Piztor/res/layout/subscribe_settings.xml @@ -3,15 +3,17 @@ android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" - > + android:layout_marginTop="10dip"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/textView1" android:text="TextView" + android:textSize="20dip" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="10dp"/> + android:layout_marginBottom="10dip" + android:layout_marginLeft="10dip"/> <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" |