archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Polish to the landscape login activity

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 2c87c840a0
commit d8bf2724c9
2 changed files with 93 additions and 96 deletions
Show Stats Download Patch File Download Diff File

143
astrid/res/layout-land/actfm_login_activity.xml
Unescape Escape View File

@ -12,108 +12,58 @@
android:background="@drawable/astrid_com_gradient"
android:orientation="vertical" >
<TextView
android:id="@+id/intro"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_alignParentLeft="true"
android:textSize="16sp"
android:paddingTop="20dip"
android:textColor="#ffffff"
android:text="@string/actfm_ALA_body" />
<TextView
android:id="@+id/error"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#ff0000"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="horizontal" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="50"
android:orientation="vertical" >
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:id="@+id/logo"
android:layout_width="fill_parent"
android:layout_height="110dip"
android:scaleType="fitCenter"
android:layout_height="fill_parent"
android:scaleType="center"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:paddingBottom="10dip"
android:src="@drawable/astrid_com_logo"
android:layout_gravity="center"
android:src="@drawable/astrid_com_logo_new"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:id="@+id/LinearLayout1"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="50"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingTop="5dip" >
<Button
android:id="@+id/gg_login"
android:layout_width="match_parent"
android:layout_height="45dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:drawableLeft="@drawable/google"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:text="@string/actfm_ALA_gg_login"
android:textSize="12sp"
android:layout_gravity="center_horizontal" />
<com.facebook.android.LoginButton
android:id="@+id/fb_login"
android:layout_width="match_parent"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:drawableLeft="@drawable/facebook"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:text="@string/actfm_ALA_fb_login"
android:textSize="12sp"
android:layout_gravity="center_horizontal" />
android:layout_marginBottom="15dip"
android:layout_marginTop="15dip"
android:paddingLeft="70dip"
android:textSize="14sp"
android:gravity="left|center_vertical"
android:background="@drawable/fb_login_background"
android:textColor="@android:color/white"
android:text="@string/actfm_ALA_fb_login" />
<Button
android:id="@+id/pw_signup"
android:layout_width="match_parent"
android:layout_height="45dp"
android:paddingLeft="17dip"
android:paddingRight="20dip"
android:id="@+id/gg_login"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:drawableLeft="@drawable/notif_astrid"
android:textSize="12sp"
android:text="@string/welcome_login_pw"
android:layout_gravity="center_horizontal" />
android:paddingLeft="70dip"
android:textSize="14sp"
android:gravity="left|center_vertical"
android:background="@drawable/google_login_background"
android:textColor="@android:color/white"
android:text="@string/actfm_ALA_gg_login" />
<TextView
android:id="@+id/pw_login"
android:layout_width="wrap_content"
android:layout_height="35dip"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:layout_above="@id/tos"
android:textColor="#444"
android:textSize="16sp"
android:text="@string/welcome_sign_in"/>
<TextView
android:id="@+id/tos"
@ -124,9 +74,54 @@
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:textSize="12.5sp"
android:visibility="invisible"
android:textColor="#ffffff" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="45dip"
android:orientation="horizontal">
<TextView
android:id="@+id/login_later"
android:text="@string/welcome_login_later"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:gravity="center"
android:layout_weight="1"
android:textSize="16sp"
android:textColor="@android:color/white"
android:visibility="gone"/>
<TextView
android:id="@+id/pw_login"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_weight="1"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="16sp"
android:text="@string/welcome_sign_in"/>
<TextView
android:id="@+id/pw_signup"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_weight="1"
android:gravity="center"
android:textColor="@android:color/white"
android:textSize="16sp"
android:text="@string/welcome_login_pw"/>
</LinearLayout>
<TextView
android:id="@+id/error"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:gravity="center"
android:textColor="#ff0000"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="gone"/>
</LinearLayout>

2
astrid/res/layout/actfm_login_activity.xml
Unescape Escape View File

@ -42,6 +42,7 @@
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:layout_marginBottom="15dip"
android:paddingLeft="70dip"
android:textSize="16sp"
android:gravity="left|center_vertical"
android:background="@drawable/fb_login_background"
@ -54,6 +55,7 @@
android:layout_height="45dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:paddingLeft="70dip"
android:textSize="16sp"
android:gravity="left|center_vertical"
android:background="@drawable/google_login_background"

Write Preview
Loading…
Cancel
Save