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

Polished the new layout for the standard login activity

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent e728bde5d6
commit 6d228312db
6 changed files with 79 additions and 105 deletions
Show Stats Download Patch File Download Diff File

12
astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
Unescape Escape View File

@ -36,7 +36,6 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup.LayoutParams;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ScrollView;
@ -215,13 +214,6 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
return link;
}
private void setupSignIn(TextView signIn) {
signIn.setOnClickListener(signInListener);
SpannableString content = new SpannableString(getString(R.string.welcome_sign_in));
content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
signIn.setText(content);
}
@SuppressWarnings("nls")
protected void initializeUI() {
facebook = new Facebook(APP_ID);
@ -239,11 +231,11 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
if(AmazonMarketStrategy.isKindleFire())
googleLogin.setVisibility(View.GONE);
googleLogin.setOnClickListener(googleListener);
Button signUp = (Button) findViewById(R.id.pw_signup);
TextView signUp = (TextView) findViewById(R.id.pw_signup);
signUp.setOnClickListener(signUpListener);
TextView signIn = (TextView) findViewById(R.id.pw_login);
setupSignIn(signIn);
signIn.setOnClickListener(signInListener);
setupTermsOfService((TextView) findViewById(R.id.tos));
}

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

@ -13,101 +13,97 @@
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" />
<ImageView
android:id="@+id/logo"
android:layout_width="fill_parent"
android:layout_height="110dip"
android:scaleType="fitCenter"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:paddingBottom="10dip"
android:src="@drawable/astrid_com_logo" />
android:layout_height="fill_parent"
android:layout_weight="1"
android:paddingTop="95dip"
android:scaleType="center"
android:src="@drawable/astrid_com_logo_new" />
<TextView
android:id="@+id/error"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="45dip"
android:gravity="center"
android:textColor="#ff0000"
android:textSize="16sp"
android:textStyle="bold" />
<RelativeLayout
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingTop="5dip">
<TextView
android:id="@+id/tos"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:layout_alignParentBottom="true"
android:gravity="center"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:textSize="12.5sp"
android:textColor="#ffffff" />
<TextView
android:id="@+id/pw_login"
android:layout_width="wrap_content"
android:layout_height="35dip"
android:gravity="center"
android:layout_centerHorizontal="true"
android:layout_above="@id/tos"
android:textColor="#444"
android:textSize="16sp"
android:text="@string/welcome_sign_in"/>
<Button
android:id="@+id/pw_signup"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_above="@id/pw_login"
android:paddingLeft="17dip"
android:paddingRight="20dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:drawableLeft="@drawable/notif_astrid"
android:textSize="16sp"
android:text="@string/welcome_login_pw"/>
android:layout_height="wrap_content"
android:orientation="vertical">
<com.facebook.android.LoginButton
android:id="@+id/fb_login"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_above="@id/pw_signup"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:layout_marginBottom="15dip"
android:textSize="16sp"
android:drawableLeft="@drawable/facebook"
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/gg_login"
android:layout_width="fill_parent"
android:layout_height="45dip"
android:layout_above="@id/fb_login"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:textSize="16sp"
android:drawableLeft="@drawable/google"
android:gravity="left|center_vertical"
android:background="@drawable/google_login_background"
android:textColor="@android:color/white"
android:text="@string/actfm_ALA_gg_login" />
</RelativeLayout>
<TextView
android:id="@+id/tos"
android:layout_width="fill_parent"
android:layout_height="35dip"
android:gravity="center"
android:paddingLeft="20dip"
android:paddingRight="20dip"
android:textSize="12.5sp"
android:visibility="invisible"
android:textColor="#ffffff" />
</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>
</LinearLayout>

1
astrid/res/layout/welcome_walkthrough_login_page.xml
Unescape Escape View File

@ -112,6 +112,7 @@
android:paddingRight="20dip"
android:paddingBottom="5dip"
android:textSize="16sp"
android:text="@string/welcome_login_later"
android:textColor="#444444" />
</RelativeLayout>

