Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #371 from mapzen/chuck/login-full-screen-swipe
Browse files Browse the repository at this point in the history
Login flow. Full screen swipe.
  • Loading branch information
baldur committed Jan 28, 2015
2 parents d717543 + 05a7b92 commit 7db8b45
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 14 deletions.
3 changes: 1 addition & 2 deletions res/layout/login_activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<android.support.v4.view.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_above="@+id/view_pager_indicator" />
android:layout_height="match_parent" />

</RelativeLayout>
5 changes: 3 additions & 2 deletions res/layout/login_page_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/login_padding_horizontal"
android:paddingRight="@dimen/login_padding_horizontal">
android:paddingRight="@dimen/login_padding_horizontal"
android:paddingBottom="@dimen/login_padding_vertical">

<TextView
android:id="@+id/title"
Expand Down
7 changes: 4 additions & 3 deletions res/layout/login_page_2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/login_padding_horizontal"
android:paddingRight="@dimen/login_padding_horizontal">
android:paddingRight="@dimen/login_padding_horizontal"
android:paddingBottom="@dimen/login_padding_vertical">

<TextView
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
7 changes: 4 additions & 3 deletions res/layout/login_page_3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/login_padding_horizontal"
android:paddingRight="@dimen/login_padding_horizontal">
android:paddingRight="@dimen/login_padding_horizontal"
android:paddingBottom="@dimen/login_padding_vertical">

<TextView
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
9 changes: 5 additions & 4 deletions res/layout/login_page_4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top"
android:gravity="bottom"
android:orientation="vertical"
android:paddingLeft="@dimen/login_padding_horizontal"
android:paddingRight="@dimen/login_padding_horizontal">
android:paddingRight="@dimen/login_padding_horizontal"
android:paddingBottom="@dimen/login_padding_vertical">

<Button
<Button
android:id="@+id/login_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -21,7 +22,7 @@
android:textColor="@android:color/white"
android:fontFamily="sans-serif-condensed"
android:background="@drawable/signin_button"
android:layout_marginBottom="40dp"
android:layout_marginBottom="8dp"
android:layout_centerHorizontal="true"
android:singleLine="true"
android:maxLines="1"
Expand Down
1 change: 1 addition & 0 deletions res/values-sw600dp/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<resources>
<dimen name="login_body_font_size">36sp</dimen>
<dimen name="login_padding_horizontal">48dp</dimen>
<dimen name="login_padding_vertical">72dp</dimen>
</resources>
1 change: 1 addition & 0 deletions res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<dimen name="login_title_margin_vertical">12dp</dimen>
<dimen name="login_body_margin_vertical">12dp</dimen>
<dimen name="login_padding_horizontal">24dp</dimen>
<dimen name="login_padding_vertical">48dp</dimen>
<dimen name="login_button_bottom_margin">16dp</dimen>

<!-- fonts -->
Expand Down

0 comments on commit 7db8b45

Please sign in to comment.