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

Restyled the next button in welcome walkthrough

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent d56ca01034
commit 5f43eda03a
4 changed files with 53 additions and 107 deletions
Show Stats Download Patch File Download Diff File

47
astrid/res/layout/welcome_walkthrough.xml
Unescape Escape View File

@ -1,37 +1,50 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- xmlns:app="http://schemas.android.com/apk/res/com.viewpagerindicator.sample" -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
>
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent">
>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"/>
/>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:paddingTop="3dip"
android:paddingBottom="3dip"
android:background="#55000000"
android:gravity="center_vertical">
<com.viewpagerindicator.CirclePageIndicator <com.viewpagerindicator.CirclePageIndicator
android:id="@+id/indicator" android:id="@+id/indicator"
android:padding="15dip" android:padding="15dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_alignBottom="@id/pager"
android:background="#00000000" android:background="#00000000"
style="@style/CustomCirclePageIndicator" style="@style/CustomCirclePageIndicator"/>
/> <TextView
<!-- android:id="@+id/next"
app:radius="10dp" android:layout_width="wrap_content"
app:fillColor="#FF888888" android:layout_height="wrap_content"
app:strokeColor="#FF000000" android:layout_alignParentRight="true"
app:strokeWidth="2dp" --> android:layout_centerVertical="true"
android:layout_marginRight="5dip"
android:text="@string/welcome_next"
android:textColor="#444444"
android:textSize="20dip"
android:textStyle="bold"
android:shadowRadius="2"
android:shadowDy="1"
android:shadowColor="@android:color/white" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

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

@ -5,7 +5,7 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:paddingLeft="4dip" android:paddingLeft="4dip"
android:paddingRight="4dip" android:paddingRight="4dip"
android:background="@drawable/welcome_walkthrough_fabric" android:background="#d0d0d0"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView

35
astrid/res/layout/welcome_walkthrough_page.xml
Unescape Escape View File

@ -3,7 +3,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@drawable/welcome_walkthrough_fabric"> android:background="#d0d0d0">
<TextView <TextView
android:id="@+id/welcome_walkthrough_title" android:id="@+id/welcome_walkthrough_title"
@ -26,28 +26,11 @@
android:src="@drawable/welcome_walkthrough_1" android:src="@drawable/welcome_walkthrough_1"
android:scaleType="fitCenter"/> android:scaleType="fitCenter"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="75dp"
android:gravity="center_vertical">
<ImageView
android:id="@+id/back"
android:layout_width="30dip"
android:layout_height="30dip"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:layout_marginLeft="3dip"
android:src="@drawable/icn_arrow_left"
android:scaleType="fitCenter"/>
<TextView <TextView
android:id="@+id/welcome_walkthrough_body" android:id="@+id/welcome_walkthrough_body"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_marginBottom="75dp"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Hello" android:text="Hello"
android:textColor="#444444" android:textColor="#444444"
@ -57,18 +40,4 @@
android:shadowDy="1" android:shadowDy="1"
android:shadowColor="@android:color/white" /> android:shadowColor="@android:color/white" />
<ImageView
android:id="@+id/next"
android:layout_width="30dip"
android:layout_height="30dip"
android:paddingLeft="5dip"
android:paddingRight="5dip"
android:layout_marginRight="3dip"
android:gravity="center_horizontal"
android:src="@drawable/icn_arrow_right"
android:scaleType="fitCenter"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

36
astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
Unescape Escape View File

@ -7,7 +7,6 @@ import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
@ -86,41 +85,6 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.MATCH_PARENT)); WindowManager.LayoutParams.MATCH_PARENT));
View back = pageView.findViewById(R.id.back);
View next = pageView.findViewById(R.id.next);
if (back != null) {
back.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (v.getVisibility() == View.VISIBLE) {
((ViewPager) pager).setCurrentItem(position -1, true);
}
}
});
if (position == 0) {
back.setVisibility(View.INVISIBLE);
}
}
if (next != null) {
next.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (v.getVisibility() == View.VISIBLE) {
((ViewPager) pager).setCurrentItem(position + 1, true);
}
}
});
if (position == layouts.length - 1) {
next.setVisibility(View.INVISIBLE);
}
}
if (pageView.findViewById(R.id.welcome_walkthrough_image) != null) { if (pageView.findViewById(R.id.welcome_walkthrough_image) != null) {
ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image); ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image);
imageView.setImageResource(images[position]); imageView.setImageResource(images[position]);

Write Preview
Loading…
Cancel
Save