Added shadow

PopPsyA · Nov 14, 2019 · 3c12e9c · 3c12e9c
1 parent f530e03
commit 3c12e9c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 14 deletions.
diff --git a/app/src/main/java/devit951/github/magictipexample/MainActivity.kt b/app/src/main/java/devit951/github/magictipexample/MainActivity.kt
@@ -1,18 +1,23 @@
 package devit951.github.magictipexample
 
+import android.annotation.TargetApi
 import android.graphics.Color
+import android.graphics.Outline
+import android.os.Build
 import android.os.Bundle
+import android.view.View
+import android.view.ViewOutlineProvider
 import androidx.appcompat.app.AppCompatActivity
-import devit951.github.magictip.AutoCloseMagicTip
+import devit951.github.magictip.tip.AutoCloseMagicTip
 import devit951.github.magictip.MagicTip
-import devit951.github.magictip.OneMagicTip
-import devit951.github.magictip.animationdelegate.AlphaMagicTipAnimation
+import devit951.github.magictip.tip.OneMagicTip
 import devit951.github.magictip.animationdelegate.CombinedMagicTipAnimation
 import devit951.github.magictip.animationdelegate.ScaledTranslateMagicTipAnimation
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -27,10 +32,12 @@ class MainActivity : AppCompatActivity() {
         imageView.setOnClickListener {
             OneMagicTip(it, MagicTip(it)
                 .settings {
-                    startAnimationDelegate = CombinedMagicTipAnimation(ScaledTranslateMagicTipAnimation())
+                    startAnimationDelegate =
+                        CombinedMagicTipAnimation(ScaledTranslateMagicTipAnimation())
                     exitAnimationDelegate = ScaledTranslateMagicTipAnimation.Reversed()
-                    text =  "Lorem Posen"
+                    text = "Lorem Posen"
                     bgColor = Color.BLUE
+
                 })
                 .show()
         }

diff --git a/magictip/src/main/java/devit951/github/magictip/CommonExtensions.kt b/magictip/src/main/java/devit951/github/magictip/CommonExtensions.kt
@@ -1,10 +1,12 @@
 package devit951.github.magictip
 
-import android.content.Context
-import android.content.res.Resources
-import android.content.ContextWrapper
 import android.app.Activity
+import android.content.ContextWrapper
+import android.content.res.Resources
+import android.graphics.Color
 import android.view.View
+import kotlin.math.min
+import kotlin.math.roundToInt
 
 
 fun dp2Px(dp: Int): Int = (Resources.getSystem().displayMetrics.density * dp).toInt()
@@ -18,4 +20,11 @@ fun View.activity(): Activity {
         context = context.baseContext
     }
     error("Activity could not find")
-}
+}
+
+fun manipulateColor(color: Int, factor: Float) = Color.argb(
+    Color.alpha(color),
+    min((Color.red(color) * factor).roundToInt(), 255),
+    min((Color.green(color) * factor).roundToInt(), 255),
+    min((Color.blue(color) * factor).roundToInt(), 255)
+)
diff --git a/magictip/src/main/java/devit951/github/magictip/MagicTipView.kt b/magictip/src/main/java/devit951/github/magictip/MagicTipView.kt
@@ -3,6 +3,7 @@ package devit951.github.magictip
 import android.content.Context
 import android.graphics.*
 import android.util.AttributeSet
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.view.ViewCompat
@@ -17,9 +18,9 @@ class MagicTipView @JvmOverloads constructor(context: Context, attrs: AttributeS
 
     private val trianglePath = Path()
 
-    private var magicTipPadding = dp2Px(4)
+    private var magicTipPadding = dp2Px(5)
     private var widthOfTriangle = dp2Px(14)
-    private var heightOfTriangle = dp2Px(10)
+    private var heightOfTriangle = dp2Px(12)
 
 
     internal var clickDelegate: MagicTipClickDelegate = ImmediatlyRemoveViewClickDelegate()
@@ -28,6 +29,7 @@ class MagicTipView @JvmOverloads constructor(context: Context, attrs: AttributeS
         set(value) {
             field = value
             bgPaint.color = value
+            bgPaint.setShadowLayer(4f, 0.0f, 2.5f, manipulateColor(field, 0.8f))
         }
 
     var startAnimationDelegate: MagicTipAnimationDelegate? = null
@@ -46,6 +48,7 @@ class MagicTipView @JvmOverloads constructor(context: Context, attrs: AttributeS
             setMargins(margin, margin, margin, margin)
         }
         ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat())
+        setLayerType(View.LAYER_TYPE_SOFTWARE, bgPaint)
     }
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
@@ -73,7 +76,7 @@ class MagicTipView @JvmOverloads constructor(context: Context, attrs: AttributeS
         val halfTriangleWidth = widthOfTriangle / 2f
         val y = h.toFloat() - heightOfTriangle
         trianglePath.moveTo(halfWidth - halfTriangleWidth, y)
-        trianglePath.lineTo(halfWidth, h.toFloat())
+        trianglePath.lineTo(halfWidth, h.toFloat() - 5)
         trianglePath.lineTo(halfWidth + halfTriangleWidth, y)
     }
 }
diff --git a/...t951/github/magictip/AutoCloseMagicTip.kt → .../github/magictip/tip/AutoCloseMagicTip.kt b/...t951/github/magictip/AutoCloseMagicTip.kt → .../github/magictip/tip/AutoCloseMagicTip.kt
@@ -1,7 +1,8 @@
-package devit951.github.magictip
+package devit951.github.magictip.tip
 
 import android.os.Handler
 import android.view.View
+import devit951.github.magictip.MagicTip
 
 class AutoCloseMagicTip(anchorView: View, private val delay: Long = 1_000): MagicTip(anchorView){
     override fun show() {

diff --git a/...a/devit951/github/magictip/OneMagicTip.kt → ...vit951/github/magictip/tip/OneMagicTip.kt b/...a/devit951/github/magictip/OneMagicTip.kt → ...vit951/github/magictip/tip/OneMagicTip.kt
@@ -1,7 +1,9 @@
-package devit951.github.magictip
+package devit951.github.magictip.tip
 
 import android.view.View
 import androidx.core.view.children
+import devit951.github.magictip.MagicTip
+import devit951.github.magictip.MagicTipView
 
 class OneMagicTip(anchorView: View, private val magicTip: MagicTip): MagicTip(anchorView) {