Skip to content

Commit

Permalink
Bah. Stupid runtime errors. (reverted from commit 4c25ed4)
Browse files Browse the repository at this point in the history
  • Loading branch information
risesoftware committed Nov 1, 2016
1 parent e0081dd commit 31faff4
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 89 deletions.
6 changes: 3 additions & 3 deletions onboarder/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ repositories {
}

android {
compileSdkVersion 25
buildToolsVersion "25.0.0"
compileSdkVersion 23
buildToolsVersion "23.0.3"

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion onboarder/src/main/java/com/chyrta/onboarder/OnboarderAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

public class OnboarderAdapter extends FragmentStatePagerAdapter {

List<OnboarderPage> pages = new ArrayList<>();
List<OnboarderPage> pages = new ArrayList<OnboarderPage>();

public OnboarderAdapter(List<OnboarderPage> pages, FragmentManager fm) {
super(fm);
Expand Down
0 ...arder/src/main/res/drawable-xhdpi/die.png → ...c/main/res/drawable-xhdpi/DieForMusic.png
View file
File renamed without changes
2 changes: 1 addition & 1 deletion onboarder/src/main/res/layout-land/fragment_onboarder.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:contentDescription="@null"
tools:background="@drawable/die"
tools:background="@drawable/DieForMusic"
/>
</FrameLayout>

Expand Down
159 changes: 76 additions & 83 deletions onboarder/src/main/res/layout/activity_onboarder.xml
View file
Original file line number Diff line number Diff line change
@@ -1,95 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_onboarder"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".OnboarderActivity"
>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cl_onboarder"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".OnboarderActivity">

<android.support.v4.view.ViewPager
android:id="@+id/vp_onboarder_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="?attr/actionBarSize"
/>
<android.support.v4.view.ViewPager
android:id="@+id/vp_onboarder_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="?attr/actionBarSize"/>

<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:layout_marginBottom="?attr/actionBarSize"
android:background="?android:attr/listDivider"
/>
<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:layout_marginBottom="?attr/actionBarSize"
android:background="?android:attr/listDivider"/>

<FrameLayout
android:id="@+id/buttons_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:paddingEnd="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingStart="@dimen/activity_margin"
>
<Button
android:id="@+id/btn_skip"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:text="@string/button.skip"
android:textColor="@color/white"
/>
<FrameLayout
android:id="@+id/buttons_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
android:paddingEnd="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingStart="@dimen/activity_margin">

<LinearLayout
android:id="@+id/ll_indicators"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal"
>
<com.chyrta.onboarder.views.CircleIndicatorView
android:id="@+id/circle_indicator_view"

<Button
android:id="@+id/btn_skip"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:text="@string/button.skip"
android:textColor="@color/white"/>

<LinearLayout
android:id="@+id/ll_indicators"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
</LinearLayout>
android:layout_gravity="center"
android:orientation="horizontal">

<com.chyrta.onboarder.views.CircleIndicatorView
android:id="@+id/circle_indicator_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

</LinearLayout>

<Button
android:id="@+id/btn_finish"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center"
android:text="@string/button.finish"
android:textColor="@color/white"
android:visibility="gone"
/>
<Button
android:id="@+id/btn_finish"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center"
android:text="@string/button.finish"
android:textColor="@color/white"
android:visibility="gone"/>

<ImageButton
android:id="@+id/ib_next"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center"
android:padding="@dimen/activity_margin"
android:src="@drawable/ic_chevron_right"
android:tint="@color/white"/>

<ImageButton
android:id="@+id/ib_next"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center"
android:padding="@dimen/activity_margin"
android:src="@drawable/ic_chevron_right"
android:tint="@color/white"
android:contentDescription="@null"
/>
</FrameLayout>
</FrameLayout>

<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="@dimen/activity_margin"
android:visibility="gone"
android:src="@drawable/ic_arrow_forward_white_24dp"
/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="@dimen/activity_margin"
android:visibility="gone"
android:src="@drawable/ic_arrow_forward_white_24dp" />

</android.support.design.widget.CoordinatorLayout>
2 changes: 1 addition & 1 deletion onboarder/src/main/res/layout/fragment_onboarder.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
android:layout_gravity="bottom|center_horizontal"
android:scaleType="fitCenter"
android:contentDescription="@null"
tools:background="@drawable/die"
tools:background="@drawable/DieForMusic"
/>
</FrameLayout>

Expand Down
8 changes: 8 additions & 0 deletions onboarder/src/main/res/values-h720dp/dimen.xml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<!-- Used for -->
<!-- Nexus 7 -->
<!-- Nexus 5x -->
<!-- Nexus 6p -->
<!-- Nexus 6 -->



<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="text_section_min_height">250dp</dimen>
Expand Down

0 comments on commit 31faff4

Please sign in to comment.