Skip to content

Added more flexible constructors, allowed Showcase item without view … #91

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
MajeurAndroid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added more flexible constructors, allowed Showcase item without view … #91

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 54 additions & 14 deletions library/src/main/java/uk/co/deanwild/materialshowcaseview/MaterialShowcaseSequence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ public class MaterialShowcaseSequence implements IDetachedListener {
private OnSequenceItemShownListener mOnItemShownListener = null;
private OnSequenceItemDismissedListener mOnItemDismissedListener = null;

private MaterialShowcaseView mCurrentShownShowcase;

public MaterialShowcaseSequence(Activity activity) {
mActivity = activity;
mShowcaseQueue = new LinkedList<>();
Expand All @@ -29,19 +31,45 @@ public MaterialShowcaseSequence(Activity activity, String sequenceID) {
this.singleUse(sequenceID);
}

public MaterialShowcaseSequence addSequenceItem(int contentResId, int dismissTextResId) {
addSequenceItem(mActivity.getString(contentResId), mActivity.getString(dismissTextResId));
return this;
}

public MaterialShowcaseSequence addSequenceItem(String content, String dismissText) {
addSequenceItem(null, content, dismissText);
return this;
}

public MaterialShowcaseSequence addSequenceItem(int targetViewId, int contentResId, int dismissTextResId) {
addSequenceItem(mActivity.findViewById(targetViewId), mActivity.getString(contentResId), mActivity.getString(dismissTextResId));
return this;
}

public MaterialShowcaseSequence addSequenceItem(int targetViewId, int titleResId, int contentResId, int dismissTextResId) {
addSequenceItem(mActivity.findViewById(targetViewId), mActivity.getString(titleResId),
mActivity.getString(contentResId), mActivity.getString(dismissTextResId));
return this;
}

public MaterialShowcaseSequence addSequenceItem(View targetView, String content, String dismissText) {
addSequenceItem(targetView, "", content, dismissText);
return this;
}

public MaterialShowcaseSequence addSequenceItem(View targetView, String title, String content, String dismissText) {

MaterialShowcaseView sequenceItem = new MaterialShowcaseView.Builder(mActivity)
.setTarget(targetView)
MaterialShowcaseView.Builder builder = new MaterialShowcaseView.Builder(mActivity)
.setTitleText(title)
.setDismissText(dismissText)
.setContentText(content)
.build();
.setContentText(content);

if (targetView != null)
builder.setTarget(targetView);
else
builder.withoutShape();

MaterialShowcaseView sequenceItem = builder.build();

if (mConfig != null) {
sequenceItem.setConfig(mConfig);
Expand Down Expand Up @@ -71,12 +99,7 @@ public void setOnItemDismissedListener(OnSequenceItemDismissedListener listener)
}

public boolean hasFired() {

if (mPrefsManager.getSequenceStatus() == PrefsManager.SEQUENCE_FINISHED) {
return true;
}

return false;
return mPrefsManager.getSequenceStatus() == PrefsManager.SEQUENCE_FINISHED;
}

public void start() {
Expand Down Expand Up @@ -111,11 +134,11 @@ public void start() {
private void showNextItem() {

if (mShowcaseQueue.size() > 0 && !mActivity.isFinishing()) {
MaterialShowcaseView sequenceItem = mShowcaseQueue.remove();
sequenceItem.setDetachedListener(this);
sequenceItem.show(mActivity);
mCurrentShownShowcase = mShowcaseQueue.remove();
mCurrentShownShowcase.setDetachedListener(this);
mCurrentShownShowcase.show(mActivity);
if (mOnItemShownListener != null) {
mOnItemShownListener.onShow(sequenceItem, mSequencePosition);
mOnItemShownListener.onShow(mCurrentShownShowcase, mSequencePosition);
}
} else {
/**
Expand All @@ -127,10 +150,27 @@ private void showNextItem() {
}
}

// Note: This is not meant to be a pause method, it will act like if user has finished this sequence
public void cancel() {

/**
* Act like we've reached the end of the sequence
*/
while (mShowcaseQueue.poll() != null)
mSequencePosition++;

if (mPrefsManager != null)
mPrefsManager.setSequenceStatus(mSequencePosition);

if (mCurrentShownShowcase != null)
mCurrentShownShowcase.hide();
}


@Override
public void onShowcaseDetached(MaterialShowcaseView showcaseView, boolean wasDismissed) {

mCurrentShownShowcase = null;
showcaseView.setDetachedListener(null);

/**
Expand Down