5
astrid/res/layout/welcome_walkthrough_simple_login.xml
Unescape Escape View File

@ -10,15 +10,14 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:paddingTop="39dip"
android:src="@drawable/astrid_com_logo_new"
android:padding="10dip"
android:scaleType="center" />
<Button
android:id="@+id/quick_login_google"
android:layout_width="280dip"
android:layout_height="45dip"
android:layout_marginTop="-30dip"
android:textSize="16sp"
android:background="@drawable/google_login_background"
android:layout_marginBottom="15dip"/>
@ -26,7 +25,7 @@
<TextView
android:id="@+id/quick_login_reject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="45dip"
android:layout_marginBottom="70dip"
android:textSize="16sp"
android:textColor="@android:color/white"/>

6
astrid/res/values/strings-intro.xml
Unescape Escape View File

@ -38,12 +38,12 @@
<string name="welcome_login_tos_link">Terms of Service</string>
<!-- slide 7e -->
<string name="welcome_login_pw">Sign up with email</string>
<string name="welcome_login_pw">Sign up</string>
<string name="welcome_sign_in">Sign in</string>
<string name="welcome_sign_in">Log in</string>
<!-- slide 7f -->
<string name="welcome_login_later">Connect Later</string>
<string name="welcome_login_later">Later</string>
<string name="welcome_login_confirm_later_title">Why not sign in?</string>

32
astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
Unescape Escape View File

@ -15,14 +15,9 @@ import android.accounts.AccountManagerCallback;
import android.accounts.AccountManagerFuture;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.ClickableSpan;
import android.util.Log;
import android.view.View;
import android.view.View.OnClickListener;
@ -82,6 +77,10 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
}
}
private int getLoginPageLayout() {
return R.layout.actfm_login_activity;
}
@Override
protected void initializeUI() {
String[] accounts = ModernAuthManager.getAccounts(this);
@ -93,8 +92,8 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
if (simpleLogin != null && !TextUtils.isEmpty(email)) {
initializeSimpleUI(email);
} else {
if (mAdapter != null && mAdapter.layouts[mAdapter.layouts.length - 1] != R.layout.welcome_walkthrough_login_page)
mAdapter.changeLoginPage(R.layout.welcome_walkthrough_login_page);
if (mAdapter != null && mAdapter.layouts[mAdapter.layouts.length - 1] != getLoginPageLayout())
mAdapter.changeLoginPage(getLoginPageLayout());
super.initializeUI();
}
}
@ -148,7 +147,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
rejectQuickLogin.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
mAdapter.changeLoginPage(R.layout.welcome_walkthrough_login_page);
mAdapter.changeLoginPage(getLoginPageLayout());
mPager.setAdapter(mAdapter);
mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
initializeUI();
@ -186,6 +185,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
currentView.findViewById(R.id.welcome_walkthrough_image).setOnClickListener(done);
}
}
((CirclePageIndicator) mIndicator).setVisibility(currentPage == mAdapter.getCount()-1 ? View.GONE : View.VISIBLE);
}
protected void setupPWLogin() {
@ -196,21 +196,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
protected void setupLoginLater() {
TextView loginLater = (TextView)currentView.findViewById(R.id.login_later);
loginLater.setOnClickListener(loginLaterListener);
String loginLaterBase = getString(R.string.welcome_login_later);
SpannableString loginLaterLink = new SpannableString(String.format("%s", loginLaterBase)); //$NON-NLS-1$
ClickableSpan laterSpan = new ClickableSpan() {
@Override
public void onClick(View widget) {
loginLaterListener.onClick(widget);
}
@Override
public void updateDrawState(TextPaint ds) {
ds.setUnderlineText(true);
ds.setColor(Color.rgb(68, 68, 68));
}
};
loginLaterLink.setSpan(laterSpan, 0, loginLaterBase.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
loginLater.setText(loginLaterLink);
loginLater.setVisibility(View.VISIBLE);
}

Write Preview
Loading…
Cancel
Save