Skip to content

Commit

Permalink
Adjust tutorial layout and paddings
Browse files Browse the repository at this point in the history
  • Loading branch information
@tasomaniac
tasomaniac committed Oct 30, 2016
1 parent 3e9497e commit 73998d5
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 128 deletions.
2 changes: 0 additions & 2 deletions app/src/main/java/org/gdg/frisbee/android/onboarding/FirstStartActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,11 @@ public void onResult(@NonNull GoogleSignInResult googleSignInResult) {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);

if (requestCode == RC_SIGN_IN) {
GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
handleSignInResult(result);
return;
}

mViewPagerAdapter.getItem(mViewPager.getCurrentItem()).onActivityResult(requestCode, resultCode, data);
}

Expand Down
164 changes: 73 additions & 91 deletions app/src/main/res/layout-land/fragment_welcome_step1.xml
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:orientation="horizontal">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_weight="1"
android:layout_marginLeft="@dimen/keyline_1"
android:layout_marginRight="@dimen/keyline_1"
android:orientation="vertical">

<LinearLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/welcome"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/choose_home_gdg"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"/>

<ViewSwitcher
android:id="@+id/viewSwitcher"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="25dip"
android:layout_marginLeft="10dip"
android:layout_marginTop="10dip"
android:orientation="vertical"
android:padding="5dip">

<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/welcome"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"
android:textIsSelectable="false" />
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">

<TextView
android:id="@+id/textView1"
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/choose_home_gdg"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"
android:textIsSelectable="false" />
android:indeterminate="true"
android:indeterminateOnly="true"/>
</LinearLayout>

<ViewSwitcher
android:id="@+id/viewSwitcher"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out">
android:gravity="center_horizontal"
android:orientation="vertical">

<LinearLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/chapter_spinner_text_input_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
android:layout_height="wrap_content">

<ProgressBar
android:id="@+id/progressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
android:indeterminateOnly="true" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">

<android.support.design.widget.TextInputLayout
android:id="@+id/chapter_spinner_text_input_layout"
<org.gdg.frisbee.android.view.AutoCompleteSpinnerView
android:id="@+id/chapter_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.gdg.frisbee.android.view.AutoCompleteSpinnerView
android:id="@+id/chapter_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/keyline_1"
android:layout_marginRight="@dimen/keyline_1"
android:drawableRight="@drawable/spinner_arrow_dropdown"
android:hint="@string/home_gdg"
android:minHeight="50dip"
android:minWidth="200dip"
android:paddingLeft="@dimen/spinner_left_padding"
android:paddingRight="4dp"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>

<Button
android:id="@+id/confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/confirm" />
</LinearLayout>
</ViewSwitcher>
</LinearLayout>
android:drawableRight="@drawable/spinner_arrow_dropdown"
android:hint="@string/home_gdg"
android:minHeight="50dip"
android:minWidth="200dip"
android:singleLine="true"/>
</android.support.design.widget.TextInputLayout>

<org.gdg.frisbee.android.widget.ResizableImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:adjustViewBounds="true"
android:background="@drawable/gdg_world" />
<Button
android:id="@+id/confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/confirm"/>
</LinearLayout>
</ViewSwitcher>
</LinearLayout>
</FrameLayout>

<org.gdg.frisbee.android.widget.ResizableImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="@dimen/keyline_1"
android:layout_marginRight="@dimen/keyline_1"
android:adjustViewBounds="true"
android:background="@drawable/gdg_world"/>
</LinearLayout>
1 change: 0 additions & 1 deletion app/src/main/res/layout-land/fragment_welcome_step2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,5 @@
android:layout_below="@id/textView1"
android:text="@string/skip" />


</RelativeLayout>
</LinearLayout>
58 changes: 24 additions & 34 deletions app/src/main/res/layout/fragment_welcome_step1.xml
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical">
android:orientation="vertical"
android:paddingLeft="@dimen/keyline_1"
android:paddingRight="@dimen/keyline_1">

<LinearLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="25dip"
android:layout_marginLeft="10dp"
android:orientation="vertical"
android:paddingBottom="5dip"
android:paddingTop="5dip">
android:linksClickable="false"
android:singleLine="true"
android:text="@string/welcome"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"/>

<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/welcome"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"
android:textIsSelectable="false" />

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/choose_home_gdg"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"
android:textIsSelectable="false" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:singleLine="true"
android:text="@string/choose_home_gdg"
android:textAppearance="@android:style/TextAppearance.Large"
android:textColor="@color/asbestos"
android:paddingBottom="24dp"/>

<org.gdg.frisbee.android.widget.ResizableImageView
android:id="@+id/imageView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:background="@drawable/gdg_world" />
android:background="@drawable/gdg_world"/>

<ViewSwitcher
android:id="@+id/viewSwitcher"
Expand All @@ -63,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
android:indeterminateOnly="true" />
android:indeterminateOnly="true"/>
</LinearLayout>

<LinearLayout
Expand All @@ -87,14 +77,14 @@
android:hint="@string/home_gdg"
android:paddingLeft="@dimen/spinner_left_padding"
android:paddingRight="4dp"
android:singleLine="true" />
android:singleLine="true"/>
</android.support.design.widget.TextInputLayout>

<Button
android:id="@+id/confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/confirm" />
android:text="@string/confirm"/>
</LinearLayout>
</ViewSwitcher>
</LinearLayout>

0 comments on commit 73998d5

Please sign in to comment.