From 037dcad7a2829374373fb05891a8c8e529dc149b Mon Sep 17 00:00:00 2001 From: alexmantaut Date: Thu, 13 Apr 2017 11:58:18 +1000 Subject: [PATCH 1/2] Added option to select text style for description and title on SlideFragment --- .../fragments/SlideFragment.java | 22 +++++++++++++++++++ .../fragments/SlideFragmentBuilder.java | 21 ++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java index 40bd55f..16342c3 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java @@ -1,10 +1,13 @@ package agency.tango.materialintroscreen.fragments; +import android.os.Build; import android.os.Bundle; import android.support.annotation.ColorRes; import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; +import android.support.annotation.StyleRes; import android.support.v4.content.ContextCompat; +import android.support.v4.widget.TextViewCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,11 +21,19 @@ public class SlideFragment extends SlideFragmentBase { public static final String BACKGROUND_COLOR = "background_color"; public static final String BUTTONS_COLOR = "buttons_color"; public static final String TITLE = "title"; + public static final String TITLE_STYLE = "title_style"; public static final String DESCRIPTION = "description"; + public static final String DESCRIPTION_STYLE = "description_style"; public static final String NEEDED_PERMISSIONS = "needed_permission"; public static final String POSSIBLE_PERMISSIONS = "possible_permission"; public static final String IMAGE = "image"; + @StyleRes + private int titleStyle; + + @StyleRes + private int descriptionStyle; + @ColorRes private int backgroundColor; @@ -97,7 +108,9 @@ private void initializeView() { buttonsColor = bundle.getInt(BUTTONS_COLOR); image = bundle.getInt(IMAGE, 0); title = bundle.getString(TITLE); + titleStyle = bundle.getInt(TITLE_STYLE,0); description = bundle.getString(DESCRIPTION); + descriptionStyle = bundle.getInt(DESCRIPTION_STYLE,0); neededPermissions = bundle.getStringArray(NEEDED_PERMISSIONS); possiblePermissions = bundle.getStringArray(POSSIBLE_PERMISSIONS); @@ -106,8 +119,17 @@ private void initializeView() { private void updateViewWithValues() { titleTextView.setText(title); + + if(titleStyle != 0){ + TextViewCompat.setTextAppearance(titleTextView,titleStyle); + } + descriptionTextView.setText(description); + if(descriptionStyle != 0){ + TextViewCompat.setTextAppearance(descriptionTextView,descriptionStyle); + } + if (image != 0) { imageView.setImageDrawable(ContextCompat.getDrawable(getActivity(), image)); imageView.setVisibility(View.VISIBLE); diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBuilder.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBuilder.java index 90fe1a2..69f2638 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBuilder.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBuilder.java @@ -3,14 +3,17 @@ import android.os.Bundle; import android.support.annotation.ColorRes; import android.support.annotation.DrawableRes; +import android.support.annotation.StyleRes; import static agency.tango.materialintroscreen.fragments.SlideFragment.BACKGROUND_COLOR; import static agency.tango.materialintroscreen.fragments.SlideFragment.BUTTONS_COLOR; import static agency.tango.materialintroscreen.fragments.SlideFragment.DESCRIPTION; +import static agency.tango.materialintroscreen.fragments.SlideFragment.DESCRIPTION_STYLE; import static agency.tango.materialintroscreen.fragments.SlideFragment.IMAGE; import static agency.tango.materialintroscreen.fragments.SlideFragment.NEEDED_PERMISSIONS; import static agency.tango.materialintroscreen.fragments.SlideFragment.POSSIBLE_PERMISSIONS; import static agency.tango.materialintroscreen.fragments.SlideFragment.TITLE; +import static agency.tango.materialintroscreen.fragments.SlideFragment.TITLE_STYLE; @SuppressWarnings("unused") public class SlideFragmentBuilder { @@ -24,6 +27,12 @@ public class SlideFragmentBuilder { @DrawableRes private int image; + @StyleRes + private int titleStyle; + + @StyleRes + private int descriptionStyle; + private String title; private String description; private String[] neededPermissions; @@ -44,11 +53,21 @@ public SlideFragmentBuilder title(String title) { return this; } + public SlideFragmentBuilder titleStyle(@StyleRes int titleStyle) { + this.titleStyle = titleStyle; + return this; + } + public SlideFragmentBuilder description(String description) { this.description = description; return this; } + public SlideFragmentBuilder descriptionStyle(@StyleRes int descriptionStyle) { + this.descriptionStyle = descriptionStyle; + return this; + } + public SlideFragmentBuilder neededPermissions(String[] neededPermissions) { this.neededPermissions = neededPermissions; return this; @@ -82,7 +101,9 @@ public SlideFragment build() { bundle.putInt(BUTTONS_COLOR, buttonsColor); bundle.putInt(IMAGE, image); bundle.putString(TITLE, title); + bundle.putInt(TITLE_STYLE, titleStyle); bundle.putString(DESCRIPTION, description); + bundle.putInt(DESCRIPTION_STYLE, descriptionStyle); bundle.putStringArray(NEEDED_PERMISSIONS, neededPermissions); bundle.putStringArray(POSSIBLE_PERMISSIONS, possiblePermissions); From 6eda46c8a9846cf26f5563a0872397e802178683 Mon Sep 17 00:00:00 2001 From: alexmantaut Date: Thu, 13 Apr 2017 22:24:45 +1000 Subject: [PATCH 2/2] Removed unused include --- .../tango/materialintroscreen/fragments/SlideFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java index 16342c3..8bb2b8a 100644 --- a/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java +++ b/material-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java @@ -1,6 +1,5 @@ package agency.tango.materialintroscreen.fragments; -import android.os.Build; import android.os.Bundle; import android.support.annotation.ColorRes; import android.support.annotation.DrawableRes;