Skip to content

Commit 5aebbcc

Browse files
Fixed setButtonCtaLabel() methods not working
1 parent d784107 commit 5aebbcc

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

library/src/main/java/com/heinrichreimersoftware/materialintro/app/IntroActivity.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import android.support.v4.view.ViewCompat;
3030
import android.support.v4.view.ViewPager;
3131
import android.support.v7.app.AppCompatActivity;
32+
import android.text.TextUtils;
3233
import android.util.TypedValue;
3334
import android.view.View;
3435
import android.view.WindowManager;
@@ -388,8 +389,17 @@ private void finishIfNeeded() {
388389
}
389390
}
390391
if (buttonCtaVisible) {
391-
return Pair.create((CharSequence) getString(R.string.mi_label_button_cta),
392-
new ButtonCtaClickListener());
392+
if (buttonCtaLabelRes != 0) {
393+
return Pair.create((CharSequence) getString(buttonCtaLabelRes),
394+
new ButtonCtaClickListener());
395+
}
396+
if (!TextUtils.isEmpty(buttonCtaLabel)) {
397+
return Pair.create(buttonCtaLabel, new ButtonCtaClickListener());
398+
}
399+
else {
400+
return Pair.create((CharSequence) getString(R.string.mi_label_button_cta),
401+
new ButtonCtaClickListener());
402+
}
393403
}
394404
return null;
395405
}

0 commit comments

Comments
 (0)