From 25cde8cda137fe9678a954fabbffb946a274cae3 Mon Sep 17 00:00:00 2001 From: gooday Date: Fri, 21 Aug 2020 14:15:17 +0300 Subject: [PATCH 1/3] Added https://github.com/Tapadoo/Alerter/issues/226 --- .../main/java/com/tapadoo/alerter/Alert.kt | 1443 +++++++++-------- .../main/java/com/tapadoo/alerter/Alerter.kt | 11 + 2 files changed, 745 insertions(+), 709 deletions(-) diff --git a/alerter/src/main/java/com/tapadoo/alerter/Alert.kt b/alerter/src/main/java/com/tapadoo/alerter/Alert.kt index 9cbb80d..9d7f035 100644 --- a/alerter/src/main/java/com/tapadoo/alerter/Alert.kt +++ b/alerter/src/main/java/com/tapadoo/alerter/Alert.kt @@ -11,6 +11,7 @@ import android.os.Build import android.text.TextUtils import android.util.AttributeSet import android.util.Log +import android.util.TypedValue import android.view.* import android.view.animation.Animation import android.view.animation.AnimationUtils @@ -40,247 +41,262 @@ class Alert @JvmOverloads constructor(context: Context, @LayoutRes layoutId: Int, attrs: AttributeSet? = null, defStyle: Int = 0) - : FrameLayout(context, attrs, defStyle), View.OnClickListener, Animation.AnimationListener, SwipeDismissTouchListener.DismissCallbacks { + : FrameLayout(context, attrs, defStyle), View.OnClickListener, Animation.AnimationListener, SwipeDismissTouchListener.DismissCallbacks { - private var onShowListener: OnShowAlertListener? = null - internal var onHideListener: OnHideAlertListener? = null + private var onShowListener: OnShowAlertListener? = null + internal var onHideListener: OnHideAlertListener? = null - internal var enterAnimation: Animation = AnimationUtils.loadAnimation(context, R.anim.alerter_slide_in_from_top) - internal var exitAnimation: Animation = AnimationUtils.loadAnimation(context, R.anim.alerter_slide_out_to_top) + internal var enterAnimation: Animation = AnimationUtils.loadAnimation(context, R.anim.alerter_slide_in_from_top) + internal var exitAnimation: Animation = AnimationUtils.loadAnimation(context, R.anim.alerter_slide_out_to_top) + + internal var duration = DISPLAY_TIME_IN_SECONDS - internal var duration = DISPLAY_TIME_IN_SECONDS + private var showIcon: Boolean = true + private var enableIconPulse = true + private var enableInfiniteDuration: Boolean = false + private var enableProgress: Boolean = false - private var showIcon: Boolean = true - private var enableIconPulse = true - private var enableInfiniteDuration: Boolean = false - private var enableProgress: Boolean = false + private var showRightIcon: Boolean = false + private var enableClickAnimation: Boolean = true + private var enableRightIconPurse = true - private var showRightIcon: Boolean = false - private var enableRightIconPurse = true + private var runningAnimation: Runnable? = null - private var runningAnimation: Runnable? = null + private var isDismissible = true - private var isDismissible = true + private var buttons = ArrayList