Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
cleaned up the signin screen layout
Browse files Browse the repository at this point in the history
  • Loading branch information
royclarkson committed Oct 15, 2010
1 parent f1cfc15 commit 35128cd
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 38 deletions.
17 changes: 14 additions & 3 deletions AndroidManifest.xml
Expand Up @@ -8,28 +8,39 @@
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name="com.springsource.greenhouse.activities.FrontDoorActivity">
<activity
android:name="com.springsource.greenhouse.activities.FrontDoorActivity"
android:theme="@android:style/Theme.NoTitleBar">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

</activity>

<activity android:name="com.springsource.greenhouse.activities.SignInActivity" android:label="@string/app_name">
<activity
android:name="com.springsource.greenhouse.activities.SignInActivity"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
<!-- <intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter> -->
</activity>

<activity android:name="com.springsource.greenhouse.activities.OAuthActivity" android:label="@string/app_name">
<activity
android:name="com.springsource.greenhouse.activities.OAuthActivity"
android:label="@string/app_name">

<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="x-com-springsource-greenhouse" android:host="oauth-response" />
</intent-filter>

</activity>

<activity
Expand Down
78 changes: 44 additions & 34 deletions res/layout/signin.xml
@@ -1,38 +1,48 @@
<?xml version='1.0' encoding='utf-8'?>
<LinearLayout xmlns:android='http://schemas.android.com/apk/res/android'
android:orientation='vertical'
android:layout_width='fill_parent'
android:layout_height='fill_parent'
android:background='#ffffff'>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="fill_vertical"
android:background="#ffffff">

<ImageView android:id='@+id/logo'
android:src='@drawable/gh_header_logo'
android:layout_width='wrap_content'
android:layout_height='wrap_content'
android:layout_gravity='center_horizontal'
/>
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="#6DB33F"
android:layout_alignParentTop="true">

<ImageView android:id="@+id/logo"
android:src="@drawable/gh_header_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />

<TextView android:id='@+id/textSignin'
android:text='@string/app_name'
android:layout_width='wrap_content'
android:layout_height='wrap_content'
android:layout_gravity='center_horizontal'
android:textSize='20sp'
android:typeface='normal'
android:textStyle='bold'
android:textColor='#000000'
/>
</FrameLayout>

<Button android:id='@+id/buttonSignin'
android:layout_width='wrap_content'
android:layout_height='wrap_content'
android:layout_gravity='center_horizontal'
android:text='@string/login'
android:layout_marginTop='50dip'
android:paddingTop='0dip'
android:paddingBottom='0dip'
android:paddingLeft='50dip'
android:paddingRight='50dip'
/>
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true">

<Button android:id="@+id/signin_button"
android:layout_width="160dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/login" />

</LinearLayout>
</FrameLayout>

<FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true" >

<ImageView android:id="@+id/logo"
android:src="@drawable/spring09_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />

</FrameLayout>

</RelativeLayout>
Expand Up @@ -15,7 +15,7 @@ public void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.signin);

findViewById(R.id.buttonSignin).setOnClickListener(new OnClickListener() {
findViewById(R.id.signin_button).setOnClickListener(new OnClickListener() {
public void onClick(final View view) {
// uncomment the following line (and comment the line after it) to enable the OAuth stuff
// startActivity(new Intent(SignInActivity.this, OAuthActivity.class));
Expand Down

0 comments on commit 35128cd

Please sign in to comment.