Skip to content

Added Text Style setting for title and description #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release/0.0.6
Choose a base branch
from
Open

Added Text Style setting for title and description #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
037dcad
Added option to select text style for description and title on SlideF…
alexmantaut Apr 13, 2017
6eda46c
Removed unused include
alexmantaut Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...-intro-screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
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;
Expand All @@ -18,11 +20,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;

Expand Down Expand Up @@ -97,7 +107,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);

Expand All @@ -106,8 +118,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);
Expand Down
21 changes: 21 additions & 0 deletions ...screen/src/main/java/agency/tango/materialintroscreen/fragments/SlideFragmentBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);

Expand Down