diff --git a/README.md b/README.md index b180155..e7e75f8 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,9 @@ setActiveIndicatorColor(R.color.white); //Set finish button text setFinishButtonTitle("Get Started"); +//Set finish button color +setFinishButtonBackground(R.color.black); + //Set the finish button style setFinishButtonDrawableStyle(ContextCompat.getDrawable(this, R.drawable.rounded_button)); ``` diff --git a/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java b/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java index 7d3ecdf..8bb6948 100644 --- a/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java +++ b/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java @@ -44,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) { } setFinishButtonTitle("Finish"); + setFinishButtonBackground(R.color.black); showNavigationControls(true); setGradientBackground(); diff --git a/onboarder/src/main/java/com/codemybrainsout/onboarder/AhoyOnboarderActivity.java b/onboarder/src/main/java/com/codemybrainsout/onboarder/AhoyOnboarderActivity.java index 30b40d7..9ff5d6e 100644 --- a/onboarder/src/main/java/com/codemybrainsout/onboarder/AhoyOnboarderActivity.java +++ b/onboarder/src/main/java/com/codemybrainsout/onboarder/AhoyOnboarderActivity.java @@ -17,6 +17,7 @@ import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.DecelerateInterpolator; +import android.widget.Button; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.RelativeLayout; @@ -33,7 +34,7 @@ public abstract class AhoyOnboarderActivity extends AppCompatActivity implements private CircleIndicatorView circleIndicatorView; private ViewPager vpOnboarderPager; private AhoyOnboarderAdapter ahoyOnboarderAdapter; - private TextView btnSkip; + private Button btnSkip; private ImageView ivNext, ivPrev; private FrameLayout navigationControls; private FrameLayout buttonsLayout; @@ -56,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) { parentLayout = (RelativeLayout) findViewById(R.id.parent_layout); circleIndicatorView = (CircleIndicatorView) findViewById(R.id.circle_indicator_view); - btnSkip = (TextView) findViewById(R.id.btn_skip); + btnSkip = (Button) findViewById(R.id.btn_skip); buttonsLayout = (FrameLayout) findViewById(R.id.buttons_layout); navigationControls = (FrameLayout) findViewById(R.id.navigation_layout); ivNext = (ImageView) findViewById(R.id.ivNext); @@ -106,9 +107,11 @@ public void onClick(View v) { if (i == R.id.btn_skip && isInLastPage) { onFinishButtonPressed(); - } else if (i == R.id.ivPrev && !isInFirstPage) { + } + else if (i == R.id.ivPrev && !isInFirstPage) { vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() - 1); - } else if (i == R.id.ivNext && !isInLastPage) { + } + else if (i == R.id.ivNext && !isInLastPage) { vpOnboarderPager.setCurrentItem(vpOnboarderPager.getCurrentItem() + 1); } } @@ -131,12 +134,14 @@ public void onPageSelected(int position) { showFinish(); fadeOut(ivNext); fadeIn(ivPrev); - } else if (position == firstPagePosition) { + } + else if (position == firstPagePosition) { fadeOut(ivPrev); fadeIn(ivNext); hideFinish(); fadeIn(circleIndicatorView); - } else { + } + else { fadeIn(circleIndicatorView); hideFinish(); fadeIn(ivPrev); @@ -267,7 +272,8 @@ private void hideActionBar() { public void showNavigationControls(boolean navigation) { if (navigation) { navigationControls.setVisibility(View.VISIBLE); - } else { + } + else { navigationControls.setVisibility(View.GONE); } } @@ -334,6 +340,20 @@ public void setFinishButtonTitle(@StringRes int titleResId) { btnSkip.setText(titleResId); } + /** + *

+ * N.B. Builds before LOLLIPOP will use the default style + *

+ * Set the color of the skip/done button,
+ * + * @param colorResId A color res representing your button color + */ + public void setFinishButtonBackground(@ColorRes int colorResId) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + btnSkip.setBackgroundTintList(ContextCompat.getColorStateList(this, colorResId)); + } + } + public void setFont(Typeface typeface) { this.btnSkip.setTypeface(typeface); this.typeface = typeface; diff --git a/onboarder/src/main/res/layout-v21/activity_ahoy.xml b/onboarder/src/main/res/layout-v21/activity_ahoy.xml index b4443c4..a409ad9 100644 --- a/onboarder/src/main/res/layout-v21/activity_ahoy.xml +++ b/onboarder/src/main/res/layout-v21/activity_ahoy.xml @@ -35,7 +35,7 @@ android:layout_marginBottom="25dp" android:layout_marginTop="20dp" /> - -