From c83648a0c8ea9bfbd3fed5c11617824cb76ca498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=93=D0=BE=D1=80=D1=88=D0=BA=D0=BE=D0=B2?= Date: Sat, 16 Jul 2016 13:56:07 +0300 Subject: [PATCH 1/2] Add background dialog support --- .../mobiwise/materialintro/utils/Constants.java | 2 ++ .../materialintro/view/MaterialIntroView.java | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/materialintro/src/main/java/co/mobiwise/materialintro/utils/Constants.java b/materialintro/src/main/java/co/mobiwise/materialintro/utils/Constants.java index c97b6a4..45c2889 100644 --- a/materialintro/src/main/java/co/mobiwise/materialintro/utils/Constants.java +++ b/materialintro/src/main/java/co/mobiwise/materialintro/utils/Constants.java @@ -15,6 +15,8 @@ public class Constants { public static int DEFAULT_COLOR_TEXTVIEW_INFO = 0xFF000000; + public static int DEFAULT_COLOR_DIALOG = 0x00000000; + public static int DEFAULT_DOT_SIZE = 55; } diff --git a/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java b/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java index fa8008b..1051c4b 100644 --- a/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java +++ b/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java @@ -11,8 +11,8 @@ import android.graphics.PorterDuffXfermode; import android.os.Build; import android.os.Handler; +import android.support.v7.widget.CardView; import android.util.AttributeSet; -import android.util.Log; import android.util.TypedValue; import android.view.Gravity; import android.view.LayoutInflater; @@ -202,6 +202,8 @@ public class MaterialIntroView extends RelativeLayout { * if this is true */ private boolean isPerformClick; + private CardView cardViewDialog; + private int colorBackgroundDialog; public MaterialIntroView(Context context) { super(context); @@ -236,6 +238,7 @@ private void init(Context context) { fadeAnimationDuration = Constants.DEFAULT_FADE_DURATION; padding = Constants.DEFAULT_TARGET_PADDING; colorTextViewInfo = Constants.DEFAULT_COLOR_TEXTVIEW_INFO; + colorBackgroundDialog = Constants.DEFAULT_COLOR_DIALOG; focusType = Focus.ALL; focusGravity = FocusGravity.CENTER; isReady = false; @@ -262,6 +265,8 @@ private void init(Context context) { View layoutInfo = LayoutInflater.from(getContext()).inflate(R.layout.material_intro_card, null); infoView = layoutInfo.findViewById(R.id.info_layout); + cardViewDialog = (CardView) layoutInfo.findViewById(R.id.card_view); + cardViewDialog.setBackgroundColor(colorBackgroundDialog); textViewInfo = (TextView) layoutInfo.findViewById(R.id.textview_info); textViewInfo.setTextColor(colorTextViewInfo); imageViewIcon = (ImageView) layoutInfo.findViewById(R.id.imageview_icon); @@ -561,6 +566,11 @@ private void setColorTextViewInfo(int colorTextViewInfo) { textViewInfo.setTextColor(this.colorTextViewInfo); } + private void setDialogBackgroundColor(int colorBackgroundDialog) { + this.colorBackgroundDialog = colorBackgroundDialog; + cardViewDialog.setBackgroundColor(this.colorBackgroundDialog); + } + private void setTextViewInfo(String textViewInfo) { this.textViewInfo.setText(textViewInfo); } @@ -664,6 +674,11 @@ public Builder setTextColor(int textColor) { return this; } + public Builder setDialogBackgroundColor(int color) { + materialIntroView.setDialogBackgroundColor(color); + return this; + } + public Builder setInfoText(String infoText) { materialIntroView.enableInfoDialog(true); materialIntroView.setTextViewInfo(infoText); From a5b7bea2a2b2a944827ec418a68bdd3ea785f7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=93=D0=BE=D1=80=D1=88=D0=BA=D0=BE=D0=B2?= Date: Mon, 18 Jul 2016 18:02:02 +0300 Subject: [PATCH 2/2] Fix background color on Android 4 --- .../co/mobiwise/materialintro/view/MaterialIntroView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java b/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java index 1051c4b..7135b4b 100644 --- a/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java +++ b/materialintro/src/main/java/co/mobiwise/materialintro/view/MaterialIntroView.java @@ -266,7 +266,8 @@ private void init(Context context) { infoView = layoutInfo.findViewById(R.id.info_layout); cardViewDialog = (CardView) layoutInfo.findViewById(R.id.card_view); - cardViewDialog.setBackgroundColor(colorBackgroundDialog); + cardViewDialog.setCardBackgroundColor(colorBackgroundDialog); +// cardViewDialog.setBackgroundColor(colorBackgroundDialog); textViewInfo = (TextView) layoutInfo.findViewById(R.id.textview_info); textViewInfo.setTextColor(colorTextViewInfo); imageViewIcon = (ImageView) layoutInfo.findViewById(R.id.imageview_icon); @@ -568,7 +569,8 @@ private void setColorTextViewInfo(int colorTextViewInfo) { private void setDialogBackgroundColor(int colorBackgroundDialog) { this.colorBackgroundDialog = colorBackgroundDialog; - cardViewDialog.setBackgroundColor(this.colorBackgroundDialog); + cardViewDialog.setCardBackgroundColor(this.colorBackgroundDialog); +// cardViewDialog.setBackgroundColor(this.colorBackgroundDialog); } private void setTextViewInfo(String textViewInfo) {