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

Renamed ViewPagerAdapter to WelcomePagerAdapter, fixed a welcome layout issue on small screens

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent 1786ee5fa0
commit e6013fa080
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -21,7 +21,7 @@
android:textStyle="bold" android:textStyle="bold"
android:shadowRadius="2" android:shadowRadius="2"
android:shadowDy="1" android:shadowDy="1"
android:shadowColor="@android:color/white" /> android:shadowColor="@android:color/white"/>
<TextView <TextView
android:id="@+id/error" android:id="@+id/error"
@ -38,34 +38,34 @@
android:paddingTop="5dip" > android:paddingTop="5dip" >
<TextView <TextView
android:id="@+id/login_later" android:id="@+id/tos"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="45dip" android:layout_height="35dip"
android:layout_alignParentTop="true"
android:gravity="center" android:gravity="center"
android:layout_alignParentBottom="true"
android:paddingLeft="20dip" android:paddingLeft="20dip"
android:paddingRight="20dip" android:paddingRight="20dip"
android:paddingBottom="5dip" android:textSize="12.5sp"
android:textSize="16sp"
android:textColor="#444444" /> android:textColor="#444444" />
<Button <Button
android:id="@+id/pw_login" android:id="@+id/gg_login"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="45dip" android:layout_height="45dip"
android:layout_above="@id/login_later" android:layout_below="@id/tos"
android:paddingLeft="20dip" android:paddingLeft="20dip"
android:paddingRight="20dip" android:paddingRight="20dip"
android:layout_marginLeft="15dip" android:layout_marginLeft="15dip"
android:layout_marginRight="15dip" android:layout_marginRight="15dip"
android:textSize="16sp" android:textSize="16sp"
android:text="@string/welcome_login_pw"/> android:drawableLeft="@drawable/google"
android:text="@string/actfm_ALA_gg_login" />
<com.facebook.android.LoginButton <com.facebook.android.LoginButton
android:id="@+id/fb_login" android:id="@+id/fb_login"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="45dip" android:layout_height="45dip"
android:layout_above="@id/pw_login" android:layout_below="@id/gg_login"
android:paddingLeft="20dip" android:paddingLeft="20dip"
android:paddingRight="20dip" android:paddingRight="20dip"
android:layout_marginLeft="15dip" android:layout_marginLeft="15dip"
@ -75,27 +75,28 @@
android:text="@string/actfm_ALA_fb_login" /> android:text="@string/actfm_ALA_fb_login" />
<Button <Button
android:id="@+id/gg_login" android:id="@+id/pw_login"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="45dip" android:layout_height="45dip"
android:layout_above="@id/fb_login" android:layout_below="@id/fb_login"
android:paddingLeft="20dip" android:paddingLeft="20dip"
android:paddingRight="20dip" android:paddingRight="20dip"
android:layout_marginLeft="15dip" android:layout_marginLeft="15dip"
android:layout_marginRight="15dip" android:layout_marginRight="15dip"
android:textSize="16sp" android:textSize="16sp"
android:drawableLeft="@drawable/google" android:text="@string/welcome_login_pw"/>
android:text="@string/actfm_ALA_gg_login" />
<TextView <TextView
android:id="@+id/tos" android:id="@+id/login_later"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="35dip" android:layout_height="45dip"
android:layout_above="@id/gg_login"
android:gravity="center" android:gravity="center"
android:layout_below="@id/pw_login"
android:paddingLeft="20dip" android:paddingLeft="20dip"
android:paddingRight="20dip" android:paddingRight="20dip"
android:textSize="12.5sp" android:paddingBottom="5dip"
android:textSize="16sp"
android:textColor="#444444" /> android:textColor="#444444" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

4
astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java → astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
Unescape Escape View File

@ -18,7 +18,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.viewpagerindicator.TitleProvider; import com.viewpagerindicator.TitleProvider;
public class ViewPagerAdapter extends PagerAdapter implements TitleProvider public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
{ {
private static int[] images = new int[] { private static int[] images = new int[] {
R.drawable.welcome_walkthrough_1, R.drawable.welcome_walkthrough_1,
@ -57,7 +57,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
public WelcomeWalkthrough parent; public WelcomeWalkthrough parent;
@Autowired ActFmPreferenceService actFmPreferenceService; @Autowired ActFmPreferenceService actFmPreferenceService;
public ViewPagerAdapter(Context context, boolean manual) { public WelcomePagerAdapter(Context context, boolean manual) {
this.context = context; this.context = context;
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);

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

@ -23,7 +23,7 @@ import com.viewpagerindicator.PageIndicator;
public class WelcomeWalkthrough extends ActFmLoginActivity { public class WelcomeWalkthrough extends ActFmLoginActivity {
private ViewPager mPager; private ViewPager mPager;
private ViewPagerAdapter mAdapter; private WelcomePagerAdapter mAdapter;
private PageIndicator mIndicator; private PageIndicator mIndicator;
private View currentView; private View currentView;
private int currentPage; private int currentPage;
@ -37,7 +37,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
requestWindowFeature(Window.FEATURE_NO_TITLE); requestWindowFeature(Window.FEATURE_NO_TITLE);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
mAdapter = new ViewPagerAdapter(this, getIntent().hasExtra(TOKEN_MANUAL_SHOW)); mAdapter = new WelcomePagerAdapter(this, getIntent().hasExtra(TOKEN_MANUAL_SHOW));
mAdapter.parent = this; mAdapter.parent = this;
mPager = (ViewPager)findViewById(R.id.pager); mPager = (ViewPager)findViewById(R.id.pager);

Write Preview
Loading…
Cancel
Save